Skip to Content

Changes for page Home

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

Summary

Details

XWiki.JavaScriptExtension[0]
Code
... ... @@ -35,13 +35,10 @@
35 35   const ye = this.end;
36 36   const yv = events.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
37 37  
38 -
39 - const cols = [];
40 40   const head = [];
41 41   const days = Array(31).fill().map(_ => []);
42 42  
43 43   if (rf) {
44 - cols.push(E("col", {class: "fc-fitCol"}));
45 45   head.push(E("th"));
46 46   days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
47 47   }
... ... @@ -50,11 +50,8 @@
50 50   const ms = ys.clone().add({month})
51 51   const me = ms.clone().add({month: 1});
52 52   const md = me.diff(ms, "days");
53 - 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));
54 54  
55 - if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-dayVal"}));
56 - cols.push(E("col"));
57 - if (wf) cols.push(E("col", {class: "fc-fitCol fc-fade fc-weekVal"}));
58 58   head.push(E("th", {colspan}, ms.format(cf)));
59 59  
60 60   const bgc = new Array(md);
... ... @@ -67,16 +67,16 @@
67 67   const oc = [];
68 68   while(mv[0]?.start.isBefore(de)) {
69 69   const v = mv.shift();
70 - const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
71 - if (v.rendering == "background") {
72 - if (v.color)
64 + const d = Math.ceil(v.end.min(me).diff(ds, "days", true));
65 + if (t.rendering == "background")
66 + if (t.color)
73 73   for (const i of range(d))
74 - bgc[day + i] = v.color;
75 - } else {
76 - const e = E("div", v.title);
68 + bgc[day + i] = t.color;
69 + else {
70 + const e = E("div", t.title);
77 77   e.style.height = `${100 * d}%`;
78 - if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
79 - if (v.textColor) e.style.color = v.textColor;
72 + if (t.color) e.style.borderColor = e.style.backgroundColor = t.color;
73 + if (t.textColor) e.style.color = t.textColor;
80 80   oc.push(e);
81 81   // TODO: soft-columns
82 82   }
... ... @@ -96,7 +96,6 @@
96 96   this.el.addClass("fc-month-cols-view").html(
97 97   E(
98 98   "table",
99 - E("colgroup", cols),
100 100   E("thead", {class: "fc-head"}, E("tr", head)),
101 101   E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
102 102   )
... ... @@ -116,7 +116,6 @@
116 116   },
117 117   monthCols: {
118 118   columnFormat: "MMM",
119 - weekFormat: "W",
120 120   titleFormat: "YYYY",
121 121   buttonText: "year",
122 122   },