Changes for page Home

Summary

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

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -3,87 +3,85 @@
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	+ render() {},
	13	+ renderEvents(events) {
	14	+ const cf = this.opt("columnFormat") ?? "MMM";
	15	+ const rf = this.opt("rowFormat") ?? "dd";
	16	+ const df = this.opt("cellFormat") ?? "ddd";
	17	+ const wf = this.opt("weekFormat") ?? "w";
	18	+ const colspan = (df || wf) ? (1 + !!df + !!wf) : null;
15	15
	20	+ const ys = this.start;
	21	+ const ye = this.end;
	22	+ const yv = events.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
	23	+
	24	+ const head = [];
	25	+ const days = Array(31).fill().map(_ => []);
	26	+
	27	+ if (rf) {
	28	+ head.push(E("th"));
	29	+ days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
	30	+ }
	31	+
	32	+ for (const month in Array(12).fill()) {
	33	+ const ms = ys.clone().add({month})
	34	+ const me = ms.clone().add({month: 1});
	35	+ const md = me.diff(ms, "days");
	36	+ const mv = yv.filter(t => ms.isBefore(t.end) || t.start.isBefore(me));
	37	+
	38	+ head.push(E("th", {colspan}, ms.format(cf)));
	39	+
	40	+ const bgc = new Array(md);
	41	+
	42	+ for (let day = 0; i < 31; i++) {
	43	+ if (i < md) {
	44	+ const ds = ms.clone().add({day});
	45	+ const de = ds.clone().add({day: 1});
	46	+
	47	+ const oc = [];
	48	+ while(mv[0]?.isBefore(de)) {
	49	+ const v = mv.shift();
	50	+ const d = Math.ceil(v.end.min(me).diff(ds, "days", true));
	51	+ if (t.rendering == "background")
	52	+ if (t.color)
	53	+ for (let i=0; i<d; i++)
	54	+ bgc[day + i] = t.color;
	55	+ else {
	56	+ const e = E("div", t.title);
	57	+ e.style.height = `${100 * d}%`;
	58	+ if (t.color) e.style.borderColor = e.style.backgroundColor = t.color;
	59	+ if (t.textColor) e.style.color = t.textColor;
	60	+ oc.push(e);
	61	+ // TODO: soft-columns
	62	+ }
	63	+ }
	64	+
	65	+ const da = {class: this.getDayClasses(d).join(" ")};
	66	+ if (df) days[i].push(E("td", da, ds.format(df)));
	67	+ if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
	68	+ days[i].push(E("td", da, oc));
	69	+ if (wf) days[i].oush(E("td", ds.weekday() ? "" : ds.format(wf)));
	70	+ } else
	71	+ days[i].push(E("td", {colspan}));
	72	+ }
	73	+ }
	74	+
	75	+
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		- ),
	79	+ E("thead", {class: "fc-head"}, E("tr", head)),
	80	+ 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	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;
	84	+ //debugger;
87	87	},
88	88	}),
89	89	duration: { year: 1 },