Changes for page Home

Summary

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

Details

Page properties

Content

...	...	@@ -20,9 +20,8 @@
20	20
21	21	{{velocity output="false"}}
22	22	$xwiki.ssx.use("Calendar.FullCalendar")
23		-$xwiki.ssx.use("MoccaCalendar.Code.Macro")
24	24	$xwiki.jsx.use("Calendar.FullCalendar", {'defer': false})
25		-$xwiki.jsx.use("MoccaCalendar.Code.Macro", {'defer': false})
	24	+$xwiki.jsx.use("Main.WebHome", {'defer': false, 'minify': false})
26	26	{{/velocity}}
27	27
28	28	(% id="calendarCustom" %)

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,14 +1,111 @@
1	1	require(["jquery", "fullcalendar"], function (jq) {
2	2	const FC = jq.fullCalendar;
3		- const View = FC.View;
4		-
5		- const MonthColView = FC.View.extend({
6		-
	3	+ const E = (tag, ...childs) => {
	4	+ const attrs = childs[0]?.constructor === Object ? childs.shift() : {};
	5	+ const ret = Element(tag, attrs);
	6	+ ret.append(...childs.flat().filter(e => e));
	7	+ return ret;
	8	+ };
	9	+ const range = num => Array(num).fill().map((_, i) => i);
	10	+ FC.defineView('monthCols', {
	11	+ class: FC.View.extend({
	12	+ render() {
	13	+ console.debug("render");
	14	+ },
	15	+ renderSkeleton() {
	16	+ console.debug("renderSkeleton");
	17	+ },
	18	+ renderEvents(events) {
	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) {
	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;
	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	+ this.el.addClass("fc-month-cols-view").html(
	97	+ E(
	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))),
	102	+ )
	103	+ );
	104	+ }
	105	+ }),
	106	+ duration: { year: 1 },
7	7	});
8		-
9		- FC.defineView('monthCols', MonthColView);
10		-
11		-
	108	+
12	12	const init = () => {
13	13	jq("#calendarCustom").fullCalendar({
14	14	views: {
...	...	@@ -19,6 +19,7 @@
19	19	},
20	20	monthCols: {
21	21	columnFormat: "MMM",
	119	+ weekFormat: "W",
22	22	titleFormat: "YYYY",
23	23	buttonText: "year",
24	24	},
...	...	@@ -42,6 +42,7 @@
42	42	defaultDate: "2024-11-06",
43	43	editable: false,
44	44	eventDataTransform: event => {
	143	+ if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
45	45	return event;
46	46	},
47	47	eventRender: function (event, element) {

Use this extension

...	...	@@ -1,1 +1,1 @@
1		-currentPage
	1	+onDemand

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -2,4 +2,17 @@
2	2	td.fc-sat, td.fc-sun {
3	3	background-color: #f5f5f5;
4	4	}
	5	+ .fc-fitCol {
	6	+ width: 1px;
	7	+ }
	8	+ .fc-fade {
	9	+ opacity: 0.3;
	10	+ }
	11	+ .fc-body td {
	12	+ position: relative;
	13	+ > div {
	14	+ position: absolute;
	15	+ width: 100%;
	16	+ }
	17	+ }
5	5	}