@royalschedule/maps 2.2.13 → 2.2.16
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/v1/from/course-events.js +1 -1
- package/dist/RS/v1/from/course-events.js.map +1 -1
- package/dist/RS/v1/to/course-events/index.js +7 -5
- package/dist/RS/v1/to/course-events/index.js.map +1 -1
- package/dist/RS/v2/from/course-events.js +1 -1
- package/dist/RS/v2/from/course-events.js.map +1 -1
- package/dist/RS/v2/to/constraints.js +2 -14
- package/dist/RS/v2/to/constraints.js.map +1 -1
- package/dist/RS/v2/to/course-events/index.js +4 -6
- package/dist/RS/v2/to/course-events/index.js.map +1 -1
- package/dist/RS/v2/to/dynamic-locked-times.d.ts +5 -3
- package/dist/RS/v2/to/dynamic-locked-times.js +56 -41
- package/dist/RS/v2/to/dynamic-locked-times.js.map +1 -1
- package/dist/core/to/locked-times.js +1 -0
- package/dist/core/to/locked-times.js.map +1 -1
- package/dist/core/types/division-settings.d.ts +2 -0
- package/dist/core/types/locked-times.d.ts +1 -0
- package/package.json +2 -1
|
@@ -69,7 +69,7 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
|
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
72
|
-
|
|
72
|
+
preferredDuration: event.length,
|
|
73
73
|
parked: !start
|
|
74
74
|
}, event[eventIdKey] && {
|
|
75
75
|
ids: event[eventIdKey]
|
|
@@ -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;
|
|
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","preferredDuration","parked","name","displayName","density","weight","potentialCenter","minBreakLength","intervals","lockedTimes","dependencies","locations","days"],"sourceRoot":"","sources":["../../../../src/RS/v1/from/course-events.ts"],"sourcesContent":[null]}
|
|
@@ -33,17 +33,19 @@ var _default = (courseEvents, options) => {
|
|
|
33
33
|
var idKey = options.idKey ? options.idKey : 'id';
|
|
34
34
|
var docs = Array.isArray(courseEvents) ? courseEvents : [courseEvents];
|
|
35
35
|
return docs.reduce((acc, event) => {
|
|
36
|
-
var _event$lockedTimes;
|
|
36
|
+
var _event$preferredDurat, _event$lockedTimes;
|
|
37
37
|
|
|
38
38
|
if (!event) return acc;
|
|
39
39
|
var course = event.course;
|
|
40
40
|
|
|
41
41
|
var id = (event[idKey] || event._id).toString();
|
|
42
42
|
|
|
43
|
-
var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
44
|
-
id: id
|
|
45
|
-
}, 'duration' in event && {
|
|
46
|
-
length: event.duration
|
|
43
|
+
var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
44
|
+
id: "events.".concat(id)
|
|
45
|
+
}, ('duration' in event || 'preferredDuration' in event) && {
|
|
46
|
+
length: (_event$preferredDurat = event.preferredDuration) !== null && _event$preferredDurat !== void 0 ? _event$preferredDurat : event.duration
|
|
47
|
+
}), event.durationVariance != null && {
|
|
48
|
+
maxLengthVariance: event.durationVariance
|
|
47
49
|
}), 'weight' in event && {
|
|
48
50
|
weight: event.weight
|
|
49
51
|
}), '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;;AAEA,QAAIC,GAAG;AACLH,QAAE,
|
|
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","preferredDuration","duration","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/v1/to/course-events/index.ts"],"sourcesContent":[null]}
|
|
@@ -69,7 +69,7 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
|
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
72
|
-
|
|
72
|
+
preferredDuration: event.length,
|
|
73
73
|
parked: !start
|
|
74
74
|
}, event[eventIdKey] && {
|
|
75
75
|
ids: event[eventIdKey]
|
|
@@ -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;
|
|
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","preferredDuration","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]}
|
|
@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
|
|
8
|
-
var _lodash = _interopRequireDefault(require("lodash"));
|
|
9
|
-
|
|
10
8
|
var _dependencies = _interopRequireDefault(require("./dependencies"));
|
|
11
9
|
|
|
12
10
|
var _teachers = _interopRequireDefault(require("./teachers"));
|
|
@@ -59,18 +57,8 @@ var _default = function _default(schedule) {
|
|
|
59
57
|
groups: (0, _groups.default)(groups, options).concat((0, _teachers.default)(teachers, options))
|
|
60
58
|
});
|
|
61
59
|
|
|
62
|
-
if (groups !== null && groups !== void 0 && groups.some(group => 'lunch' in group)) data.events = ((_data$events = data.events) !== null && _data$events !== void 0 ? _data$events : []).concat((0, _dynamicLockedTimes.default)(
|
|
63
|
-
|
|
64
|
-
lunch
|
|
65
|
-
} = _ref;
|
|
66
|
-
return lunch;
|
|
67
|
-
}).flat(), null), options));
|
|
68
|
-
if (teachers !== null && teachers !== void 0 && teachers.some(teacher => 'lunch' in teacher)) data.events = ((_data$events2 = data.events) !== null && _data$events2 !== void 0 ? _data$events2 : []).concat((0, _dynamicLockedTimes.default)(_lodash.default.without(teachers.map(_ref2 => {
|
|
69
|
-
var {
|
|
70
|
-
lunch
|
|
71
|
-
} = _ref2;
|
|
72
|
-
return lunch;
|
|
73
|
-
}).flat(), null), options));
|
|
60
|
+
if (groups !== null && groups !== void 0 && groups.some(group => 'lunch' in group)) data.events = ((_data$events = data.events) !== null && _data$events !== void 0 ? _data$events : []).concat((0, _dynamicLockedTimes.default)(groups, settings, options));
|
|
61
|
+
if (teachers !== null && teachers !== void 0 && teachers.some(teacher => 'lunch' in teacher)) data.events = ((_data$events2 = data.events) !== null && _data$events2 !== void 0 ? _data$events2 : []).concat((0, _dynamicLockedTimes.default)(teachers, settings, options));
|
|
74
62
|
return data;
|
|
75
63
|
};
|
|
76
64
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constraints.js","mappings":";;;;;;;
|
|
1
|
+
{"version":3,"file":"constraints.js","mappings":";;;;;;;AAOA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;eAEe,kBAACA,QAAD,EAA6D;AAAA;;AAAA,MAAxCC,OAAwC,uEAAlB,EAAkB;AAC1E,MAAID,QAAQ,IAAI,IAAhB,EAAsB,OAAO,EAAP;AAEtB,MAAI;AACFE,UADE;AAEFC,YAFE;AAGFC,aAHE;AAIFC,UAJE;AAKFC,iBALE;AAMFC,WANE;AAOFC,YAPE;AAQFC;AARE,MASAT,QATJ;;AAWA,MAAIU,IAAI;AACNF,YAAQ,EAAM,uBAAYA,QAAZ,CADR;AAENG,WAAO,EAAO,uBAAWH,QAAX;AAFR,KAGHC,IAAI,IAAI;AACTG,SAAK,EAAE;AACLC,uBAAiB,EAAEJ,IAAI,CAACI,iBADnB;AAELC,UAAI,EAAeL,IAAI,CAACK;AAFnB;AADE,GAHL;AASNT,UAAM,EAAQ,0BAAeE,OAAf,EAAyBF,MAAzB,EAAiCC,aAAjC,EAAgDL,OAAhD,CATR;AAUNc,gBAAY,EAAE,2BAAgBX,SAAhB,EAA4BH,OAA5B,CAVR;AAWNC,UAAM,EAAQ,qBAAUA,MAAV,EAAmBD,OAAnB,EAA4Be,MAA5B,CAAmC,uBAAYb,QAAZ,EAAuBF,OAAvB,CAAnC;AAXR,IAAR;;AAkBA,MAAIC,MAAJ,aAAIA,MAAJ,eAAIA,MAAM,CAAEe,IAAR,CAAaC,KAAK,IAAI,WAAWA,KAAjC,CAAJ,EACER,IAAI,CAACL,MAAL,GAAc,iBAACK,IAAI,CAACL,MAAN,uDAAgB,EAAhB,EAAoBW,MAApB,CAA2B,iCAAsBd,MAAtB,EAA8BM,QAA9B,EAAyCP,OAAzC,CAA3B,CAAd;AAEF,MAAIE,QAAJ,aAAIA,QAAJ,eAAIA,QAAQ,CAAEc,IAAV,CAAeE,OAAO,IAAI,WAAWA,OAArC,CAAJ,EACET,IAAI,CAACL,MAAL,GAAc,kBAACK,IAAI,CAACL,MAAN,yDAAgB,EAAhB,EAAoBW,MAApB,CAA2B,iCAAsBb,QAAtB,EAAgCK,QAAhC,EAA2CP,OAA3C,CAA3B,CAAd;AAEF,SAAOS,IAAP;AACD,C","names":["schedule","options","groups","teachers","locations","events","overlapGroups","courses","settings","area","data","default","areas","breakLengthMatrix","list","dependencies","concat","some","group","teacher"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/constraints.ts"],"sourcesContent":[null]}
|
|
@@ -33,19 +33,17 @@ var _default = (courseEvents, options) => {
|
|
|
33
33
|
var idKey = options.idKey ? options.idKey : 'id';
|
|
34
34
|
var docs = Array.isArray(courseEvents) ? courseEvents : [courseEvents];
|
|
35
35
|
return docs.reduce((acc, event) => {
|
|
36
|
-
var _event$lockedTimes;
|
|
36
|
+
var _event$preferredDurat, _event$lockedTimes;
|
|
37
37
|
|
|
38
38
|
if (!event) return acc;
|
|
39
39
|
var course = event.course;
|
|
40
40
|
|
|
41
41
|
var id = (event[idKey] || event._id).toString();
|
|
42
42
|
|
|
43
|
-
var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(
|
|
43
|
+
var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
44
44
|
id: "events.".concat(id)
|
|
45
|
-
}, 'duration' in event && {
|
|
46
|
-
length: event.duration
|
|
47
|
-
}), event.preferredDuration != null && {
|
|
48
|
-
length: event.preferredDuration
|
|
45
|
+
}, ('preferredDuration' in event || 'duration' in event) && {
|
|
46
|
+
length: (_event$preferredDurat = event.preferredDuration) !== null && _event$preferredDurat !== void 0 ? _event$preferredDurat : event.duration
|
|
49
47
|
}), event.durationVariance != null && {
|
|
50
48
|
maxLengthVariance: event.durationVariance
|
|
51
49
|
}), 'weight' in event && {
|
|
@@ -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,
|
|
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","preferredDuration","duration","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]}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { LockedTime } from '../types/locked-times';
|
|
2
1
|
import { OutOptions } from '../types/out-options';
|
|
3
|
-
import {
|
|
4
|
-
|
|
2
|
+
import { CourseEvent } from '../types/course-events';
|
|
3
|
+
import { Group as SourceGroup } from '../../../core/types/groups';
|
|
4
|
+
import { Teacher as SourceTeacher } from '../../../core/types/teachers';
|
|
5
|
+
import { DivisionSettings } from '../../../core/types/division-settings';
|
|
6
|
+
declare const _default: (docs: SourceGroup[] | SourceTeacher[], settings: DivisionSettings, options: OutOptions) => CourseEvent[] | never;
|
|
5
7
|
export default _default;
|
|
@@ -7,6 +7,10 @@ exports.default = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _moment = _interopRequireDefault(require("moment"));
|
|
9
9
|
|
|
10
|
+
var _nanoid = require("nanoid");
|
|
11
|
+
|
|
12
|
+
var _lodash = _interopRequireDefault(require("lodash"));
|
|
13
|
+
|
|
10
14
|
var _intervals2 = _interopRequireDefault(require("./intervals"));
|
|
11
15
|
|
|
12
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -17,53 +21,64 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
17
21
|
|
|
18
22
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
19
23
|
|
|
20
|
-
var _default = (
|
|
24
|
+
var _default = (docs, settings, options) => {
|
|
21
25
|
var _options$idKey;
|
|
22
26
|
|
|
23
|
-
var docs = Array.isArray(lockedTimes) ? lockedTimes : [lockedTimes];
|
|
24
27
|
var idKey = (_options$idKey = options.idKey) !== null && _options$idKey !== void 0 ? _options$idKey : 'id';
|
|
25
|
-
return docs.filter(x => !!x).
|
|
26
|
-
var
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
28
|
+
return docs.filter(x => !!x).reduce((acc, group) => {
|
|
29
|
+
var lunch = group.lunch;
|
|
30
|
+
|
|
31
|
+
if (lunch == null) {
|
|
32
|
+
var _settings$defaultLunc;
|
|
33
|
+
|
|
34
|
+
lunch = (_settings$defaultLunc = settings.defaultLunch) === null || _settings$defaultLunc === void 0 ? void 0 : _settings$defaultLunc.map(lunch => _objectSpread(_objectSpread({}, lunch), {}, {
|
|
35
|
+
coalesced: [{
|
|
36
|
+
to: _lodash.default.pick(group, idKey)
|
|
37
|
+
}]
|
|
38
|
+
}));
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (lunch == null) return acc;
|
|
42
|
+
return acc.concat(lunch.map(lockedTime => {
|
|
43
|
+
var _toString, _ref;
|
|
44
|
+
|
|
39
45
|
var {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
46
|
+
_id,
|
|
47
|
+
intervals,
|
|
48
|
+
duration,
|
|
49
|
+
durationVariance,
|
|
50
|
+
coalesced
|
|
51
|
+
} = lockedTime;
|
|
52
|
+
var id = (_toString = (_ref = lockedTime[idKey] || lockedTime._id) === null || _ref === void 0 ? void 0 : _ref.toString()) !== null && _toString !== void 0 ? _toString : (0, _nanoid.nanoid)();
|
|
53
|
+
if (duration == null) throw new Error('Length of a locked time is null');
|
|
54
|
+
if (duration < 5) throw new Error('Length of a locked time is less than 5 min');
|
|
55
|
+
var days = intervals === null || intervals === void 0 ? void 0 : intervals.map(_ref2 => {
|
|
49
56
|
var {
|
|
50
|
-
|
|
57
|
+
start
|
|
51
58
|
} = _ref2;
|
|
52
|
-
return
|
|
53
|
-
})
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
59
|
+
return (0, _moment.default)(start).day() - 1;
|
|
60
|
+
});
|
|
61
|
+
if (days) days = [...new Set(days)];
|
|
62
|
+
return _objectSpread(_objectSpread(_objectSpread({
|
|
63
|
+
id: "".concat(group.lunch == null ? 'virtual' : 'lockedtimes', ".").concat(id),
|
|
64
|
+
groups: coalesced === null || coalesced === void 0 ? void 0 : coalesced.map(_ref3 => {
|
|
65
|
+
var {
|
|
66
|
+
to
|
|
67
|
+
} = _ref3;
|
|
68
|
+
return to[idKey];
|
|
69
|
+
}),
|
|
70
|
+
length: duration
|
|
71
|
+
}, days && (days.length == 1 ? {
|
|
72
|
+
day: days[0]
|
|
73
|
+
} : {
|
|
74
|
+
days
|
|
75
|
+
})), durationVariance != null && {
|
|
76
|
+
maxLengthVariance: durationVariance
|
|
77
|
+
}), {}, {
|
|
78
|
+
intervals: (0, _intervals2.default)(intervals)
|
|
79
|
+
});
|
|
80
|
+
}));
|
|
81
|
+
}, []).flat().filter(x => !!x);
|
|
67
82
|
};
|
|
68
83
|
|
|
69
84
|
exports.default = _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-locked-times.js","mappings":";;;;;;;AAAA;;AAMA;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"dynamic-locked-times.js","mappings":";;;;;;;AAAA;;AACA;;AACA;;AAMA;;;;;;;;;;eAOe,CAACA,IAAD,EACCC,QADD,EAECC,OAFD,KAEgD;AAAA;;AAE7D,MAAIC,KAAK,qBAAoCD,OAAO,CAACC,KAA5C,2DAAqD,IAA9D;AAEA,SAAOH,IAAI,CAACI,MAAL,CAAYC,CAAC,IAAI,CAAC,CAACA,CAAnB,EAAsBC,MAAtB,CAA6B,CAACC,GAAD,EAAWC,KAAX,KAAgE;AAClG,QAAIC,KAAK,GAAGD,KAAK,CAACC,KAAlB;;AACA,QAAIA,KAAK,IAAI,IAAb,EAAmB;AAAA;;AACjBA,WAAK,4BAAGR,QAAQ,CAACS,YAAZ,0DAAG,sBAAuBC,GAAvB,CAA2BF,KAAK,oCAAUA,KAAV;AAAiBG,iBAAS,EAAE,CAAC;AAAEC,YAAE,EAAEC,gBAAEC,IAAF,CAAOP,KAAP,EAAcL,KAAd;AAAN,SAAD;AAA5B,QAAhC,CAAR;AACD;;AAED,QAAIM,KAAK,IAAI,IAAb,EACE,OAAOF,GAAP;AAEF,WAAOA,GAAG,CAACS,MAAJ,CAAWP,KAAK,CAACE,GAAN,CAAWM,UAAD,IAA8C;AAAA;;AACxE,UAAM;AAAEC,WAAF;AAAOC,iBAAP;AAAkBC,gBAAlB;AAA4BC,wBAA5B;AAA8CT;AAA9C,UAA4DK,UAAlE;AAEA,UAAMK,EAAE,wBAAYL,UAAU,CAACd,KAAD,CAAV,IAA+Cc,UAAU,CAACC,GAAtE,yCAAW,KAAkEK,QAAlE,EAAX,iDAA2F,qBAAnG;AAEA,UAAIH,QAAQ,IAAI,IAAhB,EACE,MAAM,IAAII,KAAJ,CAAU,iCAAV,CAAN;AAEF,UAAIJ,QAAQ,GAAG,CAAf,EACE,MAAM,IAAII,KAAJ,CAAU,4CAAV,CAAN;AAMF,UAAIC,IAAI,GAAyBN,SAAzB,aAAyBA,SAAzB,uBAAyBA,SAAS,CAAER,GAAX,CAAe;AAAA,YAAC;AAAEe;AAAF,SAAD;AAAA,eAAe,qBAAOA,KAAP,EAAcC,GAAd,KAAsB,CAArC;AAAA,OAAf,CAAjC;AACA,UAAIF,IAAJ,EACEA,IAAI,GAAG,CAAC,GAAG,IAAIG,GAAJ,CAAQH,IAAR,CAAJ,CAAP;AAEF;AACEH,UAAE,YAAQd,KAAK,CAACC,KAAN,IAAe,IAAf,GAAsB,SAAtB,GAAkC,aAA1C,cAA6Da,EAA7D,CADJ;AAEEO,cAAM,EAAEjB,SAAF,aAAEA,SAAF,uBAAEA,SAAS,CAAED,GAAX,CAAe;AAAA,cAAC;AAAEE;AAAF,WAAD;AAAA,iBAAYA,EAAE,CAACV,KAAD,CAAd;AAAA,SAAf,CAFV;AAGE2B,cAAM,EAAEV;AAHV,SAIKK,IAAI,KAAKA,IAAI,CAACK,MAAL,IAAe,CAAf,GAAmB;AAAEH,WAAG,EAAEF,IAAI,CAAC,CAAD;AAAX,OAAnB,GAAsC;AAAEA;AAAF,OAA3C,CAJT,GAKKJ,gBAAgB,IAAI,IAApB,IAA6B;AAAEU,yBAAiB,EAAEV;AAArB,OALlC;AAMEF,iBAAS,EAAE,yBAAWA,SAAX;AANb;AAQD,KA3BiB,CAAX,CAAP;AA6BD,GAtCM,EAsCJ,EAtCI,EAsCAa,IAtCA,GAsCO5B,MAtCP,CAsCcC,CAAC,IAAI,CAAC,CAACA,CAtCrB,CAAP;AAuCD,C","names":["docs","settings","options","idKey","filter","x","reduce","acc","group","lunch","defaultLunch","map","coalesced","to","_","pick","concat","lockedTime","_id","intervals","duration","durationVariance","id","toString","Error","days","start","day","Set","groups","length","maxLengthVariance","flat"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/dynamic-locked-times.ts"],"sourcesContent":[null]}
|
|
@@ -20,6 +20,7 @@ var _default = lockedTimes => {
|
|
|
20
20
|
delete lockedTime.lastModifiedBy;
|
|
21
21
|
delete lockedTime.createdAt;
|
|
22
22
|
if (!((_lockedTime$coalesced = lockedTime.coalesced) !== null && _lockedTime$coalesced !== void 0 && _lockedTime$coalesced.length)) return acc;
|
|
23
|
+
if (lockedTime.type == 'LUNCH') return acc;
|
|
23
24
|
lockedTime.coalesced = (_lockedTime$coalesced2 = lockedTime.coalesced) === null || _lockedTime$coalesced2 === void 0 ? void 0 : _lockedTime$coalesced2.map(_ref => {
|
|
24
25
|
var {
|
|
25
26
|
to: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locked-times.js","mappings":";;;;;;;;;;;;;eAEgBA,WAAD,IAA4C;AACzD,SAAOA,WAAW,CAACC,MAAZ,CAAmB,CAACC,GAAD,EAAoBC,UAApB,KAA8C;AAAA;;AAEtE,WAAOA,UAAU,CAACC,GAAlB;AACA,WAAOD,UAAU,CAACE,SAAlB;AACA,WAAQF,UAAkB,CAACG,cAA3B;AACA,WAAOH,UAAU,CAACI,SAAlB;AAEA,QAAI,2BAAEJ,UAAU,CAACK,SAAb,kDAAE,sBAAsBC,MAAxB,CAAJ,EAAoC,OAAOP,GAAP;
|
|
1
|
+
{"version":3,"file":"locked-times.js","mappings":";;;;;;;;;;;;;eAEgBA,WAAD,IAA4C;AACzD,SAAOA,WAAW,CAACC,MAAZ,CAAmB,CAACC,GAAD,EAAoBC,UAApB,KAA8C;AAAA;;AAEtE,WAAOA,UAAU,CAACC,GAAlB;AACA,WAAOD,UAAU,CAACE,SAAlB;AACA,WAAQF,UAAkB,CAACG,cAA3B;AACA,WAAOH,UAAU,CAACI,SAAlB;AAEA,QAAI,2BAAEJ,UAAU,CAACK,SAAb,kDAAE,sBAAsBC,MAAxB,CAAJ,EAAoC,OAAOP,GAAP;AAEpC,QAAIC,UAAU,CAACO,IAAX,IAAmB,OAAvB,EAAgC,OAAOR,GAAP;AAEhCC,cAAU,CAACK,SAAX,6BAAuBL,UAAU,CAACK,SAAlC,2DAAuB,uBAAsBG,GAAtB,CAA0B,QAA4B;AAAA,UAA3B;AAAEC,UAAE,EAAE;AAAEC;AAAF,SAAN;AAAcC;AAAd,OAA2B;AAAG,aAAO;AAAEF,UAAE,EAAEC,EAAN;AAAUC;AAAV,OAAP;AAA4B,KAArF,CAAvB;AAEA,WAAOZ,GAAG,CAACa,MAAJ,mBAAgBZ,UAAhB,EAAP;AACD,GAdM,EAcJ,EAdI,CAAP;AAeD,C","names":["lockedTimes","reduce","acc","lockedTime","_id","belongsTo","lastModifiedBy","createdAt","coalesced","length","type","map","to","id","toModel","concat"],"sourceRoot":"","sources":["../../../src/core/to/locked-times.ts"],"sourcesContent":[null]}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Types } from 'mongoose';
|
|
2
2
|
import { Division } from './divisions';
|
|
3
|
+
import { LockedTime } from './locked-times';
|
|
3
4
|
export interface DivisionSettingsBare {
|
|
4
5
|
belongsTo?: Division;
|
|
5
6
|
createdAt?: string;
|
|
@@ -21,6 +22,7 @@ export interface DivisionSettingsBare {
|
|
|
21
22
|
defaultEventWeight?: number;
|
|
22
23
|
defaultGroupWeight?: number;
|
|
23
24
|
defaultCourseWeight?: number;
|
|
25
|
+
defaultLunch?: Pick<LockedTime, 'intervals' | 'duration' | 'durationVariance'>[];
|
|
24
26
|
}
|
|
25
27
|
export interface DivisionSettings extends DivisionSettingsBare {
|
|
26
28
|
_id?: Types.ObjectId;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@royalschedule/maps",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.16",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -54,6 +54,7 @@
|
|
|
54
54
|
"module-alias": "^2.2.2",
|
|
55
55
|
"moment": "^2.29.2",
|
|
56
56
|
"mongoose": "^6.2.10",
|
|
57
|
+
"nanoid": "^3.3.4",
|
|
57
58
|
"papaparse": "^5.3.2",
|
|
58
59
|
"xlsx": "^0.18.5"
|
|
59
60
|
}
|