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

LT-251: Showing the timepoint for the current study even if it's not a key timepoint

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-06-17 08:44:47 -03:00 committed by Erik Ziegler
parent 4b307598e9
commit c2dfb0e7ba
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointBrowser.js
View File

@ -4,6 +4,11 @@ Template.studyTimepointBrowser.onCreated(() => {
// Defines whether to show all key timepoints or only the current one // Defines whether to show all key timepoints or only the current one
instance.showAdditionalTimepoints = new ReactiveVar(true); instance.showAdditionalTimepoints = new ReactiveVar(true);
// Return the current study if it's defined
instance.getCurrentStudy = () => {
return instance.data.currentStudy && instance.data.currentStudy.get();
};
// Get the studies for a specific timepoint // Get the studies for a specific timepoint
instance.getStudies = timepoint => { instance.getStudies = timepoint => {
return timepoint.studyInstanceUids.map(studyInstanceUid => { return timepoint.studyInstanceUids.map(studyInstanceUid => {
@ -83,7 +88,7 @@ Template.studyTimepointBrowser.helpers({
timepoints() { timepoints() {
const instance = Template.instance(); const instance = Template.instance();
// Get the current study // Get the current study
const currentStudy = instance.data.currentStudy && instance.data.currentStudy.get(); const currentStudy = instance.getCurrentStudy();
// Build the query // Build the query
const query = {}; const query = {};
if (currentStudy && !instance.showAdditionalTimepoints.get()) { if (currentStudy && !instance.showAdditionalTimepoints.get()) {
@ -115,6 +120,12 @@ Template.studyTimepointBrowser.helpers({
return true; return true;
} }
// Always Show the timepoint for current study
const currentStudy = instance.getCurrentStudy();
if (currentStudy && _.contains(timepoint.studyInstanceUids, currentStudy.studyInstanceUid)) {
return true;
}
// Show only the latest timepoints and baseline // Show only the latest timepoints and baseline
return index < 3 || timepoint.timepointType === 'baseline'; return index < 3 || timepoint.timepointType === 'baseline';
}, },