Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

fix time formatting

master
7kasper 2022-01-02 20:29:28 +01:00
parent 602679c6bc
commit 10a50fdde2
No known key found for this signature in database
GPG Key ID: 4AD2FD3E13BFB86A
1 changed files with 254 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/presentor/app.js
View File

@ -136,7 +136,6 @@ c: [
filly: 1,
valign: 1
}
]
}, {lazy:true});
@ -172,6 +171,15 @@ let clearToSend = true;
// Presentation Timers
let ptimers = [];
function formatTimePart(time) {
time = Math.floor(Math.abs(time));
return time < 10 ? `0${time}` : `${time}`;
}
function formatTime(time, doPlus) {
return `${time < 0 ? '-' : (doPlus ? '+' : '')}${formatTimePart(time/60)}:${formatTimePart(time%60)}`;
}
function loadSettings() {
settings = require("Storage").readJSON('presentor.json');
for (let i = 0; i < settings.pparts.length; i++) {
@ -189,7 +197,7 @@ if (!settings.pparts || pparti >= settings.pparts.length) return '00:00';
if (ptimers[pparti].tracked == -1) return '00:00';
ptimers[pparti].left -= (getTime() - ptimers[pparti].tracked);
ptimers[pparti].tracked = getTime();
return `${Math.floor(ptimers[pparti].left/60)}:${Math.floor(ptimers[pparti].left%60)}`;
return formatTime(ptimers[pparti].left);
}
function getRestTime() {
@ -198,7 +206,7 @@ let rem = 0;
for (let i = 0; i < pparti; i++) {
rem += ptimers[i].left;
}
return `${rem >= 0 ? '+':'-'}${Math.floor(rem/60)}:${Math.floor(rem%60)}`;
return formatTime(rem, true);
}
function drawMainFrame() {