diff --git a/extensions/default/src/Panels/PanelStudyBrowser.jsx b/extensions/default/src/Panels/PanelStudyBrowser.jsx index 2d46c8b83..8e813217f 100644 --- a/extensions/default/src/Panels/PanelStudyBrowser.jsx +++ b/extensions/default/src/Panels/PanelStudyBrowser.jsx @@ -1,8 +1,9 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { StudyBrowser, useImageViewer, utils } from '@ohif/ui'; +import { StudyBrowser, useImageViewer } from '@ohif/ui'; +import { utils } from '@ohif/core'; -const { getFormattedDate } = utils; +const { formatDate } = utils; /** * @@ -39,7 +40,7 @@ function PanelStudyBrowser({ const actuallyMappedStudies = mappedStudies.map(qidoStudy => { return { studyInstanceUid: qidoStudy.StudyInstanceUID, - date: getFormattedDate(qidoStudy.StudyDate), + date: formatDate(qidoStudy.StudyDate), description: qidoStudy.StudyDescription, modalities: qidoStudy.ModalitiesInStudy, numInstances: qidoStudy.NumInstances, diff --git a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js index 9b248ac64..fca1cd03b 100644 --- a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js +++ b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js @@ -4,12 +4,12 @@ import cornerstoneTools from 'cornerstone-tools'; import cornerstone from 'cornerstone-core'; import CornerstoneViewport from 'react-cornerstone-viewport'; -import OHIF from '@ohif/core'; -import { ViewportActionBar, useViewportGrid, utils } from '@ohif/ui'; +import OHIF, { utils } from '@ohif/core'; +import { ViewportActionBar, useViewportGrid } from '@ohif/ui'; import TOOL_NAMES from './constants/toolNames'; import id from './id'; -const { getFormattedDate } = utils; +const { formatDate } = utils; const scrollToIndex = cornerstoneTools.importInternal('util/scrollToIndex'); // const cine = viewportSpecificData.cine; @@ -246,7 +246,7 @@ function OHIFCornerstoneSRViewport({ label: _viewportLabels[firstViewportIndexWithMatchingDisplaySetUid], isTracked: false, isLocked: false, - studyDate: getFormattedDate(StudyDate), + studyDate: formatDate(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 9d835deb2..43af3cb59 100644 --- a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx +++ b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx @@ -1,9 +1,10 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { StudyBrowser, useImageViewer, useViewportGrid, utils } from '@ohif/ui'; +import { utils } from '@ohif/core'; +import { StudyBrowser, useImageViewer, useViewportGrid } from '@ohif/ui'; import { useTrackedMeasurements } from '../../getContextModule'; -const { getFormattedDate } = utils; +const { formatDate } = utils; /** * @@ -73,7 +74,7 @@ function PanelStudyBrowserTracking({ const actuallyMappedStudies = mappedStudies.map(qidoStudy => { return { studyInstanceUid: qidoStudy.StudyInstanceUID, - date: getFormattedDate(qidoStudy.StudyDate), + date: formatDate(qidoStudy.StudyDate), description: qidoStudy.StudyDescription, modalities: qidoStudy.ModalitiesInStudy, numInstances: qidoStudy.NumInstances, diff --git a/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js b/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js index 08e34f992..4bd626bc1 100644 --- a/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js +++ b/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js @@ -3,17 +3,16 @@ import PropTypes from 'prop-types'; import cornerstone from 'cornerstone-core'; import cornerstoneTools from 'cornerstone-tools'; import CornerstoneViewport from 'react-cornerstone-viewport'; -import OHIF, { DicomMetadataStore } from '@ohif/core'; +import OHIF, { DicomMetadataStore, utils } from '@ohif/core'; import { Notification, ViewportActionBar, useViewportGrid, useViewportDialog, - utils, } from '@ohif/ui'; import { useTrackedMeasurements } from './../getContextModule'; -const { getFormattedDate } = utils; +const { formatDate } = utils; // TODO -> Get this list from the list of tracked measurements. const { @@ -231,7 +230,7 @@ function TrackedCornerstoneViewport({ label: _viewportLabels[firstViewportIndexWithMatchingDisplaySetUid], isTracked: trackedSeries.includes(SeriesInstanceUID), isLocked: false, - studyDate: getFormattedDate(SeriesDate), // TODO: This is series date. Is that ok? + studyDate: formatDate(SeriesDate), // TODO: This is series date. Is that ok? currentSeries: SeriesNumber, seriesDescription: SeriesDescription, modality: Modality, diff --git a/platform/core/package.json b/platform/core/package.json index a14313b13..34aa934cc 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -44,6 +44,7 @@ "isomorphic-base64": "^1.0.2", "lodash.clonedeep": "^4.5.0", "lodash.merge": "^4.6.1", + "moment": "^2.24.0", "mousetrap": "^1.6.3", "validate.js": "^0.12.0" } diff --git a/platform/ui/src/utils/getFormattedDate.js b/platform/core/src/utils/formatDate.js similarity index 100% rename from platform/ui/src/utils/getFormattedDate.js rename to platform/core/src/utils/formatDate.js diff --git a/platform/core/src/utils/index.js b/platform/core/src/utils/index.js index a69889262..fdf6974cc 100644 --- a/platform/core/src/utils/index.js +++ b/platform/core/src/utils/index.js @@ -15,6 +15,7 @@ import makeCancelable from './makeCancelable'; import hotkeys from './hotkeys'; import Queue from './Queue'; import isDicomUid from './isDicomUid'; +import formatDate from './formatDate'; import formatPN from './formatPN'; import resolveObjectPath from './resolveObjectPath'; import * as hierarchicalListUtils from './hierarchicalListUtils'; @@ -27,6 +28,7 @@ const utils = { addServers, sortBy, writeScript, + formatDate, formatPN, b64toBlob, StackManager, @@ -50,6 +52,7 @@ export { absoluteUrl, addServers, sortBy, + formatDate, writeScript, b64toBlob, StackManager, diff --git a/platform/ui/src/utils/index.js b/platform/ui/src/utils/index.js index 1016b50ef..659d89d46 100644 --- a/platform/ui/src/utils/index.js +++ b/platform/ui/src/utils/index.js @@ -1,8 +1,7 @@ import getMockedStudies from './getMockedStudies'; -import getFormattedDate from './getFormattedDate'; -const utils = { getMockedStudies, getFormattedDate }; +const utils = { getMockedStudies }; -export { getMockedStudies, getFormattedDate }; +export { getMockedStudies }; export default utils;