Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.47
edited by Benjamin Fischer
on 2024/11/07 11:57
Change comment: There is no comment for this version
To version 72.16
edited by Benjamin Fischer
on 2024/11/06 12:09
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,100 +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 - const cf = this.opt("columnFormat") ?? "MMM";
21 - const rf = this.opt("rowFormat") ?? "dd";
22 - const df = this.opt("cellFormat") ?? "ddd";
23 - const wf = this.opt("weekFormat") ?? "w";
24 - const colspan = (df || wf) ? (1 + !!df + !!wf) : null;
25 -
26 - const ys = this.start;
27 - const ye = this.end;
28 - const yv = events.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
29 -
30 - const head = [];
31 - const days = Array(31).fill().map(_ => []);
32 -
33 - if (rf) {
34 - head.push(E("th"));
35 - days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
36 - }
37 -
38 - for (const month in Array(12).fill()) {
39 - const ms = ys.clone().add({month})
40 - const me = ms.clone().add({month: 1});
41 - const md = me.diff(ms, "days");
42 - const mv = yv.filter(t => ms.isBefore(t.end) || t.start.isBefore(me));
43 -
44 - head.push(E("th", {colspan}, ms.format(cf)));
45 -
46 - const bgc = new Array(md);
47 -
48 - for (let day = 0; i < 31; i++) {
49 - if (i < md) {
50 - const ds = ms.clone().add({day});
51 - const de = ds.clone().add({day: 1});
52 -
53 - const oc = [];
54 - while(mv[0]?.isBefore(de)) {
55 - const v = mv.shift();
56 - const d = Math.ceil(v.end.min(me).diff(ds, "days", true));
57 - if (t.rendering == "background")
58 - if (t.color)
59 - for (let i=0; i<d; i++)
60 - bgc[day + i] = t.color;
61 - else {
62 - const e = E("div", t.title);
63 - e.style.height = `${100 * d}%`;
64 - if (t.color) e.style.borderColor = e.style.backgroundColor = t.color;
65 - if (t.textColor) e.style.color = t.textColor;
66 - oc.push(e);
67 - // TODO: soft-columns
68 - }
69 - }
70 -
71 - const da = {class: this.getDayClasses(d).join(" ")};
72 - if (df) days[i].push(E("td", da, ds.format(df)));
73 - if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
74 - days[i].push(E("td", da, oc));
75 - if (wf) days[i].oush(E("td", ds.weekday() ? "" : ds.format(wf)));
76 - } else
77 - days[i].push(E("td", {colspan}));
78 - }
79 - }
80 -
81 -
82 - this.el.addClass("fc-month-cols-view").html(
83 - E(
84 - "table",
85 - E("thead", {class: "fc-head"}, E("tr", head)),
86 - E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
87 - )
88 - );
89 -
90 - //debugger;
91 - },
92 - }),
93 - duration: { year: 1 },
94 - });
95 -
1 +require(["jquery", "fullcalendar"], function ($) {
96 96   const init = () => {
97 - jq("#calendarCustom").fullCalendar({
3 + $("#calendar1").fullCalendar({
98 98   views: {
99 99   month: {
100 100   columnFormat: "ddd",
... ... @@ -125,10 +125,6 @@
125 125   maxTime: "23:00",
126 126   defaultDate: "2024-11-06",
127 127   editable: false,
128 - eventDataTransform: event => {
129 - if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
130 - return event;
131 - },
132 132   eventRender: function (event, element) {
133 133   // Render augmentation hook, use: event.html
134 134   },
... ... @@ -135,6 +135,6 @@
135 135   });
136 136   };
137 137  
138 - jq(document).ready(init);
40 + $(document).ready(init);
139 139  });
140 140  
Use this extension
... ... @@ -1,1 +1,1 @@
1 -onDemand
1 +currentPage
XWiki.StyleSheetExtension[0]
Caching policy
... ... @@ -1,1 +1,0 @@
1 -default
Code
... ... @@ -1,5 +1,0 @@
1 -#calendarCustom {
2 - td.fc-sat, td.fc-sun {
3 - background-color: #f5f5f5;
4 - }
5 -}
Content Type
... ... @@ -1,1 +1,0 @@
1 -LESS
Parse content
... ... @@ -1,1 +1,0 @@
1 -No
Use this extension
... ... @@ -1,1 +1,0 @@
1 -currentPage