From 322b79babf45b1bff0d219cfbf10524b975075fd Mon Sep 17 00:00:00 2001
From: marcinzelent <zelent.marcin@gmail.com>
Date: Thu, 7 Dec 2017 12:38:55 +0100
Subject: Split all data and data from last week, moved chart to the right side
 of the page.

---
 web/js/AllDataChart.js      | 71 +++++++++++++++++++++++++++++++++++++++++++++
 web/js/LastWeekDataChart.js | 71 +++++++++++++++++++++++++++++++++++++++++++++
 web/js/chartOfReadings.js   | 71 ---------------------------------------------
 3 files changed, 142 insertions(+), 71 deletions(-)
 create mode 100644 web/js/AllDataChart.js
 create mode 100644 web/js/LastWeekDataChart.js
 delete mode 100644 web/js/chartOfReadings.js

(limited to 'web')

diff --git a/web/js/AllDataChart.js b/web/js/AllDataChart.js
new file mode 100644
index 0000000..8de05cf
--- /dev/null
+++ b/web/js/AllDataChart.js
@@ -0,0 +1,71 @@
+var gasReading = {
+    Co: [],
+    No: [],
+    So: []
+};
+
+var canvas = document.querySelector('#ctx');
+var ctx = canvas.getContext('2d');
+
+var datasets = [{
+    label: "Co",
+    borderColor: "rgb(5, 0, 0)",
+    fill: false,
+    data: []
+}, {
+    label: "No",
+    borderColor: "rgb(69, 169, 230)",
+    fill: false,
+    data: []
+}, {
+    label: "So",
+    borderColor: "rgb(246, 250, 15)",
+    fill: false,
+    data: []
+}]
+
+
+
+
+fetch('/AllDataAverage')
+    .then(function(response) {
+        return response.json();
+    })
+    .then(function(data) {
+        drawChart(data, datasets);
+    })
+
+
+
+
+
+function drawChart(gasData, datasets) {
+
+    var finishedData = {
+        labels: []
+    }
+
+    Object.keys(gasData).forEach(function(key) {
+        finishedData.labels.push(key);
+        datasets[0].data.push(gasData[key].Co)
+        datasets[1].data.push(gasData[key].No);
+        datasets[2].data.push(gasData[key].So);
+    });
+
+    finishedData.datasets = datasets;
+
+
+    var myLineChart = new Chart(ctx, {
+        type: 'line',
+        data: finishedData,
+        options: {
+            scales: {
+                xAxes: [{
+                    time: {
+                        unit: 'day'
+                    }
+                }]
+            }
+        }
+    });
+}
diff --git a/web/js/LastWeekDataChart.js b/web/js/LastWeekDataChart.js
new file mode 100644
index 0000000..a24d51a
--- /dev/null
+++ b/web/js/LastWeekDataChart.js
@@ -0,0 +1,71 @@
+var gasReading = {
+    Co: [],
+    No: [],
+    So: []
+};
+
+var canvas = document.querySelector('#ctx');
+var ctx = canvas.getContext('2d');
+
+var datasets = [{
+    label: "Co",
+    borderColor: "rgb(5, 0, 0)",
+    fill: false,
+    data: []
+}, {
+    label: "No",
+    borderColor: "rgb(69, 169, 230)",
+    fill: false,
+    data: []
+}, {
+    label: "So",
+    borderColor: "rgb(246, 250, 15)",
+    fill: false,
+    data: []
+}]
+
+
+
+
+fetch('/LastWeekDataAverage')
+    .then(function(response) {
+        return response.json();
+    })
+    .then(function(data) {
+        drawChart(data, datasets);
+    })
+
+
+
+
+
+function drawChart(gasData, datasets) {
+
+    var finishedData = {
+        labels: []
+    }
+
+    Object.keys(gasData).forEach(function(key) {
+        finishedData.labels.push(key);
+        datasets[0].data.push(gasData[key].Co)
+        datasets[1].data.push(gasData[key].No);
+        datasets[2].data.push(gasData[key].So);
+    });
+
+    finishedData.datasets = datasets;
+
+
+    var myLineChart = new Chart(ctx, {
+        type: 'line',
+        data: finishedData,
+        options: {
+            scales: {
+                xAxes: [{
+                    time: {
+                        unit: 'day'
+                    }
+                }]
+            }
+        }
+    });
+}
diff --git a/web/js/chartOfReadings.js b/web/js/chartOfReadings.js
deleted file mode 100644
index 83f656a..0000000
--- a/web/js/chartOfReadings.js
+++ /dev/null
@@ -1,71 +0,0 @@
-var gasReading = {
-    Co: [],
-    No: [],
-    So: []
-};
-
-var canvas = document.querySelector('#ctx');
-var ctx = canvas.getContext('2d');
-
-var datasets = [{
-    label: "Co",
-    borderColor: "rgb(5, 0, 0)",
-    fill: false,
-    data: []
-}, {
-    label: "No",
-    borderColor: "rgb(69, 169, 230)",
-    fill: false,
-    data: []
-}, {
-    label: "So",
-    borderColor: "rgb(246, 250, 15)",
-    fill: false,
-    data: []
-}]
-
-
-
-
-fetch('/lastweek')
-    .then(function(response) {
-        return response.json();
-    })
-    .then(function(data) {
-        drawChart(data, datasets);
-    })
-
-
-
-
-
-function drawChart(gasData, datasets) {
-
-    var finishedData = {
-        labels: []
-    }
-
-    Object.keys(gasData).forEach(function(key) {
-        finishedData.labels.push(key);
-        datasets[0].data.push(gasData[key].Co)
-        datasets[1].data.push(gasData[key].No);
-        datasets[2].data.push(gasData[key].So);
-    });
-
-    finishedData.datasets = datasets;
-
-
-    var myLineChart = new Chart(ctx, {
-        type: 'line',
-        data: finishedData,
-        options: {
-            scales: {
-                xAxes: [{
-                    time: {
-                        unit: 'day'
-                    }
-                }]
-            }
-        }
-    });
-}
-- 
cgit v1.2.3