LaundrySorcery

commit 66f4758e74d6eb4ff4bab2130c759efae7c83395
parent caceb9fe3ba5f12597f4560c0aac68108e83b95d
Author: Dominik Schmidt <das1993@hotmail.com>
Date:   Wed,  6 Jun 2018 17:14:16 +0000

Improve delta_t to string conversion again.

Diffstat:
www/index.sh
 | 
37
+++++++++++++++----------------------

1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/www/index.sh b/www/index.sh
@@ -48,29 +48,22 @@ Content-Type: text/html
 			}
 			function timeSince(delta_t) {
 				var seconds = delta_t;
-				var interval = Math.floor(delta_t / 31536000);
-				txt=""
-				if (interval > 1) {
-					txt+= ", "+interval + " years";
-				}
-				interval = Math.floor(seconds / 2592000);
-				if (interval > 1) {
-					txt+= ", "+interval + " months";
-				}
-				interval = Math.floor(seconds / 86400);
-				if (interval > 1) {
-					txt+= ", "+interval + " days";
-				}
-				interval = Math.floor(seconds / 3600);
-				if (interval > 1) {
-					txt+= ", "+interval + " hours";
-				}
-				interval = Math.floor(seconds / 60);
-				if (interval > 1) {
-					txt+= ", "+interval + " minutes";
+				var timeValues=[
+					[60, "seconds"],
+					[60, "minutes"],
+					[24, "hours"],
+					[7, "days"],
+					[30.25, "weeks"]
+				];
+				var str="";
+				for(i=0; i<timeValues.length; i++){
+					var timeValue=timeValues[i];
+					if(delta_t > 0){
+						str=(delta_t % timeValue[0]) + " " + timeValue[1]+", "+str;
+						delta_t=Math.floor(delta_t/timeValue[0]);
+					}
 				}
-				txt+= ", "+Math.floor(seconds) + " seconds";
-				return txt.substr(2);
+				return str.substr(0,str.length-2);
 			}
 			updateDisplay();
 			-->