fix date format

This commit is contained in:
Rodrigo Antinarelli 2020-06-26 14:29:25 -03:00
parent ec48801be7
commit a5170076db
6 changed files with 39 additions and 18 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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