aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/AppBundle/Controller/AllDataController.php9
-rw-r--r--src/AppBundle/Controller/HomeController.php1
-rw-r--r--src/AppBundle/Controller/NewDataController.php1
3 files changed, 8 insertions, 3 deletions
diff --git a/src/AppBundle/Controller/AllDataController.php b/src/AppBundle/Controller/AllDataController.php
index 18a30a1..78b4752 100644
--- a/src/AppBundle/Controller/AllDataController.php
+++ b/src/AppBundle/Controller/AllDataController.php
@@ -5,11 +5,13 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
class AllDataController extends Controller
{
/**
* @Route("/AllDataReadings", name="AllData")
*/
+
public function GetAllData()
{
// Get cURL resource
@@ -23,6 +25,12 @@ class AllDataController extends Controller
curl_close($curl);
$data = json_decode($resp, true);
+
+
+ usort($data, function($a,$b){
+ return $a['TimeStamp'] - $b['TimeStamp'];
+ });
+
foreach($data as $index => $item)
{
$data[$index]['TimeStamp'] = gmdate("l jS \of F Y h:i:s A", $item['TimeStamp']);
@@ -30,7 +38,6 @@ class AllDataController extends Controller
$parametersToTwig = array("data" => $data);
-
return $this->render('default/AllDataPage.html.twig',$parametersToTwig);
diff --git a/src/AppBundle/Controller/HomeController.php b/src/AppBundle/Controller/HomeController.php
index 606d666..ca2043e 100644
--- a/src/AppBundle/Controller/HomeController.php
+++ b/src/AppBundle/Controller/HomeController.php
@@ -47,7 +47,6 @@ class HomeController extends Controller
$data['TimeStamp'] = gmdate("l jS \of F Y h:i:s A", $data['TimeStamp']);
$arr = [];
- print_r($data);
$CO = is_nan($aqi->calculateAQI("Co", $data['Co'], $tableObj)) ? 0 : $aqi->calculateAQI("Co", $data['Co'], $tableObj);
$SO = is_nan($aqi->calculateAQI("So", $data['So'], $tableObj)) ? 0 : $aqi->calculateAQI("So", $data['So'], $tableObj);
$NO = is_nan($aqi->calculateAQI("No", $data['No'], $tableObj)) ? 0 : $aqi->calculateAQI("No", $data['No'], $tableObj);
diff --git a/src/AppBundle/Controller/NewDataController.php b/src/AppBundle/Controller/NewDataController.php
index 9722cbd..8bfda68 100644
--- a/src/AppBundle/Controller/NewDataController.php
+++ b/src/AppBundle/Controller/NewDataController.php
@@ -43,7 +43,6 @@ class NewDataController extends Controller
if($aqi >= 151) $emailSender->sendEmail($data);
return $response;
-
}
}