Skip to content

added orderByTimeLeft field to display events in order #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exula wants to merge 1 commit into
base: main
Choose a base branch
from
Open

added orderByTimeLeft field to display events in order #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
262 changes: 162 additions & 100 deletions MMM-CountEvents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Module.register("MMM-CountEvents", {

defaults: {
refresh: 1000 * 60,
title: "nonamed",
Expand All @@ -19,125 +18,188 @@ Module.register("MMM-CountEvents", {
useQuarter: false,
onPassed: null,
onUpdated: null,

events:[],
orderByTimeLeft: null, // 'asc', 'desc', or null for default list order
events: [],
},

getStyles: function() {
return ["MMM-CountEvents.css"]
getStyles: function () {
return ["MMM-CountEvents.css"];
},

start: function() {
this.config.identifier = this.config?.identifier ?? 'CE_' + this.identifier
this.config.locale = this.config?.locale ?? config?.locale ?? "en"
start: function () {
this.config.identifier = this.config?.identifier ?? "CE_" + this.identifier;
this.config.locale = this.config?.locale ?? config?.locale ?? "en";
},

getDom: function() {
const wrapper = document.createElement("ul")
wrapper.classList.add('CE')
wrapper.id = this.config.identifier
this.config.events.forEach(ev => {
const event = this.regularize(ev)
const mmt = this.mmTime(event)
if (!mmt) return
getTargetTime: function (event) {
const t = new Date(event.targetTime);
const n = new Date(Date.now());
const tMonth = t.getMonth();
const tDate = t.getDate();
const tHour = t.getHours();
const tMinute = t.getMinutes();
const tSecond = t.getSeconds();
const tMilisecond = t.getMilliseconds();
const nYear = n.getFullYear();
const nMonth = n.getMonth();
const nDate = n.getDate();
const nHour = n.getHours();

const eventWrapper = document.createElement("li")
if (event.className) eventWrapper.classList.add(event.className)
eventWrapper.innerHTML = event.output
eventWrapper.querySelector(".title").innerHTML = event.title
eventWrapper.querySelector(".output").appendChild(mmt)
wrapper.appendChild(eventWrapper)
})
return wrapper
let nextT = new Date(t);
switch (event.repeat) {
case "yearly":
nextT = new Date(
nYear,
tMonth,
tDate,
tHour,
tMinute,
tSecond,
tMilisecond,
);
if (nextT.valueOf() < n.valueOf()) nextT.setFullYear(nYear + 1);
break;
case "monthly":
nextT = new Date(
nYear,
nMonth,
tDate,
tHour,
tMinute,
tSecond,
tMilisecond,
);
if (nextT.valueOf() < n.valueOf()) nextT.setMonth(nMonth + 1);
if (nextT.getDate() !== tDate) nextT.setDate(0);
break;
case "weekly":
nextT = new Date(
nYear,
nMonth,
nDate,
tHour,
tMinute,
tSecond,
tMilisecond,
);
const dayDiff = t.getDay() - nextT.getDay();
if (dayDiff === 0 && n.valueOf() > nextT.valueOf())
nextT.setDate(nDate + 7);
if (dayDiff !== 0) nextT.setDate(nDate + ((dayDiff + 7) % 7));
break;
case "daily":
nextT = new Date(
nYear,
nMonth,
nDate,
tHour,
tMinute,
tSecond,
tMilisecond,
);
if (nextT.valueOf() < n.valueOf()) nextT.setDate(nDate + 1);
break;
case "hourly":
nextT = new Date(
nYear,
nMonth,
nDate,
nHour,
tMinute,
tSecond,
tMilisecond,
);
if (nextT.valueOf() < n.valueOf()) nextT.setHours(nHour + 1);
break;
default:
break;
}
return nextT;
},

regularize: function(event) {
const { events, identifier, ...rest } = this.config
return { ...rest, ...event }
},
getDom: function () {
const wrapper = document.createElement("ul");
wrapper.classList.add("CE");
wrapper.id = this.config.identifier;

mmTime: function(event) {
const repeated = (event) => {
const t = new Date(event.targetTime)
const n = new Date(Date.now())
const tMonth = t.getMonth()
const tDate = t.getDate()
const tHour = t.getHours()
const tMinute = t.getMinutes()
const tSecond = t.getSeconds()
const tMilisecond = t.getMilliseconds()
const nYear = n.getFullYear()
const nMonth = n.getMonth()
const nDate = n.getDate()
const nHour = n.getHours()
let events = this.config.events.slice();

let nextT = new Date(t)
switch (event.repeat) {
case "yearly":
nextT = new Date(nYear, tMonth, tDate, tHour, tMinute, tSecond, tMilisecond)
if (nextT.valueOf() < n.valueOf()) nextT.setFullYear(nYear + 1)
break
case "monthly":
nextT = new Date(nYear, nMonth, tDate, tHour, tMinute, tSecond, tMilisecond)
if (nextT.valueOf() < n.valueOf()) nextT.setMonth(nMonth + 1)
if (nextT.getDate() !== tDate) nextT.setDate(0)
break
case "weekly":
nextT = new Date(nYear, nMonth, nDate, tHour, tMinute, tSecond, tMilisecond)
const dayDiff = t.getDay() - nextT.getDay()
if (dayDiff === 0 && n.valueOf() > nextT.valueOf()) nextT.setDate(nDate + 7)
if (dayDiff !== 0) nextT.setDate(nDate + ((dayDiff + 7) % 7))
break
case "daily":
nextT = new Date(nYear, nMonth, nDate, tHour, tMinute, tSecond, tMilisecond)
if (nextT.valueOf() < n.valueOf()) nextT.setDate(nDate + 1)
break
case "hourly":
nextT = new Date(nYear, nMonth, nDate, nHour, tMinute, tSecond, tMilisecond)
if (nextT.valueOf() < n.valueOf()) nextT.setHours(nHour + 1)
break
default: break
}
return nextT
if (this.config.orderByTimeLeft) {
events.sort((a, b) => {
const aTime = this.getTargetTime(this.regularize(a)).valueOf();
const bTime = this.getTargetTime(this.regularize(b)).valueOf();
if (this.config.orderByTimeLeft === "asc") return aTime - bTime;
if (this.config.orderByTimeLeft === "desc") return bTime - aTime;
return 0;
});
}

const targetTime = new Date(repeated(event))
const now = Date.now()
if (event.ignoreBefore && targetTime.valueOf() - +event.ignoreBefore > now) return false
if (event.ignoreAfter && targetTime.valueOf() + +event.ignoreAfter < now) return false
events.forEach((ev) => {
const event = this.regularize(ev);
const mmt = this.mmTime(event);
if (!mmt) return;

const eventWrapper = document.createElement("li");
if (event.className) eventWrapper.classList.add(event.className);
eventWrapper.innerHTML = event.output;
eventWrapper.querySelector(".title").innerHTML = event.title;
eventWrapper.querySelector(".output").appendChild(mmt);
wrapper.appendChild(eventWrapper);
});
return wrapper;
},

regularize: function (event) {
const { events, identifier, ...rest } = this.config;
return { ...rest, ...event };
},

const mmt = document.createElement("mm-time")
mmt.relative = true
mmt.locale = event?.locale ?? this.config?.locale ?? config?.locale ?? "en"
mmt.time = targetTime
mmt.decouple = true
mmt.dataset.numeric = (event.numericAlways) ? 'always' : 'auto'
if (event.unit) mmt.relativeUnit = event.unit
if (event.reverse) mmt.relativeReverse = event.reverse
if (event.refresh && event.refresh >= 1000) mmt.refresh = event.refresh
if (event.useQuarter) mmt.relativeQuarter = true
if (event.numberOnly) mmt.classList.add("number-only")
if (event.numberSign) mmt.classList.add("number-sign")
mmt.classList.add((targetTime.valueOf() < now) ? "past" : ((targetTime.valueOf() > now) ? "future" : "now"))
if (event.className) mmt.classList.add(event.className)
mmTime: function (event) {
const targetTime = new Date(this.getTargetTime(event));
const now = Date.now();
if (event.ignoreBefore && targetTime.valueOf() - +event.ignoreBefore > now)
return false;
if (event.ignoreAfter && targetTime.valueOf() + +event.ignoreAfter < now)
return false;

const mmt = document.createElement("mm-time");
mmt.relative = true;
mmt.locale = event?.locale ?? this.config?.locale ?? config?.locale ?? "en";
mmt.time = targetTime;
mmt.decouple = true;
mmt.dataset.numeric = event.numericAlways ? "always" : "auto";
if (event.unit) mmt.relativeUnit = event.unit;
if (event.reverse) mmt.relativeReverse = event.reverse;
if (event.refresh && event.refresh >= 1000) mmt.refresh = event.refresh;
if (event.useQuarter) mmt.relativeQuarter = true;
if (event.numberOnly) mmt.classList.add("number-only");
if (event.numberSign) mmt.classList.add("number-sign");
mmt.classList.add(
targetTime.valueOf() < now
? "past"
: targetTime.valueOf() > now
? "future"
: "now",
);
if (event.className) mmt.classList.add(event.className);
mmt.onPassed = (ev) => {
let ret = null
let ret = null;
if (typeof event?.onPassed === "function") {
ret = event.onPassed(event, mmt)
ret = event.onPassed(event, mmt);
}
if (event.repeat) mmt.time = new Date(repeated(event))
return ret
}
if (event.repeat) mmt.time = new Date(this.getTargetTime(event));
return ret;
};
mmt.onUpdated = (ev) => {
let ret = null
let ret = null;
if (typeof event?.onUpdated === "function") {
ret = event.onUpdated(event, mmt)
ret = event.onUpdated(event, mmt);
}
return ret
}
return ret;
};
if (typeof event?.manipulate === "function") {
return event.manipulate(mmt)
return event.manipulate(mmt);
}
return mmt
return mmt;
},
})
});
Loading