diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.html b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.html index c7450bcca..9b1a4d81a 100644 --- a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.html +++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.html @@ -2,9 +2,6 @@
-
- -
{{this.timepointApi.title timepoint}}
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js index c2736b6f2..a004c3eef 100644 --- a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js +++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js @@ -13,7 +13,6 @@ Template.timepointBrowserItem.onCreated(() => { const hasStudiesData = !!(timepoint.studiesData && timepoint.studiesData.length); instance.summary = new ReactiveVar(''); instance.studiesData = new ReactiveVar(hasStudiesData ? timepoint.studiesData : null); - instance.missingStudyUids = new ReactiveVar(null); const updateStudiesData = newDocument => { const newTimepoint = newDocument || timepointApi.timepoints.findOne({ timepointId }); @@ -58,45 +57,10 @@ Template.timepointBrowserItem.onCreated(() => { const studiesData = instance.studiesData.get(); if (studiesData) { instance.setModalitiesSummary(); - - // Determine missing timepoint studies - const missingStudyUids = []; - timepoint.studyInstanceUids.forEach((timepointStudyUid) => { - if (!studiesData.find(studyData => studyData.available && studyData.studyInstanceUid === timepointStudyUid)) { - missingStudyUids.push(timepointStudyUid); - } - }); - instance.missingStudyUids.set(missingStudyUids); } }); }); -Template.timepointBrowserItem.helpers({ - studyAvailability: () => { - const instance = Template.instance(); - const { timepoint } = instance.data; - const missingStudyUids = instance.missingStudyUids && instance.missingStudyUids.get(); - - if (!missingStudyUids || !timepoint) { - // Timepoint studies are not loaded/checked yet (may be indicated as disabled circle) - return "studies-not-ready"; - } - - if (missingStudyUids.length >= timepoint.studyInstanceUids.length) { - // All timepoint studies are not available (may be indicated as empty circle) - return "studies-not-available"; - } - - if (missingStudyUids.length > 0) { - // Timepoint studies are partially available (may be indicated as half-filled circle) - return "studies-partially-available"; - } - - // All timepoint studies are available (may be indicated as filled circle) - return "studies-fully-available"; - } -}); - Template.timepointBrowserItem.events({ 'ohif.lesiontracker.timepoint.load .timepoint-item'(event, instance) { instance.loadStudies(); diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/list.styl b/Packages/ohif-lesiontracker/client/components/timepointBrowser/list.styl index c0013baf0..653575aa3 100644 --- a/Packages/ohif-lesiontracker/client/components/timepointBrowser/list.styl +++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/list.styl @@ -78,16 +78,6 @@ theme('color', '$textPrimaryColor') padding-top: 2px - .timepoint-study-availability - .studies-not-ready - color: gray - .studies-not-available - color: red - .studies-partially-available - color: yellow - .studies-fully-available - color: green - .series-quick-switch .timepoint-browser-list padding: 0 10px diff --git a/Packages/ohif-studies/imports/client/components/browser/item.html b/Packages/ohif-studies/imports/client/components/browser/item.html index 6faeb6bd4..03bb520c6 100644 --- a/Packages/ohif-studies/imports/client/components/browser/item.html +++ b/Packages/ohif-studies/imports/client/components/browser/item.html @@ -10,12 +10,8 @@
{{studyData.modalities}}
- {{#if isLoaded}} -
{{formatDA studyData.studyDate 'D-MMM-YYYY'}}
-
{{studyData.studyDescription}}
- {{else}} -
{{#if studyData.available}}Click to load{{else}}N/A{{/if}}
- {{/if}} +
{{formatDA studyData.studyDate 'D-MMM-YYYY'}}
+
{{studyData.studyDescription}}
{{/let}} diff --git a/Packages/ohif-studies/imports/client/components/browser/item.js b/Packages/ohif-studies/imports/client/components/browser/item.js index f2b508e2d..8003f6c08 100644 --- a/Packages/ohif-studies/imports/client/components/browser/item.js +++ b/Packages/ohif-studies/imports/client/components/browser/item.js @@ -10,7 +10,7 @@ Template.studyBrowserItem.onCreated(() => { const { studyInformation } = instance.data; const { studyInstanceUid } = studyInformation; - instance.loaded = new ReactiveVar(false); + instance.loaded = false; instance.loading = new ReactiveVar(false); instance.studyData = new ReactiveVar(studyInformation); @@ -44,7 +44,7 @@ Template.studyBrowserItem.onCreated(() => { modalities: firstInstance.getRawValue('x00080060') || '', }); - instance.loaded.set(true); + instance.loaded = true; instance.loading.set(false); } }); @@ -55,12 +55,6 @@ Template.studyBrowserItem.events({ if (instance.loading.get()) return; const { studyInformation } = instance.data; - - // Skip if study is not available - if (!studyInformation.available) { - return; - } - const element = event.currentTarget.parentElement; const $element = $(element); const triggerClick = () => { @@ -71,12 +65,12 @@ Template.studyBrowserItem.events({ $element.trigger(newEvent, studyInformation); }; - if (instance.loaded.get()) { + if (instance.loaded) { triggerClick(); } else { instance.loading.set(true); OHIF.studies.loadStudy(studyInformation.studyInstanceUid).then(() => { - instance.loaded.set(true); + instance.loaded = true; instance.loading.set(false); $element.trigger('ohif.studies.study.load', studyInformation); Tracker.afterFlush(triggerClick); @@ -86,10 +80,6 @@ Template.studyBrowserItem.events({ }); Template.studyBrowserItem.helpers({ - isLoaded() { - return Template.instance().loaded.get(); - }, - isLoading() { return Template.instance().loading.get(); }, diff --git a/Packages/ohif-studies/imports/client/components/browser/list.styl b/Packages/ohif-studies/imports/client/components/browser/list.styl index 338607cde..7e2011cf5 100644 --- a/Packages/ohif-studies/imports/client/components/browser/list.styl +++ b/Packages/ohif-studies/imports/client/components/browser/list.styl @@ -104,9 +104,6 @@ $spacerY = 12px .study-description margin-top: 8px theme('color', '$textPrimaryColor') - .study-availability - margin-top: 24px - theme('color', '$textPrimaryColor') .study-modality theme('color', '$textSecondaryColor')