From 7fa242d0aa4ab6ec810be538512e3b4f0ef041ec Mon Sep 17 00:00:00 2001
From: Evren Ozkan <evren217@gmail.com>
Date: Thu, 3 Nov 2016 09:52:29 -0400
Subject: [PATCH] LT-290 Allow to display studies which are not associated

---
 .../client/components/viewer/viewer.js        | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 15e04de98..41c2f5d69 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -62,29 +62,24 @@ Template.viewer.onCreated(() => {
         ViewerStudies.insert(study);
     });
 
-    if (instance.data.currentTimepointId) {
-        instance.data.timepointApi = new OHIF.measurements.TimepointApi(instance.data.currentTimepointId);
-        const timepointsPromise = instance.data.timepointApi.retrieveTimepoints();
-        timepointsPromise.then(() => {
-            Session.set('TimepointsReady', true);
-        });
+    instance.data.timepointApi = new OHIF.measurements.TimepointApi(instance.data.currentTimepointId);
+    const timepointsPromise = instance.data.timepointApi.retrieveTimepoints();
+    timepointsPromise.then(() => {
+        Session.set('TimepointsReady', true);
+    });
 
-        instance.data.measurementApi = new OHIF.measurements.MeasurementApi(instance.data.currentTimepointId);
-        const measurementsPromise = instance.data.measurementApi.retrieveMeasurements();
-        measurementsPromise.then(() => {
-            Session.set('MeasurementsReady', true);
+    instance.data.measurementApi = new OHIF.measurements.MeasurementApi(instance.data.currentTimepointId);
+    const measurementsPromise = instance.data.measurementApi.retrieveMeasurements();
+    measurementsPromise.then(() => {
+        Session.set('MeasurementsReady', true);
 
-            instance.data.measurementApi.syncMeasurementsAndToolData();
-        });
+        instance.data.measurementApi.syncMeasurementsAndToolData();
+    });
 
-        // Provide the necessary data to the Measurement API and Timepoint API
-        const prior = instance.data.timepointApi.prior();
-        if (prior) {
-            instance.data.measurementApi.priorTimepointId = prior.timepointId;
-        }
-    } else {
-        console.warn('No current timepoint specified');
-        instance.data.measurementApi = new OHIF.measurements.MeasurementApi();
+    // Provide the necessary data to the Measurement API and Timepoint API
+    const prior = instance.data.timepointApi.prior();
+    if (prior) {
+        instance.data.measurementApi.priorTimepointId = prior.timepointId;
     }
 });