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.76
edited by Benjamin Fischer
on 2024/11/07 13:41
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  
... ... @@ -35,10 +35,12 @@
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 + const cols = [];
38 38   const head = [];
39 39   const days = Array(31).fill().map(_ => []);
40 40  
41 41   if (rf) {
43 + 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));
52 + const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
51 51  
54 + if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-borderLeft"}));
55 + cols.push(E("col", {class: df ? null : "fc-borderLeft"}));
56 + if (wf) cols.push(E("col", {class: "fc-fitCol fc-fade"}));
52 52   head.push(E("th", {colspan}, ms.format(cf)));
53 53  
54 54   const bgc = new Array(md);
... ... @@ -61,26 +61,27 @@
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)
69 + const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
70 + if (v.rendering == "background") {
71 + 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);
73 + bgc[day + i] = v.color;
74 + } else {
75 + 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;
77 + if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
78 + if (v.textColor) e.style.color = v.textColor;
74 74   oc.push(e);
75 75   // TODO: soft-columns
76 76   }
77 77   }
78 78  
79 - const da = {class: this.getDayClasses(ds).join(" ")};
80 - if (df) days[day].push(E("td", da, ds.format(df)));
81 - if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
82 - days[day].push(E("td", da, oc));
83 - if (wf) days[day].push(E("td", ds.weekday() ? "" : ds.format(wf)));
84 + const style = bgc[day] && `background-color: ${bgc[day]};`;
85 + const dc = this.getDayClasses(ds);
86 + const da = sub => ({class: dc.concat(sub).join(" "), style});
87 + if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
88 + days[day].push(E("td", da("fc-mainVal"), oc));
89 + if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
84 84   } else
85 85   days[day].push(E("td", {colspan}));
86 86   }
... ... @@ -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   },
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,5 +1,32 @@
1 -#calendarCustom {
1 +#calendarCustom.fc {
2 2   td.fc-sat, td.fc-sun {
3 3   background-color: #f5f5f5;
4 4   }
5 + .fc-month-cols-view > table {
6 + table-layout: auto;
7 + td, th {
8 + border-width: 0px;
9 + }
10 + col.fc-fitCol {
11 + width: 1px;
12 + }
13 + col.fc-borderLeft {
14 + border-left-width: 1px;
15 + }
16 + .fc-body {
17 + td {
18 + position: relative;
19 + & > div {
20 + position: absolute;
21 + width: 100%;
22 + }
23 + }
24 + td.fc-weekVal {
25 + text-align: right;
26 + }
27 + .fc-fade {
28 + opacity: 0.3;
29 + }
30 + }
31 + }
5 5  }