@royalschedule/maps 4.0.15 → 4.0.16

package/dist/SchoolSoft/api/index.d.ts

@@ -1,18 +1,453 @@
-import { Vertex } from "../../core/types/common/index.js";
-import { Types } from "../../core/types/index.js";
+import { IDType, PrivateIDType } from "../../core/interfaces/vertices/util/vertex.js";
+import { Day } from "../../core/interfaces/vertices/properties/days.js";
+import { Interval } from "../../core/interfaces/vertices/properties/intervals.js";
+import { Tag } from "../../core/interfaces/vertices/properties/tags.js";
+import { MaximumScheduleSpan } from "../../core/interfaces/vertices/properties/maximum-schedule-span.js";
+import { PlannedScheduledDuration } from "../../core/interfaces/vertices/properties/planned-scheduled-duration.js";
+import { MinBreakLength } from "../../core/interfaces/vertices/properties/min-break-length.js";
 import { Schedule } from "./types/schedule.js";
-import { Types as Types$1 } from "./types/index.js";
+import { Types } from "./types/index.js";
+import "../../index.js";
+import * as moment193 from "moment";
 
 //#region src/SchoolSoft/api/index.d.ts
 declare class Map {
   static from: {
     schedules: (data: Schedule) => {
-      locations: (Types.serializedWithoutInternalId.location & Required<Pick<Vertex, "ids">>)[];
-      teachers: (Types.serializedWithoutInternalId.teacher & Required<Pick<Vertex, "ids">>)[];
-      groups: (Types.serializedWithoutInternalId.group & Required<Pick<Vertex, "ids">>)[];
-      courses: (Types.serializedWithoutInternalId.course & Required<Pick<Vertex, "ids">>)[];
-      events: (Types.serializedWithoutInternalId.event & Required<Pick<Vertex, "ids">>)[];
-      persons: (Types.serializedWithoutInternalId.person & Required<Pick<Vertex, "ids">>)[];
+      locations: (Omit<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "location" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: number | undefined;
+        days?: Day[] | undefined;
+        maximumCapacity?: number | undefined;
+        belongsTo?: string | undefined;
+        lockedTimes?: string[] | undefined;
+        lunch?: string[] | undefined;
+        exceptions?: string[] | undefined;
+      }, "id" | "_id" | "ids"> & Partial<Pick<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "location" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: number | undefined;
+        days?: Day[] | undefined;
+        maximumCapacity?: number | undefined;
+        belongsTo?: string | undefined;
+        lockedTimes?: string[] | undefined;
+        lunch?: string[] | undefined;
+        exceptions?: string[] | undefined;
+      }, "id" | "_id" | "ids">> & {
+        ids: string;
+      })[];
+      teachers: (Omit<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "teacher" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: number | undefined;
+        maxNumWorkingHours?: number | false | undefined;
+        maxNumDailyWorkingHours?: number | number[] | false | undefined;
+        maximumScheduleSpan?: MaximumScheduleSpan | undefined;
+        forbidOverlappingEvents?: boolean | undefined;
+        disableDayLengthPunishment?: boolean | undefined;
+        weight?: number | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
+        signature?: string | undefined;
+        plannedScheduledDuration?: PlannedScheduledDuration | undefined;
+        belongsTo?: string | undefined;
+        rootInterval?: string | undefined;
+        lockedTimes?: string[] | undefined;
+        lunch?: string[] | undefined;
+        complementaryTimes?: string[] | undefined;
+        exceptions?: string[] | undefined;
+        person?: string | undefined;
+      }, "id" | "_id" | "ids"> & Partial<Pick<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "teacher" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: number | undefined;
+        maxNumWorkingHours?: number | false | undefined;
+        maxNumDailyWorkingHours?: number | number[] | false | undefined;
+        maximumScheduleSpan?: MaximumScheduleSpan | undefined;
+        forbidOverlappingEvents?: boolean | undefined;
+        disableDayLengthPunishment?: boolean | undefined;
+        weight?: number | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
+        signature?: string | undefined;
+        plannedScheduledDuration?: PlannedScheduledDuration | undefined;
+        belongsTo?: string | undefined;
+        rootInterval?: string | undefined;
+        lockedTimes?: string[] | undefined;
+        lunch?: string[] | undefined;
+        complementaryTimes?: string[] | undefined;
+        exceptions?: string[] | undefined;
+        person?: string | undefined;
+      }, "id" | "_id" | "ids">> & {
+        ids: string;
+      })[];
+      groups: (Omit<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "group" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: number | undefined;
+        maxNumWorkingHours?: number | false | undefined;
+        maxNumDailyWorkingHours?: number | number[] | false | undefined;
+        maximumScheduleSpan?: MaximumScheduleSpan | undefined;
+        forbidOverlappingEvents?: boolean | undefined;
+        disableDayLengthPunishment?: boolean | undefined;
+        weight?: number | undefined;
+        species?: "class" | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
+        belongsTo?: string | undefined;
+        parentGroups?: string[] | undefined;
+        subGroups?: string[] | undefined;
+        lockedTimes?: string[] | undefined;
+        lunch?: string[] | undefined;
+        exceptions?: string[] | undefined;
+        members?: string[] | undefined;
+        rootInterval?: string | undefined;
+        derivedParentGroups?: {
+          implicit?: boolean | undefined;
+          explicit?: boolean | undefined;
+          group: string;
+        }[] | undefined;
+      }, "id" | "_id" | "ids"> & Partial<Pick<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "group" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: number | undefined;
+        maxNumWorkingHours?: number | false | undefined;
+        maxNumDailyWorkingHours?: number | number[] | false | undefined;
+        maximumScheduleSpan?: MaximumScheduleSpan | undefined;
+        forbidOverlappingEvents?: boolean | undefined;
+        disableDayLengthPunishment?: boolean | undefined;
+        weight?: number | undefined;
+        species?: "class" | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
+        belongsTo?: string | undefined;
+        parentGroups?: string[] | undefined;
+        subGroups?: string[] | undefined;
+        lockedTimes?: string[] | undefined;
+        lunch?: string[] | undefined;
+        exceptions?: string[] | undefined;
+        members?: string[] | undefined;
+        rootInterval?: string | undefined;
+        derivedParentGroups?: {
+          implicit?: boolean | undefined;
+          explicit?: boolean | undefined;
+          group: string;
+        }[] | undefined;
+      }, "id" | "_id" | "ids">> & {
+        ids: string;
+      })[];
+      courses: (Omit<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "course" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        type?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: MinBreakLength | undefined;
+        weight?: number | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
+        subject?: string | undefined;
+        color?: string | undefined;
+        eventDurationVariance?: number | undefined;
+        centerOfAttraction?: string | null | undefined;
+        density?: number | undefined;
+        plannedDuration?: string | undefined;
+        minutesPerWeek?: number | undefined;
+        expectedTotalHours?: number | undefined;
+        belongsTo?: string | undefined;
+        period?: string | undefined;
+        overlapGroup?: string | undefined;
+        syllabus?: string | undefined;
+        lockedTimes?: string[] | undefined;
+        exceptions?: string[] | undefined;
+        events?: string[] | undefined;
+        participants?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        teachers?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        groups?: {
+          groupIndex?: number | undefined;
+          to: string;
+          exclude?: string[] | undefined;
+        }[] | undefined;
+        locations?: {
+          groupIndex?: number | undefined;
+          rank?: number | undefined;
+          locations: [string];
+        }[] | undefined;
+      }, "id" | "_id" | "ids"> & Partial<Pick<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "course" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        type?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: MinBreakLength | undefined;
+        weight?: number | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
+        subject?: string | undefined;
+        color?: string | undefined;
+        eventDurationVariance?: number | undefined;
+        centerOfAttraction?: string | null | undefined;
+        density?: number | undefined;
+        plannedDuration?: string | undefined;
+        minutesPerWeek?: number | undefined;
+        expectedTotalHours?: number | undefined;
+        belongsTo?: string | undefined;
+        period?: string | undefined;
+        overlapGroup?: string | undefined;
+        syllabus?: string | undefined;
+        lockedTimes?: string[] | undefined;
+        exceptions?: string[] | undefined;
+        events?: string[] | undefined;
+        participants?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        teachers?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        groups?: {
+          groupIndex?: number | undefined;
+          to: string;
+          exclude?: string[] | undefined;
+        }[] | undefined;
+        locations?: {
+          groupIndex?: number | undefined;
+          rank?: number | undefined;
+          locations: [string];
+        }[] | undefined;
+      }, "id" | "_id" | "ids">> & {
+        ids: string;
+      })[];
+      events: (Omit<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "event" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        start?: (moment193.Moment | string) | undefined;
+        end?: (moment193.Moment | string) | undefined;
+        potentialCenter?: string | undefined;
+        type?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: (MinBreakLength | null) | undefined;
+        weight?: number | undefined;
+        intervals?: Interval[] | null | undefined;
+        days?: Day[] | null | undefined;
+        color?: string | null | undefined;
+        centerOfAttraction?: string | null | undefined;
+        density?: number | undefined;
+        fixedStart?: boolean | undefined;
+        visible?: boolean | undefined;
+        parked?: boolean | undefined;
+        preferredDuration: number;
+        durationVariance?: number | undefined;
+        duration?: number | undefined;
+        weeks?: number[] | undefined;
+        belongsTo?: string | undefined;
+        course?: string | undefined;
+        period?: string | undefined;
+        overlapSpecies?: string | undefined;
+        lockedTimes?: string[] | undefined;
+        exceptions?: string[] | undefined;
+        inLocations?: (string | null)[] | undefined;
+        participants?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        teachers?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        groups?: {
+          groupIndex?: number | undefined;
+          to: string;
+          exclude?: string[] | undefined;
+        }[] | undefined;
+        locations?: {
+          groupIndex?: number | undefined;
+          rank?: number | undefined;
+          locations: [string];
+        }[] | undefined;
+      }, "id" | "_id" | "ids"> & Partial<Pick<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "event" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        start?: (moment193.Moment | string) | undefined;
+        end?: (moment193.Moment | string) | undefined;
+        potentialCenter?: string | undefined;
+        type?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: (MinBreakLength | null) | undefined;
+        weight?: number | undefined;
+        intervals?: Interval[] | null | undefined;
+        days?: Day[] | null | undefined;
+        color?: string | null | undefined;
+        centerOfAttraction?: string | null | undefined;
+        density?: number | undefined;
+        fixedStart?: boolean | undefined;
+        visible?: boolean | undefined;
+        parked?: boolean | undefined;
+        preferredDuration: number;
+        durationVariance?: number | undefined;
+        duration?: number | undefined;
+        weeks?: number[] | undefined;
+        belongsTo?: string | undefined;
+        course?: string | undefined;
+        period?: string | undefined;
+        overlapSpecies?: string | undefined;
+        lockedTimes?: string[] | undefined;
+        exceptions?: string[] | undefined;
+        inLocations?: (string | null)[] | undefined;
+        participants?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        teachers?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        groups?: {
+          groupIndex?: number | undefined;
+          to: string;
+          exclude?: string[] | undefined;
+        }[] | undefined;
+        locations?: {
+          groupIndex?: number | undefined;
+          rank?: number | undefined;
+          locations: [string];
+        }[] | undefined;
+      }, "id" | "_id" | "ids">> & {
+        ids: string;
+      })[];
+      persons: (Omit<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "person" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        type?: "Student" | "Teacher" | "Other" | undefined;
+        tags?: Tag[] | undefined;
+        lastName?: string | undefined;
+        firstName?: string | undefined;
+        birthDate?: Date | undefined;
+        sex?: "Man" | "Woman" | undefined;
+        SSN?: {
+          value: string;
+          nationality?: string;
+        } | undefined;
+        emails?: {
+          value: string;
+          type?: string;
+        }[] | undefined;
+        phoneNumbers?: {
+          value: string;
+          type: string;
+        }[] | undefined;
+        belongsTo?: string | undefined;
+        group?: string | undefined;
+      }, "id" | "_id" | "ids"> & Partial<Pick<{
+        id: IDType;
+        _id: PrivateIDType;
+        ids?: string | undefined;
+        is?: "person" | undefined;
+        displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        type?: "Student" | "Teacher" | "Other" | undefined;
+        tags?: Tag[] | undefined;
+        lastName?: string | undefined;
+        firstName?: string | undefined;
+        birthDate?: Date | undefined;
+        sex?: "Man" | "Woman" | undefined;
+        SSN?: {
+          value: string;
+          nationality?: string;
+        } | undefined;
+        emails?: {
+          value: string;
+          type?: string;
+        }[] | undefined;
+        phoneNumbers?: {
+          value: string;
+          type: string;
+        }[] | undefined;
+        belongsTo?: string | undefined;
+        group?: string | undefined;
+      }, "id" | "_id" | "ids">> & {
+        ids: string;
+      })[];
       meta: {
         errors?: string[];
         warnings?: string[];

package/dist/SchoolSoft/file/from/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_schedules"],"sources":["../../../../src/SchoolSoft/file/from/index.ts"],"sourcesContent":["import type { FromInterface } from '../../../common/types';\nimport _schedules from './schedules';\n\nexport default {\n  schedules: _schedules\n} satisfies FromInterface;"],"mappings":";;;AAGA,mBAAe,EACb,WAAWA"}
+{"version":3,"file":"index.js","names":["_schedules"],"sources":["../../../../src/SchoolSoft/file/from/index.ts"],"sourcesContent":["import type { FromInterface } from '../../../common/types';\nimport _schedules from './schedules';\n\nexport default {\n  schedules: _schedules\n} satisfies FromInterface;"],"mappings":";;;AAGA,mBAAe,EACb,WAAWA,mBACZ"}

package/dist/SchoolSoft/file/from/schedules.js

@@ -14,8 +14,7 @@ const days = [
 ];
 function _parseWeeks(weeks, set, method = "add") {
 	if (!weeks) return;
-	const intervals = weeks.split(",").map((x) => trim(x));
-	intervals.forEach((interval) => {
+	weeks.split(",").map((x) => trim(x)).forEach((interval) => {
 		if (!interval.includes("-")) {
 			set[method](Number(interval));
 			return;
@@ -28,92 +27,89 @@ var schedules_default = (input, options) => {
 	const teachers = /* @__PURE__ */ new Set();
 	const groups = /* @__PURE__ */ new Set();
 	const locations = /* @__PURE__ */ new Set();
-	const events = input.map((event) => {
-		if (!event.length) return;
-		const weeks = /* @__PURE__ */ new Set();
-		const { inweek, exweek, realweeks } = event;
-		try {
-			_parseWeeks(inweek, weeks, "add");
-			_parseWeeks(realweeks, weeks, "add");
-			if (weeks.size == 0) Array.from({ length: 51 }, (_, index) => index + 1).forEach((x) => weeks.add(x));
-			_parseWeeks(exweek, weeks, "delete");
-		} catch (err) {
-			console.error(err);
-		}
-		if (options?.interval) {
-			const { start: start$1, end: end$1 } = options.interval;
-			if (start$1 > 52 || start$1 <= 0) throw new Error(`(SchoolSoft::From::Schedules) Interval::start is invalid. value ${start$1}`);
-			if (end$1 > 52 || end$1 <= 0) throw new Error(`(SchoolSoft::From::Schedules) Interval::end is invalid. value ${end$1}`);
-			if (start$1 > end$1) {
-				if (!Array.from(weeks).some((week) => week >= start$1 && week <= 52 || week <= end$1)) return;
-			} else if (!Array.from(weeks).some((week) => week >= start$1 && week <= end$1)) return;
-		}
-		let start;
-		let end;
-		const { starttime, subject, day, length, teacher, group, room } = event;
-		if (day && starttime) {
-			const _day = days.indexOf(day);
-			if (_day > 4) return;
-			start = get_date_default(_day, `${starttime.substring(0, 2)}:${starttime.substring(2, 4)}`);
-			end = start.clone().add(length, "m");
-		}
-		let _teachers;
-		let _groups;
-		let _locations;
-		if (teacher) {
-			_teachers = teacher.split(",").map((x) => x.trim());
-			_teachers?.forEach((x) => teachers.add(x));
-		}
-		if (group) {
-			_groups = group.split(",").map((x) => x.trim());
-			_groups?.forEach((x) => groups.add(x));
-		}
-		if (room) {
-			_locations = sortBy(room.split(",").map((x) => x.trim()));
-			_locations?.forEach((x) => locations.add(x));
-		}
-		const doc = {
-			ids: event.id,
-			preferredDuration: event.length,
-			weeks: sortBy(Array.from(weeks)),
-			...subject && { subject },
-			...start && { start },
-			...end && { end },
-			...event.group && { groups: _groups?.map((to) => ({ to })) },
-			...event.teacher && { teachers: _teachers?.map((to) => ({ to })) },
-			...event.room && {
-				inLocations: _locations,
-				locations: _locations?.map((_location, index) => ({
-					locations: [_location],
-					groupIndex: index
-				}))
-			}
-		};
-		return doc;
-	}).filter((x) => x != null);
-	const courses = makeChainable(events).chain((x) => x.filter((e) => !!e.ids), (x) => groupBy(x, (e) => e.subject + ".g." + e.groups?.map((x$1) => x$1.to).join(",") + (e.groups?.length ? "" : ".t." + e.teachers?.map((x$1) => x$1.to).join(","))), (x) => Object.values(x).map((events$1) => {
-		const { subject, groups: groups$1, teachers: teachers$1 } = events$1[0];
-		for (const e of events$1) {
-			delete e.subject;
-			delete e.groups;
-		}
-		const course = {
-			displayName: `${subject}-${(groups$1 ?? teachers$1)?.map((x$1) => x$1.to).join(" ")}`,
-			events: events$1.map((e) => e.ids),
-			...groups$1
-		};
-		if (size(countBy(events$1, (e) => e.teachers?.map((x$1) => x$1.to).sort().join(","))) == 1) {
-			course.teachers = events$1[0].teachers ?? void 0;
-			events$1.forEach((e) => delete e.teachers);
-		}
-		if (size(countBy(events$1, (e) => e.locations?.map((x$1) => x$1.locations[0]).sort().join(","))) == 1) {
-			course.locations = events$1[0].locations ?? void 0;
-			events$1.forEach((e) => delete e.locations);
-		}
-		return course;
-	})).value;
 	return {
-		courses,
+		courses: makeChainable(input.map((event) => {
+			if (!event.length) return;
+			const weeks = /* @__PURE__ */ new Set();
+			const { inweek, exweek, realweeks } = event;
+			try {
+				_parseWeeks(inweek, weeks, "add");
+				_parseWeeks(realweeks, weeks, "add");
+				if (weeks.size == 0) Array.from({ length: 51 }, (_, index) => index + 1).forEach((x) => weeks.add(x));
+				_parseWeeks(exweek, weeks, "delete");
+			} catch (err) {
+				console.error(err);
+			}
+			if (options?.interval) {
+				const { start: start$1, end: end$1 } = options.interval;
+				if (start$1 > 52 || start$1 <= 0) throw new Error(`(SchoolSoft::From::Schedules) Interval::start is invalid. value ${start$1}`);
+				if (end$1 > 52 || end$1 <= 0) throw new Error(`(SchoolSoft::From::Schedules) Interval::end is invalid. value ${end$1}`);
+				if (start$1 > end$1) {
+					if (!Array.from(weeks).some((week) => week >= start$1 && week <= 52 || week <= end$1)) return;
+				} else if (!Array.from(weeks).some((week) => week >= start$1 && week <= end$1)) return;
+			}
+			let start;
+			let end;
+			const { starttime, subject, day, length, teacher, group, room } = event;
+			if (day && starttime) {
+				const _day = days.indexOf(day);
+				if (_day > 4) return;
+				start = get_date_default(_day, `${starttime.substring(0, 2)}:${starttime.substring(2, 4)}`);
+				end = start.clone().add(length, "m");
+			}
+			let _teachers;
+			let _groups;
+			let _locations;
+			if (teacher) {
+				_teachers = teacher.split(",").map((x) => x.trim());
+				_teachers?.forEach((x) => teachers.add(x));
+			}
+			if (group) {
+				_groups = group.split(",").map((x) => x.trim());
+				_groups?.forEach((x) => groups.add(x));
+			}
+			if (room) {
+				_locations = sortBy(room.split(",").map((x) => x.trim()));
+				_locations?.forEach((x) => locations.add(x));
+			}
+			return {
+				ids: event.id,
+				preferredDuration: event.length,
+				weeks: sortBy(Array.from(weeks)),
+				...subject && { subject },
+				...start && { start },
+				...end && { end },
+				...event.group && { groups: _groups?.map((to) => ({ to })) },
+				...event.teacher && { teachers: _teachers?.map((to) => ({ to })) },
+				...event.room && {
+					inLocations: _locations,
+					locations: _locations?.map((_location, index) => ({
+						locations: [_location],
+						groupIndex: index
+					}))
+				}
+			};
+		}).filter((x) => x != null)).chain((x) => x.filter((e) => !!e.ids), (x) => groupBy(x, (e) => e.subject + ".g." + e.groups?.map((x$1) => x$1.to).join(",") + (e.groups?.length ? "" : ".t." + e.teachers?.map((x$1) => x$1.to).join(","))), (x) => Object.values(x).map((events) => {
+			const { subject, groups: groups$1, teachers: teachers$1 } = events[0];
+			for (const e of events) {
+				delete e.subject;
+				delete e.groups;
+			}
+			const course = {
+				displayName: `${subject}-${(groups$1 ?? teachers$1)?.map((x$1) => x$1.to).join(" ")}`,
+				events: events.map((e) => e.ids),
+				...groups$1
+			};
+			if (size(countBy(events, (e) => e.teachers?.map((x$1) => x$1.to).sort().join(","))) == 1) {
+				course.teachers = events[0].teachers ?? void 0;
+				events.forEach((e) => delete e.teachers);
+			}
+			if (size(countBy(events, (e) => e.locations?.map((x$1) => x$1.locations[0]).sort().join(","))) == 1) {
+				course.locations = events[0].locations ?? void 0;
+				events.forEach((e) => delete e.locations);
+			}
+			return course;
+		})).value,
 		teachers: Array.from(teachers).map((ids) => ({
 			ids,
 			displayName: ids