Changes for page Home

Summary

• Objects (2 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]
  • XWiki.StyleSheetExtension[0]

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -3,105 +3,35 @@
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	12	render() {
13		- console.debug("render");
14		- },
15		- renderSkeleton() {
16		- console.debug("renderSkeleton");
17		- },
18		- renderEvents(events) {
19		- console.debug("renderEvents", events);
20	20	debugger;
21		- try {
22		- this._renderFun(events);
23		- } catch (e) {
24		- console.exception(e);
25		- }
26		- },
27		- _renderFun(events) {
28		- const cf = this.opt("columnFormat") ?? "MMM";
29		- const rf = this.opt("rowFormat") ?? "D";
30		- const df = this.opt("cellFormat") ?? "dd";
31		- const wf = this.opt("weekFormat") ?? "w";
32		- const colspan = (df || wf) ? (1 + !!df + !!wf) : null;
	13	+ const chf = this.opt("columnFormat") ?? "MMM";
	14	+ const start = this.start ?? FC.moment({year: FC.moment().year()});
	15	+ const months = Array(12).fill().map((_, month) => start.clone().add({month}));
33	33
34		- const ys = this.start;
35		- const ye = this.end;
36		- const yv = events.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
37		-
38		-
39		- const cols = [];
40		- const head = [];
41		- const days = Array(31).fill().map(_ => []);
42		-
43		- if (rf) {
44		- cols.push(E("col", {class: "fc-fitCol"}));
45		- head.push(E("th"));
46		- days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
47		- }
48		-
49		- for (const month of range(12)) {
50		- const ms = ys.clone().add({month})
51		- const me = ms.clone().add({month: 1});
52		- const md = me.diff(ms, "days");
53		- const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
54		-
55		- if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-dayVal"}));
56		- cols.push(E("col"));
57		- if (wf) cols.push(E("col", {class: "fc-fitCol fc-fade fc-weekVal"}));
58		- head.push(E("th", {colspan}, ms.format(cf)));
59		-
60		- const bgc = new Array(md);
61		-
62		- for (const day of range(31)) {
63		- if (day < md) {
64		- const ds = ms.clone().add({day});
65		- const de = ds.clone().add({day: 1});
66		-
67		- const oc = [];
68		- while(mv[0]?.start.isBefore(de)) {
69		- const v = mv.shift();
70		- const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
71		- if (v.rendering == "background") {
72		- if (v.color)
73		- for (const i of range(d))
74		- bgc[day + i] = v.color;
75		- } else {
76		- const e = E("div", v.title);
77		- e.style.height = `${100 * d}%`;
78		- if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
79		- if (v.textColor) e.style.color = v.textColor;
80		- oc.push(e);
81		- // TODO: soft-columns
82		- }
83		- }
84		-
85		- const da = {class: this.getDayClasses(ds).join(" ")};
86		- if (df) days[day].push(E("td", da, ds.format(df)));
87		- if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
88		- days[day].push(E("td", da, oc));
89		- if (wf) days[day].push(E("td", da, ds.weekday() ? "" : ds.format(wf)));
90		- } else
91		- days[day].push(E("td", {colspan}));
92		- }
93		- }
94		-
95		-
96	96	this.el.addClass("fc-month-cols-view").html(
97	97	E(
98	98	"table",
99		- E("colgroup", cols),
100		- E("thead", {class: "fc-head"}, E("tr", head)),
101		- E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
	20	+ E("thead", {class: "fc-head"},
	21	+ E("tr", E("th"), months.map(m => E("th", m.format(chf))))),
	22	+ E("tbody", {class: "fc-body"},
	23	+ Array(31).fill().map((_, day) => E("tr",
	24	+ E("th", {class: "fc-axis"}, `${day + 1}`),
	25	+ months.map(m => m.clone().add({day})).map(d =>
	26	+ d.date() === day + 1
	27	+ ? E("td", {class: this.getDayClasses(d).join(" ")}, [d.format("ddd")])
	28	+ : E("td")
	29	+ )))
	30	+ ),
102	102	)
103	103	);
104		- }
	33	+
	34	+ },
105	105	}),
106	106	duration: { year: 1 },
107	107	});
...	...	@@ -116,7 +116,6 @@
116	116	},
117	117	monthCols: {
118	118	columnFormat: "MMM",
119		- weekFormat: "W",
120	120	titleFormat: "YYYY",
121	121	buttonText: "year",
122	122	},

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -2,11 +2,4 @@
2	2	td.fc-sat, td.fc-sun {
3	3	background-color: #f5f5f5;
4	4	}
5		- .fc_body td {
6		- position: relative;
7		- > div {
8		- position: absolute;
9		-
10		- }
11		- }
12	12	}