PWV-1: Requesting timepoint data from PIM TIMC API

Packages/ohif-lesiontracker/server/methods.js

@@ -8,7 +8,13 @@ measurementTools.forEach(tool => {
     MeasurementCollections[tool.id] = new Mongo.Collection(tool.id);
 });
 
-Timepoints = new Mongo.Collection('timepoints');
+const Timepoints = new Mongo.Collection('timepoints');
+
+Timepoints.find().observe({
+    remove() {
+        console.warn('REMOVED');
+    }
+});
 
 // Drop our collections for testing purposes
 Meteor.startup(() => {

Packages/ohif-measurements/both/configuration/measurements.js

@@ -7,7 +7,7 @@ let configuration = {};
 
 class MeasurementApi {
     static setConfiguration(config) {
-        configuration = config;
+        _.extend(configuration, config);
     }
 
     static getConfiguration() {

Packages/ohif-measurements/both/configuration/timepoints.js

@@ -9,7 +9,7 @@ let configuration = {};
 
 class TimepointApi {
     static setConfiguration(config) {
-        configuration = config;
+        _.extend(configuration, config);
     }
 
     static getConfiguration() {
@@ -20,8 +20,6 @@ class TimepointApi {
         if (currentTimepointId) {
             this.currentTimepointId = currentTimepointId;
         }
-
-        this.config = configuration || OHIF.measurements.MeasurementApi.getConfiguration();
     }
 
     retrieveTimepoints() {
@@ -29,7 +27,7 @@ class TimepointApi {
         this.timepoints.attachSchema(TimepointSchema);
         this.timepoints._debugName = 'Timepoints';
 
-        const retrievalFn = this.config.dataExchange.retrieve;
+        const retrievalFn = configuration.dataExchange.retrieve;
         if (!_.isFunction(retrievalFn)) {
             return;
         }
@@ -49,7 +47,7 @@ class TimepointApi {
     }
 
     storeTimepoints() {
-        const storeFn = this.config.dataExchange.store;
+        const storeFn = configuration.dataExchange.store;
         if (!_.isFunction(storeFn)) {
             return;
         }

Packages/ohif-petsuv/server/methods.js

@@ -20,7 +20,7 @@ Meteor.startup(() => {
 })
 
 
-// TODO: Make storage use update instead of clearing the entire collection and 
+// TODO: Make storage use update instead of clearing the entire collection and
 // re-inserting everything.
 Meteor.methods({
 	storeTimepoints(timepoints) {
@@ -62,4 +62,4 @@ Meteor.methods({
 
 		return measurementData;
 	}
-});
+});

Packages/ohif-study-list/server/publications.js

@@ -1,14 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { OHIF } from 'meteor/ohif:core';
 
-Meteor.publish('studyImportStatus', () => {
+Meteor.publish('studyImportStatus', () => OHIF.studylist.collections.StudyImportStatus.find());
-    return OHIF.studylist.collections.StudyImportStatus.find();
-});
 
-Meteor.publish('servers', () => {
+Meteor.publish('servers', () => Servers.find());
-    return Servers.find();
-});
 
-Meteor.publish('currentServer', () => {
+Meteor.publish('currentServer', () => CurrentServer.find());
-    return CurrentServer.find();
-});