Hotfixes for Release (#89)

* Patient Data organization * Title change: age distribution Signed-off-by: Courtney Gosselin <[email protected]> --------- Signed-off-by: Courtney Gosselin <[email protected]>
CanDIG · Jul 21, 2023 · 728b10b · 728b10b
1 parent f06f3ce
commit 728b10b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/store/constant.js b/src/store/constant.js
@@ -121,7 +121,7 @@ export const DataVisualizationChartInfo = {
         yAxis: 'Number of Patients'
     },
     diagnosis_age_count: {
-        title: ' Age Range Distribution',
+        title: ' Age at Diagnosis Distribution',
         xAxis: 'Age Range',
         yAxis: 'Number of Patients'
     },

diff --git a/src/views/clinicalGenomic/widgets/patientCountSingle.js b/src/views/clinicalGenomic/widgets/patientCountSingle.js
@@ -57,7 +57,7 @@ function PatientCountSingle(props) {
                 <Divider flexItem orientation="vertical" className={classes.divider} />
                 <Grid item xs={2}>
                     <Typography align="center" className={classes.patientEntry}>
-                        {numCohorts}
+                        {patientsInSearch}
                     </Typography>
                 </Grid>
                 <Divider flexItem orientation="vertical" className={classes.divider} />
@@ -69,7 +69,7 @@ function PatientCountSingle(props) {
                 <Divider flexItem orientation="vertical" className={classes.divider} />
                 <Grid item xs={2}>
                     <Typography align="center" className={classes.patientEntry}>
-                        {patientsInSearch}
+                        {numCohorts}
                     </Typography>
                 </Grid>
                 <Divider flexItem orientation="vertical" className={classes.divider} />
@@ -106,13 +106,13 @@ function PatientCountSingle(props) {
                             <Divider flexItem orientation="vertical" className={classes.divider} />
                             <Grid item xs={2}>
                                 <Typography align="center" className={classes.patientEntry}>
-                                    {counts.totals[cohort]}
+                                    {counts.counts?.[cohort] || 0}
                                 </Typography>
                             </Grid>
                             <Divider flexItem orientation="vertical" className={classes.divider} />
                             <Grid item xs={2}>
                                 <Typography align="center" className={classes.patientEntry}>
-                                    {counts.counts?.[cohort] || 0}
+                                    {counts.totals[cohort]}
                                 </Typography>
                             </Grid>
                             <Divider flexItem orientation="vertical" className={classes.divider} />

diff --git a/src/views/clinicalGenomic/widgets/patientCounts.js b/src/views/clinicalGenomic/widgets/patientCounts.js
@@ -76,7 +76,7 @@ function PatientCounts(props) {
                     </Grid>
                     <Grid item xs={2}>
                         <Typography variant="h5" align="center" className={classes.header}>
-                            Total Cohorts
+                            Patients In Search
                         </Typography>
                     </Grid>
                     <Grid item xs={2}>
@@ -86,7 +86,7 @@ function PatientCounts(props) {
                     </Grid>
                     <Grid item xs={2}>
                         <Typography variant="h5" align="center" className={classes.header}>
-                            Patients In Search
+                            Total Cohorts
                         </Typography>
                     </Grid>
                     <Grid item xs={1} ml="auto" className={classes.button}>