From e1b6279437ca6632e3c6a65106ca608877cae027 Mon Sep 17 00:00:00 2001 From: Nathan Nguyen Date: Thu, 6 Dec 2018 15:07:58 +1100 Subject: [PATCH 1/2] user date --- views/warningbar/warningbar.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/warningbar/warningbar.js b/views/warningbar/warningbar.js index 30187c1..be59b62 100644 --- a/views/warningbar/warningbar.js +++ b/views/warningbar/warningbar.js @@ -114,8 +114,10 @@ var authOutageWarningBar = { seconds2hms: function(seconds) { var minutes = Math.floor(seconds / 60); var hours = Math.floor(minutes / 60); + var days = Math.floor(hours / 24); seconds %= 60; minutes %= 60; + hours %= 24; // Cross-browser simple solution for padding zeroes. if (minutes < 10) { minutes = "0" + minutes; @@ -123,6 +125,6 @@ var authOutageWarningBar = { if (seconds < 10) { seconds = "0" + seconds; } - return hours + ':' + minutes + ':' + seconds; + return days + ' day(s) ' + hours + ':' + minutes + ':' + seconds; } }; From c820bb1c0b6b3d6fea847485ecc40fcd16bc585e Mon Sep 17 00:00:00 2001 From: Nathan Nguyen Date: Thu, 6 Dec 2018 15:42:56 +1100 Subject: [PATCH 2/2] Fix day display --- views/warningbar/warningbar.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/views/warningbar/warningbar.js b/views/warningbar/warningbar.js index be59b62..b5acc8f 100644 --- a/views/warningbar/warningbar.js +++ b/views/warningbar/warningbar.js @@ -125,6 +125,15 @@ var authOutageWarningBar = { if (seconds < 10) { seconds = "0" + seconds; } - return days + ' day(s) ' + hours + ':' + minutes + ':' + seconds; + if (days > 0) { + if (days > 1) { + days = days + ' days '; + } else { + days = days + ' day '; + } + } else { + days = ''; + } + return days + hours + ':' + minutes + ':' + seconds; } };