From 4a47b49c1cd4a58d62040e5079113407bd813b94 Mon Sep 17 00:00:00 2001 From: Gabriele Monaco Date: Sun, 18 Dec 2022 21:47:16 +0300 Subject: [PATCH] agenda: added dynamic, short and range fields to clkinfo --- apps/agenda/ChangeLog | 1 + apps/agenda/agenda.clkinfo.js | 13 ++++++++++++- apps/agenda/metadata.json | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/apps/agenda/ChangeLog b/apps/agenda/ChangeLog index 77e11c92e..c28f475dc 100644 --- a/apps/agenda/ChangeLog +++ b/apps/agenda/ChangeLog @@ -9,3 +9,4 @@ Fix clkinfo icon 0.09: Ensure Agenda supplies an image for clkinfo items 0.10: Update clock_info to avoid a redraw +0.11: Added dynamic, short and range fields to clkinfo diff --git a/apps/agenda/agenda.clkinfo.js b/apps/agenda/agenda.clkinfo.js index 7c89446a2..d203119f4 100644 --- a/apps/agenda/agenda.clkinfo.js +++ b/apps/agenda/agenda.clkinfo.js @@ -1,7 +1,14 @@ (function() { + function getPassedSec(date) { + var now = new Date(); + var passed = (now-date)/1000; + if(passed<0) return 0; + return passed; + } var agendaItems = { name: "Agenda", img: atob("GBiBAAAAAAAAAADGMA///w///wf//wAAAA///w///w///w///x///h///h///j///D///X//+f//8wAABwAADw///w///wf//gAAAA=="), + dynamic: true, items: [] }; var locale = require("locale"); @@ -15,11 +22,15 @@ var title = entry.title.slice(0,12); var date = new Date(entry.timestamp*1000); var dateStr = locale.date(date).replace(/\d\d\d\d/,""); + var shortStr = ((date-now) > 86400000 || entry.allDay) ? dateStr : locale.time(date,1); dateStr += entry.durationInSeconds < 86400 ? "/ " + locale.time(date,1) : ""; agendaItems.items.push({ name: "Agenda "+i, - get: () => ({ text: title + "\n" + dateStr, img: agendaItems.img }), + hasRange: true, + get: () => ({ text: title + "\n" + dateStr, + img: agendaItems.img, short: shortStr.trim(), + v: getPassedSec(date), min: 0, max: entry.durationInSeconds}), show: function() {}, hide: function () {} }); diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json index 8253b36bc..b5b7c1582 100644 --- a/apps/agenda/metadata.json +++ b/apps/agenda/metadata.json @@ -1,7 +1,7 @@ { "id": "agenda", "name": "Agenda", - "version": "0.10", + "version": "0.11", "description": "Simple agenda", "icon": "agenda.png", "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],