Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.48
edited by Benjamin Fischer
on 2024/11/07 11:58
Change comment: There is no comment for this version
To version 73.3
edited by Benjamin Fischer
on 2024/11/07 16:47
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
... ... @@ -9,17 +9,19 @@
9 9   const range = num => Array(num).fill().map((_, i) => i);
10 10   FC.defineView('monthCols', {
11 11   class: FC.View.extend({
12 - render() {
13 - console.debug("render");
14 - },
15 - renderSkeleton() {
16 - console.debug("renderSkeleton");
17 - },
18 18   renderEvents(events) {
19 19   console.debug("renderEvents", events);
14 + debugger;
15 + try {
16 + this._renderFun(events);
17 + } catch (e) {
18 + console.exception(e);
19 + }
20 + },
21 + _renderFun(events) {
20 20   const cf = this.opt("columnFormat") ?? "MMM";
21 - const rf = this.opt("rowFormat") ?? "dd";
22 - const df = this.opt("cellFormat") ?? "ddd";
23 + const rf = this.opt("rowFormat") ?? "D";
24 + const df = this.opt("cellFormat") ?? "dd";
23 23   const wf = this.opt("weekFormat") ?? "w";
24 24   const colspan = (df || wf) ? (1 + !!df + !!wf) : null;
25 25  
... ... @@ -27,54 +27,63 @@
27 27   const ye = this.end;
28 28   const yv = events.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
29 29  
32 + const cols = [];
30 30   const head = [];
31 31   const days = Array(31).fill().map(_ => []);
32 32  
33 33   if (rf) {
37 + cols.push(E("col", {class: "fc-fitCol"}));
34 34   head.push(E("th"));
35 35   days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
36 36   }
37 37  
38 - for (const month in Array(12).fill()) {
42 + for (const month of range(12)) {
39 39   const ms = ys.clone().add({month})
40 40   const me = ms.clone().add({month: 1});
41 41   const md = me.diff(ms, "days");
42 - const mv = yv.filter(t => ms.isBefore(t.end) || t.start.isBefore(me));
46 + const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
43 43  
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"}));
44 44   head.push(E("th", {colspan}, ms.format(cf)));
45 45  
46 46   const bgc = new Array(md);
47 47  
48 - for (let day = 0; i < 31; i++) {
49 - if (i < md) {
55 + for (const day of range(31)) {
56 + if (day < md) {
50 50   const ds = ms.clone().add({day});
51 51   const de = ds.clone().add({day: 1});
52 52  
53 53   const oc = [];
54 - while(mv[0]?.isBefore(de)) {
61 + while(mv[0]?.start.isBefore(de)) {
55 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 + 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));
63 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;
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");
66 66   oc.push(e);
67 67   // TODO: soft-columns
68 68   }
69 69   }
70 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)));
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)));
76 76   } else
77 - days[i].push(E("td", {colspan}));
88 + days[day].push(E("td", {colspan}));
78 78   }
79 79   }
80 80  
... ... @@ -82,13 +82,12 @@
82 82   this.el.addClass("fc-month-cols-view").html(
83 83   E(
84 84   "table",
96 + E("colgroup", cols),
85 85   E("thead", {class: "fc-head"}, E("tr", head)),
86 86   E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
87 87   )
88 88   );
89 -
90 - debugger;
91 - },
101 + }
92 92   }),
93 93   duration: { year: 1 },
94 94   });
... ... @@ -103,6 +103,7 @@
103 103   },
104 104   monthCols: {
105 105   columnFormat: "MMM",
116 + weekFormat: "W",
106 106   titleFormat: "YYYY",
107 107   buttonText: "year",
108 108   },
... ... @@ -119,7 +119,7 @@
119 119   right: "month,monthCols",
120 120   },
121 121   timeFormat: "H:mm",
122 - defaultView: "month",
133 + defaultView: "monthCols",
123 123   firstDay: "1",
124 124   minTime: "8:00",
125 125   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-weelVal {
56 + color: lighten(#1D3B58, 70%);
57 + }
58 + td.fc-weekVal {
59 + text-align: right;
60 + }
61 + }
62 + }
5 5  }