@royalschedule/maps 2.2.94 → 2.2.96

package/dist/RS/v2/from/collections.js

@@ -20,11 +20,9 @@ function _course(course, teachersList, groupsList, settings) {
   var idKey = settings.collectionIdKey;
   if (!idKey) throw new Error('(RS::V2::From::Collections) Property "collectionIdKey" in settings is undefined');
   if (!course[idKey]) throw new Error('(RS::V2::From::Collections) A course missing a unique key');
-  var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
     ids: course[idKey]
-  }, overlapGroup != null && {
-    overlapGroup: overlapGroup.toString()
-  }), course.name && {
+  }, course.name && {
     displayName: course.name
   }), course.subject && {
     subject: course.subject
@@ -56,7 +54,7 @@ function _course(course, teachersList, groupsList, settings) {
     return acc;
   }, []);
   if (((_doc$teachers$length = (_doc$teachers = doc.teachers) === null || _doc$teachers === void 0 ? void 0 : _doc$teachers.length) !== null && _doc$teachers$length !== void 0 ? _doc$teachers$length : 0) + ((_doc$groups$length = (_doc$groups = doc.groups) === null || _doc$groups === void 0 ? void 0 : _doc$groups.length) !== null && _doc$groups$length !== void 0 ? _doc$groups$length : 0) !== (course.groups || []).length) throw new Error("(RS::V2::From::Collections) Length of teachers + groups does not match length of groups in input for course ".concat(course[idKey]));
-  if ((course.events || []).length) doc.events = (0, _courseEvents.default)(course.events, course, teachersList, groupsList, settings);
+  if ((course.events || []).length) doc.events = (0, _courseEvents.default)(course.events, course, teachersList, groupsList, settings, overlapGroup);
   return doc;
 }
 var reduceCourses = function reduceCourses(courses, teachersList, groupsList, settings) {

package/dist/RS/v2/from/collections.js.map

@@ -1 +1 @@
-{"version":3,"file":"collections.js","mappings":"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","names":["_course","course","teachersList","groupsList","settings","overlapGroup","idKey","collectionIdKey","Error","doc","ids","toString","name","displayName","subject","color","minBreakLength","density","weight","potentialCenter","dependencies","locations","intervals","lockedTimes","days","teachers","groups","flat","reduce","acc","gId","indexOf","concat","length","events","reduceCourses","courses","Array","isArray","_overlapGroup","innerCourse"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/collections.ts"],"sourcesContent":[null]}
+{"version":3,"file":"collections.js","mappings":"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","names":["_course","course","teachersList","groupsList","settings","overlapGroup","idKey","collectionIdKey","Error","doc","ids","name","displayName","subject","color","minBreakLength","density","weight","potentialCenter","toString","dependencies","locations","intervals","lockedTimes","days","teachers","groups","flat","reduce","acc","gId","indexOf","concat","length","events","reduceCourses","courses","Array","isArray","_overlapGroup","innerCourse"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/collections.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/course-events.d.ts

@@ -3,6 +3,6 @@ import { CourseEvent } from '../types/course-events';
 import { Collection } from '../types/collections';
 import { Types as CoreTypes } from '../../../core/types';
 import { Serialized, Deserialized } from '../../../core/types/common';
-type RetrunType = Deserialized<CoreTypes.courseEvent> & Serialized<Pick<CoreTypes.courseEvent, 'teachers' | 'groups'>>;
-declare const _default: (courseEvents: (CourseEvent | number)[], course: Collection, teachersList: string[], groupsList: string[], settings: Settings) => RetrunType[];
+type ReturnType = Deserialized<CoreTypes.courseEvent> & Serialized<Pick<CoreTypes.courseEvent, 'teachers' | 'groups'>>;
+declare const _default: (courseEvents: (CourseEvent | number)[], course: Collection, teachersList: string[], groupsList: string[], settings: Settings, overlapGroup?: number | null) => ReturnType[];
 export default _default;

package/dist/RS/v2/from/course-events.js

@@ -14,7 +14,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
-var _default = (courseEvents, course, teachersList, groupsList, settings) => {
+var _default = function _default(courseEvents, course, teachersList, groupsList, settings) {
+  var overlapGroup = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
   var collectionIdKey = settings.collectionIdKey;
   var eventIdKey = settings.eventIdKey;
   if (!collectionIdKey) throw new Error('(RS::V2::From::CourseEvents) Property "collectionIdKey" in settings is undefined');

package/dist/RS/v2/from/course-events.js.map

@@ -1 +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","toString","minBreakLength","durationVariance","maxLengthVariance","intervals","lockedTimes","dependencies","locations","days"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/course-events.ts"],"sourcesContent":[null]}
+{"version":3,"file":"course-events.js","mappings":"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","names":["courseEvents","course","teachersList","groupsList","settings","overlapGroup","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","toString","minBreakLength","durationVariance","maxLengthVariance","intervals","lockedTimes","dependencies","locations","days"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/course-events.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/index.d.ts

@@ -1,6 +1,6 @@
 export default class {
     static availableDependency: (data: any, settings: import("../types/settings").Settings) => any;
-    static courseEvent: (courseEvents: (number | import("../types/course-events").CourseEvent)[], course: import("../types/collections").Collection, teachersList: string[], groupsList: string[], settings: import("../types/settings").Settings) => (import("../../../core/types/common").Deserialized<import("../../../core/types/course-events").CourseEvent> & import("../../../core/types/common").Serialized<Pick<import("../../../core/types/course-events").CourseEvent, "groups" | "teachers">>)[];
+    static courseEvent: (courseEvents: (number | import("../types/course-events").CourseEvent)[], course: import("../types/collections").Collection, teachersList: string[], groupsList: string[], settings: import("../types/settings").Settings, overlapGroup?: number | null) => (import("../../../core/types/common").Deserialized<import("../../../core/types/course-events").CourseEvent> & import("../../../core/types/common").Serialized<Pick<import("../../../core/types/course-events").CourseEvent, "groups" | "teachers">>)[];
     static collection: (courses: (import("../types/course-events").CourseEvent | import("../types/collections").Collection | (import("../types/course-events").CourseEvent | import("../types/collections").Collection)[])[], teachersList: string[], groupsList: string[], settings: import("../types/settings").Settings, overlapGroup?: number) => import("../../../core/types/common").Deserialized<import("../../../core/types/courses").Course>[];
     static day: (days: (number | import("../types/days").Day)[], settings: import("../types/settings").Settings) => import("../../../core/types/days").Day[];
     static dependency: (dependencies: (string | import("../types/dependencies").Dependency)[], settings: import("../types/settings").Settings) => import("../../../core/types/common").Deserialized<import("../../../core/types/locations").Location>[];

package/dist/RS/v2/from/schedules.js

@@ -59,7 +59,35 @@ var _default2 = schedule => {
       });
     });
   }
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _locations && {
+  var overlapGroups = [];
+  events === null || events === void 0 ? void 0 : events.forEach(x => {
+    if (Array.isArray(x)) {
+      var overlapGroup = {
+        id: overlapGroups.length.toString(),
+        coalesced: [],
+        species: []
+      };
+      var collections = x.filter(c => 'events' in c);
+      var _events = collections.flatMap(c => c.events || []).filter(e => !_lodash.default.isNumber(e));
+      collections.forEach(c => {
+        var _overlapGroup$coalesc;
+        return (_overlapGroup$coalesc = overlapGroup.coalesced) === null || _overlapGroup$coalesc === void 0 ? void 0 : _overlapGroup$coalesc.push({
+          to: c.id,
+          toModel: 'courses'
+        });
+      });
+      _events.filter(e => !!e.forcedOverlapId).forEach(e => {
+        var _overlapGroup$species;
+        return (_overlapGroup$species = overlapGroup.species) === null || _overlapGroup$species === void 0 ? void 0 : _overlapGroup$species.push({
+          id: e.forcedOverlapId,
+          to: e.id,
+          toModel: 'courseevents'
+        });
+      });
+      overlapGroups.push(overlapGroup);
+    }
+  });
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _locations && {
     locations: _locations
   }), _teachers && {
     teachers: _teachers
@@ -71,6 +99,8 @@ var _default2 = schedule => {
     area: areas
   }), settings && {
     settings: (0, _settings.default)(settings, _default)
+  }), {}, {
+    overlapGroups: overlapGroups
   });
 };
 exports.default = _default2;

package/dist/RS/v2/from/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","mappings":";;;;;;AAAA;AAOA;AACA;AACA;AACA;AACA;AACA;AAA+D;AAAA;AAAA;AAAA;AAAA,gBAE/CA,QAAkB,IAAsC;EACtE,IAAI;IACFC,KAAK,EAAE;MACLC,QAAQ;MACRC,OAAO,EAAEC,QAAQ;MACjBC,YAAY;MACZC,MAAM;MACNC,MAAM;MACNC;IAAK,CACN,GAAG;EAAE,CACP,GAAGR,QAAQ;EAEZ,IAAM,CAACS,aAAa,EAAE,GAAGC,IAAI,CAAC,GAAGV,QAAQ,CAACW,MAAM,IAAI,EAAE;EAEtD,IAAIC,QAA6D;EACjE,IAAIC,OAA6D;EACjE,IAAIC,SAA6D;EACjE,IAAIC,UAA6D;EAEjE,IAAI,CAAEb,QAAQ,EACZ,MAAM,IAAIc,KAAK,0DAA0D;EAE3E,IAAIX,YAAY,EACdU,UAAU,GAAK,yBAAe,EAACV,YAAY,EAAEH,QAAQ,CAAC;EACxD,IAAII,MAAM,EACRQ,SAAS,GAAM,sBAAW,EAACR,MAAM,EAAEJ,QAAQ,CAAC;EAC9C,IAAII,MAAM,EACRO,OAAO,GAAQ,oBAAS,EAACP,MAAM,EAAEJ,QAAQ,CAAC;EAC5C,IAAIK,MAAM,EACRK,QAAQ,GAAO,wBAAc,EAACL,MAAO,EACP,CAACO,SAAS,IAAI,EAAE,EAAEG,GAAG,CAACC,CAAC,IAAGA,CAAC,CAACC,GAAI,CAAC,CAACC,MAAM,CAACC,OAAO,CAAC,EACjD,CAACR,OAAO,IAAI,EAAE,EAAEI,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACC,GAAI,CAAC,CAACC,MAAM,CAACC,OAAO,CAAC,EAChDnB,QAAQ,CAAC;EAEzC,IAAIO,aAAa,EAAE;IACjB,IAAM,CAACa,WAAW,CAAC,GAAG,wBAAa,EAACb,aAAa,EAAE;MAAEc,KAAK,EAAE;IAAK,CAAE,CAAC;IAEpE,IAAIC,CAAC,GAAW,CAAC,CAAC;IAElBjB,MAAM,aAANA,MAAM,uBAANA,MAAM,CAAEkB,OAAO,CAAEC,UAAU,IAAI;MAAA;MAC7B,IAAIC,KAAK,CAACC,OAAO,CAACF,UAAU,CAAC,EAC3B;MAEF,IAAI,EAAG,QAAQ,IAAIA,UAAU,CAAC,EAC5B;MAEF,gCAAU,CAACnB,MAAM,uDAAjB,mBAAmBkB,OAAO,CAACI,KAAK,IAAG;QACjC,IAAIC,eAAC,CAACC,QAAQ,CAACF,KAAK,CAAC,EACnB;QAEFL,CAAC,EAAE;QACH,IAAMQ,YAAY,GAAGV,WAAW,CAACW,IAAI,CAAC;UAAA,IAAC;YAAEd;UAAG,CAAE;UAAA,OAAKA,GAAG,IAAIU,KAAK,CAACK,EAAE;QAAA,EAAC;QAEnE,IAAIF,YAAY,EACd,OAAOG,MAAM,CAACC,MAAM,CAACP,KAAK,EAAEG,YAAY,CAAC;QAE3C,OAAOG,MAAM,CAACC,MAAM,CAACP,KAAK,EAAEP,WAAW,CAACE,CAAC,CAAC,CAAC;MAC7C,CAAC,CAAC;IACJ,CAAC,CAAC;;EAGJ,+FACKT,UAAU,IAAI;IAAEsB,SAAS,EAAEtB;EAAU,CAAE,GACvCD,SAAS,IAAK;IAAEwB,QAAQ,EAAGxB;EAAS,CAAE,GACtCR,MAAM,IAAQ;IAAEA,MAAM,EAAKO;EAAO,CAAE,GACpCN,MAAM,IAAQ;IAAEgC,OAAO,EAAI3B;EAAQ,CAAE,GACrCJ,KAAK,IAAS;IAAEgC,IAAI,EAAEhC;EAAK,CAAE,GAC7BN,QAAQ,IAAM;IAAEA,QAAQ,EAAE,qBAAW,EAACA,QAAQ,EAAEE,QAAS;EAAC,CAAE;AAEnE,CAAC;AAAA","names":["schedule","input","settings","default","_default","dependencies","groups","events","areas","configuration","meta","output","_courses","_groups","_teachers","_locations","Error","map","x","ids","filter","Boolean","_placements","idKey","i","forEach","collection","Array","isArray","event","_","isNumber","_placedEvent","find","id","Object","assign","locations","teachers","courses","area"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/schedules.ts"],"sourcesContent":[null]}
+{"version":3,"file":"schedules.js","mappings":"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","names":["schedule","input","settings","default","_default","dependencies","groups","events","areas","configuration","meta","output","_courses","_groups","_teachers","_locations","Error","map","x","ids","filter","Boolean","_placements","idKey","i","forEach","collection","Array","isArray","event","_","isNumber","_placedEvent","find","id","Object","assign","overlapGroups","overlapGroup","length","toString","coalesced","species","collections","c","flatMap","e","push","to","toModel","forcedOverlapId","locations","teachers","courses","area"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/schedules.ts"],"sourcesContent":[null]}

package/dist/RS/v2/to/default.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
 function toTime(str) {
   return parseFloat(str.replace(':', '.'));
 }
@@ -15,8 +18,8 @@ var _default = (settings, periodMap) => {
   } = settings;
   if (!dayStart) throw new Error('(RS::V2::To::Default) "dayStart" is falsy');
   if (!dayEnd) throw new Error('(RS::V2::To::Default) "dayEnd" is falsy');
-  if (!periodMap.has((_settings$period = settings.period) === null || _settings$period === void 0 ? void 0 : _settings$period.id)) throw new Error('(RS::V2::To::Default) "period" is not in periodMap');
-  var res = {
+  if (periodMap.size && !periodMap.has((_settings$period = settings.period) === null || _settings$period === void 0 ? void 0 : _settings$period.id)) throw new Error('(RS::V2::To::Default) "period" is not in periodMap');
+  var res = _objectSpread({
     intervals: [{
       beg: toTime(dayStart),
       end: toTime(dayEnd)
@@ -34,9 +37,10 @@ var _default = (settings, periodMap) => {
     dayRank: (_settings$defaultDayR = settings.defaultDayRank) !== null && _settings$defaultDayR !== void 0 ? _settings$defaultDayR : 0,
     groupWeight: (_settings$defaultGrou3 = settings.defaultGroupWeight) !== null && _settings$defaultGrou3 !== void 0 ? _settings$defaultGrou3 : 0,
     collectionWeight: (_settings$defaultCour = settings.defaultCourseWeight) !== null && _settings$defaultCour !== void 0 ? _settings$defaultCour : 0,
-    eventWeight: (_settings$defaultEven4 = settings.defaultEventWeight) !== null && _settings$defaultEven4 !== void 0 ? _settings$defaultEven4 : 0,
+    eventWeight: (_settings$defaultEven4 = settings.defaultEventWeight) !== null && _settings$defaultEven4 !== void 0 ? _settings$defaultEven4 : 0
+  }, periodMap.size && {
     period: periodMap.get((_settings$period2 = settings.period) === null || _settings$period2 === void 0 ? void 0 : _settings$period2.id)
-  };
+  });
   return res;
 };
 exports.default = _default;

package/dist/RS/v2/to/default.js.map

@@ -1 +1 @@
-{"version":3,"file":"default.js","mappings":";;;;;;AAMA,SAASA,MAAM,CAAEC,GAAW;EAC1B,OAAOC,UAAU,CAACD,GAAG,CAACE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC1C;AAAC,eAIc,CACbC,QAAyC,EACzCC,SAA0C,KAC/B;EAAA;EAGX,IAAM;IAAEC,QAAQ;IAAEC;EAAM,CAAE,GAAGH,QAAQ;EAErC,IAAK,CAAEE,QAAQ,EAAE,MAAM,IAAIE,KAAK,CAAC,2CAA2C,CAAC;EAC7E,IAAK,CAAED,MAAM,EAAI,MAAM,IAAIC,KAAK,CAAC,yCAAyC,CAAC;EAE3E,IAAK,CAAEH,SAAS,CAACI,GAAG,qBAACL,QAAQ,CAACM,MAAM,qDAAf,iBAAiBC,EAAE,CAAC,EAAE,MAAM,IAAIH,KAAK,CAAC,oDAAoD,CAAC;EAEhH,IAAII,GAAG,GAAY;IACjBC,SAAS,EAAmB,CAAC;MAAEC,GAAG,EAAEd,MAAM,CAACM,QAAQ,CAAC;MAAES,GAAG,EAAEf,MAAM,CAACO,MAAM;IAAC,CAAE,CAAC;IAE5ES,mBAAmB,2BAASZ,QAAQ,CAACa,8BAA8B,yEAAS,CAAC;IAC7EC,wBAAwB,2BAAId,QAAQ,CAACe,mCAAmC,yEAAI,CAAC;IAC7EC,mBAAmB,2BAAShB,QAAQ,CAACiB,8BAA8B,yEAAS,CAAC;IAE7EC,eAAe,EAAMtB,MAAM,0BAACI,QAAQ,CAACkB,eAAe,yEAAwB,OAAO,CAAC;IACpFC,YAAY,4BAAgBnB,QAAQ,CAACoB,mBAAmB,2EAAoB,CAAC;IAE7EC,sBAAsB,4BAAMrB,QAAQ,CAACsB,4BAA4B,2EAAW,CAAC;IAE7EC,kBAAkB,2BAAUvB,QAAQ,CAACwB,yBAAyB,yEAAc,EAAE;IAC9EC,uBAAuB,4BAAKzB,QAAQ,CAAC0B,8BAA8B,2EAAS,CAAC;IAE7EC,cAAc,4BAAc3B,QAAQ,CAAC4B,qBAAqB,2EAAkB,CAAC;IAC7EC,SAAS,4BAAmB7B,QAAQ,CAAC8B,gBAAgB,2EAAuB,CAAC;IAC7EC,OAAO,2BAAqB/B,QAAQ,CAACgC,cAAc,yEAAyB,CAAC;IAE7EC,WAAW,4BAAiBjC,QAAQ,CAACkC,kBAAkB,2EAAqB,CAAC;IAC7EC,gBAAgB,2BAAYnC,QAAQ,CAACoC,mBAAmB,yEAAoB,CAAC;IAC7EC,WAAW,4BAAiBrC,QAAQ,CAACsC,kBAAkB,2EAAqB,CAAC;IAE7EhC,MAAM,EAAsBL,SAAS,CAACsC,GAAG,sBAACvC,QAAQ,CAACM,MAAM,sDAAf,kBAAiBC,EAAE;GAC9D;EAED,OAAOC,GAAG;AACZ,CAAC;AAAA","names":["toTime","str","parseFloat","replace","settings","periodMap","dayStart","dayEnd","Error","has","period","id","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","get"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/default.ts"],"sourcesContent":[null]}
+{"version":3,"file":"default.js","mappings":";;;;;;;;;AAMA,SAASA,MAAM,CAAEC,GAAW;EAC1B,OAAOC,UAAU,CAACD,GAAG,CAACE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC1C;AAAC,eAIc,CACbC,QAAyC,EACzCC,SAA0C,KAC/B;EAAA;EAGX,IAAM;IAAEC,QAAQ;IAAEC;EAAM,CAAE,GAAGH,QAAQ;EAErC,IAAK,CAAEE,QAAQ,EAAE,MAAM,IAAIE,KAAK,CAAC,2CAA2C,CAAC;EAC7E,IAAK,CAAED,MAAM,EAAI,MAAM,IAAIC,KAAK,CAAC,yCAAyC,CAAC;EAE3E,IAAIH,SAAS,CAACI,IAAI,IAAI,CAAEJ,SAAS,CAACK,GAAG,qBAACN,QAAQ,CAACO,MAAM,qDAAf,iBAAiBC,EAAE,CAAC,EAAE,MAAM,IAAIJ,KAAK,CAAC,oDAAoD,CAAC;EAEjI,IAAIK,GAAG;IACLC,SAAS,EAAmB,CAAC;MAAEC,GAAG,EAAEf,MAAM,CAACM,QAAQ,CAAC;MAAEU,GAAG,EAAEhB,MAAM,CAACO,MAAM;IAAC,CAAE,CAAC;IAE5EU,mBAAmB,2BAASb,QAAQ,CAACc,8BAA8B,yEAAS,CAAC;IAC7EC,wBAAwB,2BAAIf,QAAQ,CAACgB,mCAAmC,yEAAI,CAAC;IAC7EC,mBAAmB,2BAASjB,QAAQ,CAACkB,8BAA8B,yEAAS,CAAC;IAE7EC,eAAe,EAAMvB,MAAM,0BAACI,QAAQ,CAACmB,eAAe,yEAAwB,OAAO,CAAC;IACpFC,YAAY,4BAAgBpB,QAAQ,CAACqB,mBAAmB,2EAAoB,CAAC;IAE7EC,sBAAsB,4BAAMtB,QAAQ,CAACuB,4BAA4B,2EAAW,CAAC;IAE7EC,kBAAkB,2BAAUxB,QAAQ,CAACyB,yBAAyB,yEAAc,EAAE;IAC9EC,uBAAuB,4BAAK1B,QAAQ,CAAC2B,8BAA8B,2EAAS,CAAC;IAE7EC,cAAc,4BAAc5B,QAAQ,CAAC6B,qBAAqB,2EAAkB,CAAC;IAC7EC,SAAS,4BAAmB9B,QAAQ,CAAC+B,gBAAgB,2EAAuB,CAAC;IAC7EC,OAAO,2BAAqBhC,QAAQ,CAACiC,cAAc,yEAAyB,CAAC;IAE7EC,WAAW,4BAAiBlC,QAAQ,CAACmC,kBAAkB,2EAAqB,CAAC;IAC7EC,gBAAgB,2BAAYpC,QAAQ,CAACqC,mBAAmB,yEAAoB,CAAC;IAC7EC,WAAW,4BAAiBtC,QAAQ,CAACuC,kBAAkB,2EAAqB;EAAC,GAE1EtC,SAAS,CAACI,IAAI,IAAI;IAAEE,MAAM,EAAEN,SAAS,CAACuC,GAAG,sBAACxC,QAAQ,CAACO,MAAM,sDAAf,kBAAiBC,EAAE;EAAE,CAAE,CACrE;EAED,OAAOC,GAAG;AACZ,CAAC;AAAA","names":["toTime","str","parseFloat","replace","settings","periodMap","dayStart","dayEnd","Error","size","has","period","id","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","get"],"sourceRoot":"","sources":["../../../../src/RS/v2/to/default.ts"],"sourcesContent":[null]}

package/dist/RS/v2/types/course-events.d.ts

@@ -20,4 +20,5 @@ export interface CourseEvent {
     groups?: string[][];
     dependencies?: (AvailableDependency[] | AvailableDependency | string | string[])[];
     period?: number;
+    forcedOverlapId?: string;
 }

package/dist/RS/v2/types/default.d.ts

@@ -16,5 +16,5 @@ export interface Default {
     groupWeight: number;
     collectionWeight: number;
     eventWeight: number;
-    period: number;
+    period?: number;
 }

package/dist/SS12000/to/persons.js

@@ -29,10 +29,10 @@ var _default = (persons, belongsTo) => {
       sex: person.sex ? _lodash.default.get(SexMap, person.sex, 'Okänt') : 'Okänt'
     }, person.displayName && {
       displayName: person.displayName
-    }), person.firstname && {
-      givenName: person.firstname
-    }), person.lastname && {
-      familyName: person.lastname
+    }), person.firstName && {
+      givenName: person.firstName
+    }), person.lastName && {
+      familyName: person.lastName
     }), person.SSN && {
       civicNo: person.SSN
     }), person.emails && {

package/dist/SS12000/to/persons.js.map

@@ -1 +1 @@
-{"version":3,"file":"persons.js","mappings":";;;;;;AAAA;AACA;AAAyD;AAAA;AAAA;AAAA;AAOzD,IAAMA,MAAM,GAAgE;EAAEC,GAAG,EAAE,KAAK;EAAEC,KAAK,EAAE;AAAQ,CAAE;AAAC,eAE7F,CAACC,OAAyC,EAAEC,SAA8B,KAAc;EACrG,IAAI,CAAEC,KAAK,CAACC,OAAO,CAACH,OAAO,CAAC,EAC1B,MAAM,IAAII,KAAK,CAAC,0DAA0D,CAAC;EAE7E,IAAI,CAAEJ,OAAO,CAACK,KAAK,CAAEC,MAAM,IAAKC,eAAC,CAACC,GAAG,CAACF,MAAM,EAAE,IAAI,CAAC,CAAC,EAClD,MAAM,IAAIF,KAAK,CAAC,6DAA6D,CAAC;EAEhF,IAAI,CAAEH,SAAS,IAAI,CAAED,OAAO,CAACK,KAAK,CAAEC,MAAM,IAAKC,eAAC,CAACC,GAAG,CAACF,MAAM,EAAE,WAAW,CAAC,CAAC,EACxE,MAAM,IAAIF,KAAK,CAAC,8EAA8E,CAAC;EAEjG,OAAOJ,OAAO,CAACS,GAAG,CAAEH,MAAM;IAAA;IAAA;MACxBI,EAAE,6BAAcT,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAES,EAAE,yDAAIJ,MAAM,CAACL,SAAU,CAACS,EAAG,cAAKJ,MAAM,CAACI,EAAG,CAAE;MACvEC,IAAI,EAAE;QACJC,OAAO,EAAgB,mBAAM,EAACN,MAAM,CAACO,SAAS,CAAC,CAACC,WAAW,EAAE;QAC7DC,QAAQ,EAAe,mBAAM,EAACT,MAAM,CAACU,SAAS,CAAC,CAACF,WAAW;OAC5D;MACDG,GAAG,EAASX,MAAM,CAACW,GAAG,GAAGV,eAAC,CAACW,GAAG,CAACrB,MAAM,EAAES,MAAM,CAACW,GAAG,EAAE,OAAO,CAAC,GAAG;IAAO,GAClEX,MAAM,CAACa,WAAW,IAAK;MAAEA,WAAW,EAAGb,MAAM,CAACa;IAAW,CAAE,GAC3Db,MAAM,CAACc,SAAS,IAAO;MAAEC,SAAS,EAAKf,MAAM,CAACc;IAAS,CAAE,GACzDd,MAAM,CAACgB,QAAQ,IAAQ;MAAEC,UAAU,EAAIjB,MAAM,CAACgB;IAAQ,CAAE,GACxDhB,MAAM,CAACkB,GAAG,IAAa;MAAEC,OAAO,EAAOnB,MAAM,CAACkB;IAAG,CAAE,GACnDlB,MAAM,CAACoB,MAAM,IAAU;MAAEA,MAAM,EAAQpB,MAAM,CAACoB;IAAM,CAAE,GACtDpB,MAAM,CAACqB,YAAY,IAAI;MAAEA,YAAY,EAAErB,MAAM,CAACqB;IAAY,CAAE;EAAA,CAC/D,CAAC;AACL,CAAC;AAAA","names":["SexMap","Man","Woman","persons","belongsTo","Array","isArray","Error","every","person","_","has","map","id","meta","created","createdAt","toISOString","modified","updatedAt","sex","get","displayName","firstname","givenName","lastname","familyName","SSN","civicNo","emails","phoneNumbers"],"sourceRoot":"","sources":["../../../src/SS12000/to/persons.ts"],"sourcesContent":[null]}
+{"version":3,"file":"persons.js","mappings":";;;;;;AAAA;AACA;AAAyD;AAAA;AAAA;AAAA;AAOzD,IAAMA,MAAM,GAAgE;EAAEC,GAAG,EAAE,KAAK;EAAEC,KAAK,EAAE;AAAQ,CAAE;AAAC,eAE7F,CAACC,OAAyC,EAAEC,SAA8B,KAAc;EACrG,IAAI,CAAEC,KAAK,CAACC,OAAO,CAACH,OAAO,CAAC,EAC1B,MAAM,IAAII,KAAK,CAAC,0DAA0D,CAAC;EAE7E,IAAI,CAAEJ,OAAO,CAACK,KAAK,CAAEC,MAAM,IAAKC,eAAC,CAACC,GAAG,CAACF,MAAM,EAAE,IAAI,CAAC,CAAC,EAClD,MAAM,IAAIF,KAAK,CAAC,6DAA6D,CAAC;EAEhF,IAAI,CAAEH,SAAS,IAAI,CAAED,OAAO,CAACK,KAAK,CAAEC,MAAM,IAAKC,eAAC,CAACC,GAAG,CAACF,MAAM,EAAE,WAAW,CAAC,CAAC,EACxE,MAAM,IAAIF,KAAK,CAAC,8EAA8E,CAAC;EAEjG,OAAOJ,OAAO,CAACS,GAAG,CAAEH,MAAM;IAAA;IAAA;MACxBI,EAAE,6BAAcT,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAES,EAAE,yDAAIJ,MAAM,CAACL,SAAU,CAACS,EAAG,cAAKJ,MAAM,CAACI,EAAG,CAAE;MACvEC,IAAI,EAAE;QACJC,OAAO,EAAgB,mBAAM,EAACN,MAAM,CAACO,SAAS,CAAC,CAACC,WAAW,EAAE;QAC7DC,QAAQ,EAAe,mBAAM,EAACT,MAAM,CAACU,SAAS,CAAC,CAACF,WAAW;OAC5D;MACDG,GAAG,EAASX,MAAM,CAACW,GAAG,GAAGV,eAAC,CAACW,GAAG,CAACrB,MAAM,EAAES,MAAM,CAACW,GAAG,EAAE,OAAO,CAAC,GAAG;IAAO,GAClEX,MAAM,CAACa,WAAW,IAAK;MAAEA,WAAW,EAAGb,MAAM,CAACa;IAAW,CAAE,GAC3Db,MAAM,CAACc,SAAS,IAAO;MAAEC,SAAS,EAAKf,MAAM,CAACc;IAAS,CAAE,GACzDd,MAAM,CAACgB,QAAQ,IAAQ;MAAEC,UAAU,EAAIjB,MAAM,CAACgB;IAAQ,CAAE,GACxDhB,MAAM,CAACkB,GAAG,IAAa;MAAEC,OAAO,EAAOnB,MAAM,CAACkB;IAAG,CAAE,GACnDlB,MAAM,CAACoB,MAAM,IAAU;MAAEA,MAAM,EAAQpB,MAAM,CAACoB;IAAM,CAAE,GACtDpB,MAAM,CAACqB,YAAY,IAAI;MAAEA,YAAY,EAAErB,MAAM,CAACqB;IAAY,CAAE;EAAA,CAC/D,CAAC;AACL,CAAC;AAAA","names":["SexMap","Man","Woman","persons","belongsTo","Array","isArray","Error","every","person","_","has","map","id","meta","created","createdAt","toISOString","modified","updatedAt","sex","get","displayName","firstName","givenName","lastName","familyName","SSN","civicNo","emails","phoneNumbers"],"sourceRoot":"","sources":["../../../src/SS12000/to/persons.ts"],"sourcesContent":[null]}

package/dist/core/types/persons.d.ts

@@ -7,8 +7,8 @@ export interface PersonBare {
     belongsTo?: Edge<Division>;
     ids?: string;
     displayName?: string;
-    lastname?: string;
-    firstname?: string;
+    lastName?: string;
+    firstName?: string;
     birthDate?: Date;
     sex?: 'Man' | 'Woman';
     SSN?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@royalschedule/maps",
-  "version": "2.2.94",
+  "version": "2.2.96",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",