From 1be1751a3d9038530495aac40e588812981ab507 Mon Sep 17 00:00:00 2001
From: Kevin Puertas <kevin01010@gmail.com>
Date: Sat, 4 Nov 2017 18:58:17 +0100
Subject: [PATCH] View uptime in index page

---
 assets/html/indexpage.twig | 4 ++--
 assets/translations/en.php | 1 +
 assets/translations/es.php | 1 +
 functions.php              | 8 ++++++--
 index.php                  | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/assets/html/indexpage.twig b/assets/html/indexpage.twig
index 89b370d..6759042 100755
--- a/assets/html/indexpage.twig
+++ b/assets/html/indexpage.twig
@@ -12,7 +12,7 @@
                       <tr>
                         <!--<th>#</th>-->
                         <th>{{T_.name}}</th>
-                        <th>{{T_.status}}</th>
+                        <th>{{T_.status_uptime}}</th>
                         <th>{{T_.last_check}}</th>
                         <th>{{T_.last_err}}</th>
                       </tr>
@@ -47,7 +47,7 @@
 								<span class='grey' data-tooltip='Type of check: {{check.nameCheck}}' data-tooltip-position='top'>{{T_.status_empty}}</span>
 							{%endif%}
 							{#END IF/SWITCH#}
-
+							 ({{ check.uptime}}%)
 							</td>
 							{% if check.status is defined %}{#Only if records exists#}
 								<td>
diff --git a/assets/translations/en.php b/assets/translations/en.php
index 1250a2d..364b803 100755
--- a/assets/translations/en.php
+++ b/assets/translations/en.php
@@ -6,6 +6,7 @@ define('T_ENGVERSION',1);
 $T_['statdif1'] = 'Status of different checks';
 $T_['name'] = 'Name';
 $T_['status'] = 'Status';
+$T_['status_uptime'] = 'Status (Uptime)';
 $T_['failed'] = 'Failed';
 $T_['last_check'] = 'Last check';
 $T_['last_err'] = 'Last error';
diff --git a/assets/translations/es.php b/assets/translations/es.php
index 18b4fb4..8190912 100755
--- a/assets/translations/es.php
+++ b/assets/translations/es.php
@@ -6,6 +6,7 @@ define('T_VERSION',1);
 $T_['statdif1'] = 'Estado de los diferentes servicios';
 $T_['name'] = 'Nombre';
 $T_['status'] = 'Estado';
+$T_['status_uptime'] = 'Estado (Uptime)';
 $T_['failed'] = 'Erróneo';
 $T_['last_check'] = 'Última comprobación';
 $T_['last_err'] = 'Último error';
diff --git a/functions.php b/functions.php
index 914ee5b..59dcba7 100755
--- a/functions.php
+++ b/functions.php
@@ -28,7 +28,11 @@ function checkStatus($db_conn,$ID_C){
 }
 
 function checkUptime($db_conn,$ID_C,$precision = 0){
-	$time = $precision;
+	if ($precision == 0){
+		$time = time()-30*24*3600; //Last month
+	}else{
+		$time = $precision;
+	}
 	if ($precision != 0){
 		$good = dbw_query_fetch_array($db_conn,"SELECT COUNT(*) FROM CHKHIST WHERE ID_C = '$ID_C' AND code == 0 AND `timestamp` > $time")[0];
 		$all = dbw_query_fetch_array($db_conn,"SELECT COUNT(*) FROM CHKHIST WHERE ID_C = '$ID_C' AND `timestamp` > $time")[0];
@@ -37,7 +41,7 @@ function checkUptime($db_conn,$ID_C,$precision = 0){
 		$all = dbw_query_fetch_array($db_conn,"SELECT COUNT(*) FROM CHKHIST WHERE ID_C = '$ID_C'")[0]; 
 	}
 	if ($all != 0){
-		$uptime = ($good/$all)*100;
+		$uptime = round(($good/$all)*100,2);
 		return $uptime;
 	}else{
 		return 100;
diff --git a/index.php b/index.php
index b04dc4b..a258884 100755
--- a/index.php
+++ b/index.php
@@ -34,6 +34,7 @@ while ($onechk = dbw_fetch_array($db_conn,$results)){
 
 				$ID_TC = $chks[$idchk]['ID_TC'];
 				$chks[$idchk]['nameCheck'] = textTypeChk($T_,$ID_TC);
+				$chks[$idchk]['uptime'] = checkUptime($db_conn,$ID_C);
 			}
 
 		break;