@royalschedule/maps 4.0.24 → 4.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Additio/to/index.d.ts +2 -2
- package/dist/Admentum/from/courses.js +12 -15
- package/dist/Admentum/from/courses.js.map +1 -1
- package/dist/Admentum/from/events.js +38 -31
- package/dist/Admentum/from/events.js.map +1 -1
- package/dist/SchoolSoft/file/to/index.d.ts +2 -2
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@ import { Types } from "../../core/types/index.js";
|
|
|
2
2
|
import { Types as Types$1 } from "../types/index.js";
|
|
3
3
|
import "../index.js";
|
|
4
4
|
import "../../index.js";
|
|
5
|
-
import * as
|
|
5
|
+
import * as xlsx0 from "xlsx";
|
|
6
6
|
|
|
7
7
|
//#region src/Additio/to/index.d.ts
|
|
8
8
|
declare class export_default {
|
|
@@ -16,7 +16,7 @@ declare class export_default {
|
|
|
16
16
|
courses: Types.Mixed.Course[];
|
|
17
17
|
events: Types.Mixed.Event[];
|
|
18
18
|
lockedTimes: Types.Mixed.LockedTime[];
|
|
19
|
-
}, _options?: Types$1.options) =>
|
|
19
|
+
}, _options?: Types$1.options) => xlsx0.WorkBook;
|
|
20
20
|
}
|
|
21
21
|
//#endregion
|
|
22
22
|
export { export_default };
|
|
@@ -3,22 +3,19 @@ function courses_default(scheduledGroups, school, importErrors, importWarnings)
|
|
|
3
3
|
const courses = [];
|
|
4
4
|
scheduledGroups?.forEach((scheduledGroup) => {
|
|
5
5
|
const subjects = school.school_type == "GR" ? scheduledGroup.subjects : scheduledGroup.courses;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
6
|
+
for (const subject of subjects) {
|
|
7
|
+
if (scheduledGroup.teachers?.length == 0) {
|
|
8
|
+
const warn = `The schedule group "${scheduledGroup.name}" with id "${scheduledGroup.id}" did not contain any teachers.`;
|
|
9
|
+
importWarnings.push(warn);
|
|
10
|
+
}
|
|
11
|
+
courses.push({
|
|
12
|
+
ids: scheduledGroup.id.toString(),
|
|
13
|
+
displayName: scheduledGroup.name,
|
|
14
|
+
subject: subject.name,
|
|
15
|
+
groups: scheduledGroup.users_primary_groups.map((x) => ({ to: x.toString() })),
|
|
16
|
+
teachers: scheduledGroup.teachers?.map((x) => ({ to: x.id.toString() }))
|
|
17
|
+
});
|
|
10
18
|
}
|
|
11
|
-
if (scheduledGroup.teachers?.length == 0) {
|
|
12
|
-
const warn = `The schedule group "${scheduledGroup.name}" with id "${scheduledGroup.id}" did not contain any teachers.`;
|
|
13
|
-
importWarnings.push(warn);
|
|
14
|
-
}
|
|
15
|
-
courses.push({
|
|
16
|
-
ids: scheduledGroup.id.toString(),
|
|
17
|
-
displayName: scheduledGroup.name,
|
|
18
|
-
subject: subjects.map((x) => x.name).join(", "),
|
|
19
|
-
groups: scheduledGroup.users_primary_groups.map((x) => ({ to: x.toString() })),
|
|
20
|
-
teachers: scheduledGroup.teachers?.map((x) => ({ to: x.id.toString() }))
|
|
21
|
-
});
|
|
22
19
|
});
|
|
23
20
|
return courses;
|
|
24
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"courses.js","names":["courses: OutTypes.course[]"],"sources":["../../../src/Admentum/from/courses.ts"],"sourcesContent":["import type { ScheduleGroup } from '../types/schedule-groups';\nimport type { School } from '../types/schools';\nimport type { OutTypes } from './schedules';\n\n\nexport default function (\n scheduledGroups: ScheduleGroup[] | undefined,\n school: School,\n importErrors: string[],\n importWarnings: string[],\n): OutTypes.course[] {\n\n const courses: OutTypes.course[] = [];\n\n scheduledGroups?.forEach(scheduledGroup => {\n\n ////\n //// check number of subjects/courses\n ////\n const subjects = school.school_type == 'GR' ? scheduledGroup.subjects : scheduledGroup.courses;\n
|
|
1
|
+
{"version":3,"file":"courses.js","names":["courses: OutTypes.course[]"],"sources":["../../../src/Admentum/from/courses.ts"],"sourcesContent":["import type { ScheduleGroup } from '../types/schedule-groups';\nimport type { School } from '../types/schools';\nimport type { OutTypes } from './schedules';\n\n\nexport default function (\n scheduledGroups: ScheduleGroup[] | undefined,\n school: School,\n importErrors: string[],\n importWarnings: string[],\n): OutTypes.course[] {\n\n const courses: OutTypes.course[] = [];\n\n scheduledGroups?.forEach(scheduledGroup => {\n\n ////\n //// check number of subjects/courses\n ////\n const subjects = school.school_type == 'GR' ? scheduledGroup.subjects : scheduledGroup.courses;\n // Nikos takes full responsibility for this line of code and the decision to allow multiple subjects per schedule group, which is a scenario that we have observed in the wild but that we do not fully understand the implications of.\n for (const subject of subjects) {\n ////\n //// check number of teachers\n ////\n if (scheduledGroup.teachers?.length == 0) {\n const warn = `The schedule group \"${scheduledGroup.name}\" with id \"${scheduledGroup.id}\" did not contain any teachers.`;\n importWarnings.push(warn);\n }\n\n courses.push({\n ids: scheduledGroup.id.toString(),\n displayName: scheduledGroup.name,\n subject: subject.name,\n groups: scheduledGroup.users_primary_groups.map(x => ({ to: x.toString() })),\n teachers: scheduledGroup.teachers?.map(x => ({ to: x.id.toString() }))\n } satisfies OutTypes.course);\n }\n });\n\n return courses;\n}\n"],"mappings":";AAKA,yBACE,iBACA,QACA,cACA,gBACmB;CAEnB,MAAMA,UAA6B,EAAE;AAErC,kBAAiB,SAAQ,mBAAkB;EAKzC,MAAM,WAAW,OAAO,eAAe,OAAO,eAAe,WAAW,eAAe;AAEvF,OAAK,MAAM,WAAW,UAAU;AAI9B,OAAI,eAAe,UAAU,UAAU,GAAG;IACxC,MAAM,OAAO,uBAAuB,eAAe,KAAK,aAAa,eAAe,GAAG;AACvF,mBAAe,KAAK,KAAK;;AAG3B,WAAQ,KAAK;IACX,KAAa,eAAe,GAAG,UAAU;IACzC,aAAa,eAAe;IAC5B,SAAa,QAAQ;IACrB,QAAa,eAAe,qBAAqB,KAAI,OAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;IACjF,UAAa,eAAe,UAAU,KAAI,OAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,EAAE;IAC1E,CAA2B;;GAE9B;AAEF,QAAO"}
|
|
@@ -18,40 +18,47 @@ function events_default(lessons, courses, teachers, importErrors, importWarnings
|
|
|
18
18
|
importWarnings.push(warn);
|
|
19
19
|
return;
|
|
20
20
|
}
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const warn = `The lesson with id "${l.id}" referenced the unknown/faulty schedule_group (course) "${course_id}" and was therefore ignored.`;
|
|
25
|
-
importWarnings.push(warn);
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
|
-
const start = fromTimeString(l.weekday, l.info.start);
|
|
29
|
-
const end = fromTimeString(l.weekday, l.info.end);
|
|
30
|
-
const preferredDuration = l.info.duration;
|
|
31
|
-
const duration = l.info.duration;
|
|
32
|
-
let eventTeachers;
|
|
33
|
-
if (!course.teachers || !course.teachers?.every((x) => l.info.teachers?.some((y) => y.id.toString() == x.to))) {
|
|
34
|
-
eventTeachers = l.info.teachers?.map((x) => x.id.toString());
|
|
35
|
-
for (const teacher of eventTeachers ?? []) if (!teacherSet.has(teacher)) {
|
|
36
|
-
const warn = `The lesson with id "${l.id}" referenced the unknown teacher "${teacher}" and was therefore ignored.`;
|
|
21
|
+
groupScope: for (const group of l.info.groups) {
|
|
22
|
+
if (!group2course.has(group.id.toString())) {
|
|
23
|
+
const warn = `The lesson with id "${l.id}" referenced the unknown/faulty schedule_group (course) "${group.id}" and was therefore ignored.`;
|
|
37
24
|
importWarnings.push(warn);
|
|
38
|
-
|
|
25
|
+
continue groupScope;
|
|
26
|
+
}
|
|
27
|
+
const course_id = group.id.toString();
|
|
28
|
+
const course = group2course.get(course_id);
|
|
29
|
+
if (!course) {
|
|
30
|
+
const warn = `The lesson with id "${l.id}" referenced the unknown/faulty schedule_group (course) "${course_id}" and was therefore ignored.`;
|
|
31
|
+
importWarnings.push(warn);
|
|
32
|
+
continue groupScope;
|
|
33
|
+
}
|
|
34
|
+
const start = fromTimeString(l.weekday, l.info.start);
|
|
35
|
+
const end = fromTimeString(l.weekday, l.info.end);
|
|
36
|
+
const preferredDuration = l.info.duration;
|
|
37
|
+
const duration = l.info.duration;
|
|
38
|
+
let eventTeachers;
|
|
39
|
+
if (!course.teachers || !course.teachers?.every((x) => l.info.teachers?.some((y) => y.id.toString() == x.to))) {
|
|
40
|
+
eventTeachers = l.info.teachers?.map((x) => x.id.toString());
|
|
41
|
+
for (const teacher of eventTeachers ?? []) if (!teacherSet.has(teacher)) {
|
|
42
|
+
const warn = `The lesson with id "${l.id}" referenced the unknown teacher "${teacher}" and was therefore ignored.`;
|
|
43
|
+
importWarnings.push(warn);
|
|
44
|
+
continue groupScope;
|
|
45
|
+
}
|
|
39
46
|
}
|
|
47
|
+
const location = l.info.room?.id.toString();
|
|
48
|
+
events.push({
|
|
49
|
+
ids: l.id.toString(),
|
|
50
|
+
start,
|
|
51
|
+
end,
|
|
52
|
+
preferredDuration,
|
|
53
|
+
duration,
|
|
54
|
+
course: course_id,
|
|
55
|
+
...location && {
|
|
56
|
+
inLocations: [location],
|
|
57
|
+
locations: [{ locations: [location] }]
|
|
58
|
+
},
|
|
59
|
+
...eventTeachers && { teachers: eventTeachers.map((to) => ({ to })) }
|
|
60
|
+
});
|
|
40
61
|
}
|
|
41
|
-
const location = l.info.room?.id.toString();
|
|
42
|
-
events.push({
|
|
43
|
-
ids: l.id.toString(),
|
|
44
|
-
start,
|
|
45
|
-
end,
|
|
46
|
-
preferredDuration,
|
|
47
|
-
duration,
|
|
48
|
-
course: course_id,
|
|
49
|
-
...location && {
|
|
50
|
-
inLocations: [location],
|
|
51
|
-
locations: [{ locations: [location] }]
|
|
52
|
-
},
|
|
53
|
-
...eventTeachers && { teachers: eventTeachers.map((to) => ({ to })) }
|
|
54
|
-
});
|
|
55
62
|
});
|
|
56
63
|
return events;
|
|
57
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","names":["events: OutTypes.event[]","eventTeachers: string[] | undefined"],"sources":["../../../src/Admentum/from/events.ts"],"sourcesContent":["\nimport moment from 'moment';\nimport type { Lesson } from '../types/lessons';\nimport type { OutTypes } from './schedules';\n\nconst firstDay = moment.utc('1970-01-05');\n\nfunction fromTimeString (\n day: number,\n timeString: string\n): moment.Moment {\n const [hours, minutes, seconds] = timeString.split(':').map((time: string) => parseInt(time));\n return firstDay.clone().add(day, 'day')\n .set('hour', hours)\n .set('minute', minutes);\n}\n\nexport default function (\n lessons: Lesson[] | undefined,\n courses: OutTypes.course[] | undefined,\n teachers: OutTypes.teacher[] | undefined,\n importErrors: string[],\n importWarnings: string[],\n): OutTypes.event[] {\n\n // create schedule_group (group) to course map for quick lookup\n const group2course = new Map<string, OutTypes.course>();\n courses?.forEach(c => group2course.set(c.ids!, c));\n\n // create teacher set for quick lookup\n const teacherSet = new Set<string>();\n teachers?.forEach(t => teacherSet.add(t.ids!));\n\n const events: OutTypes.event[] = [];\n lessons?.forEach(l => {\n\n // check number of groups (schedule_groups = course) to ensure that only one exists\n if (l.info.groups?.length != 1) {\n const warn = `The lesson with id \"${l.id} contained ${l.info.groups?.length} number of groups (schedule_groups = courses) and was therefore omitted: a lesson shall contain only a single group.`;\n importWarnings.push(warn);\n return;\n }\n const
|
|
1
|
+
{"version":3,"file":"events.js","names":["events: OutTypes.event[]","eventTeachers: string[] | undefined"],"sources":["../../../src/Admentum/from/events.ts"],"sourcesContent":["\nimport moment from 'moment';\nimport type { Lesson } from '../types/lessons';\nimport type { OutTypes } from './schedules';\n\nconst firstDay = moment.utc('1970-01-05');\n\nfunction fromTimeString (\n day: number,\n timeString: string\n): moment.Moment {\n const [hours, minutes, seconds] = timeString.split(':').map((time: string) => parseInt(time));\n return firstDay.clone().add(day, 'day')\n .set('hour', hours)\n .set('minute', minutes);\n}\n\nexport default function (\n lessons: Lesson[] | undefined,\n courses: OutTypes.course[] | undefined,\n teachers: OutTypes.teacher[] | undefined,\n importErrors: string[],\n importWarnings: string[],\n): OutTypes.event[] {\n\n // create schedule_group (group) to course map for quick lookup\n const group2course = new Map<string, OutTypes.course>();\n courses?.forEach(c => group2course.set(c.ids!, c));\n\n // create teacher set for quick lookup\n const teacherSet = new Set<string>();\n teachers?.forEach(t => teacherSet.add(t.ids!));\n\n const events: OutTypes.event[] = [];\n lessons?.forEach(l => {\n\n // check number of groups (schedule_groups = course) to ensure that only one exists\n if (l.info.groups?.length != 1) {\n const warn = `The lesson with id \"${l.id} contained ${l.info.groups?.length} number of groups (schedule_groups = courses) and was therefore omitted: a lesson shall contain only a single group.`;\n importWarnings.push(warn);\n return;\n }\n\n // Nikos takes full responsibility for this line of code\n groupScope: for (const group of l.info.groups) {\n if (!group2course.has(group.id.toString())) {\n const warn = `The lesson with id \"${l.id}\" referenced the unknown/faulty schedule_group (course) \"${group.id}\" and was therefore ignored.`;\n importWarnings.push(warn);\n continue groupScope;\n }\n const course_id = group.id.toString();\n const course = group2course.get(course_id);\n\n if (!course) {\n const warn = `The lesson with id \"${l.id}\" referenced the unknown/faulty schedule_group (course) \"${course_id}\" and was therefore ignored.`;\n importWarnings.push(warn);\n continue groupScope;\n }\n\n const start = fromTimeString(l.weekday, l.info.start);\n const end = fromTimeString(l.weekday, l.info.end);\n const preferredDuration = l.info.duration;\n const duration = l.info.duration;\n\n // store only teachers if they mismatch teachers of parent course\n let eventTeachers: string[] | undefined;\n if (!course.teachers || !course.teachers?.every(x => l.info.teachers?.some(y => y.id.toString() == x.to))) {\n eventTeachers = l.info.teachers?.map(x => x.id.toString());\n\n // ensure that the teachers exist\n for (const teacher of eventTeachers ?? []) {\n if (!teacherSet.has(teacher)) {\n const warn = `The lesson with id \"${l.id}\" referenced the unknown teacher \"${teacher}\" and was therefore ignored.`;\n importWarnings.push(warn);\n continue groupScope;\n }\n }\n }\n\n // location\n const location = l.info.room?.id.toString();\n\n events.push({\n ids: l.id.toString(),\n start,\n end,\n preferredDuration,\n duration,\n course: course_id,\n ...location && { inLocations: [ location ], locations: [{ locations: [ location ] }] },\n ...(eventTeachers && { teachers: eventTeachers.map((to) => ({ to })) })\n } satisfies OutTypes.event);\n }\n });\n\n return events;\n}\n"],"mappings":";;;AAKA,MAAM,WAAW,OAAO,IAAI,aAAa;AAEzC,SAAS,eACP,KACA,YACe;CACf,MAAM,CAAC,OAAO,SAAS,WAAW,WAAW,MAAM,IAAI,CAAC,KAAK,SAAiB,SAAS,KAAK,CAAC;AAC7F,QAAO,SAAS,OAAO,CAAC,IAAI,KAAK,MAAM,CACpC,IAAI,QAAQ,MAAM,CAClB,IAAI,UAAU,QAAQ;;AAG3B,wBACE,SACA,SACA,UACA,cACA,gBACkB;CAGlB,MAAM,+BAAe,IAAI,KAA8B;AACvD,UAAS,SAAQ,MAAK,aAAa,IAAI,EAAE,KAAM,EAAE,CAAC;CAGlD,MAAM,6BAAa,IAAI,KAAa;AACpC,WAAU,SAAQ,MAAK,WAAW,IAAI,EAAE,IAAK,CAAC;CAE9C,MAAMA,SAA2B,EAAE;AACnC,UAAS,SAAQ,MAAK;AAGpB,MAAI,EAAE,KAAK,QAAQ,UAAU,GAAG;GAC9B,MAAM,OAAO,uBAAuB,EAAE,GAAG,aAAa,EAAE,KAAK,QAAQ,OAAO;AAC5E,kBAAe,KAAK,KAAK;AACzB;;AAIF,aAAY,MAAK,MAAM,SAAS,EAAE,KAAK,QAAQ;AAC7C,OAAI,CAAC,aAAa,IAAI,MAAM,GAAG,UAAU,CAAC,EAAE;IAC1C,MAAM,OAAO,uBAAuB,EAAE,GAAG,2DAA2D,MAAM,GAAG;AAC7G,mBAAe,KAAK,KAAK;AACzB,aAAS;;GAEX,MAAM,YAAY,MAAM,GAAG,UAAU;GACrC,MAAM,SAAS,aAAa,IAAI,UAAU;AAE1C,OAAI,CAAC,QAAQ;IACX,MAAM,OAAO,uBAAuB,EAAE,GAAG,2DAA2D,UAAU;AAC9G,mBAAe,KAAK,KAAK;AACzB,aAAS;;GAGX,MAAM,QAAoB,eAAe,EAAE,SAAS,EAAE,KAAK,MAAM;GACjE,MAAM,MAAoB,eAAe,EAAE,SAAS,EAAE,KAAK,IAAI;GAC/D,MAAM,oBAAoB,EAAE,KAAK;GACjC,MAAM,WAAoB,EAAE,KAAK;GAGjC,IAAIC;AACJ,OAAI,CAAC,OAAO,YAAY,CAAC,OAAO,UAAU,OAAM,MAAK,EAAE,KAAK,UAAU,MAAK,MAAK,EAAE,GAAG,UAAU,IAAI,EAAE,GAAG,CAAC,EAAE;AACzG,oBAAgB,EAAE,KAAK,UAAU,KAAI,MAAK,EAAE,GAAG,UAAU,CAAC;AAG1D,SAAK,MAAM,WAAW,iBAAiB,EAAE,CACvC,KAAI,CAAC,WAAW,IAAI,QAAQ,EAAE;KAC5B,MAAM,OAAO,uBAAuB,EAAE,GAAG,oCAAoC,QAAQ;AACrF,oBAAe,KAAK,KAAK;AACzB,cAAS;;;GAMf,MAAM,WAAW,EAAE,KAAK,MAAM,GAAG,UAAU;AAE3C,UAAO,KAAK;IACV,KAAQ,EAAE,GAAG,UAAU;IACvB;IACA;IACA;IACA;IACA,QAAQ;IACR,GAAG,YAAY;KAAE,aAAa,CAAE,SAAU;KAAE,WAAW,CAAC,EAAE,WAAW,CAAE,SAAU,EAAE,CAAC;KAAE;IACtF,GAAI,iBAAiB,EAAE,UAAU,cAAc,KAAK,QAAQ,EAAE,IAAI,EAAE,EAAE;IACvE,CAA0B;;GAE7B;AAEF,QAAO"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { BaseOptions } from "../../../common/types.js";
|
|
2
2
|
import { Types } from "../../../core/types/index.js";
|
|
3
3
|
import "../../../index.js";
|
|
4
|
-
import * as
|
|
4
|
+
import * as xlsx1 from "xlsx";
|
|
5
5
|
|
|
6
6
|
//#region src/SchoolSoft/file/to/index.d.ts
|
|
7
7
|
declare class export_default {
|
|
8
8
|
static schedules: (schedule: Types.Mixed.Schedule & {
|
|
9
9
|
division?: Types.Mixed.Division;
|
|
10
|
-
}, options?: BaseOptions) =>
|
|
10
|
+
}, options?: BaseOptions) => xlsx1.WorkBook;
|
|
11
11
|
}
|
|
12
12
|
//#endregion
|
|
13
13
|
export { export_default };
|