Merge branch 'remastering' of https://gitea.steelants.cz/SH/PHP_SMART_HOME_V3 into remastering

app/Routes.php

@@ -28,13 +28,17 @@ $router->post('/api/login', 'AuthApi@login');
 $router->post('/api/logout', 'AuthApi@logout');
 $router->get('/api/rooms', 'RoomsApi@default');
 $router->get('/api/rooms/{roomId}/update', 'RoomsApi@update');
+
 $router->get('/api/devices', 'DevicesApi@default');
 $router->get('/api/plugins', 'PluginsApi@default');
 $router->get('/api/users', 'UsersApi@default');
 $router->get('/api/server', 'ServerApi@default');
 $router->get('/api/server/log', 'ServerApi@logStatus');
+
 $router->post('/api/widgets/{widgetId}/run', 'WidgetApi@run');
 $router->get('/api/widgets/{widgetId}/detail', 'WidgetApi@detail');
+$router->get('/api/widgets/{widgetId}/detail/{period}', 'WidgetApi@detail');
+
 
 //cron
 $router->post('/cron/clean', 'CronApi@clean');

app/api/RoomsApi.php

@@ -3,8 +3,7 @@
 class RoomsApi extends ApiController
 {
 	
-	public function
-	default()
+	public function	default()
 	{
 		//$this->requireAuth();
 		$response = [];

app/api/ServerApi.php

@@ -12,16 +12,24 @@ class ServerApi extends ApiController {
 		return $meminfo;
     }
 
+    private function getProcessorUsage(){
+		$loads=sys_getloadavg();
+		$core_nums=trim(shell_exec("grep -P '^physical id' /proc/cpuinfo|wc -l"));
+		$load = round($loads[0]/($core_nums + 1)*100, 2);
+		return $load;
+	}
+
     public function default(){
         //$this->requireAuth();
         $response = [
-            "cpu_load" => sys_getloadavg()[0],
+            "cpu_load" => $this->getProcessorUsage(),
             "uptime" => shell_exec('uptime -p'),
             "ramFree" => $this->getSystemMemInfo()["MemFree"],
             "ramTotal" => $this->getSystemMemInfo()["MemTotal"],
             "diskFree" => disk_free_space("/"),
             "diskTotal" => disk_total_space("/"),
-            "serverTime" =>  date('m. d. Y H:i:s - e'),
+            "serverTime" => date('m. d. Y H:i:s'),
+            "serverTimeZone" => date('e'),
         ];
         $this->response($response);
     }

app/api/WidgetApi.php

@@ -32,9 +32,17 @@ class WidgetApi extends ApiController
 		$this->response(['value' => $response]);
 	}
 
-	public function detail($subDeviceId)
+	public function detail($subDeviceId, $period = "day")
 	{
 		//$this->requireAuth();
+
+		$groupBy = [
+			"year" => "month",
+			"month" => "day",
+			"day" => "hour",
+			"hout" => "minute",
+		];
+
 		$response = null;
 		$connectionError = true;
 
@@ -42,11 +50,18 @@ class WidgetApi extends ApiController
 		$deviceData = DeviceManager::getDeviceById($subDeviceData['device_id']);
 
 		//TODO: zeptat se @Patrik Je Graf Dobře Seřazený na DESC ?
-		$events = RecordManager::getAllRecordForGraph($subDeviceId);
+		$events = RecordManager::getAllRecordForGraph($subDeviceId, $period, $groupBy[$period]);
 		if ( count($events) == 0){
 			throw new Exception("No Records", 404);
 		}
 
+		//Striping executed value from dataset if pasiv device such as Senzor ETC
+		if ($subDeviceData['type'] != "on/off") {
+			foreach ($events as $key => $event) {
+				unset($events[$key]['execuded']);
+			}
+		}
+
 		$LastRecordTime = new DateTime(reset($events)['time']);
 		$niceTime = Utilities::ago($LastRecordTime);
 
@@ -115,7 +130,7 @@ class WidgetApi extends ApiController
 
 		//TODO: Make Cleaner 
 		if (isset(RANGES[$subDeviceData['type']])){
-			$response['graph']['options']['options']['scales']['yAxes'] = [[
+			$response['graph']['options']['scales']['yAxes'] = [[
 				'ticks' => [
 					'min' => RANGES[$subDeviceData['type']]['min'],
 					'max' => RANGES[$subDeviceData['type']]['max'],

app/models/managers/RecordManager.php

@@ -86,7 +86,7 @@ class RecordManager{
 		$dateTime = $dateTime->modify($periodLocal);
 		$dateTime = $dateTime->format('Y-m-d H:i:s');
 		$groupBy = strtoupper($groupBy).'(time)';
-		$sql = 'SELECT value, time FROM records
+		$sql = 'SELECT value, time, execuded FROM records
 		WHERE
 		subdevice_id = ?
 		AND

app/models/managers/SubDeviceManager.php

@@ -77,7 +77,7 @@ class SubDeviceManager
 
 		//TODO: @Patrik Check line 89
 		$rows = Db::loadAll("
-			SELECT d.room_id, sd.subdevice_id, sd.device_id, d.name, sd.type, sd.unit, r.value FROM subdevices sd
+			SELECT d.room_id, sd.subdevice_id, sd.device_id, d.icon, d.name, sd.type, sd.unit, r.value FROM subdevices sd
 			JOIN devices d ON sd.device_id = d.device_id
 			JOIN records r ON r.subdevice_id = sd.subdevice_id
 			WHERE d.room_id IN (".str_repeat("?,", count($roomIds)-1)."?)

app/views/Server.php

@@ -23,8 +23,8 @@ class Server extends Template
 		return $load;
 	}
 		
-		function __construct()
-		{
+	function __construct()
+	{
 			$userManager = new UserManager();
 		$langMng = new LanguageManager('en');