@royalschedule/maps 2.2.9 → 2.2.12
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/index.d.ts +1 -1
- package/dist/RS/v2/from/placements.d.ts +2 -1
- package/dist/RS/v2/from/placements.js +15 -5
- package/dist/RS/v2/from/placements.js.map +1 -1
- package/dist/RS/v2/from/schedules.js +1 -2
- package/dist/RS/v2/from/schedules.js.map +1 -1
- package/dist/RS/v2/to/collections.js +3 -1
- package/dist/RS/v2/to/collections.js.map +1 -1
- package/dist/RS/v2/to/constraints.js +4 -4
- package/dist/RS/v2/to/constraints.js.map +1 -1
- package/dist/RS/v2/to/default.js +3 -3
- package/dist/RS/v2/to/default.js.map +1 -1
- package/dist/RS/v2/to/dynamic-locked-times.js +1 -1
- package/dist/RS/v2/to/dynamic-locked-times.js.map +1 -1
- package/dist/core/types/courses.d.ts +1 -0
- package/dist/core/types/division-settings.d.ts +1 -0
- package/package.json +1 -1
|
@@ -9,7 +9,7 @@ export default class {
|
|
|
9
9
|
static lockedTime: (lockedTimes: import("../types/locked-times").LockedTime[]) => import("../../../core/types/locked-times").LockedTime[];
|
|
10
10
|
static placement: (configuration: import("../types/configurations").Configuration, options?: {
|
|
11
11
|
idKey?: "id" | "_id" | "ids" | undefined;
|
|
12
|
-
}) => import("../../../core/types/course-events").CourseEvent[];
|
|
12
|
+
}) => [import("../../../core/types/course-events").CourseEvent[], import("../../../core/types/locked-times").LockedTime[]];
|
|
13
13
|
static schedules: (schedule: import("../types/schedules").Schedule) => import("../../../core/types/divisions").Division;
|
|
14
14
|
static setting: (settings: import("../types/settings").Settings, _default: import("../types/default").Default) => import("../../../core/types/division-settings").DivisionSettings;
|
|
15
15
|
static teacher: (teachers: import("../types/groups").Group[], settings: any) => import("../../../core/types/teachers").Teacher[];
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Configuration } from '../types/configurations';
|
|
2
2
|
import { CourseEvent } from '../../../core/types/course-events';
|
|
3
|
+
import { LockedTime } from '../../../core/types/locked-times';
|
|
3
4
|
declare type Options = {
|
|
4
5
|
idKey?: '_id' | 'id' | 'ids';
|
|
5
6
|
};
|
|
6
|
-
declare const _default: (configuration: Configuration, options?: Options) => CourseEvent[];
|
|
7
|
+
declare const _default: (configuration: Configuration, options?: Options) => [CourseEvent[], LockedTime[]];
|
|
7
8
|
export default _default;
|
|
@@ -7,6 +7,8 @@ exports.default = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _moment = _interopRequireDefault(require("moment"));
|
|
9
9
|
|
|
10
|
+
var _lodash = _interopRequireDefault(require("lodash"));
|
|
11
|
+
|
|
10
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
13
|
|
|
12
14
|
var _default = function _default(configuration) {
|
|
@@ -15,17 +17,25 @@ var _default = function _default(configuration) {
|
|
|
15
17
|
var {
|
|
16
18
|
events
|
|
17
19
|
} = configuration !== null && configuration !== void 0 ? configuration : {};
|
|
18
|
-
return events
|
|
20
|
+
return _lodash.default.reduce(events, (_ref, event) => {
|
|
19
21
|
var _event$dependencies;
|
|
20
22
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
+
var [eventAcc, lockedAcc] = _ref;
|
|
24
|
+
var [collection, id] = event.id.split('.');
|
|
25
|
+
if (collection == 'events') eventAcc = eventAcc.concat({
|
|
26
|
+
[idKey]: id,
|
|
23
27
|
parked: false,
|
|
24
28
|
inLocations: (_event$dependencies = event.dependencies) !== null && _event$dependencies !== void 0 ? _event$dependencies : [],
|
|
25
29
|
start: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.start, 'minutes').toISOString(),
|
|
26
30
|
end: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.end, 'minutes').toISOString()
|
|
27
|
-
};
|
|
28
|
-
|
|
31
|
+
});
|
|
32
|
+
if (collection == 'lockedtimes') lockedAcc = lockedAcc.concat({
|
|
33
|
+
[idKey]: id,
|
|
34
|
+
start: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.start, 'minutes').toISOString(),
|
|
35
|
+
end: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.end, 'minutes').toISOString()
|
|
36
|
+
});
|
|
37
|
+
return [eventAcc, lockedAcc];
|
|
38
|
+
}, [[], []]);
|
|
29
39
|
};
|
|
30
40
|
|
|
31
41
|
exports.default = _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placements.js","mappings":";;;;;;;AAAA;;;;eAYe,kBAACA,aAAD,
|
|
1
|
+
{"version":3,"file":"placements.js","mappings":";;;;;;;AAAA;;AACA;;;;eAYe,kBAACA,aAAD,EAAuF;AAAA,MAAxDC,OAAwD,uEAArC,EAAqC;AAEpG,MAAMC,KAAK,GAAsBD,OAAO,CAACC,KAAR,IAAiB,IAAlD;AAEA,MAAM;AAAEC;AAAF,MAAaH,aAAb,aAAaA,aAAb,cAAaA,aAAb,GAA8B,EAApC;AAEA,SAAOI,gBAAEC,MAAF,CAASF,MAAT,EAAiB,OAAuDG,KAAvD,KAA2E;AAAA;;AAAA,QAA1E,CAACC,QAAD,EAAWC,SAAX,CAA0E;AACjG,QAAM,CAACC,UAAD,EAAaC,EAAb,IAAmBJ,KAAK,CAACI,EAAN,CAASC,KAAT,CAAe,GAAf,CAAzB;AACA,QAAIF,UAAU,IAAI,QAAlB,EACEF,QAAQ,GAAGA,QAAQ,CAACK,MAAT,CAAgB;AACzB,OAACV,KAAD,GAAcQ,EADW;AAEzBG,YAAM,EAAQ,KAFW;AAGzBC,iBAAW,yBAAGR,KAAK,CAACS,YAAT,qEAAyB,EAHX;AAIzBC,WAAK,EAASC,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACU,KAAhE,EAAuE,SAAvE,EAAkFK,WAAlF,EAJW;AAKzBC,SAAG,EAAWL,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACgB,GAAhE,EAAqE,SAArE,EAAgFD,WAAhF;AALW,KAAhB,CAAX;AAOF,QAAIZ,UAAU,IAAI,aAAlB,EACED,SAAS,GAAGA,SAAS,CAACI,MAAV,CAAiB;AAC3B,OAACV,KAAD,GAAcQ,EADa;AAE3BM,WAAK,EAASC,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACU,KAAhE,EAAuE,SAAvE,EAAkFK,WAAlF,EAFa;AAG3BC,SAAG,EAAWL,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACgB,GAAhE,EAAqE,SAArE,EAAgFD,WAAhF;AAHa,KAAjB,CAAZ;AAKF,WAAO,CAACd,QAAD,EAAWC,SAAX,CAAP;AACD,GAjBM,EAiBJ,CAAC,EAAD,EAAK,EAAL,CAjBI,CAAP;AAkBD,C","names":["configuration","options","idKey","events","_","reduce","event","eventAcc","lockedAcc","collection","id","split","concat","parked","inLocations","dependencies","start","moment","utc","add","day","toISOString","end"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/placements.ts"],"sourcesContent":[null]}
|
|
@@ -49,10 +49,9 @@ var _default2 = schedule => {
|
|
|
49
49
|
if (configuration) {
|
|
50
50
|
var _events;
|
|
51
51
|
|
|
52
|
-
var _placements = (0, _placements2.default)(configuration, {
|
|
52
|
+
var [_placements] = (0, _placements2.default)(configuration, {
|
|
53
53
|
idKey: 'ids'
|
|
54
54
|
});
|
|
55
|
-
|
|
56
55
|
var i = -1;
|
|
57
56
|
(_events = events) === null || _events === void 0 ? void 0 : _events.forEach(collection => {
|
|
58
57
|
var _collection$events;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedules.js","mappings":";;;;;;;AAIA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;gBAEgBA,QAAD,IAAiC;AAE9C,MAAI;AACFC,SAAK,EAAE;AACLC,cADK;AAELC,aAAO,EAAEC,QAFJ;AAGLC,kBAHK;AAILC,YAJK;AAKLC,YALK;AAMLC;AANK;AADL,MASKR,QATT;AAWA,MAAM,CAACS,aAAD,EAAgB,GAAGC,IAAnB,IAA2BV,QAAQ,CAACW,MAAT,IAAmB,EAApD;AAEA,MAAIC,QAAJ;AACA,MAAIC,SAAJ;AAEA,MAAI,CAAEX,QAAN,EACE,MAAM,IAAIY,KAAJ,gCAAN;AAEF,MAAIT,YAAJ,EACEQ,SAAS,GAAM,2BAAgBR,YAAhB,EAA8BH,QAA9B,CAAf;AACF,MAAII,MAAJ,EACEM,QAAQ,GAAO,uBAAYN,MAAZ,EAAoBJ,QAApB,CAAf;AACF,MAAII,MAAJ,EACEA,MAAM,GAAS,qBAAUA,MAAV,EAAkBJ,QAAlB,CAAf;AACF,MAAIK,MAAJ,EACEA,MAAM,GAAS,0BAAeA,MAAf,EACe,CAACK,QAAQ,IAAI,EAAb,EAAiBG,GAAjB,CAAsBC,CAAD,IAAYA,CAAC,CAACC,GAAnC,CADf,EAEe,CAACX,MAAM,IAAI,EAAX,EAAeS,GAAf,CAAoBC,CAAD,IAAYA,CAAC,CAACC,GAAjC,CAFf,EAGef,QAHf,CAAf;AAIFA,UAAQ,GAAS,uBAAYA,QAAZ,EAAsBE,QAAtB,CAAjB;;AAEA,MAAIK,aAAJ,EAAmB;AAAA;;AACjB,
|
|
1
|
+
{"version":3,"file":"schedules.js","mappings":";;;;;;;AAIA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;gBAEgBA,QAAD,IAAiC;AAE9C,MAAI;AACFC,SAAK,EAAE;AACLC,cADK;AAELC,aAAO,EAAEC,QAFJ;AAGLC,kBAHK;AAILC,YAJK;AAKLC,YALK;AAMLC;AANK;AADL,MASKR,QATT;AAWA,MAAM,CAACS,aAAD,EAAgB,GAAGC,IAAnB,IAA2BV,QAAQ,CAACW,MAAT,IAAmB,EAApD;AAEA,MAAIC,QAAJ;AACA,MAAIC,SAAJ;AAEA,MAAI,CAAEX,QAAN,EACE,MAAM,IAAIY,KAAJ,gCAAN;AAEF,MAAIT,YAAJ,EACEQ,SAAS,GAAM,2BAAgBR,YAAhB,EAA8BH,QAA9B,CAAf;AACF,MAAII,MAAJ,EACEM,QAAQ,GAAO,uBAAYN,MAAZ,EAAoBJ,QAApB,CAAf;AACF,MAAII,MAAJ,EACEA,MAAM,GAAS,qBAAUA,MAAV,EAAkBJ,QAAlB,CAAf;AACF,MAAIK,MAAJ,EACEA,MAAM,GAAS,0BAAeA,MAAf,EACe,CAACK,QAAQ,IAAI,EAAb,EAAiBG,GAAjB,CAAsBC,CAAD,IAAYA,CAAC,CAACC,GAAnC,CADf,EAEe,CAACX,MAAM,IAAI,EAAX,EAAeS,GAAf,CAAoBC,CAAD,IAAYA,CAAC,CAACC,GAAjC,CAFf,EAGef,QAHf,CAAf;AAIFA,UAAQ,GAAS,uBAAYA,QAAZ,EAAsBE,QAAtB,CAAjB;;AAEA,MAAIK,aAAJ,EAAmB;AAAA;;AACjB,QAAM,CAACS,WAAD,IAAgB,0BAAcT,aAAd,EAA6B;AAAEU,WAAK,EAAE;AAAT,KAA7B,CAAtB;AAEA,QAAIC,CAAC,GAAW,CAAC,CAAjB;AAEA,qBAAM,UAAN,0CAAQC,OAAR,CAAiBC,UAAD,IAAoB;AAAA;;AAClC,sCAAU,CAACf,MAAX,0EAAmBc,OAAnB,CAA4BE,KAAD,IAAe;AACxCH,SAAC;;AACD,YAAMI,YAAY,GAAQN,WAAW,CAACO,IAAZ,CAAiB;AAAA,cAAC;AAAER;AAAF,WAAD;AAAA,iBAAaA,GAAG,IAAIM,KAAK,CAACN,GAA1B;AAAA,SAAjB,CAA1B;;AAEA,YAAIO,YAAJ,EACE,OAAOE,MAAM,CAACC,MAAP,CAAcJ,KAAd,EAAqBC,YAArB,CAAP;AAEF,eAAOE,MAAM,CAACC,MAAP,CAAcJ,KAAd,EAAqBL,WAAW,CAACE,CAAD,CAAhC,CAAP;AACD,OARD;AASD,KAVD;AAWD;;AAED,iGACKP,SAAS,IAAI;AAAEA;AAAF,GADlB,GAEKD,QAAQ,IAAK;AAAEA;AAAF,GAFlB,GAGKN,MAAM,IAAO;AAAEA;AAAF,GAHlB,GAIKC,MAAM,IAAO;AAAEqB,WAAO,EAAErB;AAAX,GAJlB,GAKKC,KAAK,IAAQ;AAAEqB,QAAI,EAAErB;AAAR,GALlB,GAMKN,QAAQ,IAAK;AAAEA;AAAF,GANlB;AAQD,C","names":["schedule","input","settings","default","_default","dependencies","groups","events","areas","configuration","meta","output","teachers","locations","Error","map","x","ids","_placements","idKey","i","forEach","collection","event","_placedEvent","find","Object","assign","courses","area"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/schedules.ts"],"sourcesContent":[null]}
|
|
@@ -49,12 +49,14 @@ 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({
|
|
53
53
|
id: (_course$idKey = course[idKey]) === null || _course$idKey === void 0 ? void 0 : _course$idKey.toString()
|
|
54
54
|
}, 'weight' in course && {
|
|
55
55
|
weight: course.weight
|
|
56
56
|
}), 'density' in course && {
|
|
57
57
|
density: course.density
|
|
58
|
+
}), course.eventDurationVariance != null && {
|
|
59
|
+
maxEventLengthVariance: course.eventDurationVariance
|
|
58
60
|
}), course.potentialCenter && {
|
|
59
61
|
potentialCenter: parseFloat(course.potentialCenter)
|
|
60
62
|
}), ((_course$locations = course.locations) === null || _course$locations === void 0 ? void 0 : _course$locations.length) && {
|
|
@@ -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,mBAAuDP,MAAM,CAACL,KAAD,CAA7D,kDAAuD,cAAegB,QAAf;AADpD,OAEF,
|
|
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","teachers","groups","Set","concat","x","meta","color","ids","displayName","name","overlapGroup","index","indexOf","fill"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/collections.ts"],"sourcesContent":[null]}
|
|
@@ -59,18 +59,18 @@ var _default = function _default(schedule) {
|
|
|
59
59
|
groups: (0, _groups.default)(groups, options).concat((0, _teachers.default)(teachers, options))
|
|
60
60
|
});
|
|
61
61
|
|
|
62
|
-
if (groups !== null && groups !== void 0 && groups.some(
|
|
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)(_lodash.default.without(groups.map(_ref => {
|
|
63
63
|
var {
|
|
64
64
|
lunch
|
|
65
65
|
} = _ref;
|
|
66
66
|
return lunch;
|
|
67
|
-
}), null), options));
|
|
68
|
-
if (teachers !== null && teachers !== void 0 && teachers.some(
|
|
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
69
|
var {
|
|
70
70
|
lunch
|
|
71
71
|
} = _ref2;
|
|
72
72
|
return lunch;
|
|
73
|
-
}), null), options));
|
|
73
|
+
}).flat(), null), options));
|
|
74
74
|
return data;
|
|
75
75
|
};
|
|
76
76
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constraints.js","mappings":";;;;;;;AAAA;;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,
|
|
1
|
+
{"version":3,"file":"constraints.js","mappings":";;;;;;;AAAA;;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,iCAAsBG,gBAAEC,OAAF,CAAUlB,MAAM,CAACmB,GAAP,CAAW;AAAA,QAAC;AAAEC;AAAF,KAAD;AAAA,WAAeA,KAAf;AAAA,GAAX,EAAiCC,IAAjC,EAAV,EAAmD,IAAnD,CAAtB,EAAuFtB,OAAvF,CAA3B,CAAd;AAEF,MAAIE,QAAJ,aAAIA,QAAJ,eAAIA,QAAQ,CAAEc,IAAV,CAAeO,OAAO,IAAI,WAAWA,OAArC,CAAJ,EACEd,IAAI,CAACL,MAAL,GAAc,kBAACK,IAAI,CAACL,MAAN,yDAAgB,EAAhB,EAAoBW,MAApB,CAA2B,iCAAsBG,gBAAEC,OAAF,CAAUjB,QAAQ,CAACkB,GAAT,CAAa;AAAA,QAAC;AAAEC;AAAF,KAAD;AAAA,WAAeA,KAAf;AAAA,GAAb,EAAmCC,IAAnC,EAAV,EAAqD,IAArD,CAAtB,EAAyFtB,OAAzF,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","_","without","map","lunch","flat","teacher"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/constraints.ts"],"sourcesContent":[null]}
|
package/dist/RS/v2/to/default.js
CHANGED
|
@@ -10,7 +10,7 @@ function toTime(str) {
|
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
var _default = settings => {
|
|
13
|
-
var _settings$defaultGrou, _settings$defaultDepe, _settings$defaultEven, _settings$potentialCe, _settings$defaultEven2, _settings$defaultMaxN, _settings$defaultMaxN2, _settings$defaultDepe2, _settings$defaultGrou2, _settings$defaultDayR, _settings$defaultGrou3, _settings$defaultCour, _settings$
|
|
13
|
+
var _settings$defaultGrou, _settings$defaultDepe, _settings$defaultEven, _settings$potentialCe, _settings$defaultEven2, _settings$defaultEven3, _settings$defaultMaxN, _settings$defaultMaxN2, _settings$defaultDepe2, _settings$defaultGrou2, _settings$defaultDayR, _settings$defaultGrou3, _settings$defaultCour, _settings$defaultEven4;
|
|
14
14
|
|
|
15
15
|
var {
|
|
16
16
|
dayStart,
|
|
@@ -28,7 +28,7 @@ var _default = settings => {
|
|
|
28
28
|
eventMinBreakLength: (_settings$defaultEven = settings.defaultEventMinimumBreakLength) !== null && _settings$defaultEven !== void 0 ? _settings$defaultEven : 5,
|
|
29
29
|
potentialCenter: toTime((_settings$potentialCe = settings.potentialCenter) !== null && _settings$potentialCe !== void 0 ? _settings$potentialCe : '12:00'),
|
|
30
30
|
eventDensity: (_settings$defaultEven2 = settings.defaultEventDensity) !== null && _settings$defaultEven2 !== void 0 ? _settings$defaultEven2 : 0,
|
|
31
|
-
maxEventLengthVariance: 0,
|
|
31
|
+
maxEventLengthVariance: (_settings$defaultEven3 = settings.defaultEventDurationVariance) !== null && _settings$defaultEven3 !== void 0 ? _settings$defaultEven3 : 0,
|
|
32
32
|
maxNumWorkingHours: (_settings$defaultMaxN = settings.defaultMaxNumWorkingHours) !== null && _settings$defaultMaxN !== void 0 ? _settings$defaultMaxN : 40,
|
|
33
33
|
maxNumDailyWorkingHours: (_settings$defaultMaxN2 = settings.defaultMaxNumDailyWorkingHours) !== null && _settings$defaultMaxN2 !== void 0 ? _settings$defaultMaxN2 : 8,
|
|
34
34
|
dependencyRank: (_settings$defaultDepe2 = settings.defaultDependencyRank) !== null && _settings$defaultDepe2 !== void 0 ? _settings$defaultDepe2 : 0,
|
|
@@ -36,7 +36,7 @@ var _default = settings => {
|
|
|
36
36
|
dayRank: (_settings$defaultDayR = settings.defaultDayRank) !== null && _settings$defaultDayR !== void 0 ? _settings$defaultDayR : 0,
|
|
37
37
|
groupWeight: (_settings$defaultGrou3 = settings.defaultGroupWeight) !== null && _settings$defaultGrou3 !== void 0 ? _settings$defaultGrou3 : 0,
|
|
38
38
|
collectionWeight: (_settings$defaultCour = settings.defaultCourseWeight) !== null && _settings$defaultCour !== void 0 ? _settings$defaultCour : 0,
|
|
39
|
-
eventWeight: (_settings$
|
|
39
|
+
eventWeight: (_settings$defaultEven4 = settings.defaultEventWeight) !== null && _settings$defaultEven4 !== void 0 ? _settings$defaultEven4 : 0
|
|
40
40
|
};
|
|
41
41
|
return res;
|
|
42
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","mappings":";;;;;;;AAIA,SAASA,MAAT,CAAiBC,GAAjB,EAA4B;AAC1B,SAAOC,UAAU,CAACD,GAAG,CAACE,OAAJ,CAAY,GAAZ,EAAiB,GAAjB,CAAD,CAAjB;AACD;;eAEeC,QAAD,IAAwC;AAAA;;AAErD,MAAM;AAAEC,YAAF;AAAYC;AAAZ,MAAuBF,QAA7B;AAEA,MAAK,CAAEC,QAAP,EAAiB,MAAM,IAAIE,KAAJ,CAAU,wCAAV,CAAN;AACjB,MAAK,CAAED,MAAP,EAAiB,MAAM,IAAIC,KAAJ,CAAU,sCAAV,CAAN;AAEjB,MAAIC,GAAG,GAAG;AACRC,aAAS,EAAmB,CAAC;AAAEC,SAAG,EAAEV,MAAM,CAACK,QAAD,CAAb;AAAyBM,SAAG,EAAEX,MAAM,CAACM,MAAD;AAApC,KAAD,CADpB;AAGRM,uBAAmB,2BAASR,QAAQ,CAACS,8BAAlB,yEAAyD,CAHpE;AAIRC,4BAAwB,2BAAIV,QAAQ,CAACW,mCAAb,yEAAoD,CAJpE;AAKRC,uBAAmB,2BAASZ,QAAQ,CAACa,8BAAlB,yEAAyD,CALpE;AAORC,mBAAe,EAAMlB,MAAM,0BAACI,QAAQ,CAACc,eAAV,yEAAiD,OAAjD,CAPnB;AAQRC,gBAAY,4BAAgBf,QAAQ,CAACgB,mBAAzB,2EAAgE,CARpE;AAURC,0BAAsB,
|
|
1
|
+
{"version":3,"file":"default.js","mappings":";;;;;;;AAIA,SAASA,MAAT,CAAiBC,GAAjB,EAA4B;AAC1B,SAAOC,UAAU,CAACD,GAAG,CAACE,OAAJ,CAAY,GAAZ,EAAiB,GAAjB,CAAD,CAAjB;AACD;;eAEeC,QAAD,IAAwC;AAAA;;AAErD,MAAM;AAAEC,YAAF;AAAYC;AAAZ,MAAuBF,QAA7B;AAEA,MAAK,CAAEC,QAAP,EAAiB,MAAM,IAAIE,KAAJ,CAAU,wCAAV,CAAN;AACjB,MAAK,CAAED,MAAP,EAAiB,MAAM,IAAIC,KAAJ,CAAU,sCAAV,CAAN;AAEjB,MAAIC,GAAG,GAAG;AACRC,aAAS,EAAmB,CAAC;AAAEC,SAAG,EAAEV,MAAM,CAACK,QAAD,CAAb;AAAyBM,SAAG,EAAEX,MAAM,CAACM,MAAD;AAApC,KAAD,CADpB;AAGRM,uBAAmB,2BAASR,QAAQ,CAACS,8BAAlB,yEAAyD,CAHpE;AAIRC,4BAAwB,2BAAIV,QAAQ,CAACW,mCAAb,yEAAoD,CAJpE;AAKRC,uBAAmB,2BAASZ,QAAQ,CAACa,8BAAlB,yEAAyD,CALpE;AAORC,mBAAe,EAAMlB,MAAM,0BAACI,QAAQ,CAACc,eAAV,yEAAiD,OAAjD,CAPnB;AAQRC,gBAAY,4BAAgBf,QAAQ,CAACgB,mBAAzB,2EAAgE,CARpE;AAURC,0BAAsB,4BAAMjB,QAAQ,CAACkB,4BAAf,2EAAsD,CAVpE;AAYRC,sBAAkB,2BAAUnB,QAAQ,CAACoB,yBAAnB,yEAA0D,EAZpE;AAaRC,2BAAuB,4BAAKrB,QAAQ,CAACsB,8BAAd,2EAAqD,CAbpE;AAeRC,kBAAc,4BAAcvB,QAAQ,CAACwB,qBAAvB,2EAA8D,CAfpE;AAgBRC,aAAS,4BAAmBzB,QAAQ,CAAC0B,gBAA5B,2EAAmE,CAhBpE;AAiBRC,WAAO,2BAAqB3B,QAAQ,CAAC4B,cAA9B,yEAAqE,CAjBpE;AAmBRC,eAAW,4BAAiB7B,QAAQ,CAAC8B,kBAA1B,2EAAiE,CAnBpE;AAoBRC,oBAAgB,2BAAY/B,QAAQ,CAACgC,mBAArB,yEAA4D,CApBpE;AAqBRC,eAAW,4BAAiBjC,QAAQ,CAACkC,kBAA1B,2EAAiE;AArBpE,GAAV;AAwBA,SAAO9B,GAAP;AACD,C","names":["toTime","str","parseFloat","replace","settings","dayStart","dayEnd","Error","res","intervals","beg","end","groupMinBreakLength","defaultGroupMinimumBreakLength","dependencyMinBreakLength","defaultDependencyMinimumBreakLength","eventMinBreakLength","defaultEventMinimumBreakLength","potentialCenter","eventDensity","defaultEventDensity","maxEventLengthVariance","defaultEventDurationVariance","maxNumWorkingHours","defaultMaxNumWorkingHours","maxNumDailyWorkingHours","defaultMaxNumDailyWorkingHours","dependencyRank","defaultDependencyRank","groupRank","defaultGroupRank","dayRank","defaultDayRank","groupWeight","defaultGroupWeight","collectionWeight","defaultCourseWeight","eventWeight","defaultEventWeight"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/default.ts"],"sourcesContent":[null]}
|
|
@@ -20,7 +20,7 @@ var _default = (lockedTimes, options) => {
|
|
|
20
20
|
|
|
21
21
|
var docs = Array.isArray(lockedTimes) ? lockedTimes : [lockedTimes];
|
|
22
22
|
var idKey = (_options$idKey = options.idKey) !== null && _options$idKey !== void 0 ? _options$idKey : 'id';
|
|
23
|
-
return docs.map(lockedTime => {
|
|
23
|
+
return docs.filter(x => !!x).map(lockedTime => {
|
|
24
24
|
var {
|
|
25
25
|
_id,
|
|
26
26
|
intervals,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-locked-times.js","mappings":";;;;;;;AAMA;;;;;;;;;;eAIe,CAACA,WAAD,EACCC,OADD,KACkD;AAAA;;AAE/D,MAAIC,IAAI,GAAwBC,KAAK,CAACC,OAAN,CAAcJ,WAAd,IAA6BA,WAA7B,GAA2C,CAACA,WAAD,CAA3E;AACA,MAAIK,KAAK,qBAAoCJ,OAAO,CAACI,KAA5C,2DAAqD,IAA9D;AAEA,SAAOH,IAAI,CAACI,
|
|
1
|
+
{"version":3,"file":"dynamic-locked-times.js","mappings":";;;;;;;AAMA;;;;;;;;;;eAIe,CAACA,WAAD,EACCC,OADD,KACkD;AAAA;;AAE/D,MAAIC,IAAI,GAAwBC,KAAK,CAACC,OAAN,CAAcJ,WAAd,IAA6BA,WAA7B,GAA2C,CAACA,WAAD,CAA3E;AACA,MAAIK,KAAK,qBAAoCJ,OAAO,CAACI,KAA5C,2DAAqD,IAA9D;AAEA,SAAOH,IAAI,CAACI,MAAL,CAAYC,CAAC,IAAI,CAAC,CAACA,CAAnB,EAAsBC,GAAtB,CAA2BC,UAAD,IAA6C;AAC5E,QAAM;AAAEC,SAAF;AAAOC,eAAP;AAAkBC,cAAlB;AAA4BC,sBAA5B;AAA8CC;AAA9C,QAA4DL,UAAlE;;AAEA,QAAMM,EAAE,GAAW,CAACN,UAAU,CAACJ,KAAD,CAAV,IAA+CI,UAAU,CAACC,GAA3D,EAAiEM,QAAjE,EAAnB;;AAEA,QAAIJ,QAAQ,IAAI,IAAhB,EACE,MAAM,IAAIK,KAAJ,CAAU,iCAAV,CAAN;AAEF,QAAIL,QAAQ,GAAG,CAAf,EACE,MAAM,IAAIK,KAAJ,CAAU,4CAAV,CAAN;;AAEF,QAAIC,GAAG;AACLH,QAAE,wBAAoBL,GAApB,CADG;AAELS,YAAM,EAAEL,SAAF,aAAEA,SAAF,uBAAEA,SAAS,CAAEN,GAAX,CAAe;AAAA,YAAC;AAAEY;AAAF,SAAD;AAAA,eAAYA,EAAE,CAACf,KAAD,CAAd;AAAA,OAAf,CAFH;AAGLgB,YAAM,EAAET;AAHH,OAIFC,gBAAgB,IAAI,IAApB,IAA6B;AAAES,uBAAiB,EAAET;AAArB,KAJ3B;AAKLF,eAAS,EAAE,yBAAWA,SAAX;AALN,MAAP;;AAQA,WAAOO,GAAP;AACD,GApBM,CAAP;AAqBD,C","names":["lockedTimes","options","docs","Array","isArray","idKey","filter","x","map","lockedTime","_id","intervals","duration","durationVariance","coalesced","id","toString","Error","doc","groups","to","length","maxLengthVariance"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/dynamic-locked-times.ts"],"sourcesContent":[null]}
|
|
@@ -12,6 +12,7 @@ export interface DivisionSettingsBare {
|
|
|
12
12
|
defaultEventMinimumBreakLength?: number;
|
|
13
13
|
potentialCenter?: string;
|
|
14
14
|
defaultEventDensity?: number;
|
|
15
|
+
defaultEventDurationVariance?: number;
|
|
15
16
|
defaultMaxNumWorkingHours?: number | boolean;
|
|
16
17
|
defaultMaxNumDailyWorkingHours?: number | boolean;
|
|
17
18
|
defaultDayRank?: number;
|