From a5170076db87051ba28b7714f37b5907a0a4e093 Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Fri, 26 Jun 2020 14:29:25 -0300 Subject: [PATCH] fix date format --- .../default/src/Panels/PanelStudyBrowser.jsx | 16 +++++++++------- .../dicom-sr/src/OHIFCornerstoneSRViewport.js | 5 +++-- .../PanelStudyBrowserTracking.jsx | 14 ++++++++------ .../src/viewports/TrackedCornerstoneViewport.js | 5 ++++- platform/ui/src/utils/getFormattedDate.js | 12 ++++++++++++ platform/ui/src/utils/index.js | 5 +++-- 6 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 platform/ui/src/utils/getFormattedDate.js diff --git a/extensions/default/src/Panels/PanelStudyBrowser.jsx b/extensions/default/src/Panels/PanelStudyBrowser.jsx index 221395926..2d46c8b83 100644 --- a/extensions/default/src/Panels/PanelStudyBrowser.jsx +++ b/extensions/default/src/Panels/PanelStudyBrowser.jsx @@ -1,6 +1,8 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { StudyBrowser, useImageViewer } from '@ohif/ui'; +import { StudyBrowser, useImageViewer, utils } from '@ohif/ui'; + +const { getFormattedDate } = utils; /** * @@ -37,7 +39,7 @@ function PanelStudyBrowser({ const actuallyMappedStudies = mappedStudies.map(qidoStudy => { return { studyInstanceUid: qidoStudy.StudyInstanceUID, - date: qidoStudy.StudyDate, + date: getFormattedDate(qidoStudy.StudyDate), description: qidoStudy.StudyDescription, modalities: qidoStudy.ModalitiesInStudy, numInstances: qidoStudy.NumInstances, @@ -151,11 +153,11 @@ function PanelStudyBrowser({ ); const updatedExpandedStudyInstanceUIDs = shouldCollapseStudy ? // eslint-disable-next-line prettier/prettier - [ - ...expandedStudyInstanceUIDs.filter( - stdyUid => stdyUid !== StudyInstanceUID - ), - ] + [ + ...expandedStudyInstanceUIDs.filter( + stdyUid => stdyUid !== StudyInstanceUID + ), + ] : [...expandedStudyInstanceUIDs, StudyInstanceUID]; setExpandedStudyInstanceUIDs(updatedExpandedStudyInstanceUIDs); diff --git a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js index 22f343112..9b248ac64 100644 --- a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js +++ b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js @@ -5,10 +5,11 @@ import cornerstone from 'cornerstone-core'; import CornerstoneViewport from 'react-cornerstone-viewport'; import OHIF from '@ohif/core'; -import { ViewportActionBar, useViewportGrid } from '@ohif/ui'; +import { ViewportActionBar, useViewportGrid, utils } from '@ohif/ui'; import TOOL_NAMES from './constants/toolNames'; import id from './id'; +const { getFormattedDate } = utils; const scrollToIndex = cornerstoneTools.importInternal('util/scrollToIndex'); // const cine = viewportSpecificData.cine; @@ -245,7 +246,7 @@ function OHIFCornerstoneSRViewport({ label: _viewportLabels[firstViewportIndexWithMatchingDisplaySetUid], isTracked: false, isLocked: false, - studyDate: StudyDate, + studyDate: getFormattedDate(StudyDate), currentSeries: SeriesNumber, seriesDescription: SeriesDescription, modality: Modality, diff --git a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx index 2e9f45429..9d835deb2 100644 --- a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx +++ b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx @@ -1,8 +1,10 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { StudyBrowser, useImageViewer, useViewportGrid } from '@ohif/ui'; +import { StudyBrowser, useImageViewer, useViewportGrid, utils } from '@ohif/ui'; import { useTrackedMeasurements } from '../../getContextModule'; +const { getFormattedDate } = utils; + /** * * @param {*} param0 @@ -71,7 +73,7 @@ function PanelStudyBrowserTracking({ const actuallyMappedStudies = mappedStudies.map(qidoStudy => { return { studyInstanceUid: qidoStudy.StudyInstanceUID, - date: qidoStudy.StudyDate, + date: getFormattedDate(qidoStudy.StudyDate), description: qidoStudy.StudyDescription, modalities: qidoStudy.ModalitiesInStudy, numInstances: qidoStudy.NumInstances, @@ -201,10 +203,10 @@ function PanelStudyBrowserTracking({ ); const updatedExpandedStudyInstanceUIDs = shouldCollapseStudy ? [ - ...expandedStudyInstanceUIDs.filter( - stdyUid => stdyUid !== StudyInstanceUID - ), - ] + ...expandedStudyInstanceUIDs.filter( + stdyUid => stdyUid !== StudyInstanceUID + ), + ] : [...expandedStudyInstanceUIDs, StudyInstanceUID]; setExpandedStudyInstanceUIDs(updatedExpandedStudyInstanceUIDs); diff --git a/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js b/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js index 91e28bb84..08e34f992 100644 --- a/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js +++ b/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js @@ -9,9 +9,12 @@ import { ViewportActionBar, useViewportGrid, useViewportDialog, + utils, } from '@ohif/ui'; import { useTrackedMeasurements } from './../getContextModule'; +const { getFormattedDate } = utils; + // TODO -> Get this list from the list of tracked measurements. const { ArrowAnnotateTool, @@ -228,7 +231,7 @@ function TrackedCornerstoneViewport({ label: _viewportLabels[firstViewportIndexWithMatchingDisplaySetUid], isTracked: trackedSeries.includes(SeriesInstanceUID), isLocked: false, - studyDate: SeriesDate, // TODO: This is series date. Is that ok? + studyDate: getFormattedDate(SeriesDate), // TODO: This is series date. Is that ok? currentSeries: SeriesNumber, seriesDescription: SeriesDescription, modality: Modality, diff --git a/platform/ui/src/utils/getFormattedDate.js b/platform/ui/src/utils/getFormattedDate.js new file mode 100644 index 000000000..a2a9a9bab --- /dev/null +++ b/platform/ui/src/utils/getFormattedDate.js @@ -0,0 +1,12 @@ +import moment from 'moment'; + +/** + * Format date + * + * @param {string} date Date to be formatted + * @param {string} format Desired date format + * @returns {string} Formatted date + */ +export default (date, format = 'DD-MMM-YYYY') => { + return moment(date).format(format); +}; diff --git a/platform/ui/src/utils/index.js b/platform/ui/src/utils/index.js index 659d89d46..1016b50ef 100644 --- a/platform/ui/src/utils/index.js +++ b/platform/ui/src/utils/index.js @@ -1,7 +1,8 @@ import getMockedStudies from './getMockedStudies'; +import getFormattedDate from './getFormattedDate'; -const utils = { getMockedStudies }; +const utils = { getMockedStudies, getFormattedDate }; -export { getMockedStudies }; +export { getMockedStudies, getFormattedDate }; export default utils;