Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.55
edited by Benjamin Fischer
on 2024/11/07 12:09
Change comment: There is no comment for this version
To version 72.58
edited by Benjamin Fischer
on 2024/11/07 12:23
Change comment: There is no comment for this version

Summary

Details

XWiki.JavaScriptExtension[0]
Code
... ... @@ -26,8 +26,8 @@
26 26   },
27 27   _renderFun(events) {
28 28   const cf = this.opt("columnFormat") ?? "MMM";
29 - const rf = this.opt("rowFormat") ?? "dd";
30 - const df = this.opt("cellFormat") ?? "ddd";
29 + const rf = this.opt("rowFormat") ?? "D";
30 + const df = this.opt("cellFormat") ?? "dd";
31 31   const wf = this.opt("weekFormat") ?? "w";
32 32   const colspan = (df || wf) ? (1 + !!df + !!wf) : null;
33 33  
... ... @@ -47,7 +47,7 @@
47 47   const ms = ys.clone().add({month})
48 48   const me = ms.clone().add({month: 1});
49 49   const md = me.diff(ms, "days");
50 - const mv = yv.filter(t => ms.isBefore(t.end) || t.start.isBefore(me));
50 + const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
51 51  
52 52   head.push(E("th", {colspan}, ms.format(cf)));
53 53  
... ... @@ -61,16 +61,16 @@
61 61   const oc = [];
62 62   while(mv[0]?.start.isBefore(de)) {
63 63   const v = mv.shift();
64 - const d = Math.ceil(v.end.min(me).diff(ds, "days", true));
65 - if (t.rendering == "background")
66 - if (t.color)
64 + const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
65 + if (v.rendering == "background")
66 + if (v.color)
67 67   for (const i of range(d))
68 - bgc[day + i] = t.color;
68 + bgc[day + i] = v.color;
69 69   else {
70 - const e = E("div", t.title);
70 + const e = E("div", v.title);
71 71   e.style.height = `${100 * d}%`;
72 - if (t.color) e.style.borderColor = e.style.backgroundColor = t.color;
73 - if (t.textColor) e.style.color = t.textColor;
72 + if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
73 + if (v.textColor) e.style.color = v.textColor;
74 74   oc.push(e);
75 75   // TODO: soft-columns
76 76   }
... ... @@ -80,7 +80,7 @@
80 80   if (df) days[day].push(E("td", da, ds.format(df)));
81 81   if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
82 82   days[day].push(E("td", da, oc));
83 - if (wf) days[day].push(E("td", ds.weekday() ? "" : ds.format(wf)));
83 + if (wf) days[day].push(E("td", da, ds.weekday() ? "" : ds.format(wf)));
84 84   } else
85 85   days[day].push(E("td", {colspan}));
86 86   }