Compare commits

..

5 Commits

Author SHA1 Message Date
Armilar
60f31595d4 v4.3.3.36 - Update NSPanelTs.ts 2024-01-10 22:39:48 +01:00
Armilar
7194d7f613 v4.3.3.36 - Update NSPanelTs.ts
Fix Alexa Elapsed
2024-01-10 22:31:29 +01:00
Armilar
af02a70600 Merge pull request #1138 from ticaki/main
Fixed: schedule with objects starts only 1 time
2024-01-10 22:27:01 +01:00
ticaki
77d8e0607d Merge branch 'joBr99:main' into main 2024-01-10 22:21:08 +01:00
ticaki
d6d12bc93c Fixed: schedule with objects starts only 1 time 2024-01-10 22:19:44 +01:00

View File

@@ -5130,6 +5130,9 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
vElapsed = vElapsed.slice(1);
}
}
if (vElapsed == 0) {
vElapsed = '0:00';
}
let vDuration = Duration;
if (vDuration.length == 5) {
if(parseInt(vDuration.slice(0,2)) < 9) {
@@ -9691,8 +9694,8 @@ type PageAlarm = NSPanel.PageAlarm;
/**
*
* @param time object: { hour: number, minutes: number } | starttime
* @param repeatTime in ms
* @param time object { hour: number, minutes: number } | number: Time as number in ms
* @param repeatTime in seconds
* @param callback what todo
* @returns
*/
@@ -9703,7 +9706,7 @@ function adapterSchedule(time: {hour?: number, minute?: number} | undefined | nu
return ref;
}
function _schedule(time: {hour?: number, minute?: number} | undefined | number, ref: number, repeatTime, callback, init: boolean = false) {
function _schedule(time: {hour?: number, minute?: number} | undefined | number, ref: number, repeatTime: number, callback, init: boolean = false) {
if (!scheduleList[ref]) return;
if (!init) callback();
let targetTime: number;
@@ -9714,12 +9717,12 @@ function _schedule(time: {hour?: number, minute?: number} | undefined | number,
targetTime = time + repeatTime * 1000;
time = targetTime;
} else {
time.hour = time.hour !== undefined ? time.hour : 1;
time.hour = time.hour !== undefined ? time.hour : -1;
time.minute = time.minute !== undefined ? time.minute : 0;
targetTime = time.hour !== -1 ? new Date().setHours(time.hour, time.minute, 0) : new Date().setMinutes(time.minute, 0);
if (new Date().getTime() > targetTime) {
targetTime = time.hour !== -1 ? new Date().setHours(time.hour, time.minute, 0, 0) : new Date().setMinutes(time.minute, 0, 0);
if (new Date().getTime() >= targetTime) {
targetTime += repeatTime * 1000;
targetTime = time.hour !== -1 ? new Date(targetTime).setHours(time.hour, time.minute, 0) : new Date(targetTime).setMinutes(time.minute, 0);
targetTime = time.hour !== -1 ? new Date(targetTime).setHours(time.hour, time.minute, 0, 0) : new Date(targetTime).setMinutes(time.minute, 0, 0);
}
}
const timeout = targetTime - new Date().getTime();