-
+
diff --git a/Packages/ohif-core/client/ui/draggable/draggable.js b/Packages/ohif-core/client/ui/draggable/draggable.js
index ea9754188..3bf8843d0 100644
--- a/Packages/ohif-core/client/ui/draggable/draggable.js
+++ b/Packages/ohif-core/client/ui/draggable/draggable.js
@@ -46,6 +46,9 @@ function makeDraggable(element, options) {
return;
}
+ // Stop the dragging if it's not the primary button
+ if (e.button !== 0) return;
+
// Stop the dragging if the element is being resized
if ($(element).hasClass('resizing')) {
return;
diff --git a/Packages/ohif-core/client/ui/notifications/notifications.js b/Packages/ohif-core/client/ui/notifications/notifications.js
index d52383bbb..23c550c70 100644
--- a/Packages/ohif-core/client/ui/notifications/notifications.js
+++ b/Packages/ohif-core/client/ui/notifications/notifications.js
@@ -1,8 +1,8 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
-import { ReactiveDict } from 'meteor/reactive-dict';
-import { Tracker } from 'meteor/tracker';
+import { Blaze } from 'meteor/blaze';
import { $ } from 'meteor/jquery';
+import { _ } from 'meteor/underscore';
import { OHIF } from 'meteor/ohif:core';
const Notifications = {
@@ -29,7 +29,7 @@ Notifications.dismiss = id => {
if ($note.length) {
$note.addClass('out').one('transitionend', () => removeView(id, view));
} else {
- removeView(id, view)
+ removeView(id, view);
}
};
diff --git a/Packages/ohif-lesiontracker/client/components/index.js b/Packages/ohif-lesiontracker/client/components/index.js
index 54c0a6400..7d832b241 100644
--- a/Packages/ohif-lesiontracker/client/components/index.js
+++ b/Packages/ohif-lesiontracker/client/components/index.js
@@ -1,6 +1,8 @@
import './dialog/nonTargetMeasurement.html';
import './dialog/nonTargetMeasurement.js';
+import './timepointBrowser';
+
import './trialOptionsModal/irRCDescription.html';
import './trialOptionsModal/recistDescription.html';
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/index.js b/Packages/ohif-lesiontracker/client/components/timepointBrowser/index.js
new file mode 100644
index 000000000..66e32a13e
--- /dev/null
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/index.js
@@ -0,0 +1,3 @@
+import './list.html';
+import './item.html';
+import './item.js';
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.html b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.html
new file mode 100644
index 000000000..9d041de13
--- /dev/null
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.html
@@ -0,0 +1,16 @@
+
+
{{>Template.contentBlock}}
+
+
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js
new file mode 100644
index 000000000..7b986aaba
--- /dev/null
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js
@@ -0,0 +1,28 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { OHIF } from 'meteor/ohif:core';
+
+Template.timepointBrowserItem.onCreated(() => {
+ const instance = Template.instance();
+ const { timepoint, timepointApi } = instance.data;
+
+ instance.loading = new ReactiveVar(false);
+ instance.loaded = !!(timepoint.studiesData && timepoint.studiesData.length);
+
+ instance.autorun(() => {
+ if (instance.loaded || !instance.loading.get()) return;
+
+ const filter = { studyInstanceUid: timepoint.studyInstanceUids };
+ Meteor.call('StudyListSearch', filter, (error, studiesData) => {
+ if (error) {
+ const text = 'An error has occurred while retrieving studies information';
+ OHIF.ui.notifications.danger({ text });
+ OHIF.log.error(error);
+ } else {
+ timepoint.studiesData = studiesData;
+ timepointApi.timepoints.update(timepoint._id, { $set: studiesData });
+ }
+ });
+ });
+});
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/list.html b/Packages/ohif-lesiontracker/client/components/timepointBrowser/list.html
new file mode 100644
index 000000000..66f179f9e
--- /dev/null
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/list.html
@@ -0,0 +1,7 @@
+
+ {{#scrollArea class=(concat 'full-height ' this.class) scrollableClass=this.scrollableClass}}
+ {{#each timepoint in this.timepoints}}
+ {{>timepointBrowserItem (clone this timepoint=timepoint)}}
+ {{/each}}
+ {{/scrollArea}}
+
diff --git a/Packages/ohif-lesiontracker/package.js b/Packages/ohif-lesiontracker/package.js
index f794417f3..a5e3df082 100644
--- a/Packages/ohif-lesiontracker/package.js
+++ b/Packages/ohif-lesiontracker/package.js
@@ -21,6 +21,7 @@ Package.onUse(function(api) {
// Our custom packages
api.use('ohif:design');
api.use('ohif:core');
+ api.use('ohif:studies');
api.use('ohif:study-list');
api.use('ohif:cornerstone');
api.use('ohif:measurements');
diff --git a/Packages/ohif-measurements/both/schema/timepoints.js b/Packages/ohif-measurements/both/schema/timepoints.js
index 627bb6fbf..1b734cbf3 100644
--- a/Packages/ohif-measurements/both/schema/timepoints.js
+++ b/Packages/ohif-measurements/both/schema/timepoints.js
@@ -1,31 +1,5 @@
import { SimpleSchema } from 'meteor/aldeed:simple-schema';
-const StudiesData = new SimpleSchema({
- studyInstanceUid: {
- type: String,
- label: 'Study Instance Uid'
- },
- description: {
- type: String,
- label: 'Study Description',
- optional: true
- },
- date: {
- type: Date,
- label: 'Study Date'
- },
- modality: {
- type: String,
- label: 'Study Modality'
- },
- loaded: {
- type: Boolean,
- label: 'Defines if the Study is already loaded',
- optional: true,
- defaultValue: false
- }
-});
-
export const schema = new SimpleSchema({
patientId: {
type: String,
@@ -64,8 +38,8 @@ export const schema = new SimpleSchema({
optional: true
},
studiesData: {
- type: [StudiesData],
- label: 'Studies minimal data to allow lazy loading',
+ type: [Object],
+ label: 'Studies data to allow lazy loading',
optional: true
}
});
diff --git a/Packages/ohif-studies/imports/client/components/browser/item.html b/Packages/ohif-studies/imports/client/components/browser/item.html
index e42902dfd..f69b7db1b 100644
--- a/Packages/ohif-studies/imports/client/components/browser/item.html
+++ b/Packages/ohif-studies/imports/client/components/browser/item.html
@@ -9,8 +9,8 @@
+
+
+
+
+
+ {{this.timepointApi.title timepoint}}
+
+
+ {{formatDA this.timepoint.earliestDate 'D-MMM-YYYY'}}
+ {{instance.modalities}}
-
{{formatDA this.studyInformation.date 'D-MMM-YYYY'}}
- {{this.studyInformation.description}}
+ {{formatDA this.studyInformation.studyDate 'D-MMM-YYYY'}}
+ {{this.studyInformation.studyDescription}}