Skip to Content

Changes for page Home

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

Summary

Details

XWiki.JavaScriptExtension[0]
Code
... ... @@ -35,10 +35,13 @@
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 = [];
38 38   const head = [];
39 39   const days = Array(31).fill().map(_ => []);
40 40  
41 41   if (rf) {
44 + cols.push(E("col", {class: "fc-fitCol"}));
42 42   head.push(E("th"));
43 43   days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
44 44   }
... ... @@ -47,8 +47,11 @@
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));
53 + const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
51 51  
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"}));
52 52   head.push(E("th", {colspan}, ms.format(cf)));
53 53  
54 54   const bgc = new Array(md);
... ... @@ -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)
70 + const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
71 + if (v.rendering == "background") {
72 + if (v.color)
67 67   for (const i of range(d))
68 - bgc[day + i] = t.color;
69 - else {
70 - const e = E("div", t.title);
74 + bgc[day + i] = v.color;
75 + } else {
76 + 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;
78 + if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
79 + if (v.textColor) e.style.color = v.textColor;
74 74   oc.push(e);
75 75   // TODO: soft-columns
76 76   }
... ... @@ -90,6 +90,7 @@
90 90   this.el.addClass("fc-month-cols-view").html(
91 91   E(
92 92   "table",
99 + E("colgroup", cols),
93 93   E("thead", {class: "fc-head"}, E("tr", head)),
94 94   E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
95 95   )
... ... @@ -109,6 +109,7 @@
109 109   },
110 110   monthCols: {
111 111   columnFormat: "MMM",
119 + weekFormat: "W",
112 112   titleFormat: "YYYY",
113 113   buttonText: "year",
114 114   },