Merge pull request #1619 from ral-facilities/feature/simpler-icat-tim…

…estamps

simpler icat timestamps

.gitignore

@@ -38,3 +38,4 @@ yarn-error.log*
 **/public/*settings*.json
 !**/public/*settings.example.json
 
+.vscode/

packages/datagateway-common/src/card/cardView.component.tsx

@@ -191,6 +191,22 @@ const CardView = (props: CardViewProps): React.ReactElement => {
     sort,
   } = props;
 
+  // Format dates to be more readable
+  // Format only if the date has a time component
+  // (to avoid formatting dates like 2020-01-01)
+  React.useEffect(() => {
+    data.forEach((entity) => {
+      ['createTime', 'modTime', 'startDate', 'endDate'].forEach((key) => {
+        if (entity[key] && /\d{2}:\d{2}:\d{2}/.test(entity[key])) {
+          entity[key] = new Date(entity[key])
+            .toISOString()
+            .replace('T', ' ')
+            .split(/[.+]/)[0];
+        }
+      });
+    });
+  }, [data]);
+
   const [shiftDown, setShiftDown] = React.useState(false);
   // add event listener to listen for shift key being pressed
   React.useEffect(() => {

packages/datagateway-common/src/table/table.component.tsx

@@ -163,6 +163,22 @@ const VirtualizedTable = React.memo(
       disableSelectAll,
     } = props;
 
+    // Format dates to be more readable
+    // Format only if the date has a time component
+    // (to avoid formatting dates like 2020-01-01)
+    React.useEffect(() => {
+      data.forEach((entity) => {
+        ['createTime', 'modTime', 'startDate', 'endDate'].forEach((key) => {
+          if (entity[key] && /\d{2}:\d{2}:\d{2}/.test(entity[key])) {
+            entity[key] = new Date(entity[key])
+              .toISOString()
+              .replace('T', ' ')
+              .split(/[.+]/)[0];
+          }
+        });
+      });
+    }, [data]);
+
     const [shiftDown, setShiftDown] = React.useState(false);
     // add event listener to listen for shift key being pressed
     React.useEffect(() => {