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

Minor improvements

master
David Peer 2022-08-20 11:57:39 +02:00
parent 91c794d5ee
commit 43deb4eb3d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/bwclk/app.js
View File

@ -216,12 +216,10 @@ try{
/*
* AGENDA MENU
* Note that we handle the agenda differently in order to hide old entries...
*/
var agendaIdx = 0;
var agenda = storage.readJSON("android.calendar.json");
if(agenda !== undefined){
agenda = agenda.sort((a,b)=>a.timestamp - b.timestamp);
if(storage.readJSON("android.calendar.json") !== undefined){
function nextAgendaEntry(){
agendaIdx += 1;
}
@ -233,15 +231,22 @@ if(agenda !== undefined){
menu.push([
function(){
var now = new Date();
agenda = agenda.filter(ev=>ev.timestamp + ev.durationInSeconds > now/1000);
var agenda = storage.readJSON("android.calendar.json")
.filter(ev=>ev.timestamp + ev.durationInSeconds > now/1000)
.sort((a,b)=>a.timestamp - b.timestamp);
if(agenda.length <= 0){
return ["All done", imgAgenda()]
}
agendaIdx = agendaIdx < 0 ? 0 : agendaIdx;
agendaIdx = agendaIdx >= agenda.length ? agendaIdx -1 : agendaIdx;
var entry = agenda[agendaIdx];
var title = entry.title.slice(0,14);
var date = new Date(entry.timestamp*1000);
var dateStr = locale.date(date).replace(/\d\d\d\d/,"");
dateStr += entry.durationInSeconds < 86400 ? " - " + locale.time(date,1) : "";
dateStr += entry.durationInSeconds < 86400 ? " / " + locale.time(date,1) : "";
return [title + "\n" + dateStr, imgAgenda(), () => nextAgendaEntry(), () => previousAgendaEntry(), null]
},