From ef31fd4f01cd72b14e2630b1d675329d4ced3831 Mon Sep 17 00:00:00 2001 From: David Peer Date: Sat, 26 Feb 2022 09:24:42 +0100 Subject: [PATCH] Added more functions to get the time, time str or remaining minutes. --- apps/widtmr/README.md | 1 + apps/widtmr/widget.js | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/widtmr/README.md b/apps/widtmr/README.md index 7edaffb10..bd795d20f 100644 --- a/apps/widtmr/README.md +++ b/apps/widtmr/README.md @@ -26,6 +26,7 @@ The following functions are available: - decreaseTimer(int) -> void - getRemainingMinutes() -> int - getRemainingTime() -> DateTime +- getRemainingTimeStr() -> str Example to increase the timer by 5 and ensure that its started: ```Javascript diff --git a/apps/widtmr/widget.js b/apps/widtmr/widget.js index b83b4a204..8dcc5ec41 100644 --- a/apps/widtmr/widget.js +++ b/apps/widtmr/widget.js @@ -131,16 +131,30 @@ var diff = settings.goal - now; return Math.ceil(diff / (1000*60)); - }, getRemainingTime: function(){ + }, getRemainingTimeStr: function(){ + settings = storage.readJSON("widtmr.json",1)||{started: false}; if(!settings.started){ return; } var now = new Date(); var diff = settings.goal - now; - return getTime(diff); - } + var timeStr = getTime(diff); + if(diff < 3600000){ + timeStr = timeStr.substring(3); // remove hour part 00:00:00 -> 00:00 + } + return timeStr; + }, getRemainingTime: function(){ + settings = storage.readJSON("widtmr.json",1)||{started: false}; + if(!settings.started){ + return; + } + + var now = new Date(); + var diff = settings.goal - now; + return diff; + } }; // set width correctly, start countdown each second