From 10729c2414fe9b03618f6eca681bc699dc7b6663 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Tue, 12 May 2020 13:27:12 -0400
Subject: [PATCH] Sort for everything except studydate/time

---
 .../default/src/DicomWebDataSource/qido.js    | 18 ++++--------
 .../StudyListContainer/StudyListContainer.jsx | 29 ++++++++++---------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/extensions/default/src/DicomWebDataSource/qido.js b/extensions/default/src/DicomWebDataSource/qido.js
index 41d9aedb9..b9409ff5c 100644
--- a/extensions/default/src/DicomWebDataSource/qido.js
+++ b/extensions/default/src/DicomWebDataSource/qido.js
@@ -46,19 +46,13 @@ function processResults(qidoStudies) {
   qidoStudies.forEach(qidoStudy =>
     studies.push({
       studyInstanceUid: getString(qidoStudy['0020000D']),
-      studyDate: getString(qidoStudy['00080020']),
-      // HHmmss.SSS (24-hour, minutes, seconds, fractional seconds)
-      studyTime: getString(qidoStudy['00080030']),
-      accessionNumber: getString(qidoStudy['00080050']),
-      // referringPhysicianName: getString(qidoStudy['00080090']),
-      mrn: getString(qidoStudy['00100020']), // patientId
+      date: getString(qidoStudy['00080020']),
+      time: getString(qidoStudy['00080030']), // HHmmss.SSS (24-hour, minutes, seconds, fractional seconds)
+      accession: getString(qidoStudy['00080050']), // short string, probably a number?
+      mrn: getString(qidoStudy['00100020']), // medicalRecordNumber
       patientName: getName(qidoStudy['00100010']),
-      // patientBirthdate: getString(qidoStudy['00100030']),
-      // patientSex: getString(qidoStudy['00100040']),
-      // studyId: getString(qidoStudy['00200010']), // mrn?
-      // numberOfStudyRelatedSeries: getString(qidoStudy['00201206']),
-      instances: getString(qidoStudy['00201208']),
-      studyDescription: getString(qidoStudy['00081030']),
+      instances: Number(getString(qidoStudy['00201208'])), // number
+      description: getString(qidoStudy['00081030']),
       modalities: getString(
         getModalities(qidoStudy['00080060'], qidoStudy['00080061'])
       ),
diff --git a/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx b/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
index 9a703b85d..89cbde8d4 100644
--- a/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
+++ b/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
@@ -163,6 +163,7 @@ function StudyListContainer({ history, data: studies }) {
     });
   };
   const tableDataSource = studies
+    // TOOD: Move sort to DataSourceWrapper?
     .sort((s1, s2) => {
       const noSortApplied = sortBy === '' || !sortBy;
       const sortModifier = sortDirection === 'descending' ? 1 : -1;
@@ -176,7 +177,7 @@ function StudyListContainer({ history, data: studies }) {
       if (typeof s1Prop === 'string' && typeof s2Prop === 'string') {
         return s1Prop.localeCompare(s2Prop) * sortModifier;
       } else if (typeof s1Prop === 'number' && typeof s2Prop === 'number') {
-        return (s1Prop > s2Prop) * sortModifier;
+        return (s1Prop > s2Prop ? 1 : -1) * sortModifier;
       } else if (!s1Prop && s2Prop) {
         return -1 * sortModifier;
       } else if (!s2Prop && s1Prop) {
@@ -189,14 +190,14 @@ function StudyListContainer({ history, data: studies }) {
       const rowKey = key + 1;
       const isExpanded = expandedRows.some(k => k === rowKey);
       const {
-        accessionNumber,
+        accession,
         modalities,
         instances,
-        studyDescription,
+        description,
         mrn,
         patientName,
-        studyDate,
-        studyTime,
+        date,
+        time,
         // ??
         // TODO: won't have until expanded
         series = [],
@@ -239,11 +240,11 @@ function StudyListContainer({ history, data: studies }) {
             content: (
               <div>
                 <span className="mr-4">
-                  {moment(studyDate).format('MMM-DD-YYYY')}
+                  {moment(date).format('MMM-DD-YYYY')}
                 </span>
-                {studyTime && (
+                {time && (
                   <span>
-                    {moment(studyTime, 'HHmmss.SSS').format('hh:mm A')}
+                    {moment(time, 'HHmmss.SSS').format('hh:mm A')}
                   </span>
                 )}
               </div>
@@ -253,8 +254,8 @@ function StudyListContainer({ history, data: studies }) {
           },
           {
             key: 'description',
-            content: studyDescription,
-            title: studyDescription,
+            content: description,
+            title: description,
             gridCol: 4,
           },
           {
@@ -265,8 +266,8 @@ function StudyListContainer({ history, data: studies }) {
           },
           {
             key: 'accession',
-            content: accessionNumber,
-            title: accessionNumber,
+            content: accession,
+            title: accession,
             gridCol: 4,
           },
           {
@@ -283,7 +284,7 @@ function StudyListContainer({ history, data: studies }) {
                 {instances}
               </>
             ),
-            title: instances,
+            title: (instances || 0).toString(),
             gridCol: 4,
           },
         ],
@@ -442,7 +443,7 @@ function _getQueryFilterValues(query) {
       ? query.get('modalities').split(',')
       : [],
     accession: query.get('accession'),
-    sortBy: query.get('soryBy'),
+    sortBy: query.get('sortBy'),
     sortDirection: query.get('sortDirection'),
     pageNumber: _tryParseInt(query.get('pageNumber'), undefined),
     resultsPerPage: _tryParseInt(query.get('resultsPerPage'), undefined),