Skip to Content

Changes for page Home

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

Summary

Details

Page properties
Content
... ... @@ -19,16 +19,18 @@
19 19  = ErUM-Data Calendar =
20 20  
21 21  {{velocity output="false"}}
22 -$xwiki.ssx.use("Calendar.FullCalendar")
23 23  $xwiki.jsx.use("Calendar.FullCalendar", {'defer': false})
24 -$xwiki.jsx.use("Main.WebHome", {'defer': false, 'minify': false})
23 +$xwiki.jsx.use("MoccaCalendar.Code.Macro", {'defer': false})
25 25  {{/velocity}}
26 26  
27 27  (% id="calendarCustom" %)
28 28  (((
29 -
30 30  )))
31 31  
30 +----
31 +
32 +{{calendar json="/bin/get/MoccaCalendar/Code/JSONService?xpage=plain&outputSyntax=plain&calendarDoc=Main.WebHome&filter=wiki&classname=MoccaCalendar.MoccaCalendarEventClass&startfield=startDate&endfield=endDate&durationfield=" right="month,plainList" editable="false"/}}
33 +
32 32  {{velocity}}
33 33  #set ($showcomments = false)
34 34  #set ($showannotations = false)
XWiki.JavaScriptExtension[0]
Code
... ... @@ -1,106 +1,6 @@
1 -require(["jquery", "fullcalendar"], function (jq) {
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 - render() {
13 - console.debug("render");
14 - },
15 - renderSkeleton() {
16 - console.debug("renderSkeleton");
17 - },
18 - renderEvents(events) {
19 - console.debug("renderEvents", events);
20 - try {
21 - this._renderFun(events);
22 - } catch (e) {
23 - console.exception(e);
24 - }
25 - debugger;
26 - },
27 - _renderFun(events) {
28 - const cf = this.opt("columnFormat") ?? "MMM";
29 - const rf = this.opt("rowFormat") ?? "dd";
30 - const df = this.opt("cellFormat") ?? "ddd";
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 head = [];
39 - const days = Array(31).fill().map(_ => []);
40 -
41 - if (rf) {
42 - head.push(E("th"));
43 - days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
44 - }
45 -
46 - for (const month in Array(12).fill()) {
47 - const ms = ys.clone().add({month})
48 - const me = ms.clone().add({month: 1});
49 - const md = me.diff(ms, "days");
50 - const mv = yv.filter(t => ms.isBefore(t.end) || t.start.isBefore(me));
51 -
52 - head.push(E("th", {colspan}, ms.format(cf)));
53 -
54 - const bgc = new Array(md);
55 -
56 - for (let day = 0; i < 31; i++) {
57 - if (i < md) {
58 - const ds = ms.clone().add({day});
59 - const de = ds.clone().add({day: 1});
60 -
61 - const oc = [];
62 - while(mv[0]?.isBefore(de)) {
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)
67 - for (let i=0; i<d; i++)
68 - bgc[day + i] = t.color;
69 - else {
70 - const e = E("div", t.title);
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;
74 - oc.push(e);
75 - // TODO: soft-columns
76 - }
77 - }
78 -
79 - const da = {class: this.getDayClasses(d).join(" ")};
80 - if (df) days[i].push(E("td", da, ds.format(df)));
81 - if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
82 - days[i].push(E("td", da, oc));
83 - if (wf) days[i].oush(E("td", ds.weekday() ? "" : ds.format(wf)));
84 - } else
85 - days[i].push(E("td", {colspan}));
86 - }
87 - }
88 -
89 -
90 - this.el.addClass("fc-month-cols-view").html(
91 - E(
92 - "table",
93 - E("thead", {class: "fc-head"}, E("tr", head)),
94 - E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
95 - )
96 - );
97 - }
98 - }),
99 - duration: { year: 1 },
100 - });
101 -
1 +require(["jquery", "fullcalendar"], function ($) {
102 102   const init = () => {
103 - jq("#calendarCustom").fullCalendar({
3 + $("#calendarCustom").fullCalendar({
104 104   views: {
105 105   month: {
106 106   columnFormat: "ddd",
... ... @@ -131,10 +131,6 @@
131 131   maxTime: "23:00",
132 132   defaultDate: "2024-11-06",
133 133   editable: false,
134 - eventDataTransform: event => {
135 - if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
136 - return event;
137 - },
138 138   eventRender: function (event, element) {
139 139   // Render augmentation hook, use: event.html
140 140   },
... ... @@ -141,6 +141,6 @@
141 141   });
142 142   };
143 143  
144 - jq(document).ready(init);
40 + $(document).ready(init);
145 145  });
146 146  
Use this extension
... ... @@ -1,1 +1,1 @@
1 -onDemand
1 +currentPage