client/annotviz/app/js/annotstimeline.js
changeset 137 750d9076a4a8
parent 135 d3066fa80a81
child 144 1762372184ae
--- a/client/annotviz/app/js/annotstimeline.js	Fri Jan 23 10:46:26 2015 +0100
+++ b/client/annotviz/app/js/annotstimeline.js	Fri Jan 23 11:28:25 2015 +0100
@@ -86,7 +86,10 @@
         //query -> need channel + eventCode
         //iterate over data fill cells
         var startTs = _this.timeBegin;
-        var endTs = _this.startTs;
+        var endTs = Math.min(_this.timeEnd,_this.startTs);
+
+        console.log("START TS",new Date(startTs).toISOString());
+        console.log("END TS",new Date(endTs).toISOString());
 
         var url = serverUrl + '/p/api/v1/annotation';
         var filters = [
@@ -102,7 +105,7 @@
         var currentPage = 1;
 
         var processResFunction = function(res) {
-
+            //console.log("RES archive", res);
             if(res) {
                 var data = res.target.json;
                 /*jshint -W069 */
@@ -117,7 +120,6 @@
                 jsonLoader.load();
                 currentPage++;
             }
-            console.log(res);
         };
         processResFunction();
 
@@ -135,6 +137,10 @@
             }
         });
 
+        if(!colorsDef) {
+            return;
+        }
+
         if (this.timeEnd > ts){
             var i = Math.floor((ts - this.timeBegin)/(1000*this.intervalDuration));