Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.44
edited by Benjamin Fischer
on 2024/11/06 16:58
Change comment: There is no comment for this version
To version 73.5
edited by Benjamin Fischer
on 2024/11/07 16:57
Change comment: There is no comment for this version

Summary

Details

Page properties
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  
XWiki.JavaScriptExtension[0]
Code
... ... @@ -3,88 +3,102 @@
3 3   const E = (tag, ...childs) => {
4 4   const attrs = childs[0]?.constructor === Object ? childs.shift() : {};
5 5   const ret = Element(tag, attrs);
6 - ret.append(...childs.flat());
6 + ret.append(...childs.flat().filter(e => e));
7 7   return ret;
8 8   };
9 + const range = num => Array(num).fill().map((_, i) => i);
9 9   FC.defineView('monthCols', {
10 10   class: FC.View.extend({
11 - render() {
12 - const chf = this.opt("columnFormat") ?? "MMM";
13 - const start = this.start ?? FC.moment({year: FC.moment().year()});
14 - const months = Array(12).fill().map((_, month) => start.clone().add({month}));
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;
15 15  
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 +
16 16   this.el.addClass("fc-month-cols-view").html(
17 17   E(
18 18   "table",
19 - E("thead", {class: "fc-head"},
20 - E("tr", E("th"), months.map(m => E("th", m.format(chf))))),
21 - E("tbody", {class: "fc-body"},
22 - Array(31).fill().map((_, day) => E("tr",
23 - E("th", {class: "fc-axis"}, `${day + 1}`),
24 - months.map(m => m.clone().add({day})).map(d =>
25 - d.date() === day + 1
26 - ? E("td", {class: this.getDayClasses(d).join(" ")}, [d.format("dd")])
27 - : E("td")
28 - )))
29 - ),
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))),
30 30   )
31 31   );
32 - },
33 - renderEvents(ev) {
34 - const todo = ev.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
35 - const cols = [];
36 -
37 - for(
38 - let s = this.start.clone(), e = s.clone().add({day: 1}), col = [], occ = [], bgc, bgt, bgn = 0, sim;
39 - s.isBefore(this.end);
40 - s.add({day: 1}), e.add({day: 1}), bgn--, occ = occ.map(o => o--).filter(o => o > 0)
41 - ) {
42 - // calculate maximum number of simultaneous events
43 - if (s.date() == 1) {
44 - const e2 = s.clone().add({month: 1});
45 - sim = Math.max(0, ...todo
46 - .filter(t => s.isBefore(t.end) && t.start.isBefore(e2))
47 - .map((t, i, arr) => arr.slice(i).filter(o => o.start.isBefore(t.end)).length)
48 - );
49 - }
50 - const cells = [E("td", s.format("dd"))];
51 - // new events
52 - while (todo && todo[0].start.isBefore(e)) {
53 - const t = todo.shift();
54 - const d = Math.ceil(t.end.diff(t.start, "days", true));
55 - if (t.rendering == "background") {
56 - bgc = t.color;
57 - bgt = t.title;
58 - bgn = d;
59 - } else {
60 - const e = E("td", t.title);
61 - if (t.color) e.style.borderColor = e.style.backgroundColor = t.color;
62 - if (t.textColor) e.style.color = t.textColor;
63 - if (d > 1) e.rowspan = d;
64 - occ.push(d);
65 - }
66 - }
67 - // fill the rest
68 - const m = sim - occ.length;
69 - if (m) cells.push(E("td", {colspan: m}));
70 - cells.push(E("td", s.weekday() ? "" : s.weekYear()));
71 - // apply background color
72 - if (bgn && bgc) {
73 - for (const c of cells) {
74 - e.style.backgroundColor ||= bgc;
75 - if (bgr) e.title ||= bgt;
76 - }
77 - }
78 - // flush month
79 - if (s.month() != e.month()) {
80 - while(col.length < 31) col.push();
81 - cols.push(col);
82 - col = [];
83 - }
84 - }
85 -
86 - debugger;
87 - },
101 + }
88 88   }),
89 89   duration: { year: 1 },
90 90   });
... ... @@ -99,6 +99,7 @@
99 99   },
100 100   monthCols: {
101 101   columnFormat: "MMM",
116 + weekFormat: "W",
102 102   titleFormat: "YYYY",
103 103   buttonText: "year",
104 104   },
... ... @@ -115,7 +115,7 @@
115 115   right: "month,monthCols",
116 116   },
117 117   timeFormat: "H:mm",
118 - defaultView: "month",
133 + defaultView: "monthCols",
119 119   firstDay: "1",
120 120   minTime: "8:00",
121 121   maxTime: "23:00",
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-dayVal, td.fc-weekVal {
56 + color: desaturate(lighten(#1D3B58, 50%), 80%);
57 + }
58 + td.fc-weekVal {
59 + text-align: right;
60 + }
61 + }
62 + }
5 5  }