@royalschedule/maps 3.2.44 → 3.2.46
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.
|
@@ -12,6 +12,7 @@ var getId = ref => {
|
|
|
12
12
|
return ref.id.toString();
|
|
13
13
|
};
|
|
14
14
|
var _default = schedule => {
|
|
15
|
+
var _schedule$settings$ca;
|
|
15
16
|
var did = schedule.division.id;
|
|
16
17
|
if (!did) throw new Error('division id is undefined');
|
|
17
18
|
var periodsMap = new Map(schedule.periods.map(p => [getId(p), p]));
|
|
@@ -21,11 +22,26 @@ var _default = schedule => {
|
|
|
21
22
|
end: schedule.division.end
|
|
22
23
|
}]
|
|
23
24
|
};
|
|
25
|
+
periodsMap.set(undefined, defaultPeriod);
|
|
24
26
|
var coursesMap = new Map(schedule.courses.map(c => [getId(c), c]));
|
|
25
27
|
var locationsMap = new Map(schedule.locations.map(l => [getId(l), l]));
|
|
26
28
|
var startDate = _moment.default.utc(schedule.division.start).format('YYYY-MM-DD');
|
|
27
29
|
var endDate = _moment.default.utc(schedule.division.end).format('YYYY-MM-DD');
|
|
28
30
|
var schoolYear = _moment.default.utc(schedule.division.start).format('YY') + '/' + _moment.default.utc(schedule.division.start).add(1, 'year').format('YY');
|
|
31
|
+
var holidays = (_schedule$settings$ca = schedule.settings.calendarExceptions) === null || _schedule$settings$ca === void 0 ? void 0 : _schedule$settings$ca.filter(x => x.start && x.end);
|
|
32
|
+
var holidaysInDays = [];
|
|
33
|
+
if (holidays) {
|
|
34
|
+
for (var holiday of holidays) {
|
|
35
|
+
var start = _moment.default.utc(holiday.start);
|
|
36
|
+
var end = _moment.default.utc(holiday.end);
|
|
37
|
+
while (start.isBefore(end)) {
|
|
38
|
+
if (start.isoWeekday() < 6) {
|
|
39
|
+
holidaysInDays.push(start.clone());
|
|
40
|
+
}
|
|
41
|
+
start.add(1, 'day');
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
29
45
|
var activities = schedule.events.map(e => {
|
|
30
46
|
var _course$displayName, _e$inLocations, _ref, _e$period;
|
|
31
47
|
if (!e.start || !e.end) return null;
|
|
@@ -38,7 +54,7 @@ var _default = schedule => {
|
|
|
38
54
|
var location = inLocation ? locationsMap.get(getId(inLocation)) : undefined;
|
|
39
55
|
var locationName = location === null || location === void 0 ? void 0 : location.displayName;
|
|
40
56
|
var _period = (_ref = (_e$period = e.period) !== null && _e$period !== void 0 ? _e$period : course.period) !== null && _ref !== void 0 ? _ref : schedule.settings.period;
|
|
41
|
-
var period = _period ?
|
|
57
|
+
var period = periodsMap.get(_period ? getId(_period) : undefined);
|
|
42
58
|
var weeksInPeriod = period === null || period === void 0 ? void 0 : period.ranges.map(x => {
|
|
43
59
|
var start = _moment.default.utc(x.start);
|
|
44
60
|
var end = _moment.default.utc(x.end);
|
|
@@ -60,6 +76,9 @@ var _default = schedule => {
|
|
|
60
76
|
return weeks;
|
|
61
77
|
}).flat();
|
|
62
78
|
var excludedWeeks = allWeeks.filter(x => !(weeksInPeriod !== null && weeksInPeriod !== void 0 && weeksInPeriod.includes(x))).join(', ');
|
|
79
|
+
var holidaysInPeriod = holidaysInDays.filter(x => {
|
|
80
|
+
return weeksInPeriod === null || weeksInPeriod === void 0 ? void 0 : weeksInPeriod.includes(x.week());
|
|
81
|
+
}).map(x => x.format('YYYY-MM-DD')).join(', ');
|
|
63
82
|
return {
|
|
64
83
|
DayOfWeek: (start.day() + 6) % 7,
|
|
65
84
|
Duration: end.diff(start, 'minutes'),
|
|
@@ -67,7 +86,7 @@ var _default = schedule => {
|
|
|
67
86
|
Name: courseName,
|
|
68
87
|
StartDate: startDate,
|
|
69
88
|
StartTime: start.format('HH:mm'),
|
|
70
|
-
ExcludeDates:
|
|
89
|
+
ExcludeDates: holidaysInPeriod,
|
|
71
90
|
ExcludeWeeks: excludedWeeks,
|
|
72
91
|
ExternalActivityID: e.ids,
|
|
73
92
|
ExternalLocationID: '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedules.js","names":["_moment","_interopRequireDefault","require","_xlsx","e","__esModule","default","getId","ref","id","toString","_default","schedule","did","division","Error","periodsMap","Map","periods","map","p","defaultPeriod","ranges","start","end","coursesMap","courses","c","locationsMap","locations","l","startDate","moment","utc","format","endDate","schoolYear","add","activities","events","_course$displayName","_e$inLocations","_ref","_e$period","course","get","
|
|
1
|
+
{"version":3,"file":"schedules.js","names":["_moment","_interopRequireDefault","require","_xlsx","e","__esModule","default","getId","ref","id","toString","_default","schedule","_schedule$settings$ca","did","division","Error","periodsMap","Map","periods","map","p","defaultPeriod","ranges","start","end","set","undefined","coursesMap","courses","c","locationsMap","locations","l","startDate","moment","utc","format","endDate","schoolYear","add","holidays","settings","calendarExceptions","filter","x","holidaysInDays","holiday","isBefore","isoWeekday","push","clone","activities","events","_course$displayName","_e$inLocations","_ref","_e$period","course","get","courseName","displayName","inLocation","inLocations","at","location","locationName","_period","period","weeksInPeriod","weeks","Array","week","flat","allWeeks","excludedWeeks","includes","join","holidaysInPeriod","DayOfWeek","day","Duration","diff","EndDate","Name","StartDate","StartTime","ExcludeDates","ExcludeWeeks","ExternalActivityID","ids","ExternalLocationID","ExternalTeachingGroupID","Location","SchoolYear","Teachers","wb","XLSX","utils","book_new","book_append_sheet","json_to_sheet","exports"],"sources":["../../../../src/Quiculum/file/to/schedules.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@royalschedule/maps",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "3.2.
|
|
4
|
+
"version": "3.2.46",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"engines": {
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
"dev_SchoolSoft_api": "ts-node tests/SchoolSoft/api/index.ts",
|
|
17
17
|
"dev_SchoolSoft_file_from": "ts-node tests/SchoolSoft/file/from/index.ts",
|
|
18
18
|
"dev_SchoolSoft_file_to": "ts-node tests/SchoolSoft/file/to/index.ts",
|
|
19
|
+
"dev_Quiculum_file_to": "ts-node tests/Quiculum/file/to/index.ts",
|
|
19
20
|
"dev_vKlass": "ts-node tests/vKlass/index.ts",
|
|
20
21
|
"dev_PlanDigital": "ts-node tests/PlanDigital/index.ts",
|
|
21
22
|
"dev_SS12000": "ts-node tests/SS12000/index.ts",
|