Changes for page Home

Summary

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

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -17,9 +17,17 @@
17	17	},
18	18	renderEvents(events) {
19	19	console.debug("renderEvents", events);
	20	+ debugger;
	21	+ try {
	22	+ this._renderFun(events);
	23	+ } catch (e) {
	24	+ console.exception(e);
	25	+ }
	26	+ },
	27	+ _renderFun(events) {
20	20	const cf = this.opt("columnFormat") ?? "MMM";
21		- const rf = this.opt("rowFormat") ?? "dd";
22		- const df = this.opt("cellFormat") ?? "ddd";
	29	+ const rf = this.opt("rowFormat") ?? "D";
	30	+ 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,60 @@
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
	38	+
	39	+ const cols = [];
30	30	const head = [];
31	31	const days = Array(31).fill().map(_ => []);
32	32
33	33	if (rf) {
	44	+ 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()) {
	49	+ 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));
	53	+ const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
43	43
	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"}));
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) {
	62	+ for (const day of range(31)) {
	63	+ 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)) {
	68	+ 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);
	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);
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;
	78	+ if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
	79	+ if (v.textColor) e.style.color = v.textColor;
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)));
	85	+ const da = {class: this.getDayClasses(ds).join(" ")};
	86	+ if (df) days[day].push(E("td", da, ds.format(df)));
73	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)));
	88	+ days[day].push(E("td", da, oc));
	89	+ if (wf) days[day].push(E("td", da, ds.weekday() ? "" : ds.format(wf)));
76	76	} else
77		- days[i].push(E("td", {colspan}));
	91	+ 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",
	99	+ 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		- },
	104	+ }
92	92	}),
93	93	duration: { year: 1 },
94	94	});
...	...	@@ -103,6 +103,7 @@
103	103	},
104	104	monthCols: {
105	105	columnFormat: "MMM",
	119	+ weekFormat: "W",
106	106	titleFormat: "YYYY",
107	107	buttonText: "year",
108	108	},

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -2,4 +2,11 @@
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	+ }
5	5	}