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.

---
 app/Resources/views/base.html.twig                 |  7 ++-
 app/Resources/views/default/AllData.html.twig      | 35 +++++++++++
 app/Resources/views/default/AllDataPage.html.twig  | 29 ---------
 app/Resources/views/default/LastWeekData.html.twig | 35 +++++++++++
 .../Controller/AllDataAverageController.php        | 68 ++++++++++++++++++++
 src/AppBundle/Controller/AllDataController.php     |  7 +--
 src/AppBundle/Controller/LastWeekData.php          | 72 ----------------------
 .../Controller/LastWeekDataAverageController.php   | 72 ++++++++++++++++++++++
 .../Controller/LastWeekDataController.php          | 43 +++++++++++++
 web/js/AllDataChart.js                             | 71 +++++++++++++++++++++
 web/js/LastWeekDataChart.js                        | 71 +++++++++++++++++++++
 web/js/chartOfReadings.js                          | 71 ---------------------
 12 files changed, 403 insertions(+), 178 deletions(-)
 create mode 100644 app/Resources/views/default/AllData.html.twig
 delete mode 100644 app/Resources/views/default/AllDataPage.html.twig
 create mode 100644 app/Resources/views/default/LastWeekData.html.twig
 create mode 100644 src/AppBundle/Controller/AllDataAverageController.php
 delete mode 100644 src/AppBundle/Controller/LastWeekData.php
 create mode 100644 src/AppBundle/Controller/LastWeekDataAverageController.php
 create mode 100644 src/AppBundle/Controller/LastWeekDataController.php
 create mode 100644 web/js/AllDataChart.js
 create mode 100644 web/js/LastWeekDataChart.js
 delete mode 100644 web/js/chartOfReadings.js

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 3f93ff8..b4cc11a 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -14,8 +14,11 @@
                 <img src="https://cdn3.iconfinder.com/data/icons/christmas-icon-set-pixel-perfect/64/christmas-color-12-512.png" alt="Pollutometer" width="50px" height="auto">
                 <span>Pollutometer</span>
             </a>
-            <a class="navbar-item" href="/AllDataReadings">
-                <span>All Data Readings</span>
+            <a class="navbar-item" href="/{{ path('AllData') }}">
+                <span>All Data</span>
+            </a>
+            <a class="navbar-item" href="/{{ path('LastWeekData') }}">
+                <span>Last Week Data</span>
             </a>
         </div>
     </nav>
diff --git a/app/Resources/views/default/AllData.html.twig b/app/Resources/views/default/AllData.html.twig
new file mode 100644
index 0000000..7bc33af
--- /dev/null
+++ b/app/Resources/views/default/AllData.html.twig
@@ -0,0 +1,35 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+<div class="columns">
+    <div class="column is-narrow">
+<table class="table">
+    <thead class="thead">
+        <tr class="tr">
+            <th>TimeStamp</th>
+            <th>Co</th>
+            <th>No</th>
+            <th>So</th>
+        </tr>
+    </thead>
+    <tbody class="tbody">
+        <tr class="tr">
+            {% for table in data %}
+            <td class="td">{{ table.TimeStamp }}</td>
+            <td class="td">{{ table.Co }}</td>
+            <td class="td">{{ table.No }}</td>
+            <td class="td">{{ table.So }}</td>
+        </tr>
+    </tbody>
+    {% endfor %}
+</table>
+    </div>
+    <div class="column">
+<canvas id="ctx"></canvas>
+    </div>
+</div>
+{% endblock %}
+{% block javascripts %}
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.bundle.min.js"></script>
+    <script src="{{ asset('js/AllDataChart.js') }}"></script
+{% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/default/AllDataPage.html.twig b/app/Resources/views/default/AllDataPage.html.twig
deleted file mode 100644
index 4607049..0000000
--- a/app/Resources/views/default/AllDataPage.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% block body %}
-<table class="table">
-    <thead class="thead">
-        <tr class="tr">
-            <th>TimeStamp</th>
-            <th>Co</th>
-            <th>No</th>
-            <th>So</th>
-        </tr>
-    </thead>
-    <tbody class="tbody">
-        <tr class="tr">
-            {% for table in data %}
-            <td class="td">{{ table.TimeStamp }}</td>
-            <td class="td">{{ table.Co }}</td>
-            <td class="td">{{ table.No }}</td>
-            <td class="td">{{ table.So }}</td>
-        </tr>
-    </tbody>
-    {% endfor %}
-</table>
-<canvas id="ctx"></canvas>
-{% endblock %}
-{% block javascripts %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.bundle.min.js"></script>
-    <script src="{{ asset('js/chartOfReadings.js') }}"></script
-{% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/default/LastWeekData.html.twig b/app/Resources/views/default/LastWeekData.html.twig
new file mode 100644
index 0000000..fdc6dd9
--- /dev/null
+++ b/app/Resources/views/default/LastWeekData.html.twig
@@ -0,0 +1,35 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+<div class="columns">
+    <div class="column is-narrow">
+<table class="table">
+    <thead class="thead">
+        <tr class="tr">
+            <th>TimeStamp</th>
+            <th>Co</th>
+            <th>No</th>
+            <th>So</th>
+        </tr>
+    </thead>
+    <tbody class="tbody">
+        <tr class="tr">
+            {% for table in data %}
+            <td class="td">{{ table.TimeStamp }}</td>
+            <td class="td">{{ table.Co }}</td>
+            <td class="td">{{ table.No }}</td>
+            <td class="td">{{ table.So }}</td>
+        </tr>
+    </tbody>
+    {% endfor %}
+</table>
+    </div>
+    <div class="column">
+<canvas id="ctx"></canvas>
+    </div>
+</div>
+{% endblock %}
+{% block javascripts %}
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.bundle.min.js"></script>
+    <script src="{{ asset('js/LastWeekDataChart.js') }}"></script
+{% endblock %}
\ No newline at end of file
diff --git a/src/AppBundle/Controller/AllDataAverageController.php b/src/AppBundle/Controller/AllDataAverageController.php
new file mode 100644
index 0000000..439058a
--- /dev/null
+++ b/src/AppBundle/Controller/AllDataAverageController.php
@@ -0,0 +1,68 @@
+<?php
+namespace AppBundle\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+
+class AllDataAverageController extends Controller
+{
+    /**
+     * @Route("/AllDataAverage", name="AllDataAverage")
+     */
+
+    public function GetAllDataAverage()
+    {
+        // Get cURL resource
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, "https://pollutometerapi.azurewebsites.net/api/Readings");
+        curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-type: application/json')); // Assuming you're requesting JSON
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        // Send the request & save response to $resp
+        $resp = curl_exec($curl);
+        // Close request to clear up some resources
+        curl_close($curl);
+
+        $data = json_decode($resp, true);
+
+        $readings = array();
+
+
+        foreach($data as $index => $item)
+        {
+            $data[$index]['TimeStamp'] = gmdate('d F l', $item['TimeStamp']);
+            $readings[$data[$index]['TimeStamp']][] = $data[$index];
+        }
+
+       $gasAverage = array('Co' => 0, 'No' => 0, 'So' => 0);
+        foreach($readings as $key => $item)
+        {
+