Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.22
edited by Benjamin Fischer
on 2024/11/06 12:49
Change comment: There is no comment for this version
To version 73.1
edited by Judith Steinfeld
on 2024/11/07 16:17
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.fischer
1 +XWiki.JudithSteinfeld
Content
... ... @@ -1,6 +1,6 @@
1 1  {{box cssClass="floatinginfobox" image="https://wiki.test.erumdatahub.de/bin/download/Main/WebHome/logo_horizontal_23_neu.png?width=200"}}
2 2  {{displayIcon name="application_view_tile"/}} [[Indico>>https://indico.desy.de/category/984/]]
3 -{{displayIcon name="email"/}} [[Mailing Lists]]
3 +{{displayIcon name="email"/}} [[Mailing Lists>>https://wiki.erumdatahub.de/de/mailing-lists]]
4 4  {{displayIcon name="world"/}} [[Website>>https://erumdatahub.de/]]
5 5  {{/box}}
6 6  
... ... @@ -20,9 +20,8 @@
20 20  
21 21  {{velocity output="false"}}
22 22  $xwiki.ssx.use("Calendar.FullCalendar")
23 -$xwiki.ssx.use("MoccaCalendar.Code.Macro")
24 24  $xwiki.jsx.use("Calendar.FullCalendar", {'defer': false})
25 -$xwiki.jsx.use("MoccaCalendar.Code.Macro", {'defer': false})
24 +$xwiki.jsx.use("Main.WebHome", {'defer': false, 'minify': false})
26 26  {{/velocity}}
27 27  
28 28  (% id="calendarCustom" %)
XWiki.JavaScriptExtension[0]
Code
... ... @@ -1,14 +1,108 @@
1 1  require(["jquery", "fullcalendar"], function (jq) {
2 2   const FC = jq.fullCalendar;
3 - const View = FC.View;
4 -
5 - const MonthColView = FC.View.extend({
6 -
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 + renderEvents(events) {
13 + console.debug("renderEvents", events);
14 + debugger;
15 + try {
16 + this._renderFun(events);
17 + } catch (e) {
18 + console.exception(e);
19 + }
20 + },
21 + _renderFun(events) {
22 + const cf = this.opt("columnFormat") ?? "MMM";
23 + const rf = this.opt("rowFormat") ?? "D";
24 + const df = this.opt("cellFormat") ?? "dd";
25 + const wf = this.opt("weekFormat") ?? "w";
26 + const colspan = (df || wf) ? (1 + !!df + !!wf) : null;
27 +
28 + const ys = this.start;
29 + const ye = this.end;
30 + const yv = events.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
31 +
32 + const cols = [];
33 + const head = [];
34 + const days = Array(31).fill().map(_ => []);
35 +
36 + if (rf) {
37 + cols.push(E("col", {class: "fc-fitCol"}));
38 + head.push(E("th"));
39 + days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
40 + }
41 +
42 + for (const month of range(12)) {
43 + const ms = ys.clone().add({month})
44 + const me = ms.clone().add({month: 1});
45 + const md = me.diff(ms, "days");
46 + const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
47 +
48 + if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-borderLeft"}));
49 + cols.push(E("col", {class: df ? null : "fc-borderLeft"}));
50 + if (wf) cols.push(E("col", {class: "fc-fitCol fc-fade"}));
51 + head.push(E("th", {colspan}, ms.format(cf)));
52 +
53 + const bgc = new Array(md);
54 +
55 + for (const day of range(31)) {
56 + if (day < md) {
57 + const ds = ms.clone().add({day});
58 + const de = ds.clone().add({day: 1});
59 +
60 + const oc = [];
61 + while(mv[0]?.start.isBefore(de)) {
62 + const v = mv.shift();
63 + const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
64 + if (v.rendering == "background") {
65 + if (v.color)
66 + for (const i of range(d))
67 + bgc[day + i] = v.color;
68 + } else {
69 + const href = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? v.url;
70 + const e = E("div", E("a", {href}, v.title));
71 + e.style.height = `${100 * d}%`;
72 + if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
73 + if (v.textColor) e.style.color = v.textColor;
74 + if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
75 + if (me.isBefore(v.end)) e.classList.add("fc-cut-end");
76 + oc.push(e);
77 + // TODO: soft-columns
78 + }
79 + }
80 +
81 + const style = bgc[day] && `background-color: ${bgc[day]};`;
82 + const dc = this.getDayClasses(ds);
83 + const da = sub => ({class: dc.concat(sub).join(" "), style});
84 + if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
85 + days[day].push(E("td", da("fc-mainVal"), oc));
86 + if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
87 + } else
88 + days[day].push(E("td", {colspan}));
89 + }
90 + }
91 +
92 +
93 + this.el.addClass("fc-month-cols-view").html(
94 + E(
95 + "table",
96 + E("colgroup", cols),
97 + E("thead", {class: "fc-head"}, E("tr", head)),
98 + E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
99 + )
100 + );
101 + }
102 + }),
103 + duration: { year: 1 },
7 7   });
8 -
9 - fullCalendar.defineView('monthCols', MonthColView);
10 -
11 -
105 +
12 12   const init = () => {
13 13   jq("#calendarCustom").fullCalendar({
14 14   views: {
... ... @@ -19,6 +19,7 @@
19 19   },
20 20   monthCols: {
21 21   columnFormat: "MMM",
116 + weekFormat: "W",
22 22   titleFormat: "YYYY",
23 23   buttonText: "year",
24 24   },
... ... @@ -35,7 +35,7 @@
35 35   right: "month,monthCols",
36 36   },
37 37   timeFormat: "H:mm",
38 - defaultView: "month",
133 + defaultView: "monthCols",
39 39   firstDay: "1",
40 40   minTime: "8:00",
41 41   maxTime: "23:00",
... ... @@ -42,6 +42,7 @@
42 42   defaultDate: "2024-11-06",
43 43   editable: false,
44 44   eventDataTransform: event => {
140 + if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
45 45   return event;
46 46   },
47 47   eventRender: function (event, element) {
Use this extension
... ... @@ -1,1 +1,1 @@
1 -currentPage
1 +onDemand
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,5 +1,63 @@
1 -#calendarCustom {
1 +#calendarCustom.fc {
2 2   td.fc-sat, td.fc-sun {
3 3   background-color: #f5f5f5;
4 + &.fc-dayVal {
5 + background-color: #f5f5f5 !important;
6 + }
4 4   }
8 + .fc-month-cols-view > table {
9 + table-layout: auto;
10 + td, th {
11 + border-width: 0px;
12 + }
13 + col.fc-fitCol {
14 + width: 1px;
15 + }
16 + .fc-body {
17 + tr:nth-child(4n+3) > * {
18 + border-top: 1px solid #ddd;
19 + }
20 + tr:nth-child(4n+5) > * {
21 + border-top: 1px solid #bbb;
22 + }
23 + tr:hover {
24 + filter: brightness(0.95);
25 + }
26 + td.fc-mainVal {
27 + position: relative;
28 + & > div {
29 + z-index: 5;
30 + position: absolute;
31 + width: 100%;
32 + overflow: hidden;
33 + border-radius: 4px;
34 + &.fc-cut-start {
35 + border-top-left-radius: 0px;
36 + border-top-right-radius: 0px;
37 + }
38 + &.fc-cut-end {
39 + border-bottom-left-radius: 0px;
40 + border-bottom-right-radius: 0px;
41 + }
42 + &:hover {
43 + width: auto;
44 + max-width: 10vw;
45 + height: auto !important;
46 + z-index: 10;
47 + }
48 + & > a {
49 + display: block;
50 + color: inherit;
51 + background-color: inherit;
52 + }
53 + }
54 + }
55 + td.fc-weekVal {
56 + text-align: right;
57 + }
58 + .fc-fade2 {
59 + opacity: 0.3;
60 + }
61 + }
62 + }
5 5  }