Feature

app/application/controllers/Dashboard.php

@@ -1,11 +1,11 @@
-<?php 
+<?php
 	if (!defined('BASEPATH')) exit('No direct script access allowed');
     ob_start();
 	/**
 	* FruxePi (frx-dev-v0.3)
 	* Dashboard Controller
 	*/
-	class Dashboard extends CI_Controller 
+	class Dashboard extends CI_Controller
 	{
 
 		// Constructor
@@ -29,8 +29,8 @@ public function __construct()
 
 		/**
 		* Dashboard - Index
-		* The main page of the FruxePi app. From here, all things are possible! 
-		* 
+		* The main page of the FruxePi app. From here, all things are possible!
+		*
 		* @url /dashboard
 		*/
 		public function index()
@@ -47,11 +47,13 @@ public function index()
 				$data['crops'] = $this->Crop_model->getAllCropsInfo();
 				$data['crop_activity'] = $this->Crop_model->get_cropActivity();
 
-				$data['temperature_chart'] = $this->Dashboard_model->get_temperature_chart_data();
 				$data['temperature_format'] = $this->Climate_model->getTemperatureFormat();
-				$data['humidity_chart'] = $this->Dashboard_model->get_humidity_chart_data();
-				$data['chart_legend'] = $this->Dashboard_model->get_chart_legend();
-
+
+				$data['temperature_chart7'] = $this->Dashboard_model->get_temperature_chart7_data();
+				$data['humidity_chart7'] = $this->Dashboard_model->get_humidity_chart7_data();
+				$data['moisture_chart7'] = $this->Dashboard_model->get_moisture_chart7_data();
+				$data['chart_legend7'] = $this->Dashboard_model->get_chart_legend7();
+
 				$data['pump_schedule'] = $this->Pump_model->getPumpSchedule();
 				$data['fan_schedule'] = $this->Fan_model->getFanSchedule();
 				$data['fan_status'] = $this->Fan_model->getFanStatus();
@@ -65,9 +67,14 @@ public function index()
 				$data['cropConditions'] = $this->Dashboard_model->get_cropConditions();
 				$data['soil_status'] = $this->Moisture_model->readMoistureSensor();
 
+				$data['temperature_chart'] = $this->Dashboard_model->get_temperature_chart_data();
+				$data['temperature_format'] = $this->Climate_model->getTemperatureFormat();
+				$data['humidity_chart'] = $this->Dashboard_model->get_humidity_chart_data();
+				$data['moisture_chart'] = $this->Dashboard_model->get_moisture_chart_data();
+				$data['chart_legend'] = $this->Dashboard_model->get_chart_legend();
 				// Page View
 				$this->load->view('dashboard/index', $data);
-			
+
 			} else {
 				// Redirect to login.
 				redirect('/login');
@@ -81,11 +88,11 @@ public function editGrowRoomSettings()
 	    	{
 				// Set climate threshold
 				$this->Climate_model->setClimateThreshold();
-				
+
 				// Change lighting schedule in DB
 				$lightsON = $this->Lights_model->setLightTimerON();
 				$lightsOFF = $this->Lights_model->setLightTimerOFF();
-				
+
 				// Edit lighting CRON
                 $this->Scheduler_model->editLightsCRON($lightsON, $lightsOFF);
 
@@ -94,9 +101,9 @@ public function editGrowRoomSettings()
 
 				// Set Pump schedule
 				$this->Pump_model->setPumpSchedule();
-		
+
 				redirect($_SERVER['HTTP_REFERER']);
-			
+
 			} else {
 				// Redirect to login.
 				redirect('/login');
@@ -112,7 +119,7 @@ public function latestPhoto()
 				$filename = $this->Camera_model->takePhoto();
 
 				redirect(asset_url() . "tmp/". $filename);
-			
+
 			} else {
 				// Redirect to login.
 				redirect('/login');
@@ -124,7 +131,7 @@ public function reset()
 		{
 			// Page View
 			$this->load->view('auth/reset');
-			
+
 		}
 
 	}

app/application/models/Dashboard_model.php

@@ -21,23 +21,23 @@ public function get_user_info()
 			// Get user ID for current user logged in
 			$user = $this->ion_auth->user()->row();
 			$id = $user->id;
-	
+
 			// Fetch user record from the database
 			$this->db->select('*');
 			$this->db->from('users');
 			$this->db->where(array('users.id' => $id));
-	
+
 			// Return the result as array
 			$query = $this->db->get();
 			return $query->result();
 		}
-		
+
 		// Get latest grow data
 		public function get_latest_grow_data()
 		{
 			$this->db->select("*");
 			$this->db->from("grow_data");
-			$this->db->order_by("id","DESC");
+			$this->db->order_by("id DESC");
 			$this->db->limit(1);
 
 			$query = $this->db->get();
@@ -55,6 +55,7 @@ public function get_latest_grow_data()
 				"moisture_status" => $grow_data["moisture_status"],
 				"fan_status" => $grow_data["fan_status"],
 				"pump_status" => $grow_data["pump_status"],
+				"moisture" => $grow_data["moisture"],
 			);
 
 			return $data;
@@ -76,15 +77,127 @@ public function get_sensor_activation_state()
 			return $data;
 		}
 
+
+		// Get 24-hr temperature chart data
+		public function get_temperature_chart7_data()
+		{
+			$tempFormat = $this->Climate_model->getTemperatureFormat();
+
+			$this->db->select("date_time, round(avg(temperature)) as temperature");
+			$this->db->from("grow_data");
+			$this->db->group_by("day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(7);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					if ($tempFormat == "F") {
+						$output .= celsiusToFahrenheit($result["temperature"]);
+					} else {
+						$output .= $result["temperature"];
+					}
+				} else {
+					if ($tempFormat == "F") {
+						$output .= celsiusToFahrenheit($result["temperature"]) . ", ";
+					} else {
+						$output .= $result["temperature"] . ", ";
+					}
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
+		// Get 24-hr humidity chart data
+		public function get_humidity_chart7_data()
+		{
+			$this->db->select("date_time, round(avg(humidity)) as humidity");
+			$this->db->from("grow_data");
+			$this->db->group_by("day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(7);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					$output .= $result["humidity"];
+				} else {
+					$output .= $result["humidity"] . ", ";
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
+		// Get 24-hr moisture chart data
+		public function get_moisture_chart7_data()
+		{
+			$this->db->select("date_time, round(avg(moisture)) as moisture");
+			$this->db->from("grow_data");
+			$this->db->group_by("day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(7);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					$output .= $result["moisture"];
+				} else {
+					$output .= $result["moisture"] . ", ";
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
+		// Get chart legend
+		public function get_chart_legend7()
+		{
+			$this->db->select("date_time");
+			$this->db->from("grow_data");
+			$this->db->group_by("day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(7);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					$output .= "\"" . date_format(date_create($result["date_time"]), "M d") . "\"";
+				} else {
+					$output .= "\"" . date_format(date_create($result["date_time"]), "M d")  . "\"" . ", ";
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
 		// Get 24-hr temperature chart data
 		public function get_temperature_chart_data()
 		{
 			$tempFormat = $this->Climate_model->getTemperatureFormat();
 
-			$this->db->select("*");
-			$this->db->from("climate_history");
-			$this->db->order_by("id","DESC");
-			$this->db->limit(24);
+			$this->db->select("date_time, round(avg(temperature)) as temperature");
+			$this->db->from("grow_data");
+			$this->db->group_by("hour( date_time ), day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(48);
 
 			$query = $this->db->get();
 			$results = $query->result_array();
@@ -114,10 +227,11 @@ public function get_temperature_chart_data()
 		// Get 24-hr humidity chart data
 		public function get_humidity_chart_data()
 		{
-			$this->db->select("*");
-			$this->db->from("climate_history");
-			$this->db->order_by("id","DESC");
-			$this->db->limit(24);
+			$this->db->select("date_time, round(avg(humidity)) as humidity");
+			$this->db->from("grow_data");
+			$this->db->group_by("hour( date_time ), day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(48);
 
 			$query = $this->db->get();
 			$results = $query->result_array();
@@ -136,13 +250,39 @@ public function get_humidity_chart_data()
 			return $output;
 		}
 
+		// Get 24-hr moisture chart data
+		public function get_moisture_chart_data()
+		{
+			$this->db->select("date_time, round(avg(moisture)) as moisture");
+			$this->db->from("grow_data");
+			$this->db->group_by("hour( date_time ), day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(48);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					$output .= $result["moisture"];
+				} else {
+					$output .= $result["moisture"] . ", ";
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
 		// Get chart legend
 		public function get_chart_legend()
 		{
-			$this->db->select("*");
-			$this->db->from("climate_history");
-			$this->db->order_by("id","DESC");
-			$this->db->limit(24);
+			$this->db->select("date_time");
+			$this->db->from("grow_data");
+			$this->db->group_by("hour( date_time ), day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(48);
 
 			$query = $this->db->get();
 			$results = $query->result_array();
@@ -256,8 +396,8 @@ public function get_cropThresholds()
 		// Current Crop Conditions
 		public function get_cropConditions()
 		{
-			
-			$sql = "SELECT * FROM grow_data WHERE DATE(date_time) = CURDATE() ORDER BY date_time DESC";
+
+			$sql = "SELECT * FROM grow_data WHERE DATE(date_time) = CURDATE() ORDER BY date_time ASC";
 			$query = $this->db->query($sql);
 			$tempData = $query->result_array();
 
@@ -271,7 +411,7 @@ public function get_cropConditions()
 			// Loop through tempData
 			$total_records = sizeof($tempData);
 			$positive_records = 0;
-			
+
 			foreach ($tempData as $item) {
 				$temp = $item['temperature'];
 				$humid = $item['humidity'];
@@ -289,7 +429,7 @@ public function get_cropConditions()
 			}
 
 		}
-	
+
 	}
 
-?>
+?>