From acee3f94653329f2f7572e2e898e3e40fa461b4b Mon Sep 17 00:00:00 2001
From: unknown <frankherko@gmail.com>
Date: Tue, 5 Jan 2021 12:56:34 +0100
Subject: [PATCH] adds speed chart for serial and tcp

---
 static/scripts/chart.js     | 10 ---------
 static/scripts/chartfull.js | 44 ++++++++++++++++++++++++-------------
 static/scripts/refull.js    |  2 +-
 static/scripts/websocket.js | 10 +++++++--
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/static/scripts/chart.js b/static/scripts/chart.js
index 6f61b07..4d50434 100644
--- a/static/scripts/chart.js
+++ b/static/scripts/chart.js
@@ -12,16 +12,6 @@ var myChart = new Chart(ctx, {
             pointRadius: 0,
             lineTension: 0.5,
             data: new Array(GRAPH_RES)
-        },
-        {
-            label: 'Smartphone',
-            backgroundColor: 'rgba(30, 139, 195, 1)',
-            borderColor: 'rgba(30, 139, 195, 1)',
-            borderWidth: 1,
-            fill: false,
-            pointRadius: 0,
-            lineTension: 0.5,
-            data: new Array(GRAPH_RES)
         }]
     },
     options: {
diff --git a/static/scripts/chartfull.js b/static/scripts/chartfull.js
index 113de7f..8127683 100644
--- a/static/scripts/chartfull.js
+++ b/static/scripts/chartfull.js
@@ -1,3 +1,6 @@
+var arrayTCP = [];
+var arraySERIAL = [];
+
 var ctx = document.getElementById('myChart').getContext('2d');
 var myChart = new Chart(ctx, {
     type: 'line',
@@ -11,7 +14,7 @@ var myChart = new Chart(ctx, {
             fill: false,
             pointRadius: 0,
             lineTension: 0.5,
-            data: new Array()
+            data: arraySERIAL
         },
         {
             label: 'Smartphone',
@@ -21,7 +24,7 @@ var myChart = new Chart(ctx, {
             fill: false,
             pointRadius: 0,
             lineTension: 0.5,
-            data: new Array()
+            data: arrayTCP
         }]
     },
     options: {
@@ -31,6 +34,13 @@ var myChart = new Chart(ctx, {
                     min: 0,
                     max: 250
                 }
+            }],
+            xAxes: [{
+                ticks: {
+                    min: 0,
+                    max: 25
+                },
+                stepSize: 1
             }]
         },
         animation: {
@@ -38,33 +48,36 @@ var myChart = new Chart(ctx, {
         }
     }
 });
-myChart.data.labels.fill("", 0, GRAPH_RES);
-myChart.data.datasets.forEach((dataset) => dataset.data.fill(0, 0, GRAPH_RES))
+//myChart.data.labels.fill("", 0, GRAPH_RES);
+//myChart.data.datasets.forEach((dataset) => dataset.data.fill(0, 0, GRAPH_RES))
 
 function addSerialSpeedData(sensordataList) {
     let speedsSerial = []
-
+    let times = []
     sensordataList.forEach(sensordata => {
         if (sensordata.Speed === 0) {
             return;
         }
         let speed = sensordata.Speed
         speedsSerial.push(speed);
+        let time = sensordata.Servertime
+        times.push(time)
 
     })
 
-    myChart.data.labels.push("");
-    myChart.data.datasets[0].data.push(speedsSerial);
+    myChart.data.labels = times;
+    myChart.data.datasets[0].data = speedsSerial;
 
-    while (myChart.data.labels.length >= GRAPH_RES) {
+    /*while (myChart.data.labels.length >= GRAPH_RES) {
         myChart.data.labels.shift();
         myChart.data.datasets.forEach((dataset) => dataset.data.shift())
-    }
+    }*/
     myChart.update();
 };
 
-function addTCPSpeedData(data) {
+function addTCPSpeedData(sensordataList) {
     let speedsTCP = []
+    let times = []
 
     sensordataList.forEach(sensordata => {
         if (sensordata.Speed === 0) {
@@ -72,15 +85,16 @@ function addTCPSpeedData(data) {
         }
         let speed = sensordata.Speed
         speedsTCP.push(speed);
+        let time = sensordata.Servertime
+        times.push(time)
 
     })
+    //myChart.data.labels = times;
+    myChart.data.datasets[1].data = speedsTCP;
 
-    myChart.data.labels.push("");
-    myChart.data.datasets[1].data.push(speedsTCP);
-
-    while (myChart.data.labels.length >= GRAPH_RES) {
+    /*while (myChart.data.labels.length >= GRAPH_RES) {
         myChart.data.labels.shift();
         myChart.data.datasets.forEach((dataset) => dataset.data.shift())
-    }
+    }*/
     myChart.update();
 };
diff --git a/static/scripts/refull.js b/static/scripts/refull.js
index 65cf0ab..b2976a6 100644
--- a/static/scripts/refull.js
+++ b/static/scripts/refull.js
@@ -33,7 +33,7 @@ window.addEventListener("load", function(evt) {
         fetch(`http://localhost:3011/trackings/${trackings[sel.selectedIndex].UUID}`, { method: 'GET'}).then(results => {
             return results.json()
         }).then(r => {
-            // console.log(r.data.Data)
+            console.log(r.data.Data)
             console.log(r.data)
             if ('SOURCE_TCP' in r.data.Data && r.data.Data.SOURCE_TCP.length > 0) {
                 updateMapTCPbulk(r.data.Data.SOURCE_TCP)
diff --git a/static/scripts/websocket.js b/static/scripts/websocket.js
index 6cbf30e..70baea4 100644
--- a/static/scripts/websocket.js
+++ b/static/scripts/websocket.js
@@ -78,9 +78,15 @@ window.addEventListener("load", function(evt) {
             console.log("no data to compare")
         }
 
-        if(!(dat.SOURCE_SERIAL.Position[2] === 0)){
-            addSerialAltData(dat.SOURCE_SERIAL.Position[2])
+        try{
+            if(!(dat.SOURCE_SERIAL.Position[2] === 0)){
+                addSerialAltData(dat.SOURCE_SERIAL.Position[2])
+            }
         }
+        catch{
+            console.log("no data")
+        }
+
 
 
         /*