Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 73.7
edited by Benjamin Fischer
on 2024/11/07 17:05
Change comment: There is no comment for this version
To version 72.44
edited by Benjamin Fischer
on 2024/11/06 16:58
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>>https://wiki.erumdatahub.de/de/mailing-lists]]
3 +{{displayIcon name="email"/}} [[Mailing Lists]]
4 4  {{displayIcon name="world"/}} [[Website>>https://erumdatahub.de/]]
5 5  {{/box}}
6 6  
XWiki.JavaScriptExtension[0]
Code
... ... @@ -3,102 +3,88 @@
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().filter(e => e));
6 + ret.append(...childs.flat());
7 7   return ret;
8 8   };
9 - const range = num => Array(num).fill().map((_, i) => i);
10 10   FC.defineView('monthCols', {
11 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;
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}));
27 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 93   this.el.addClass("fc-month-cols-view").html(
94 94   E(
95 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))),
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 + ),
99 99   )
100 100   );
101 - }
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 + },
102 102   }),
103 103   duration: { year: 1 },
104 104   });
... ... @@ -113,7 +113,6 @@
113 113   },
114 114   monthCols: {
115 115   columnFormat: "MMM",
116 - weekFormat: "W",
117 117   titleFormat: "YYYY",
118 118   buttonText: "year",
119 119   },
... ... @@ -130,7 +130,7 @@
130 130   right: "month,monthCols",
131 131   },
132 132   timeFormat: "H:mm",
133 - defaultView: "monthCols",
118 + defaultView: "month",
134 134   firstDay: "1",
135 135   minTime: "8:00",
136 136   maxTime: "23:00",
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,69 +1,5 @@
1 -@weekend-color: #f5f5f5;
2 -#calendarCustom.fc {
1 +#calendarCustom {
3 3   td.fc-sat, td.fc-sun {
4 - background-color: @weekend-color;
3 + background-color: #f5f5f5;
5 5   }
6 - .fc-month-cols-view > table {
7 - table-layout: auto;
8 - td, th {
9 - border-width: 0px;
10 - }
11 - col.fc-fitCol {
12 - width: 1px;
13 - }
14 - tbody.fc-body {
15 - td {
16 - background-color: #fff;
17 - &.fc-sat, &.fc-sun {
18 - &.fc-dayVal {
19 - background-color: @weekend-color !important;
20 - }
21 - }
22 - }
23 - tr:nth-child(4n+3) > * {
24 - border-top: 1px solid #ddd;
25 - }
26 - tr:nth-child(4n+5) > * {
27 - border-top: 1px solid #bbb;
28 - }
29 - tr:hover {
30 - filter: brightness(0.95);
31 - }
32 - td.fc-mainVal {
33 - position: relative;
34 - & > div {
35 - z-index: 5;
36 - position: absolute;
37 - width: 100%;
38 - overflow: hidden;
39 - border-radius: 4px;
40 - &.fc-cut-start {
41 - border-top-left-radius: 0px;
42 - border-top-right-radius: 0px;
43 - }
44 - &.fc-cut-end {
45 - border-bottom-left-radius: 0px;
46 - border-bottom-right-radius: 0px;
47 - }
48 - &:hover {
49 - width: auto;
50 - max-width: 10vw;
51 - height: auto !important;
52 - z-index: 10;
53 - }
54 - & > a {
55 - display: block;
56 - color: inherit;
57 - background-color: inherit;
58 - }
59 - }
60 - }
61 - td.fc-dayVal, td.fc-weekVal {
62 - color: desaturate(lighten(#1D3B58, 50%), 80%);
63 - }
64 - td.fc-weekVal {
65 - text-align: right;
66 - }
67 - }
68 - }
69 69  }