@royalschedule/maps 2.2.25 → 2.2.28
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/RS/v2/to/collections.js +6 -2
- package/dist/RS/v2/to/collections.js.map +1 -1
- package/dist/RS/v2/to/course-events/index.js +3 -1
- package/dist/RS/v2/to/course-events/index.js.map +1 -1
- package/dist/SchoolSoft/api/from/schedules.js +21 -15
- package/dist/SchoolSoft/api/from/schedules.js.map +1 -1
- package/dist/SchoolSoft/api/types/group.d.ts +6 -6
- package/dist/SchoolSoft/api/types/index.d.ts +2 -0
- package/dist/SchoolSoft/api/types/location.d.ts +4 -0
- package/dist/SchoolSoft/api/types/location.js +6 -0
- package/dist/SchoolSoft/api/types/location.js.map +1 -0
- package/dist/SchoolSoft/api/types/schedule.d.ts +2 -0
- package/dist/SchoolSoft/api/types/teacher.d.ts +3 -3
- package/dist/core/types/course-events.d.ts +1 -0
- package/dist/core/types/courses.d.ts +1 -0
- package/package.json +1 -1
|
@@ -33,7 +33,7 @@ var _default = function _default(courses) {
|
|
|
33
33
|
courses = Array.isArray(courses) ? courses : [courses];
|
|
34
34
|
events = Array.isArray(events) ? events : [events];
|
|
35
35
|
return courses.reduce((acc, course) => {
|
|
36
|
-
var _course$locations, _course$intervals, _course$days, _course$lockedTimes, _course$teachers, _course$groups;
|
|
36
|
+
var _course$locations, _course$intervals, _course$days, _course$lockedTimes, _course$lockedTimes2, _course$teachers, _course$groups;
|
|
37
37
|
|
|
38
38
|
if (!course[idKey]) throw new Error('A course does not have a unique key');
|
|
39
39
|
if (course.events) course.events = course.events.filter(event => !!event).map(event => {
|
|
@@ -49,7 +49,7 @@ var _default = function _default(courses) {
|
|
|
49
49
|
return event;
|
|
50
50
|
});
|
|
51
51
|
|
|
52
|
-
var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
52
|
+
var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
53
53
|
id: course[idKey].toString(),
|
|
54
54
|
events: course.events ? (0, _courseEvents.default)(course.events, options) : []
|
|
55
55
|
}, 'weight' in course && {
|
|
@@ -70,6 +70,10 @@ var _default = function _default(courses) {
|
|
|
70
70
|
minBreakLength: (0, _breakLengths.default)(course.minBreakLength)
|
|
71
71
|
}), ((_course$lockedTimes = course.lockedTimes) === null || _course$lockedTimes === void 0 ? void 0 : _course$lockedTimes.length) && {
|
|
72
72
|
lockedTimes: (0, _lockedTimes.default)(course.lockedTimes, options)
|
|
73
|
+
}), ((_course$lockedTimes2 = course.lockedTimes) === null || _course$lockedTimes2 === void 0 ? void 0 : _course$lockedTimes2.length) && {
|
|
74
|
+
lockedTimes: (0, _lockedTimes.default)(course.lockedTimes, options)
|
|
75
|
+
}), course.centerOfAttraction && {
|
|
76
|
+
potentialCenter: parseFloat(course.centerOfAttraction.replace(':', '.'))
|
|
73
77
|
});
|
|
74
78
|
|
|
75
79
|
if (course.teachers || course.groups) Object.assign(doc, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collections.js","mappings":";;;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;eAUe,kBAACA,OAAD,EAG6D;AAAA,MAF5DC,MAE4D,uEAFd,EAEc;AAAA,MAD5DC,aAC4D,uEADd,EACc;AAAA,MAA5DC,OAA4D;AAE1E,MAAMC,KAAK,GAAuBD,OAAO,CAACC,KAAR,IAAiB,IAAnD;AAEAJ,SAAO,GAAGK,KAAK,CAACC,OAAN,CAAcN,OAAd,IAAyBA,OAAzB,GAAmC,CAACA,OAAD,CAA7C;AACAC,QAAM,GAAII,KAAK,CAACC,OAAN,CAAcL,MAAd,IAAyBA,MAAzB,GAAmC,CAACA,MAAD,CAA7C;AAEA,SAAOD,OAAO,CAACO,MAAR,CAAe,CAACC,GAAD,EAAWC,MAAX,KAAmC;AAAA;;AAEvD,QAAI,CAAEA,MAAM,CAACL,KAAD,CAAZ,EACE,MAAM,IAAIM,KAAJ,CAAU,qCAAV,CAAN;AAEF,QAAID,MAAM,CAACR,MAAX,EACEQ,MAAM,CAACR,MAAP,GAAiBQ,MAAM,CAACR,MAAP,CACAU,MADA,CACQC,KAAD,IAAiC,CAAC,CAAEA,KAD3C,EAEAC,GAFA,CAEID,KAAK,IAAG;AAC3B,UAAME,MAAM,GAAIb,MAAwB,CAACc,IAAzB,CAA8B;AAAA,YAAC;AAAEC;AAAF,SAAD;AAAA,eAAYJ,KAAK,CAACI,EAAN,IAAYA,EAAxB;AAAA,OAA9B,CAAhB;;AACA,UAAIF,MAAJ,EAAYG,MAAM,CAACC,MAAP,CAAcN,KAAd,EAAqBE,MAArB;AACZF,WAAK,CAACH,MAAN,GAAeA,MAAf;AACA,aAAOG,KAAP;AACD,KAPgB,CAAjB;;AASF,QAAIO,GAAG;AACLH,QAAE,EAAMP,MAAM,CAACL,KAAD,CAAN,CAAegB,QAAf,EADH;AAELnB,YAAM,EAAEQ,MAAM,CAACR,MAAP,GAAgB,2BAAaQ,MAAM,CAACR,MAApB,EAA4BE,OAA5B,CAAhB,GAAuD;AAF1D,OAIF,YAA2BM,MAA3B,IAAwC;AAAEY,YAAM,
|
|
1
|
+
{"version":3,"file":"collections.js","mappings":"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","names":["courses","events","overlapGroups","options","idKey","Array","isArray","reduce","acc","course","Error","filter","event","map","_event","find","id","Object","assign","doc","toString","weight","density","eventDurationVariance","maxEventLengthVariance","potentialCenter","parseFloat","locations","length","dependencies","intervals","days","minBreakLength","lockedTimes","centerOfAttraction","replace","teachers","groups","Set","concat","x","meta","color","ids","displayName","name","overlapGroup","index","indexOf","fill"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/collections.ts"],"sourcesContent":[null]}
|
|
@@ -40,7 +40,7 @@ var _default = (courseEvents, options) => {
|
|
|
40
40
|
|
|
41
41
|
var id = (event[idKey] || event._id).toString();
|
|
42
42
|
|
|
43
|
-
var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
43
|
+
var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
44
44
|
id: "events.".concat(id),
|
|
45
45
|
length: (_event$preferredDurat = event.preferredDuration) !== null && _event$preferredDurat !== void 0 ? _event$preferredDurat : event.duration
|
|
46
46
|
}, event.durationVariance != null && {
|
|
@@ -55,6 +55,8 @@ var _default = (courseEvents, options) => {
|
|
|
55
55
|
lockedTimes: (0, _lockedTimes.default)(event.lockedTimes, options)
|
|
56
56
|
}), event.minBreakLength != null && {
|
|
57
57
|
minBreakLength: (0, _breakLengths.default)(event.minBreakLength)
|
|
58
|
+
}), event.centerOfAttraction && {
|
|
59
|
+
potentialCenter: parseFloat(event.centerOfAttraction.replace(':', '.'))
|
|
58
60
|
});
|
|
59
61
|
|
|
60
62
|
var groups = (0, _groups2.default)(event, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAaA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;eAEe,CAACA,YAAD,EACCC,OADD,KAC4C;AAEzD,MAAIC,KAAK,GAA6BD,OAAO,CAACC,KAAR,GAAgBD,OAAO,CAACC,KAAxB,GAAgC,IAAtE;AACA,MAAIC,IAAI,GAA8BC,KAAK,CAACC,OAAN,CAAcL,YAAd,IAA8BA,YAA9B,GAA6C,CAACA,YAAD,CAAnF;AAEA,SAAOG,IAAI,CAACG,MAAL,CAAY,CAACC,GAAD,EAAaC,KAAb,KAAyC;AAAA;;AAC1D,QAAI,CAAEA,KAAN,EACE,OAAOD,GAAP;AACF,QAAIE,MAAM,GAAiBD,KAAK,CAACC,MAAjC;;AAEA,QAAMC,EAAE,GAAW,CAACF,KAAK,CAACN,KAAD,CAAL,IAAgBM,KAAK,CAACG,GAAvB,EAA6BC,QAA7B,EAAnB;;AAKA,QAAIC,GAAG;AACLH,QAAE,mBAAiBA,EAAjB,CADG;AAGLI,YAAM,2BAAEN,KAAK,CAACO,iBAAR,yEAA6BP,KAAK,CAACQ;AAHpC,OAKFR,KAAK,CAACS,gBAAN,IAA0B,IAA1B,
|
|
1
|
+
{"version":3,"file":"index.js","mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAaA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;eAEe,CAACA,YAAD,EACCC,OADD,KAC4C;AAEzD,MAAIC,KAAK,GAA6BD,OAAO,CAACC,KAAR,GAAgBD,OAAO,CAACC,KAAxB,GAAgC,IAAtE;AACA,MAAIC,IAAI,GAA8BC,KAAK,CAACC,OAAN,CAAcL,YAAd,IAA8BA,YAA9B,GAA6C,CAACA,YAAD,CAAnF;AAEA,SAAOG,IAAI,CAACG,MAAL,CAAY,CAACC,GAAD,EAAaC,KAAb,KAAyC;AAAA;;AAC1D,QAAI,CAAEA,KAAN,EACE,OAAOD,GAAP;AACF,QAAIE,MAAM,GAAiBD,KAAK,CAACC,MAAjC;;AAEA,QAAMC,EAAE,GAAW,CAACF,KAAK,CAACN,KAAD,CAAL,IAAgBM,KAAK,CAACG,GAAvB,EAA6BC,QAA7B,EAAnB;;AAKA,QAAIC,GAAG;AACLH,QAAE,mBAAiBA,EAAjB,CADG;AAGLI,YAAM,2BAAEN,KAAK,CAACO,iBAAR,yEAA6BP,KAAK,CAACQ;AAHpC,OAKFR,KAAK,CAACS,gBAAN,IAA0B,IAA1B,IAAsC;AAAEC,uBAAiB,EAAEV,KAAK,CAACS;AAA3B,KALpC,GAMF,YAAuBT,KAAvB,IAAsC;AAAEW,YAAM,EAAaX,KAAK,CAACW;AAA3B,KANpC,GAOF,aAAuBX,KAAvB,IAAsC;AAAEY,aAAO,EAAYZ,KAAK,CAACY;AAA3B,KAPpC,GAQFZ,KAAK,CAACa,eAAN,IAAsC;AAAEA,qBAAe,EAAIC,UAAU,CAACd,KAAK,CAACa,eAAP;AAA/B,KARpC,GASF,4BAAK,CAACE,WAAN,0EAAmBT,MAAnB,KAAsC;AAAES,iBAAW,EAAQ,0BAAaf,KAAK,CAACe,WAAnB,EAAwCtB,OAAxC;AAArB,KATpC,GAUDO,KAAK,CAACgB,cAAN,IAAwB,IAAzB,IAAsC;AAAEA,oBAAc,EAAK,2BAAYhB,KAAK,CAACgB,cAAlB;AAArB,KAVpC,GAWFhB,KAAK,CAACiB,kBAAN,IAAsC;AAAEJ,qBAAe,EAAIC,UAAU,CAACd,KAAK,CAACiB,kBAAN,CAAyBC,OAAzB,CAAiC,GAAjC,EAAsC,GAAtC,CAAD;AAA/B,KAXpC,CAAP;;AAcA,QAAMC,MAAM,GAAG,sBAAQnB,KAAR,EAAeP,OAAf,CAAf;AACA,QAAI0B,MAAJ,EACEC,MAAM,CAACC,MAAP,CAAchB,GAAd,EAAmBc,MAAnB;AAEF,QAAMG,YAAY,GAAG,4BAActB,KAAd,EAAqBP,OAArB,CAArB;AACA,QAAI6B,YAAJ,EACEF,MAAM,CAACC,MAAP,CAAchB,GAAd,EAAmBiB,YAAnB;;AAEF,QAAI7B,OAAO,CAAC8B,IAAZ,EAAkB;AAChBH,YAAM,CAACC,MAAP,CAAchB,GAAd,EAAmB,oBAAML,KAAN,EAAaP,OAAb,CAAnB;AACD;;AAED,QAAM+B,IAAI,GAAG,oBAAMxB,KAAN,EAAaP,OAAb,CAAb;AACA,QAAI+B,IAAJ,EACEJ,MAAM,CAACC,MAAP,CAAchB,GAAd,EAAmBmB,IAAnB;AAEF,QAAMC,SAAS,GAAG,yBAAWzB,KAAX,EAAkBP,OAAlB,CAAlB;AACA,QAAIgC,SAAJ,EACEL,MAAM,CAACC,MAAP,CAAchB,GAAd,EAAmBoB,SAAnB;;AAEF,QAAIzB,KAAK,CAAC0B,UAAN,IAAoB1B,KAAK,CAAC2B,KAA9B,EAAqC;AACnCP,YAAM,CAACC,MAAP,CAAchB,GAAd,EAAmB;AACjBsB,aAAK,EAAEb,UAAU,CAACc,gBAAOC,GAAP,CAAW7B,KAAK,CAAC2B,KAAjB,EAAwBG,MAAxB,CAA+B,OAA/B,CAAD,CADA;AAEjBC,WAAG,EAAIH,gBAAOC,GAAP,CAAW7B,KAAK,CAAC2B,KAAjB,EAAwBI,GAAxB,KAAgC;AAFtB,OAAnB;AAID;;AAED,WAAOhC,GAAG,CAACiC,MAAJ,CAAW3B,GAAX,CAAP;AACD,GApDM,EAoDJ,EApDI,CAAP;AAqDD,C","names":["courseEvents","options","idKey","docs","Array","isArray","reduce","acc","event","course","id","_id","toString","doc","length","preferredDuration","duration","durationVariance","maxLengthVariance","weight","density","potentialCenter","parseFloat","lockedTimes","minBreakLength","centerOfAttraction","replace","groups","Object","assign","dependencies","meta","days","intervals","fixedStart","start","moment","utc","format","day","concat"],"sourceRoot":"","sources":["../../../../../src/RS/v2/to/course-events/index.ts"],"sourcesContent":[null]}
|
|
@@ -16,38 +16,45 @@ var sep = ',';
|
|
|
16
16
|
var _default = data => {
|
|
17
17
|
var errors = [];
|
|
18
18
|
var warnings = [];
|
|
19
|
+
var locations = [];
|
|
20
|
+
data.locations.forEach(x => {
|
|
21
|
+
locations.push({
|
|
22
|
+
ids: x.id,
|
|
23
|
+
displayName: x.name
|
|
24
|
+
});
|
|
25
|
+
});
|
|
19
26
|
var initialTeacherMap = new Map();
|
|
20
27
|
data.teachers.forEach(x => {
|
|
21
|
-
if (
|
|
28
|
+
if (x.active != '1') return;
|
|
22
29
|
initialTeacherMap.set(x.initial, {
|
|
23
|
-
ids: x.id
|
|
30
|
+
ids: x.id,
|
|
24
31
|
displayName: x.fname + ' ' + x.lname
|
|
25
32
|
});
|
|
26
33
|
});
|
|
27
34
|
var groups = [];
|
|
28
35
|
var studentGroupMap = new Map();
|
|
29
36
|
data.groups.forEach(x => {
|
|
30
|
-
if (
|
|
31
|
-
if (
|
|
37
|
+
if (x.active != '1') return;
|
|
38
|
+
if (x.classtype != '1') return;
|
|
32
39
|
groups.push({
|
|
33
|
-
ids: x.id
|
|
34
|
-
displayName: x.name
|
|
40
|
+
ids: x.id,
|
|
41
|
+
displayName: x.name
|
|
35
42
|
});
|
|
36
|
-
x.studentid.
|
|
43
|
+
x.studentid.split(sep).forEach(id => {
|
|
37
44
|
if (studentGroupMap.has(id)) {
|
|
38
45
|
errors.push("The student with id \"".concat(id, "\" does already belong to a different group."));
|
|
39
46
|
return;
|
|
40
47
|
}
|
|
41
48
|
|
|
42
|
-
studentGroupMap.set(id, x.id
|
|
49
|
+
studentGroupMap.set(id, x.id);
|
|
43
50
|
});
|
|
44
51
|
});
|
|
45
52
|
var courses = [];
|
|
46
53
|
data.groups.forEach(x => {
|
|
47
|
-
if (
|
|
48
|
-
if (x.classtype) return;
|
|
54
|
+
if (x.active != '1') return;
|
|
55
|
+
if (x.classtype == '1') return;
|
|
49
56
|
var groupSet = new Set();
|
|
50
|
-
x.studentid.
|
|
57
|
+
x.studentid.split(sep).map(id => {
|
|
51
58
|
if (!studentGroupMap.has(id)) {
|
|
52
59
|
errors.push("The student with id \"".concat(id, "\" does not belong to a group."));
|
|
53
60
|
return;
|
|
@@ -56,7 +63,7 @@ var _default = data => {
|
|
|
56
63
|
groupSet.add(studentGroupMap.get(id));
|
|
57
64
|
});
|
|
58
65
|
var teacherSet = new Set();
|
|
59
|
-
x.teacher.
|
|
66
|
+
x.teacher.split(sep).map(initial => {
|
|
60
67
|
if (!initialTeacherMap.has(initial)) {
|
|
61
68
|
errors.push("The teacher with initial \"".concat(initial, "\" does not exist."));
|
|
62
69
|
return;
|
|
@@ -65,13 +72,12 @@ var _default = data => {
|
|
|
65
72
|
teacherSet.add(initialTeacherMap.get(initial).ids);
|
|
66
73
|
});
|
|
67
74
|
courses.push({
|
|
68
|
-
ids: x.id
|
|
69
|
-
displayName: x.name
|
|
75
|
+
ids: x.id,
|
|
76
|
+
displayName: x.name,
|
|
70
77
|
groups: [...groupSet],
|
|
71
78
|
teachers: [...teacherSet]
|
|
72
79
|
});
|
|
73
80
|
});
|
|
74
|
-
var locations = [];
|
|
75
81
|
var teachers = [...initialTeacherMap.values()];
|
|
76
82
|
var events = [];
|
|
77
83
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedules.js","mappings":";;;;;;;;;;;;;AAOA,IAAMA,GAAG,GAAG,GAAZ;;
|
|
1
|
+
{"version":3,"file":"schedules.js","mappings":"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","names":["sep","data","errors","warnings","locations","forEach","x","push","ids","id","displayName","name","initialTeacherMap","Map","teachers","active","set","initial","fname","lname","groups","studentGroupMap","classtype","studentid","split","has","courses","groupSet","Set","map","add","get","teacherSet","teacher","values","events","meta","length"],"sourceRoot":"","sources":["../../../../src/SchoolSoft/api/from/schedules.ts"],"sourcesContent":[null]}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare type Group = {
|
|
2
|
-
id:
|
|
3
|
-
name:
|
|
4
|
-
active: 0 | 1;
|
|
5
|
-
classtype: 0 | 1;
|
|
6
|
-
studentid:
|
|
7
|
-
teacher:
|
|
2
|
+
id: string;
|
|
3
|
+
name: string;
|
|
4
|
+
active: '0' | '1';
|
|
5
|
+
classtype: '0' | '1';
|
|
6
|
+
studentid: string;
|
|
7
|
+
teacher: string;
|
|
8
8
|
};
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { Location } from './location';
|
|
1
2
|
import { Teacher } from './teacher';
|
|
2
3
|
import { Group } from './group';
|
|
3
4
|
import { Schedule } from './schedule';
|
|
4
5
|
export declare type Types = {
|
|
6
|
+
Location: Location;
|
|
5
7
|
Teacher: Teacher;
|
|
6
8
|
Group: Group;
|
|
7
9
|
Schedule: Schedule;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"location.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|