From 4783d1634b33c55b88913c74a2a9aeb25257fdb0 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Wed, 22 Feb 2017 19:55:01 -0300 Subject: [PATCH] Adding accessionNumber to metadata and preventing some crashes on measurements table --- .../ohif-cornerstone/client/lib/classes/MetadataProvider.js | 1 + .../measurementTableView/measurementTableView.js | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js b/Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js index f1a297fe0..dd15fd190 100644 --- a/Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js +++ b/Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js @@ -27,6 +27,7 @@ export class MetadataProvider { const metadata = {}; metadata.study = { + accessionNumber: studyMetadata.accessionNumber, patientId: studyMetadata.patientId, studyInstanceUid: studyMetadata.studyInstanceUid, studyDate: studyMetadata.studyDate, diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js index 81726a683..7bb30daaf 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js @@ -28,7 +28,7 @@ Template.measurementTableView.helpers({ const instance = Template.instance(); const groups = instance.data.measurementGroups.get(); const group = _.find(groups, item => item.toolGroup.id === toolGroupId); - return !!group.measurementRows.length; + return group && !!group.measurementRows.length; }, getNewToolGroup(tool) { @@ -58,9 +58,7 @@ Template.measurementTableView.helpers({ const current = instance.data.timepointApi.current(); const baseline = timepointApi.baseline(); - if (!measurementApi || !timepointApi || !current) { - return; - } + if (!measurementApi || !timepointApi || !current || !baseline) return; // If this is a baseline, stop here since there are no new measurements to display