From 8afcb1a1a98133ebee21a867dc1b8807ce14a8a3 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Sat, 9 Jan 2016 18:03:12 +0100
Subject: [PATCH] Fix lesion table ordering, new lesion numbering

---
 .../client/compatibility/LesionManager.js             | 11 +++++++----
 .../client/components/lesionTable/lesionTable.js      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Packages/lesiontracker/client/compatibility/LesionManager.js b/Packages/lesiontracker/client/compatibility/LesionManager.js
index b1950c377..5d7c3fc24 100644
--- a/Packages/lesiontracker/client/compatibility/LesionManager.js
+++ b/Packages/lesiontracker/client/compatibility/LesionManager.js
@@ -127,15 +127,17 @@ var LesionManager = (function() {
             isTarget: isTarget
         }, {
             sort: {lesionNumber: 1}
-        });
+        }).fetch();
 
         // If measurements exist, find the last lesion number
         // from the given timepoint
         var lesionNumberCounter = 1;
 
-        // Search through Measurements to see which ones
-        // already have data for this Timepoint
-        measurements.forEach(function(measurement) {
+        // Search through every Measurement to see which ones
+        // already have data for this Timepoint, if we find one that
+        // doesn't have data, we will stop there and use that as the
+        // current Measurement
+        measurements.every(function(measurement) {
             // If this measurement has no data for this Timepoint,
             // use this as the current Measurement
             if (!measurement.timepoints[timepointID]) {
@@ -144,6 +146,7 @@ var LesionManager = (function() {
             }
 
             lesionNumberCounter++;
+            return true;
         });
         return lesionNumberCounter;
     }
diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
index ae83ccc0c..4fa0a5c92 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
@@ -2,7 +2,7 @@ Template.lesionTable.helpers({
     'measurement': function() {
         return Measurements.find({}, {
             sort: {
-                lesionNumber: 1
+                lesionNumberAbsolute: 1
             }
         });
     },