From 8f284aafac6cbb44f049d148ff01da0e1d775ead Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Tue, 12 May 2020 00:05:15 -0400
Subject: [PATCH] apply start/end dates to qido search

---
 .../default/src/DicomWebDataSource/qido.js    | 38 ++++++++-----------
 .../StudyListTable/StudyListTableRow.js       |  4 +-
 .../viewer/src/routes/DataSourceWrapper.jsx   |  6 +--
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/extensions/default/src/DicomWebDataSource/qido.js b/extensions/default/src/DicomWebDataSource/qido.js
index 50e113c2c..95f8f73b3 100644
--- a/extensions/default/src/DicomWebDataSource/qido.js
+++ b/extensions/default/src/DicomWebDataSource/qido.js
@@ -126,11 +126,13 @@ function mapParams(params) {
   ].join(',');
 
   const parameters = {
+    // Named
     PatientName: params.patientName,
     PatientID: params.patientId,
     AccessionNumber: params.accessionNumber,
     StudyDescription: params.studyDescription,
     ModalitiesInStudy: params.modalitiesInStudy,
+    // Other
     limit: params.limit || 101,
     offset: params.offset || 0,
     fuzzymatching: params.fuzzymatching === undefined ? false : true,
@@ -138,10 +140,20 @@ function mapParams(params) {
   };
 
   // build the StudyDate range parameter
-  if (params.studyDateFrom || params.studyDateTo) {
-    const dateFrom = _dateToString(new Date(params.studyDateFrom));
-    const dateTo = _dateToString(new Date(params.studyDateTo));
-    parameters.StudyDate = `${dateFrom}-${dateTo}`;
+  if (params.startDate && params.endDate) {
+    parameters.StudyDate = `${params.startDate}-${params.endDate}`;
+  } else if (params.startDate) {
+    const today = new Date();
+    const DD = String(today.getDate()).padStart(2, '0');
+    const MM = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
+    const YYYY = today.getFullYear();
+    const todayStr = `${YYYY}${MM}${DD}`;
+
+    parameters.StudyDate = `${params.startDate}-${todayStr}`;
+  } else if (params.endDate) {
+    const oldDateStr = `19700102`;
+
+    parameters.StudyDate = `${oldDateStr}-${params.endDate}`;
   }
 
   // Build the StudyInstanceUID parameter
@@ -163,22 +175,4 @@ function mapParams(params) {
   return final;
 }
 
-/**
- * Creates a QIDO date string for a date range query
- * Assumes the year is positive, at most 4 digits long.
- *
- * @param date The Date object to be formatted
- * @returns {string} The formatted date string
- */
-function _dateToString(date) {
-  if (!date) return '';
-  let year = date.getFullYear().toString();
-  let month = (date.getMonth() + 1).toString();
-  let day = date.getDate().toString();
-  year = '0'.repeat(4 - year.length).concat(year);
-  month = '0'.repeat(2 - month.length).concat(month);
-  day = '0'.repeat(2 - day.length).concat(day);
-  return ''.concat(year, month, day);
-}
-
 export { mapParams, search, processResults };
diff --git a/platform/ui/src/components/StudyListTable/StudyListTableRow.js b/platform/ui/src/components/StudyListTable/StudyListTableRow.js
index 6d7b2e586..67db2ab56 100644
--- a/platform/ui/src/components/StudyListTable/StudyListTableRow.js
+++ b/platform/ui/src/components/StudyListTable/StudyListTableRow.js
@@ -77,10 +77,12 @@ const StudyListTableRow = props => {
 
 StudyListTableRow.propTypes = {
   tableData: PropTypes.shape({
+    /** A table row represented by an array of "cell" objects */
     row: PropTypes.arrayOf(
       PropTypes.shape({
         key: PropTypes.string.isRequired,
-        content: PropTypes.node.isRequired,
+        /** Optional content to render in row's cell */
+        content: PropTypes.node,
         /** Title attribute to use for provided content */
         title: PropTypes.string,
         gridCol: PropTypes.number.isRequired,
diff --git a/platform/viewer/src/routes/DataSourceWrapper.jsx b/platform/viewer/src/routes/DataSourceWrapper.jsx
index f5b547f16..2c7a8d167 100644
--- a/platform/viewer/src/routes/DataSourceWrapper.jsx
+++ b/platform/viewer/src/routes/DataSourceWrapper.jsx
@@ -93,10 +93,8 @@ function _getQueryFilterValues(query) {
   const queryFilterValues = {
     patientName: query.get('patientName'),
     // mrn: query.get('mrn'), patientId?
-    studyDate: {
-      startDate: query.get('startDate'),
-      endDate: query.get('endDate'),
-    },
+    startDate: query.get('startDate'),
+    endDate: query.get('endDate'),
     studyDescription: query.get('description'),
     //modalitiesInStudy: _tryParseJson(query.get('modality'), undefined),
     accessionNumber: query.get('accession'),