From 31581744eb77fe25fd82335283a6659371343018 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Mon, 6 Jul 2020 07:36:30 -0400
Subject: [PATCH] fix studydate/time tooltip

---
 .../viewer/src/routes/WorkList/WorkList.jsx   | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/platform/viewer/src/routes/WorkList/WorkList.jsx b/platform/viewer/src/routes/WorkList/WorkList.jsx
index 1213b7a92..11f6da21d 100644
--- a/platform/viewer/src/routes/WorkList/WorkList.jsx
+++ b/platform/viewer/src/routes/WorkList/WorkList.jsx
@@ -199,6 +199,15 @@ function WorkList({ history, data: studies, isLoadingData, dataSource }) {
       date,
       time,
     } = study;
+    const studyDate =
+      date &&
+      moment(date, ['YYYYMMDD', 'YYYY.MM.DD'], true).isValid() &&
+      moment(date, ['YYYYMMDD', 'YYYY.MM.DD']).format('MMM-DD-YYYY');
+    const studyTime =
+      time &&
+      moment(time, ['HH', 'HHmm', 'HHmmss', 'HHmmss.SSS']).isValid() &&
+      moment(time, ['HH', 'HHmm', 'HHmmss', 'HHmmss.SSS']).format('hh:mm A');
+
     return {
       row: [
         {
@@ -221,30 +230,11 @@ function WorkList({ history, data: studies, isLoadingData, dataSource }) {
           key: 'studyDate',
           content: (
             <div>
-              <span className="mr-4">
-                {date &&
-                  moment(date, ['YYYYMMDD', 'YYYY.MM.DD'], true).isValid() &&
-                  moment(date, ['YYYYMMDD', 'YYYY.MM.DD']).format(
-                    'MMM-DD-YYYY'
-                  )}
-              </span>
-              {time && (
-                <span>
-                  {time &&
-                    moment(time, [
-                      'HH',
-                      'HHmm',
-                      'HHmmss',
-                      'HHmmss.SSS',
-                    ]).isValid() &&
-                    moment(time, ['HH', 'HHmm', 'HHmmss', 'HHmmss.SSS']).format(
-                      'hh:mm A'
-                    )}
-                </span>
-              )}
+              {studyDate && <span className="mr-4">{studyDate}</span>}
+              {studyTime && <span>{studyTime}</span>}
             </div>
           ),
-          title: 'time',
+          title: `${studyDate || ''} ${studyTime || ''}`,
           gridCol: 5,
         },
         {