othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move formatDate to ohif/core

Browse Source
This commit is contained in:
Rodrigo Antinarelli 2020-06-26 16:17:25 -03:00
parent a5170076db
commit 9145215596
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/default/src/Panels/PanelStudyBrowser.jsx
View File

@ -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,

8
extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
View File

@ -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,

7
extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx
View File

@ -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,

7
extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js
View File

@ -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,

1
platform/core/package.json
View File

@ -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"
}

0
platform/ui/src/utils/getFormattedDate.js → platform/core/src/utils/formatDate.js
View File

3
platform/core/src/utils/index.js
View File

@ -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,

5
platform/ui/src/utils/index.js
View File

@ -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;