Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.79
edited by Benjamin Fischer
on 2024/11/07 13:55
Change comment: There is no comment for this version
To version 72.23
edited by Benjamin Fischer
on 2024/11/06 12:49
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -20,8 +20,9 @@
20 20  
21 21  {{velocity output="false"}}
22 22  $xwiki.ssx.use("Calendar.FullCalendar")
23 +$xwiki.ssx.use("MoccaCalendar.Code.Macro")
23 23  $xwiki.jsx.use("Calendar.FullCalendar", {'defer': false})
24 -$xwiki.jsx.use("Main.WebHome", {'defer': false, 'minify': false})
25 +$xwiki.jsx.use("MoccaCalendar.Code.Macro", {'defer': false})
25 25  {{/velocity}}
26 26  
27 27  (% id="calendarCustom" %)
XWiki.JavaScriptExtension[0]
Code
... ... @@ -1,112 +1,14 @@
1 1  require(["jquery", "fullcalendar"], function (jq) {
2 2   const FC = jq.fullCalendar;
3 - const E = (tag, ...childs) => {
4 - const attrs = childs[0]?.constructor === Object ? childs.shift() : {};
5 - const ret = Element(tag, attrs);
6 - ret.append(...childs.flat().filter(e => e));
7 - return ret;
8 - };
9 - const range = num => Array(num).fill().map((_, i) => i);
10 - FC.defineView('monthCols', {
11 - class: FC.View.extend({
12 - Qrender() {
13 - console.debug("render");
14 - },
15 - QrenderSkeleton() {
16 - console.debug("renderSkeleton");
17 - },
18 - renderEvents(events) {
19 - console.debug("renderEvents", events);
20 - debugger;
21 - try {
22 - this._renderFun(events);
23 - } catch (e) {
24 - console.exception(e);
25 - }
26 - },
27 - _renderFun(events) {
28 - const cf = this.opt("columnFormat") ?? "MMM";
29 - const rf = this.opt("rowFormat") ?? "D";
30 - const df = this.opt("cellFormat") ?? "dd";
31 - const wf = this.opt("weekFormat") ?? "w";
32 - const colspan = (df || wf) ? (1 + !!df + !!wf) : null;
33 -
34 - const ys = this.start;
35 - const ye = this.end;
36 - const yv = events.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
37 -
38 - const cols = [];
39 - const head = [];
40 - const days = Array(31).fill().map(_ => []);
41 -
42 - if (rf) {
43 - cols.push(E("col", {class: "fc-fitCol"}));
44 - head.push(E("th"));
45 - days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
46 - }
47 -
48 - for (const month of range(12)) {
49 - const ms = ys.clone().add({month})
50 - const me = ms.clone().add({month: 1});
51 - const md = me.diff(ms, "days");
52 - const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
53 -
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"}));
57 - head.push(E("th", {colspan}, ms.format(cf)));
58 -
59 - const bgc = new Array(md);
60 -
61 - for (const day of range(31)) {
62 - if (day < md) {
63 - const ds = ms.clone().add({day});
64 - const de = ds.clone().add({day: 1});
65 -
66 - const oc = [];
67 - while(mv[0]?.start.isBefore(de)) {
68 - const v = mv.shift();
69 - const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
70 - if (v.rendering == "background") {
71 - if (v.color)
72 - for (const i of range(d))
73 - bgc[day + i] = v.color;
74 - } else {
75 - const u = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1];
76 - const e = E("div", u ? E("a", {href: u}, v.title) : v.title);
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;
80 - oc.push(e);
81 - // TODO: soft-columns
82 - }
83 - }
84 -
85 - const style = bgc[day] && `background-color: ${bgc[day]};`;
86 - const dc = this.getDayClasses(ds);
87 - const da = sub => ({class: dc.concat(sub).join(" "), style});
88 - if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
89 - days[day].push(E("td", da("fc-mainVal"), oc));
90 - if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
91 - } else
92 - days[day].push(E("td", {colspan}));
93 - }
94 - }
95 -
96 -
97 - this.el.addClass("fc-month-cols-view").html(
98 - E(
99 - "table",
100 - E("colgroup", cols),
101 - E("thead", {class: "fc-head"}, E("tr", head)),
102 - E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
103 - )
104 - );
105 - }
106 - }),
107 - duration: { year: 1 },
3 + const View = FC.View;
4 +
5 + const MonthColView = FC.View.extend({
6 +
108 108   });
109 -
8 +
9 + FC.defineView('monthCols', MonthColView);
10 +
11 +
110 110   const init = () => {
111 111   jq("#calendarCustom").fullCalendar({
112 112   views: {
... ... @@ -117,7 +117,6 @@
117 117   },
118 118   monthCols: {
119 119   columnFormat: "MMM",
120 - weekFormat: "W",
121 121   titleFormat: "YYYY",
122 122   buttonText: "year",
123 123   },
... ... @@ -141,7 +141,6 @@
141 141   defaultDate: "2024-11-06",
142 142   editable: false,
143 143   eventDataTransform: event => {
144 - if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
145 145   return event;
146 146   },
147 147   eventRender: function (event, element) {
Use this extension
... ... @@ -1,1 +1,1 @@
1 -onDemand
1 +currentPage
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,45 +1,5 @@
1 -#calendarCustom.fc {
1 +#calendarCustom {
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 - z-index: 5;
21 - position: absolute;
22 - width: 100%;
23 - overflow: hidden;
24 - border-radius: 4px;
25 - &:hover {
26 - width: auto;
27 - max-width: 10vw;
28 - height: auto !important;
29 - }
30 - & > a {
31 - display: block;
32 - color: inherit;
33 - background-color: inherit;
34 - }
35 - }
36 - }
37 - td.fc-weekVal {
38 - text-align: right;
39 - }
40 - .fc-fade {
41 - opacity: 0.3;
42 - }
43 - }
44 - }
45 45  }