From 8af6b07b77dec5c46636168fd66c0f272dc314f2 Mon Sep 17 00:00:00 2001 From: Emel Alkim Date: Thu, 1 Jul 2021 14:33:48 -0700 Subject: [PATCH 1/8] add volume and fix longitudinal report if check --- src/components/searchView/Report.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/searchView/Report.jsx b/src/components/searchView/Report.jsx index b1a6d96e0..86d798915 100644 --- a/src/components/searchView/Report.jsx +++ b/src/components/searchView/Report.jsx @@ -77,7 +77,7 @@ const Report = props => { loadFilter = 'shapes=line&metric=standard deviation'; numofHeaderCols = 2; hideCols = []; - } else if (report === 'Longitudinal') { + } else if (report) { filter = 'report=Longitudinal'; if (report != 'Longitudinal') loadFilter = 'metric=' + report; if (template != null) filter += '&templatecode=' + template; @@ -148,7 +148,7 @@ const Report = props => { const metric = e.target.value; props.handleMetric(metric); const validMetric = - metric === 'ADLA' || metric === 'RECIST' || metric === 'intensitystddev' || metric === 'Export (beta)'; + metric === 'ADLA' || metric === 'RECIST' || metric === 'intensitystddev' || metric === 'volume' || metric === 'Export (beta)'; const type = 'BASELINE'; let result; if (validMetric) { @@ -502,6 +502,7 @@ const Report = props => { + From 89d9241b26e1cce2041868fa5608c799da36f14f Mon Sep 17 00:00:00 2001 From: Emel Alkim Date: Tue, 27 Jul 2021 15:31:41 -0700 Subject: [PATCH 2/8] add u24 options for waterfall --- src/components/searchView/Report.jsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/searchView/Report.jsx b/src/components/searchView/Report.jsx index 86d798915..7e0efc091 100644 --- a/src/components/searchView/Report.jsx +++ b/src/components/searchView/Report.jsx @@ -148,7 +148,7 @@ const Report = props => { const metric = e.target.value; props.handleMetric(metric); const validMetric = - metric === 'ADLA' || metric === 'RECIST' || metric === 'intensitystddev' || metric === 'volume' || metric === 'Export (beta)'; + metric === 'ADLA' || metric === 'RECIST' || metric === 'intensitystddev' || metric === 'ser_original_shape_VoxelVolume' || metric === 'ser_original_shape_Maximum2DDiameterSlice' || metric === 'ser_original_firstorder_Maximum' || metric === 'ser_original_firstorder_Median' || metric === 'adc_original_firstorder_Maximum' || metric === 'adc_original_firstorder_Median' || metric === 've_original_firstorder_Maximum' || metric === 've_original_firstorder_Median' || metric === 'Export (beta)'; const type = 'BASELINE'; let result; if (validMetric) { @@ -502,7 +502,14 @@ const Report = props => { - + + + + + + + + From d9c620f25a52bf4d796ddd1efcc7759e443f308e Mon Sep 17 00:00:00 2001 From: Emel Alkim Date: Tue, 27 Jul 2021 15:46:43 -0700 Subject: [PATCH 3/8] lowercase feature names --- src/components/searchView/Report.jsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/searchView/Report.jsx b/src/components/searchView/Report.jsx index 7e0efc091..10163113a 100644 --- a/src/components/searchView/Report.jsx +++ b/src/components/searchView/Report.jsx @@ -148,7 +148,7 @@ const Report = props => { const metric = e.target.value; props.handleMetric(metric); const validMetric = - metric === 'ADLA' || metric === 'RECIST' || metric === 'intensitystddev' || metric === 'ser_original_shape_VoxelVolume' || metric === 'ser_original_shape_Maximum2DDiameterSlice' || metric === 'ser_original_firstorder_Maximum' || metric === 'ser_original_firstorder_Median' || metric === 'adc_original_firstorder_Maximum' || metric === 'adc_original_firstorder_Median' || metric === 've_original_firstorder_Maximum' || metric === 've_original_firstorder_Median' || metric === 'Export (beta)'; + metric === 'ADLA' || metric === 'RECIST' || metric === 'intensitystddev' || metric === 'ser_original_shape_voxelvolume' || metric === 'ser_original_shape_maximum2ddiameterslice' || metric === 'ser_original_firstorder_maximum' || metric === 'ser_original_firstorder_median' || metric === 'adc_original_firstorder_maximum' || metric === 'adc_original_firstorder_median' || metric === 've_original_firstorder_maximum' || metric === 've_original_firstorder_median' || metric === 'Export (beta)'; const type = 'BASELINE'; let result; if (validMetric) { @@ -502,14 +502,14 @@ const Report = props => { - - - - - - - - + + + + + + + + From a7a40fb500ea43b64272c704db07978c2dc1c2a5 Mon Sep 17 00:00:00 2001 From: Emel Alkim Date: Tue, 27 Jul 2021 16:54:09 -0700 Subject: [PATCH 4/8] enable reports on lite mode --- src/components/navbar.jsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/navbar.jsx b/src/components/navbar.jsx index 225e24feb..d278468e9 100644 --- a/src/components/navbar.jsx +++ b/src/components/navbar.jsx @@ -87,16 +87,7 @@ const NavBar = ({ Progress - */} - + */} {/*
  • Edit @@ -117,6 +108,15 @@ const NavBar = ({
    • {' '} )} +