@royalschedule/maps 2.2.3 → 2.2.6
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/from/course-events.js +3 -1
- package/dist/RS/v2/from/course-events.js.map +1 -1
- package/dist/RS/v2/to/course-events/index.js +5 -1
- package/dist/RS/v2/to/course-events/index.js.map +1 -1
- package/dist/RS/v2/types/course-events.d.ts +1 -0
- package/dist/core/types/course-events.d.ts +2 -0
- package/package.json +8 -8
- package/dist/Admentum/types/course-section.d.ts +0 -0
- package/dist/Admentum/types/course-section.js +0 -2
- package/dist/Admentum/types/course-section.js.map +0 -1
- package/dist/Admentum/types/course.d.ts +0 -0
- package/dist/Admentum/types/course.js +0 -2
- package/dist/Admentum/types/course.js.map +0 -1
- package/dist/Admentum/types/lesson.d.ts +0 -22
- package/dist/Admentum/types/lesson.js +0 -6
- package/dist/Admentum/types/lesson.js.map +0 -1
- package/dist/Admentum/types/primary-group.d.ts +0 -4
- package/dist/Admentum/types/primary-group.js +0 -6
- package/dist/Admentum/types/primary-group.js.map +0 -1
- package/dist/Admentum/types/room.d.ts +0 -4
- package/dist/Admentum/types/room.js +0 -6
- package/dist/Admentum/types/room.js.map +0 -1
- package/dist/Admentum/types/schedule-group.d.ts +0 -18
- package/dist/Admentum/types/schedule-group.js +0 -6
- package/dist/Admentum/types/schedule-group.js.map +0 -1
- package/dist/Admentum/types/schedule.d.ts +0 -15
- package/dist/Admentum/types/schedule.js +0 -6
- package/dist/Admentum/types/schedule.js.map +0 -1
- package/dist/Admentum/types/school.d.ts +0 -4
- package/dist/Admentum/types/school.js +0 -6
- package/dist/Admentum/types/school.js.map +0 -1
- package/dist/Admentum/types/user.d.ts +0 -5
- package/dist/Admentum/types/user.js +0 -6
- package/dist/Admentum/types/user.js.map +0 -1
- package/dist/SS12000/from/teachers.d.ts +0 -4
- package/dist/SS12000/from/teachers.js +0 -18
- package/dist/SS12000/from/teachers.js.map +0 -1
- package/dist/SS12000/to/teachers.d.ts +0 -4
- package/dist/SS12000/to/teachers.js +0 -29
- package/dist/SS12000/to/teachers.js.map +0 -1
- package/dist/SS12000/types/teachers.d.ts +0 -13
- package/dist/SS12000/types/teachers.js +0 -6
- package/dist/SS12000/types/teachers.js.map +0 -1
- package/dist/Skola24/from/assert-week-overlap.d.ts +0 -1
- package/dist/Skola24/from/assert-week-overlap.js +0 -28
- package/dist/Skola24/from/assert-week-overlap.js.map +0 -1
- package/dist/Skola24/from/course-events.d.ts +0 -6
- package/dist/Skola24/from/course-events.js +0 -127
- package/dist/Skola24/from/course-events.js.map +0 -1
- package/dist/Skola24/from/courses.d.ts +0 -11
- package/dist/Skola24/from/courses.js +0 -93
- package/dist/Skola24/from/courses.js.map +0 -1
- package/dist/Skola24/from/events.d.ts +0 -11
- package/dist/Skola24/from/events.js +0 -146
- package/dist/Skola24/from/events.js.map +0 -1
- package/dist/Skola24/from/filter-on-period.d.ts +0 -7
- package/dist/Skola24/from/filter-on-period.js +0 -24
- package/dist/Skola24/from/filter-on-period.js.map +0 -1
- package/dist/Skola24/types/TA-group-link.d.ts +0 -4
- package/dist/Skola24/types/TA-group-link.js +0 -6
- package/dist/Skola24/types/TA-group-link.js.map +0 -1
- package/dist/Skola24/types/TA-teacher-link.d.ts +0 -4
- package/dist/Skola24/types/TA-teacher-link.js +0 -6
- package/dist/Skola24/types/TA-teacher-link.js.map +0 -1
- package/dist/Skola24/types/TA.d.ts +0 -8
- package/dist/Skola24/types/TA.js +0 -6
- package/dist/Skola24/types/TA.js.map +0 -1
- package/dist/Skola24/types/group-student-link.d.ts +0 -4
- package/dist/Skola24/types/group-student-link.js +0 -6
- package/dist/Skola24/types/group-student-link.js.map +0 -1
- package/dist/Skola24/types/group.d.ts +0 -4
- package/dist/Skola24/types/group.js +0 -6
- package/dist/Skola24/types/group.js.map +0 -1
- package/dist/Skola24/types/lesson-group-link.d.ts +0 -4
- package/dist/Skola24/types/lesson-group-link.js +0 -6
- package/dist/Skola24/types/lesson-group-link.js.map +0 -1
- package/dist/Skola24/types/lesson-room-link.d.ts +0 -4
- package/dist/Skola24/types/lesson-room-link.js +0 -6
- package/dist/Skola24/types/lesson-room-link.js.map +0 -1
- package/dist/Skola24/types/lesson-teacher-link.d.ts +0 -4
- package/dist/Skola24/types/lesson-teacher-link.js +0 -6
- package/dist/Skola24/types/lesson-teacher-link.js.map +0 -1
- package/dist/Skola24/types/lesson.d.ts +0 -9
- package/dist/Skola24/types/lesson.js +0 -6
- package/dist/Skola24/types/lesson.js.map +0 -1
- package/dist/Skola24/types/room.d.ts +0 -4
- package/dist/Skola24/types/room.js +0 -6
- package/dist/Skola24/types/room.js.map +0 -1
- package/dist/Skola24/types/schedule.d.ts +0 -24
- package/dist/Skola24/types/schedule.js +0 -6
- package/dist/Skola24/types/schedule.js.map +0 -1
- package/dist/Skola24/types/teacher.d.ts +0 -5
- package/dist/Skola24/types/teacher.js +0 -6
- package/dist/Skola24/types/teacher.js.map +0 -1
- package/dist/Skola24_old/from/assert-week-overlap.d.ts +0 -1
- package/dist/Skola24_old/from/assert-week-overlap.js +0 -28
- package/dist/Skola24_old/from/assert-week-overlap.js.map +0 -1
- package/dist/Skola24_old/from/course-events.d.ts +0 -6
- package/dist/Skola24_old/from/course-events.js +0 -127
- package/dist/Skola24_old/from/course-events.js.map +0 -1
- package/dist/Skola24_old/from/courses.d.ts +0 -5
- package/dist/Skola24_old/from/courses.js +0 -55
- package/dist/Skola24_old/from/courses.js.map +0 -1
- package/dist/Skola24_old/from/groups.d.ts +0 -3
- package/dist/Skola24_old/from/groups.js +0 -14
- package/dist/Skola24_old/from/groups.js.map +0 -1
- package/dist/Skola24_old/from/index.d.ts +0 -4
- package/dist/Skola24_old/from/index.js +0 -20
- package/dist/Skola24_old/from/index.js.map +0 -1
- package/dist/Skola24_old/from/locations.d.ts +0 -3
- package/dist/Skola24_old/from/locations.js +0 -14
- package/dist/Skola24_old/from/locations.js.map +0 -1
- package/dist/Skola24_old/from/schedule.d.ts +0 -3
- package/dist/Skola24_old/from/schedule.js +0 -68
- package/dist/Skola24_old/from/schedule.js.map +0 -1
- package/dist/Skola24_old/from/teachers.d.ts +0 -3
- package/dist/Skola24_old/from/teachers.js +0 -14
- package/dist/Skola24_old/from/teachers.js.map +0 -1
- package/dist/Skola24_old/index.d.ts +0 -4
- package/dist/Skola24_old/index.js +0 -20
- package/dist/Skola24_old/index.js.map +0 -1
- package/dist/Skola24_old/types/TA-group-link.d.ts +0 -4
- package/dist/Skola24_old/types/TA-group-link.js +0 -6
- package/dist/Skola24_old/types/TA-group-link.js.map +0 -1
- package/dist/Skola24_old/types/TA-teacher-link.d.ts +0 -4
- package/dist/Skola24_old/types/TA-teacher-link.js +0 -6
- package/dist/Skola24_old/types/TA-teacher-link.js.map +0 -1
- package/dist/Skola24_old/types/TA.d.ts +0 -8
- package/dist/Skola24_old/types/TA.js +0 -6
- package/dist/Skola24_old/types/TA.js.map +0 -1
- package/dist/Skola24_old/types/group-student-link.d.ts +0 -4
- package/dist/Skola24_old/types/group-student-link.js +0 -6
- package/dist/Skola24_old/types/group-student-link.js.map +0 -1
- package/dist/Skola24_old/types/group.d.ts +0 -4
- package/dist/Skola24_old/types/group.js +0 -6
- package/dist/Skola24_old/types/group.js.map +0 -1
- package/dist/Skola24_old/types/lesson-group-link.d.ts +0 -4
- package/dist/Skola24_old/types/lesson-group-link.js +0 -6
- package/dist/Skola24_old/types/lesson-group-link.js.map +0 -1
- package/dist/Skola24_old/types/lesson-room-link.d.ts +0 -4
- package/dist/Skola24_old/types/lesson-room-link.js +0 -6
- package/dist/Skola24_old/types/lesson-room-link.js.map +0 -1
- package/dist/Skola24_old/types/lesson-teacher-link.d.ts +0 -4
- package/dist/Skola24_old/types/lesson-teacher-link.js +0 -6
- package/dist/Skola24_old/types/lesson-teacher-link.js.map +0 -1
- package/dist/Skola24_old/types/lesson.d.ts +0 -9
- package/dist/Skola24_old/types/lesson.js +0 -6
- package/dist/Skola24_old/types/lesson.js.map +0 -1
- package/dist/Skola24_old/types/room.d.ts +0 -4
- package/dist/Skola24_old/types/room.js +0 -6
- package/dist/Skola24_old/types/room.js.map +0 -1
- package/dist/Skola24_old/types/schedule.d.ts +0 -24
- package/dist/Skola24_old/types/schedule.js +0 -6
- package/dist/Skola24_old/types/schedule.js.map +0 -1
- package/dist/Skola24_old/types/teacher.d.ts +0 -5
- package/dist/Skola24_old/types/teacher.js +0 -6
- package/dist/Skola24_old/types/teacher.js.map +0 -1
|
@@ -68,7 +68,7 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
|
|
|
68
68
|
if (start.day() != end.day()) throw new Error('course event have fixed time such that the event span multiple days');
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
71
|
+
return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
72
72
|
duration: event.length,
|
|
73
73
|
parked: !start
|
|
74
74
|
}, event[eventIdKey] && {
|
|
@@ -89,6 +89,8 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
|
|
|
89
89
|
potentialCenter: event.potentialCenter
|
|
90
90
|
}), 'minBreakLength' in event && {
|
|
91
91
|
minBreakLength: (0, _breakLengths.default)(event.minBreakLength)
|
|
92
|
+
}), 'maxLengthVariance' in event && {
|
|
93
|
+
durationVariance: event.maxLengthVariance
|
|
92
94
|
}), event.intervals && {
|
|
93
95
|
intervals: (0, _intervals.default)(event.intervals)
|
|
94
96
|
}), event.lockedTimes && {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"course-events.js","mappings":";;;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;eAMe,CAACA,YAAD,EACCC,MADD,EAECC,YAFD,EAGCC,UAHD,EAICC,QAJD,KAIgC;AAC7C,MAAMC,eAAe,GAAsBD,QAAQ,CAACC,eAApD;AACA,MAAMC,UAAU,GAA2BF,QAAQ,CAACE,UAApD;AAEA,MAAI,CAAED,eAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,qDAAV,CAAN;AAEF,SAAOP,YAAY,CAACQ,MAAb,CAAoB,CAACC,GAAD,EAAaC,KAAb,KAA4C;AAAA;;AAErE,YAAQ,OAAOA,KAAf;AACE,WAAK,QAAL;AACE,eAAOD,GAAG,CAACE,MAAJ,CAAW;AAChBC,kBAAQ,EAAQF,KADA;AAEhBG,aAAG,YAAiBZ,MAAM,CAACI,eAAD,CAAvB,cAA8CI,GAAG,CAACK,MAAlD;AAFa,SAAX,CAAP;;AAIF,WAAK,QAAL;AAEE,YAAI,CAAEJ,KAAK,CAACJ,UAAD,CAAX,EAAyB;AACvBS,gBAAM,CAACC,MAAP,CAAcN,KAAd,EAAqB;AAAE,aAACJ,UAAD,aAAkBL,MAAM,CAACI,eAAD,CAAxB,cAA+CI,GAAG,CAACK,MAAnD;AAAF,WAArB;AACD;;AAED,YAAMG,QAAQ,oBAAGP,KAAK,CAACQ,MAAT,kDAAG,cAAcC,IAAd,GAAqBX,MAArB,CAA4B,CAACC,GAAD,EAAgBW,GAAhB,KAA4B;AACvE,cAAIlB,YAAY,CAACmB,QAAb,CAAsBD,GAAtB,CAAJ,EACE,OAAOX,GAAG,CAACE,MAAJ,CAAWS,GAAX,CAAP;AACF,iBAAOX,GAAP;AACD,SAJgB,EAId,EAJc,CAAjB;AAMA,YAAMS,MAAM,qBAAGR,KAAK,CAACQ,MAAT,mDAAG,eAAcC,IAAd,GAAqBX,MAArB,CAA4B,CAACC,GAAD,EAAaW,GAAb,KAAyB;AAClE,cAAIjB,UAAU,CAACkB,QAAX,CAAoBD,GAApB,CAAJ,EACE,OAAOX,GAAG,CAACE,MAAJ,CAAWS,GAAX,CAAP;AACF,iBAAOX,GAAP;AACD,SAJc,EAIZ,EAJY,CAAf;AAMA,YAAIa,UAAU,GAAyB,KAAvC;AACA,YAAIC,KAAK,GAA8B,IAAvC;AACA,YAAIC,GAAG,GAAgC,IAAvC;;AACA,YAAId,KAAK,CAACa,KAAV,EAAiB;AAAA;;AACf,cAAME,GAAG,iBAAWf,KAAK,CAACe,GAAjB,mDAAwB,CAAjC;AACAH,oBAAU,GAAG,IAAb;AACAC,eAAK,GAAQ,sBAAQE,GAAR,EAAaf,KAAK,CAACa,KAAN,CAAYG,OAAZ,CAAoB,CAApB,EAAuBC,OAAvB,CAA+B,GAA/B,EAAoC,GAApC,CAAb,CAAb;AACAH,aAAG,GAAUD,KAAK,CAACK,KAAN,GAAcC,GAAd,CAAkBnB,KAAK,CAACI,MAAxB,EAAgC,SAAhC,CAAb;AAEA,cAAIS,KAAK,CAACE,GAAN,MAAeD,GAAG,CAACC,GAAJ,EAAnB,EACE,MAAM,IAAIlB,KAAJ,CAAU,qEAAV,CAAN;AACH;;AAED,eAAOE,GAAG,CAACE,MAAJ;AACLC,kBAAQ,
|
|
1
|
+
{"version":3,"file":"course-events.js","mappings":"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","names":["courseEvents","course","teachersList","groupsList","settings","collectionIdKey","eventIdKey","Error","reduce","acc","event","concat","duration","ids","length","Object","assign","teachers","groups","flat","gId","includes","fixedStart","start","end","day","toFixed","replace","clone","add","parked","name","displayName","density","weight","potentialCenter","minBreakLength","durationVariance","maxLengthVariance","intervals","lockedTimes","dependencies","locations","days"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/course-events.ts"],"sourcesContent":[null]}
|
|
@@ -40,10 +40,14 @@ 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(_objectSpread({
|
|
44
44
|
id: id
|
|
45
45
|
}, 'duration' in event && {
|
|
46
46
|
length: event.duration
|
|
47
|
+
}), event.preferredDuration != null && {
|
|
48
|
+
length: event.preferredDuration
|
|
49
|
+
}), event.durationVariance != null && {
|
|
50
|
+
maxLengthVariance: event.durationVariance
|
|
47
51
|
}), 'weight' in event && {
|
|
48
52
|
weight: event.weight
|
|
49
53
|
}), 'density' in event && {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAcA;;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;;
|
|
1
|
+
{"version":3,"file":"index.js","mappings":"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","names":["courseEvents","options","idKey","docs","Array","isArray","reduce","acc","event","course","id","_id","toString","doc","length","duration","preferredDuration","durationVariance","maxLengthVariance","weight","density","potentialCenter","parseFloat","lockedTimes","minBreakLength","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]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@royalschedule/maps",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.6",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -34,16 +34,16 @@
|
|
|
34
34
|
"homepage": "https://bitbucket.org/royalschedule/maps#readme",
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@babel/cli": "^7.17.6",
|
|
37
|
-
"@babel/core": "^7.17.
|
|
37
|
+
"@babel/core": "^7.17.9",
|
|
38
38
|
"@babel/preset-env": "^7.16.11",
|
|
39
39
|
"@types/app-module-path": "^2.2.0",
|
|
40
40
|
"@types/json2csv": "^5.0.3",
|
|
41
|
-
"@types/lodash": "^4.14.
|
|
41
|
+
"@types/lodash": "^4.14.181",
|
|
42
42
|
"@types/papaparse": "^5.3.2",
|
|
43
43
|
"nodemon": "^2.0.15",
|
|
44
44
|
"ts-node": "^10.7.0",
|
|
45
45
|
"tslib": "^2.3.1",
|
|
46
|
-
"typescript": "^4.6.
|
|
46
|
+
"typescript": "^4.6.3"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"app-module-path": "^2.2.0",
|
|
@@ -52,9 +52,9 @@
|
|
|
52
52
|
"json2csv": "^5.0.7",
|
|
53
53
|
"lodash": "^4.17.21",
|
|
54
54
|
"module-alias": "^2.2.2",
|
|
55
|
-
"moment": "^2.29.
|
|
56
|
-
"mongoose": "^6.2.
|
|
57
|
-
"papaparse": "^5.3.
|
|
58
|
-
"xlsx": "^0.18.
|
|
55
|
+
"moment": "^2.29.2",
|
|
56
|
+
"mongoose": "^6.2.10",
|
|
57
|
+
"papaparse": "^5.3.2",
|
|
58
|
+
"xlsx": "^0.18.5"
|
|
59
59
|
}
|
|
60
60
|
}
|
|
File without changes
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"course-section.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
File without changes
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"course.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import { User } from './user';
|
|
2
|
-
export interface LessonInfo {
|
|
3
|
-
start: string;
|
|
4
|
-
end: string;
|
|
5
|
-
duration: number;
|
|
6
|
-
room?: {
|
|
7
|
-
id: number;
|
|
8
|
-
};
|
|
9
|
-
teachers: {
|
|
10
|
-
id: number;
|
|
11
|
-
}[];
|
|
12
|
-
groups: {
|
|
13
|
-
id: number;
|
|
14
|
-
}[];
|
|
15
|
-
}
|
|
16
|
-
export interface Lesson {
|
|
17
|
-
id: number;
|
|
18
|
-
weekday: number;
|
|
19
|
-
date: string;
|
|
20
|
-
info: LessonInfo;
|
|
21
|
-
teachers: User[];
|
|
22
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"lesson.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"primary-group.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"room.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { User } from "./user";
|
|
2
|
-
declare type Subject = {
|
|
3
|
-
id: number;
|
|
4
|
-
name: string;
|
|
5
|
-
};
|
|
6
|
-
declare type Course = {
|
|
7
|
-
id: number;
|
|
8
|
-
name: string;
|
|
9
|
-
};
|
|
10
|
-
export interface ScheduleGroup {
|
|
11
|
-
id: number;
|
|
12
|
-
name: string;
|
|
13
|
-
teachers: User[];
|
|
14
|
-
users_primary_groups: number[];
|
|
15
|
-
subjects: Subject[];
|
|
16
|
-
courses: Course[];
|
|
17
|
-
}
|
|
18
|
-
export {};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"schedule-group.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { School } from './school';
|
|
2
|
-
import { Room } from './room';
|
|
3
|
-
import { PrimaryGroup } from './primary-group';
|
|
4
|
-
import { ScheduleGroup } from './schedule-group';
|
|
5
|
-
import { Lesson } from './lesson';
|
|
6
|
-
export interface Schedule {
|
|
7
|
-
schedule: {
|
|
8
|
-
id: number;
|
|
9
|
-
};
|
|
10
|
-
schools: School[];
|
|
11
|
-
rooms: Room[];
|
|
12
|
-
primary_groups: PrimaryGroup[];
|
|
13
|
-
schedule_groups: ScheduleGroup[];
|
|
14
|
-
lessons: Lesson[];
|
|
15
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"schedule.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"school.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = void 0;
|
|
7
|
-
|
|
8
|
-
var _default = teachers => {
|
|
9
|
-
if (!Array.isArray(teachers)) throw new Error('(SS12000::From::Teacher) Teacher input is not of array type');
|
|
10
|
-
return teachers.map(teacher => ({
|
|
11
|
-
id: teacher.id,
|
|
12
|
-
displayName: teacher.displayName,
|
|
13
|
-
dutyRole: "Lärare"
|
|
14
|
-
}));
|
|
15
|
-
};
|
|
16
|
-
|
|
17
|
-
exports.default = _default;
|
|
18
|
-
//# sourceMappingURL=teachers.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"teachers.js","mappings":";;;;;;;eAIgBA,QAAD,IAA6C;AAC1D,MAAI,CAAEC,KAAK,CAACC,OAAND,CAAcD,QAAdC,CAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,6DAAV,CAAN;AAEF,SAAOH,QAAQ,CAACI,GAATJ,CAAcK,OAAD,KAAc;AAChCC,MAAE,EAAED,OAAO,CAACC,EADoB;AAEhCC,eAAW,EAAEF,OAAO,CAACE,WAFW;AAGhCC,YAAQ,EAAE;AAHsB,GAAd,CAAbR,CAAP","names":["teachers","Array","isArray","Error","map","teacher","id","displayName","dutyRole"],"sourceRoot":"","sources":["../../../src/SS12000/from/teachers.ts"],"sourcesContent":[null]}
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = void 0;
|
|
7
|
-
|
|
8
|
-
var _default = teachers => {
|
|
9
|
-
if (!Array.isArray(teachers)) throw new Error('(SS12000::To::Teacher) Teacher input is not of array type');
|
|
10
|
-
return teachers.map(teacher => {
|
|
11
|
-
var _teacher$displayName;
|
|
12
|
-
|
|
13
|
-
return {
|
|
14
|
-
id: teacher.id,
|
|
15
|
-
meta: {
|
|
16
|
-
created: teacher.createdAt,
|
|
17
|
-
modified: teacher.updatedAt
|
|
18
|
-
},
|
|
19
|
-
person: {
|
|
20
|
-
id: teacher.id,
|
|
21
|
-
displayName: (_teacher$displayName = teacher.displayName) !== null && _teacher$displayName !== void 0 ? _teacher$displayName : teacher.ids
|
|
22
|
-
},
|
|
23
|
-
dutyRole: "Lärare"
|
|
24
|
-
};
|
|
25
|
-
});
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
exports.default = _default;
|
|
29
|
-
//# sourceMappingURL=teachers.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"teachers.js","mappings":";;;;;;;eAIgBA,QAAD,IAA6C;AAC1D,MAAI,CAAEC,KAAK,CAACC,OAAND,CAAcD,QAAdC,CAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,2DAAV,CAAN;AAEF,SAAOH,QAAQ,CAACI,GAATJ,CAAcK,OAAD;AAAA;;AAAA,WAAc;AAChCC,QAAE,EAAED,OAAO,CAACC,EADoB;AAEhCC,UAAI,EAAE;AACJC,eAAO,EAAGH,OAAO,CAACI,SADd;AAEJC,gBAAQ,EAAEL,OAAO,CAACM;AAFd,OAF0B;AAMhCC,YAAM,EAAE;AACNN,UAAE,EAAED,OAAO,CAACC,EADN;AAENO,mBAAW,0BAAER,OAAO,CAACQ,WAAV,uEAAyBR,OAAO,CAACS;AAFtC,OANwB;AAWhCC,cAAQ,EAAE;AAXsB,KAAd;AAAb,IAAP","names":["teachers","Array","isArray","Error","map","teacher","id","meta","created","createdAt","modified","updatedAt","person","displayName","ids","dutyRole"],"sourceRoot":"","sources":["../../../src/SS12000/to/teachers.ts"],"sourcesContent":[null]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"teachers.js","mappings":"","names":[],"sourceRoot":"","sources":[],"sourcesContent":[]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function assertWeekOverlap(_actualWeeks: string, scheduleWeeks: number[]): boolean;
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.assertWeekOverlap = assertWeekOverlap;
|
|
7
|
-
|
|
8
|
-
function parseActualWeeks(input) {
|
|
9
|
-
var weeks = [];
|
|
10
|
-
input.split(",").forEach(x => {
|
|
11
|
-
if (x.includes("-")) {
|
|
12
|
-
var [start, end] = x.split("-");
|
|
13
|
-
|
|
14
|
-
for (var i = parseInt(start); i <= parseInt(end); i++) {
|
|
15
|
-
weeks.push(i);
|
|
16
|
-
}
|
|
17
|
-
} else {
|
|
18
|
-
weeks.push(parseInt(x));
|
|
19
|
-
}
|
|
20
|
-
});
|
|
21
|
-
return weeks;
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
function assertWeekOverlap(_actualWeeks, scheduleWeeks) {
|
|
25
|
-
var actualWeeks = parseActualWeeks(_actualWeeks);
|
|
26
|
-
return !!actualWeeks.filter(w => scheduleWeeks.includes(w)).length;
|
|
27
|
-
}
|
|
28
|
-
//# sourceMappingURL=assert-week-overlap.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"assert-week-overlap.js","mappings":";;;;;;;AAAA,SAASA,gBAAT,CACEC,KADF,EACe;AAEb,MAAIC,KAAK,GAAa,EAAtB;AACAD,OAAK,CAACE,KAANF,CAAY,GAAZA,EACMG,OADNH,CACcI,CAAC,IAAG;AAChB,QAAIA,CAAC,CAACC,QAAFD,CAAW,GAAXA,CAAJ,EAAqB;AAEnB,UAAI,CAACE,KAAD,EAAQC,GAAR,IAAeH,CAAC,CAACF,KAAFE,CAAQ,GAARA,CAAnB;;AACA,WAAK,IAAII,CAAC,GAAGC,QAAQ,CAACH,KAAD,CAArB,EAA8BE,CAAC,IAAIC,QAAQ,CAACF,GAAD,CAA3C,EAAkDC,CAAC,EAAnD;AACEP,aAAK,CAACS,IAANT,CAAWO,CAAXP;AADF;AAHF,WAKO;AAELA,WAAK,CAACS,IAANT,CAAWQ,QAAQ,CAACL,CAAD,CAAnBH;AACD;AAVH;AAaA,SAAOA,KAAP;AACD;;AAEK,SAAUU,iBAAV,CACJC,YADI,EAEJC,aAFI,EAEmB;AAEvB,MAAIC,WAAW,GAAGf,gBAAgB,CAACa,YAAD,CAAlC;AACA,SAAO,CAAC,CAAEE,WAAW,CAACC,MAAZD,CAAmBE,CAAC,IAAIH,aAAa,CAACR,QAAdQ,CAAuBG,CAAvBH,CAAxBC,EAAmDG,MAA7D;AACD","names":["parseActualWeeks","input","weeks","split","forEach","x","includes","start","end","i","parseInt","push","assertWeekOverlap","_actualWeeks","scheduleWeeks","actualWeeks","filter","w","length"],"sourceRoot":"","sources":["../../../src/Skola24/from/assert-week-overlap.ts"],"sourcesContent":[null]}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { Lesson } from '../types/lesson';
|
|
2
|
-
import { LessonTeacherLink } from '../types/lesson-teacher-link';
|
|
3
|
-
import { LessonGroupLink } from '../types/lesson-group-link';
|
|
4
|
-
import { LessonRoomLink } from '../types/lesson-room-link';
|
|
5
|
-
import { Types } from '../../core/types';
|
|
6
|
-
export default function (lesson: Lesson[], lessonTeacherLinks: LessonTeacherLink[], lessonGroupLinks: LessonGroupLink[], lessonRoomLinks: LessonRoomLink[], groupClassesMap: Map<string, Set<string>>, classes: Types.group[], groupCourseMap: Map<string, Types.course>, weeks: number[]): Types.courseEvent[];
|
|
@@ -1,127 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = _default;
|
|
7
|
-
|
|
8
|
-
var _moment = _interopRequireDefault(require("moment"));
|
|
9
|
-
|
|
10
|
-
var _assertWeekOverlap = require("./assert-week-overlap");
|
|
11
|
-
|
|
12
|
-
function _interopRequireDefault(obj) {
|
|
13
|
-
return obj && obj.__esModule ? obj : {
|
|
14
|
-
default: obj
|
|
15
|
-
};
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
function ownKeys(object, enumerableOnly) {
|
|
19
|
-
var keys = Object.keys(object);
|
|
20
|
-
|
|
21
|
-
if (Object.getOwnPropertySymbols) {
|
|
22
|
-
var symbols = Object.getOwnPropertySymbols(object);
|
|
23
|
-
enumerableOnly && (symbols = symbols.filter(function (sym) {
|
|
24
|
-
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
25
|
-
})), keys.push.apply(keys, symbols);
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
return keys;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
function _objectSpread(target) {
|
|
32
|
-
for (var i = 1; i < arguments.length; i++) {
|
|
33
|
-
var source = null != arguments[i] ? arguments[i] : {};
|
|
34
|
-
i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
|
|
35
|
-
_defineProperty(target, key, source[key]);
|
|
36
|
-
}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
|
|
37
|
-
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
38
|
-
});
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
return target;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
function _defineProperty(obj, key, value) {
|
|
45
|
-
if (key in obj) {
|
|
46
|
-
Object.defineProperty(obj, key, {
|
|
47
|
-
value: value,
|
|
48
|
-
enumerable: true,
|
|
49
|
-
configurable: true,
|
|
50
|
-
writable: true
|
|
51
|
-
});
|
|
52
|
-
} else {
|
|
53
|
-
obj[key] = value;
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
return obj;
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
var startAndEnd = function startAndEnd(lesson) {
|
|
60
|
-
if ("Length" in lesson && "DayOfWeek" in lesson && "Starttime" in lesson) {
|
|
61
|
-
var d = lesson.DayOfWeek;
|
|
62
|
-
var hm = lesson.Starttime.split(":");
|
|
63
|
-
|
|
64
|
-
var start = _moment.default.utc("1970-01-05").add(d, "days").add(hm[0], "hours").add(hm.length == 2 ? hm[1] : 0, "minutes");
|
|
65
|
-
|
|
66
|
-
var end = start.clone().add(lesson.Length, "minute");
|
|
67
|
-
return {
|
|
68
|
-
start: start,
|
|
69
|
-
end: end,
|
|
70
|
-
parked: false
|
|
71
|
-
};
|
|
72
|
-
} else {
|
|
73
|
-
return {};
|
|
74
|
-
}
|
|
75
|
-
};
|
|
76
|
-
|
|
77
|
-
function _default(lesson, lessonTeacherLinks, lessonGroupLinks, lessonRoomLinks, groupClassesMap, classes, groupCourseMap, weeks) {
|
|
78
|
-
var courseEvents = lesson.filter(x => (0, _assertWeekOverlap.assertWeekOverlap)(x.ActualWeeks, weeks)).map(x => _objectSpread({
|
|
79
|
-
ids: x.Lesson.toString(),
|
|
80
|
-
displayName: x.Course || x.Subject,
|
|
81
|
-
duration: x.Length
|
|
82
|
-
}, startAndEnd(x)));
|
|
83
|
-
courseEvents.forEach(x => {
|
|
84
|
-
var teachers = lessonTeacherLinks.filter(y => y.Lesson == parseInt(x.ids)).map(y => y.Teacher);
|
|
85
|
-
if (teachers.length) x.teachers = teachers;
|
|
86
|
-
});
|
|
87
|
-
courseEvents.forEach(x => {
|
|
88
|
-
var groups = lessonGroupLinks.filter(y => y.Lesson == parseInt(x.ids)).map(y => y.Group);
|
|
89
|
-
|
|
90
|
-
if (groups.length == 1) {
|
|
91
|
-
var group = groups[0];
|
|
92
|
-
|
|
93
|
-
if (classes.map(x => x.ids).includes(group)) {
|
|
94
|
-
x.groups = groups;
|
|
95
|
-
} else {
|
|
96
|
-
if (groupClassesMap.has(group)) {
|
|
97
|
-
x.groups = [...groupClassesMap.get(group)];
|
|
98
|
-
x.displayName = group;
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
} else if (groups.length > 1) {
|
|
102
|
-
var groupSet = new Set();
|
|
103
|
-
groups.forEach(group => {
|
|
104
|
-
if (groupClassesMap.has(group)) groupClassesMap.get(group).forEach(groupSet.add, groupSet);
|
|
105
|
-
});
|
|
106
|
-
if (groupSet.size) x.groups = [...groupSet];
|
|
107
|
-
}
|
|
108
|
-
});
|
|
109
|
-
courseEvents.forEach(x => {
|
|
110
|
-
var rooms = lessonRoomLinks.filter(y => y.Lesson == parseInt(x.ids)).map(y => y.Room);
|
|
111
|
-
|
|
112
|
-
if (rooms.length) {
|
|
113
|
-
x.inLocations = rooms;
|
|
114
|
-
x.locations = rooms.map((y, i) => ({
|
|
115
|
-
locations: [y],
|
|
116
|
-
groupIndex: i
|
|
117
|
-
}));
|
|
118
|
-
}
|
|
119
|
-
});
|
|
120
|
-
var unknownCourseCounter = 1;
|
|
121
|
-
courseEvents.forEach(x => {
|
|
122
|
-
var groups = lessonGroupLinks.filter(y => y.Lesson == parseInt(x.ids)).map(y => y.Group);
|
|
123
|
-
if (groups.length == 1 && groupCourseMap.has(groups[0])) x.course = groupCourseMap.get(groups[0]).ids;else x.course = "unknown course " + unknownCourseCounter++;
|
|
124
|
-
});
|
|
125
|
-
return courseEvents;
|
|
126
|
-
}
|
|
127
|
-
//# sourceMappingURL=course-events.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"course-events.js","mappings":"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","names":["startAndEnd","lesson","d","DayOfWeek","hm","Starttime","split","start","moment","utc","add","length","end","clone","Length","parked","lessonTeacherLinks","lessonGroupLinks","lessonRoomLinks","groupClassesMap","classes","groupCourseMap","weeks","courseEvents","filter","x","ActualWeeks","map","ids","Lesson","toString","displayName","Course","Subject","duration","forEach","teachers","y","parseInt","Teacher","groups","Group","group","includes","has","get","groupSet","Set","size","rooms","Room","inLocations","locations","i","groupIndex","unknownCourseCounter","course"],"sourceRoot":"","sources":["../../../src/Skola24/from/course-events.ts"],"sourcesContent":[null]}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import moment from 'moment';
|
|
2
|
-
import { Types } from '../../core/types';
|
|
3
|
-
import { Plan } from '../types/Plan';
|
|
4
|
-
import { Group } from '../types/Group';
|
|
5
|
-
export default function (groups: Group[], groupPlansMap: Map<number, Set<string>>, planMap: Map<number, Plan>, scheduleDates: {
|
|
6
|
-
start?: moment.Moment;
|
|
7
|
-
end?: moment.Moment;
|
|
8
|
-
}, subjectMap: Map<number, string>, planDateMap: Map<number, {
|
|
9
|
-
start: moment.Moment;
|
|
10
|
-
end: moment.Moment;
|
|
11
|
-
}>, planTeachersMap: Map<number, Set<string>>, groupClassesMap: Map<string, Set<string>>, warnings: string[], errors: string[]): Map<number, Types.course>;
|