LaundrySorcery

commit 10b0d0368dea6a2c7ed82af441af615300754343
parent fbe24233e444900f8ada6fee255fb264f82d7b6e
Author: Dominik Schmidt <das1993@hotmail.com>
Date:   Fri,  8 Jun 2018 14:41:20 +0000

Adapt web-interface to display since when the washing machine is off

Diffstat:
www/delta_t.sh
 | 
10
+++++++---
www/index.cgi
 | 
8
+++++---
www/print_delta_t.cgi
 | 
2
+-

3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/www/delta_t.sh b/www/delta_t.sh
@@ -2,15 +2,19 @@
 
 declare TIME
 declare DTIME
+declare RTIME
 declare ON
 
 ON=false
 OTIME=`<on_file`
-if [[ $OTIME -ge 0 ]]
+TIME=`date +%s`
+if [[ $OTIME -gt 0 ]]
 then
 	ON=true
-	TIME=`date +%s`
 	DTIME=$(( TIME-OTIME ))
+	RTIME=$DTIME
 else
-	DTIME="-1"
+	ON=false
+	DTIME=$(( TIME+OTIME ))
+	RTIME=$(( -DTIME ))
 fi
diff --git a/www/index.cgi b/www/index.cgi
@@ -25,17 +25,19 @@ Content-Type: text/html
 			<div id="statusLine">The laundry machine is <span id="delta_t"></span></div>
 		<script type="text/JavaScript">
 			<!--
-			delta_t=${DTIME};
+			delta_t=${RTIME};
 			function updateDisplay(){
 				var dt=document.getElementById("delta_t");
 				if(delta_t < 0){
-					dt.textContent="off";
+					dt.textContent="off since "+timeSince(-delta_t);
+					dt.class="off";
 				}
 				else{
 					dt.textContent="on since "+timeSince(delta_t);
+					dt.class="on";
 				}
 			}
-			setInterval(function(){ if(delta_t>=0){delta_t++}; updateDisplay();}, 1000);
+			setInterval(function(){ if(delta_t>=0){delta_t++}else{delta_t--}; updateDisplay();}, 1000);
 			setInterval(function(){ readTextFile("print_delta_t.cgi");}, 5*1000);
 			function readTextFile(file){
 				var rawFile = new XMLHttpRequest();
diff --git a/www/print_delta_t.cgi b/www/print_delta_t.cgi
@@ -4,4 +4,4 @@ source delta_t.sh
 
 echo "Content-Type: text/plain"
 echo
-echo "$DTIME"
+echo "$RTIME"