From a14973be04f4e02077e4b0cebfb473fbfa4d44a8 Mon Sep 17 00:00:00 2001
From: Evren Ozkan <evren217@gmail.com>
Date: Thu, 10 Dec 2015 15:17:52 -0500
Subject: [PATCH] Bug fixing: The code block which activates first measurement
 is moved outside of if statement that checks whether toolDataInsertedManually
 is true.

---
 LesionTracker/client/components/viewer.js        | 16 +++++++++-------
 .../client/components/lesionTable/lesionTable.js |  8 ++++----
 .../components/lesionTable/lesionTable.styl      |  1 -
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/LesionTracker/client/components/viewer.js b/LesionTracker/client/components/viewer.js
index 0a25fdb9c..8ee44071d 100644
--- a/LesionTracker/client/components/viewer.js
+++ b/LesionTracker/client/components/viewer.js
@@ -139,15 +139,17 @@ Template.viewer.onCreated(function() {
             added: function (data) {
                 if (data.toolDataInsertedManually === true) {
 
-                    // Activate first measurements in image box as default if exists
-                    if (!firstMeasurementsActivated) {
-                        var templateData = {contentId: Session.get("activeContentId")};
-                        // Activate measurement
-                        activateLesion(data._id, templateData);
-                        firstMeasurementsActivated = true;
-                    }
                     return;
                 }
+
+                // Activate first measurements in image box as default if exists
+                if (!firstMeasurementsActivated) {
+                    var templateData = {contentId: Session.get("activeContentId")};
+                    // Activate measurement
+                    activateLesion(data._id, templateData);
+                    firstMeasurementsActivated = true;
+                }
+
                 log.info('Measurement added');
 
                 addMeasurementAsToolData(data);
diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
index 47b7e2fd1..bf7f7e3aa 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
@@ -4,7 +4,10 @@
  * @param measurementId The unique key for a specific Measurement
  */
 activateLesion =  function(measurementId, templateData) {
-    // Find Measurement data for this lesion
+
+    // Set background color of selected row
+    $("tr[data-measurementid="+measurementId+"]").addClass("selectedRow").siblings().removeClass("selectedRow");
+
     var measurementData = Measurements.findOne(measurementId);
 
     // If there is no measurement with this ID, stop here
@@ -221,9 +224,6 @@ Template.lesionTable.events({
         // Retrieve the lesion id from the DOM data for this row
         var measurementId = $(e.currentTarget).data('measurementid');
 
-        // Set background color of selected row
-        $(e.currentTarget).addClass("selectedRow").siblings().removeClass("selectedRow");
-
         activateLesion(measurementId,template.data);
     },
 
diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.styl b/Packages/lesiontracker/client/components/lesionTable/lesionTable.styl
index 842183950..270805d23 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.styl
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.styl
@@ -6,7 +6,6 @@
   #dragbar
     width: 100%
     height: 3px
-    postion: absolute
     top: 0
     left: 0
     right: 0