@royalschedule/maps 2.2.1 → 2.2.4

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

@@ -68,7 +68,7 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
           if (start.day() != end.day()) throw new Error('course event have fixed time such that the event span multiple days');
         }
 
-        return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+        return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
           duration: event.length,
           parked: !start
         }, event[eventIdKey] && {
@@ -89,6 +89,8 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
           potentialCenter: event.potentialCenter
         }), 'minBreakLength' in event && {
           minBreakLength: (0, _breakLengths.default)(event.minBreakLength)
+        }), 'maxLengthVariance' in event && {
+          durationVariance: event.maxLengthVariance
         }), event.intervals && {
           intervals: (0, _intervals.default)(event.intervals)
         }), event.lockedTimes && {

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","parked","name","displayName","density","weight","potentialCenter","minBreakLength","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","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]}

package/dist/RS/v2/to/course-events/index.js

@@ -40,10 +40,14 @@ var _default = (courseEvents, options) => {
 
     var id = (event[idKey] || event._id).toString();
 
-    var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
       id: id
     }, 'duration' in event && {
       length: event.duration
+    }), 'preferredDuration' in event && {
+      length: event.preferredDuration
+    }), 'durationVariance' in event && {
+      maxLengthVariance: event.durationVariance
     }), 'weight' in event && {
       weight: event.weight
     }), 'density' in event && {

package/dist/RS/v2/to/course-events/index.js.map

@@ -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,EAAkDA;AAD/C,OAEF,cAAcF,KAAd,IAAmC;AAAEM,YAAM,EAAWN,KAAK,CAACO;AAAzB,KAFjC,GAGF,YAAcP,KAAd,IAAmC;AAAEQ,YAAM,EAAWR,KAAK,CAACQ;AAAzB,KAHjC,GAIF,aAAcR,KAAd,IAAmC;AAAES,aAAO,EAAUT,KAAK,CAACS;AAAzB,KAJjC,GAKFT,KAAK,CAACU,eAAN,IAAmC;AAAEA,qBAAe,EAAEC,UAAU,CAACX,KAAK,CAACU,eAAP;AAA7B,KALjC,GAMF,4BAAK,CAACE,WAAN,0EAAmBN,MAAnB,KAAmC;AAAEM,iBAAW,EAAM,0BAAaZ,KAAK,CAACY,WAAnB,EAAwCnB,OAAxC;AAAnB,KANjC,GAODO,KAAK,CAACa,cAAN,IAAwB,IAAzB,IAAmC;AAAEA,oBAAc,EAAG,2BAAYb,KAAK,CAACa,cAAlB;AAAnB,KAPjC,CAAP;;AAUA,QAAMC,MAAM,GAAG,sBAAQd,KAAR,EAAeP,OAAf,CAAf;AACA,QAAIqB,MAAJ,EACEC,MAAM,CAACC,MAAP,CAAcX,GAAd,EAAmBS,MAAnB;AAEF,QAAMG,YAAY,GAAG,4BAAcjB,KAAd,EAAqBP,OAArB,CAArB;AACA,QAAIwB,YAAJ,EACEF,MAAM,CAACC,MAAP,CAAcX,GAAd,EAAmBY,YAAnB;;AAEF,QAAIxB,OAAO,CAACyB,IAAZ,EAAkB;AAChBH,YAAM,CAACC,MAAP,CAAcX,GAAd,EAAmB,oBAAML,KAAN,EAAaP,OAAb,CAAnB;AACD;;AAED,QAAM0B,IAAI,GAAG,oBAAMnB,KAAN,EAAaP,OAAb,CAAb;AACA,QAAI0B,IAAJ,EACEJ,MAAM,CAACC,MAAP,CAAcX,GAAd,EAAmBc,IAAnB;AAEF,QAAMC,SAAS,GAAG,yBAAWpB,KAAX,EAAkBP,OAAlB,CAAlB;AACA,QAAI2B,SAAJ,EACEL,MAAM,CAACC,MAAP,CAAcX,GAAd,EAAmBe,SAAnB;;AAEF,QAAIpB,KAAK,CAACqB,UAAN,IAAoBrB,KAAK,CAACsB,KAA9B,EAAqC;AACnCP,YAAM,CAACC,MAAP,CAAcX,GAAd,EAAmB;AACjBiB,aAAK,EAAEX,UAAU,CAACY,gBAAOC,GAAP,CAAWxB,KAAK,CAACsB,KAAjB,EAAwBG,MAAxB,CAA+B,OAA/B,CAAD,CADA;AAEjBC,WAAG,EAAIH,gBAAOC,GAAP,CAAWxB,KAAK,CAACsB,KAAjB,EAAwBI,GAAxB,KAAgC;AAFtB,OAAnB;AAID;;AAED,WAAO3B,GAAG,CAAC4B,MAAJ,CAAWtB,GAAX,CAAP;AACD,GA7CM,EA6CJ,EA7CI,CAAP;AA8CD,C","names":["courseEvents","options","idKey","docs","Array","isArray","reduce","acc","event","course","id","_id","toString","doc","length","duration","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]}
+{"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","maxLengthVariance","durationVariance","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/dist/RS/v2/types/course-events.d.ts

@@ -11,6 +11,7 @@ export interface CourseEvent {
     density?: number;
     weight?: number;
     minBreakLength?: BreakLength;
+    maxLengthVariance?: number;
     start?: number;
     lockedTimes?: LockedTime[];
     intervals?: Interval[];

package/dist/SS12000/to/teachers.d.ts

@@ -1,4 +1,4 @@
 import { Types as CoreTypes } from '../../core/types';
 import { Teacher } from '../types/teachers';
-declare const _default: (teachers: CoreTypes.teacher[]) => Teacher[];
+declare const _default: (teachers: CoreTypes.teacher[], belongsTo?: string | undefined) => Teacher[];
 export default _default;

package/dist/SS12000/to/teachers.js

@@ -5,19 +5,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _default = teachers => {
+var _lodash = _interopRequireDefault(require("lodash"));
+
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+
+var _default = (teachers, belongsTo) => {
   if (!Array.isArray(teachers)) throw new Error('(SS12000::To::Teacher) Teacher input is not of array type');
+  if (!teachers.every(teacher => _lodash.default.has(teacher, 'id'))) throw new Error('(SS12000::To::Teacher) Some teachers are missing "id" values');
+  if (!belongsTo && !teachers.every(teacher => _lodash.default.has(teacher, 'belongsTo'))) throw new Error('(SS12000::To::Teacher) Some top layer teachers are missing "belongsTo" values');
   return teachers.map(teacher => {
     var _teacher$displayName;
 
     return {
-      id: teacher.id,
+      id: "".concat(belongsTo !== null && belongsTo !== void 0 ? belongsTo : teacher.belongsTo.id, ".").concat(teacher.id),
       meta: {
         created: teacher.createdAt,
         modified: teacher.updatedAt
       },
       person: {
-        id: teacher.id,
+        id: "".concat(belongsTo !== null && belongsTo !== void 0 ? belongsTo : teacher.belongsTo.id, ".").concat(teacher.id),
         displayName: (_teacher$displayName = teacher.displayName) !== null && _teacher$displayName !== void 0 ? _teacher$displayName : teacher.ids
       },
       dutyRole: "Lärare"

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

@@ -1 +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]}
+{"version":3,"file":"teachers.js","mappings":";;;;;;;AAAA;;;;;;;;eAMe,CAACA,QAAD,EAAgCC,SAAhC,KAAiE;AAC9E,MAAI,CAAEC,KAAK,CAACC,OAAND,CAAcF,QAAdE,CAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,2DAAV,CAAN;AAEF,MAAI,CAAEJ,QAAQ,CAACK,KAATL,CAAgBM,OAAD,IAAaC,gBAAEC,GAAFD,CAAMD,OAANC,EAAe,IAAfA,CAA5BP,CAAN,EACE,MAAM,IAAII,KAAJ,CAAU,8DAAV,CAAN;AAEF,MAAI,CAAEH,SAAF,IAAe,CAAED,QAAQ,CAACK,KAATL,CAAgBM,OAAD,IAAaC,gBAAEC,GAAFD,CAAMD,OAANC,EAAe,WAAfA,CAA5BP,CAArB,EACE,MAAM,IAAII,KAAJ,CAAU,+EAAV,CAAN;AAEF,SAAOJ,QAAQ,CAACS,GAATT,CAAcM,OAAD;AAAA;;AAAA,WAAc;AAChCI,QAAE,YAAcT,SAAd,SAAcA,aAAd,WAAcA,eAAaK,OAAO,CAACL,SAARK,CAAmBI,EAA9C,cAAsDJ,OAAO,CAACI,EAA9D,CAD8B;AAEhCC,UAAI,EAAE;AACJC,eAAO,EAAGN,OAAO,CAACO,SADd;AAEJC,gBAAQ,EAAER,OAAO,CAACS;AAFd,OAF0B;AAMhCC,YAAM,EAAE;AACNN,UAAE,YAAeT,SAAf,SAAeA,aAAf,WAAeA,eAAaK,OAAO,CAACL,SAARK,CAAmBI,EAA/C,cAAuDJ,OAAO,CAACI,EAA/D,CADI;AAENO,mBAAW,0BAAEX,OAAO,CAACW,WAAV,uEAAyBX,OAAO,CAACY;AAFtC,OANwB;AAWhCC,cAAQ,EAAE;AAXsB,KAAd;AAAb,IAAP","names":["teachers","belongsTo","Array","isArray","Error","every","teacher","_","has","map","id","meta","created","createdAt","modified","updatedAt","person","displayName","ids","dutyRole"],"sourceRoot":"","sources":["../../../src/SS12000/to/teachers.ts"],"sourcesContent":[null]}

package/dist/Skola24/from/course-and-events.js

@@ -7,6 +7,8 @@ exports.default = _default;
 
 var _moment = _interopRequireDefault(require("moment"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -278,10 +280,10 @@ function _default(groups, lessons, meta, groupPlansMap, planMap, subjectMap, pla
     }
   });
   var populatedCourses = new Set();
-  var eventsArray = [];
   eventMap.forEach((events, key) => {
     var _courseMap$get3;
 
+    if (!events.length) return;
     var courseIds = key.split(separator).map(x => parseInt(x));
     if (courseIds.length != 1 && events.length) throw "Well this was unexpected...";
     var courseId = courseIds[0];
@@ -289,13 +291,12 @@ function _default(groups, lessons, meta, groupPlansMap, planMap, subjectMap, pla
 
     if (PK == undefined) {
       errors.push("The events with PKs ".concat(events.map(e => e.ids), " were ignored since their course was not found."));
+      events.length = 0;
       return;
     }
 
-    events.forEach(e => eventsArray.push(_objectSpread(_objectSpread({}, e), {}, {
-      course: PK
-    })));
-    if (events.length) populatedCourses.add(courseId);
+    events.forEach(e => e.course = PK);
+    populatedCourses.add(courseId);
   });
 
   if (meta !== null && meta !== void 0 && meta.ignoreEmptyCourses) {
@@ -306,9 +307,34 @@ function _default(groups, lessons, meta, groupPlansMap, planMap, subjectMap, pla
     courseMap = new Map(courses);
   }
 
+  var keys = ['groups', 'teachers'];
+
+  var _loop = function _loop(key) {
+    courseMap.forEach(c => {
+      var _c$key;
+
+      var events = eventMap.get(c.ids);
+      var courseEntry = (_c$key = c[key]) === null || _c$key === void 0 ? void 0 : _c$key.sort();
+      var eventEntries = events === null || events === void 0 ? void 0 : events.map(e => {
+        var _e$key;
+
+        return (_e$key = e[key]) === null || _e$key === void 0 ? void 0 : _e$key.sort();
+      });
+
+      if (eventEntries !== null && eventEntries !== void 0 && eventEntries[0] && _lodash.default.size(_lodash.default.groupBy(eventEntries)) == 1 && (!courseEntry || courseEntry.length == 0 || _lodash.default.isEqual(courseEntry, eventEntries[0]))) {
+        c[key] = eventEntries[0];
+        events === null || events === void 0 ? void 0 : events.forEach(e => delete e[key]);
+      }
+    });
+  };
+
+  for (var key of keys) {
+    _loop(key);
+  }
+
   return {
     courses: [...courseMap.values()],
-    events: eventsArray
+    events: [...eventMap.values()].flat()
   };
 }
 //# sourceMappingURL=course-and-events.js.map

package/dist/Skola24/from/course-and-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"course-and-events.js","mappings":";;;;;;;AAAA;;;;;;;;;;AAUA,IAAMA,SAAS,GAAS,IAAxB;AACA,IAAMC,SAAS,GAAS,YAAYC,WAAZ,EAAxB;AACA,IAAMC,QAAQ,GAAU,YAAxB;AACA,IAAMC,OAAO,GAAW,CAAxB;AACA,IAAMC,eAAe,GAAG,CAAC,CAAD,EAAK,CAAL,CAAxB;AACA,IAAMC,aAAa,GAAK,CAAC,EAAD,EAAK,CAAL,CAAxB;;AAEA,SAASC,YAAT,CACEC,IADF,EAEEC,KAFF,EAGEC,OAHF,EAGiB;AAEf,SAAOC,gBAAOC,GAAP,CAAWT,QAAX,EACOU,GADP,CACWL,IADX,EACiB,MADjB,EAEOK,GAFP,CAEWJ,KAFX,EAEkB,OAFlB,EAGOI,GAHP,CAGWH,OAHX,EAGoB,SAHpB,CAAP;AAID;;AAED,SAASI,WAAT,CACEC,MADF,EACgB;AAEd,MAAI,YAAYA,MAAZ,IAAsB,eAAeA,MAArC,IAA+C,eAAeA,MAAlE,EAA0E;AACxE,QAAIC,YAAY,GAAG,qBAAOD,MAAM,CAACE,SAAd,EAAyB,mBAAzB,CAAnB;AACA,QAAIR,KAAK,GAAKO,YAAY,CAACE,GAAb,CAAiB,OAAjB,CAAd;AACA,QAAIR,OAAO,GAAGM,YAAY,CAACE,GAAb,CAAiB,SAAjB,CAAd;AAMA,QAAIC,KAAK,GAAGZ,YAAY,CAACQ,MAAM,CAACK,SAAR,EAAoBX,KAApB,EAA2BC,OAA3B,CAAxB;AACA,QAAIW,GAAG,GAAGF,KAAK,CAACG,KAAN,GAAcT,GAAd,CAAkBE,MAAM,CAACQ,MAAzB,EAAiC,QAAjC,CAAV;AACA,WAAO;AAAEJ,WAAK,EAAEA,KAAT;AAAgBE,SAAG,EAAEA,GAArB;AAA0BG,YAAM,EAAE;AAAlC,KAAP;AACD,GAZD,MAYO;AACL,WAAO,EAAP;AACD;AACF;;AAED,SAASC,gBAAT,CAA2BC,GAA3B,EAAuC;AACrC,MAAK,CAAEA,GAAP,EAAY,OAAO,EAAP;AAEZ,MAAIC,KAAK,GAAa,EAAtB;AAEAD,KAAG,CACFE,KADD,CACO,GADP,EAECC,OAFD,CAESC,CAAC,IAAG;AACX,QAAIA,CAAC,CAACC,QAAF,CAAW,GAAX,CAAJ,EAAqB;AAEnB,UAAI,CAACZ,KAAD,EAAQE,GAAR,IAAeS,CAAC,CAACF,KAAF,CAAQ,GAAR,CAAnB;;AACA,WAAK,IAAII,CAAC,GAAGC,QAAQ,CAACd,KAAD,CAArB,EAA8Ba,CAAC,IAAIC,QAAQ,CAACZ,GAAD,CAA3C,EAAkDW,CAAC,EAAnD;AACEL,aAAK,CAACO,IAAN,CAAWF,CAAX;AADF;AAED,KALD,MAKO;AAELL,WAAK,CAACO,IAAN,CAAWD,QAAQ,CAACH,CAAD,CAAnB;AACD;AACF,GAZD;AAcA,SAAOH,KAAP;AACD;;AAED,SAASQ,iBAAT,CACEC,IADF,EAEEC,QAFF,EAGEC,cAHF,EAGqC;AAGnC,MAAMC,KAAK,GAAG,cAAd;AAEA,MAAIC,OAAJ;;AACA,SAAOA,OAAO,GAAGD,KAAK,CAACE,IAAN,CAAWL,IAAX,CAAjB,EAAmC;AACjC,QAAIE,cAAc,CAACI,GAAf,CAAmBF,OAAO,CAAC,CAAD,CAA1B,CAAJ,EAAoC;AAClC,UAAMG,EAAE,GAAGL,cAAc,CAACpB,GAAf,CAAmBsB,OAAO,CAAC,CAAD,CAA1B,CAAX;AACAH,cAAQ,CAACxB,GAAT,CAAa8B,EAAb;AACD;AACF;AACF;;AAED,SAASC,MAAT,CAAiBC,GAAjB,EAAmC;AACjC,SAAOA,GAAG,CAACC,SAAJ,KAAkBnC,gBAAOC,GAAP,CAAWT,QAAX,EAAqB2C,SAArB,EAAzB;AACD;;AAED,SAASC,sBAAT,GAA+B;AAC7B,MAAIC,SAAS,GAAqB,EAAlC;;AAEA,OAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAG7C,OAApB,EAA6B6C,CAAC,EAA9B,EAAkC;AAChCD,aAAS,CAACd,IAAV,CAAe;AACbf,WAAK,EAAEZ,YAAY,CAAC0C,CAAD,EAAI5C,eAAe,CAAC,CAAD,CAAnB,EAAwBA,eAAe,CAAC,CAAD,CAAvC,CADN;AAEbgB,SAAG,EAAEd,YAAY,CAAC0C,CAAD,EAAM3C,aAAa,CAAC,CAAD,CAAnB,EAA0BA,aAAa,CAAC,CAAD,CAAvC;AAFJ,KAAf;AAID;;AAED,SAAO0C,SAAP;AACD;;AAKa,kBACZE,MADY,EAEZC,OAFY,EAGZC,IAHY,EAKZC,aALY,EAMZC,OANY,EAQZC,UARY,EASZC,eATY,EAUZC,eAVY,EAWZC,QAXY,EAaZC,QAbY,EAcZC,cAdY,EAeZC,iBAfY,EAgBZC,eAhBY,EAiBZC,UAjBY,EAmBZC,QAnBY,EAoBZC,MApBY,EAoBY;AAIxB,MAAM3B,cAAc,GAAG,IAAI4B,GAAJ,CAAQR,QAAQ,CAACS,GAAT,CAAaC,CAAC,IAAI,CAACA,CAAC,CAACC,WAAH,EAAiBD,CAAC,CAACE,GAAnB,CAAlB,CAAR,CAAvB;AAKA,MAAIC,SAAS,GAA8B,IAAIL,GAAJ,EAA3C;AACAhB,QAAM,CAACrB,OAAP,CAAeC,CAAC,IAAG;AAAA;;AAEjB,QAAIA,CAAC,CAAC0C,MAAN,EAAc;AAGd,QAAIC,KAAK,GAAGpB,aAAa,CAACnC,GAAd,CAAkBY,CAAC,CAACa,EAApB,CAAZ;AAGA,QAAI+B,OAAJ;;AACA,QAAID,KAAJ,EAAW;AAAA;;AACT,UAAIE,MAAM,mBAAGrB,OAAO,CAACpC,GAAR,CAAYe,QAAQ,CAAC,CAAC,GAAGwC,KAAJ,EAAW,CAAX,CAAD,CAApB,CAAH,iDAAG,aAAsCG,SAAnD;AACA,UAAID,MAAJ,EAAYD,OAAO,GAAGnB,UAAU,CAACrC,GAAX,CAAeyD,MAAf,CAAV;AACb;;AAGD,QAAItC,QAAQ,2BAAGoB,eAAe,CAACvC,GAAhB,CAAoBY,CAAC,CAACa,EAAF,CAAKkC,QAAL,EAApB,CAAH,uEAA2C,IAAIC,GAAJ,EAAvD;;AAGA,QAAI1B,IAAI,SAAJ,QAAI,WAAJ,QAAI,CAAE2B,0BAAN,IAAoCjD,CAAC,CAACkD,EAA1C,EAA8C;AAC5C7C,uBAAiB,CAACL,CAAC,CAACkD,EAAH,EAAO3C,QAAP,EAAiBC,cAAjB,CAAjB;AAWD;;AAMD,QAAI2C,UAAU,GAAG,IAAIH,GAAJ,EAAjB;AACA,uCAAa,CAAC5D,GAAd,CAAkBY,CAAC,CAACa,EAApB,2EAAyBd,OAAzB,CAAiCqD,CAAC,IAAG;AAAA;;AACnC,6CAAe,CAAChE,GAAhB,CAAoBe,QAAQ,CAACiD,CAAD,CAA5B,+EAAkCrD,OAAlC,CAA0CsD,CAAC,IAAIF,UAAU,CAACpE,GAAX,CAAesE,CAAf,CAA/C;AACD,KAFD;AAMAZ,aAAS,CAACa,GAAV,CAActD,CAAC,CAACa,EAAhB;AACE2B,SAAG,EAAUxC,CAAC,CAACa,EAAF,CAAKkC,QAAL,EADf;AAEER,iBAAW,EAAEvC,CAAC,CAACkD;AAFjB,OAION,OAAO,IAAY;AAAEA;AAAF,KAJ1B,GAKO,SAAQ,SAAR,YAAQ,WAAR,oBAAQ,CAAEW,IAAV,KAAmB;AAAEnC,YAAM,EAAI,CAAC,GAAGb,QAAJ;AAAZ,KAL1B,GAMO4C,UAAU,CAACI,IAAX,IAAmB;AAAEC,cAAQ,EAAE,CAAC,GAAGL,UAAJ;AAAZ,KAN1B;AAQD,GAnDD;AA0DA,MAAIM,oBAAoB,GAAG,CAA3B;AACA,MAAIC,QAAQ,GAAM,IAAItB,GAAJ,EAAlB;AACA,MAAIuB,WAAW,GAAG,IAAIvB,GAAJ,EAAlB;AACAf,SAAO,CAACtB,OAAR,CAAgB6D,CAAC,IAAG;AAAA;;AAElB,QAAI,KAAI,SAAJ,QAAI,WAAJ,gBAAI,CAAEC,IAAN,KAAcC,SAAd,IAA2B,CAAEnE,gBAAgB,CAACiE,CAAC,CAACG,eAAH,CAAhB,CAAoC9D,QAApC,CAA6CqB,IAAK,CAACuC,IAAnD,CAAjC,EAA2F;AAG3F,QAAIG,UAAU,GAAG,CAAC,4BAAIhC,eAAe,CAAC5C,GAAhB,CAAoBwE,CAAC,CAAC/C,EAAtB,CAAJ,uEAAiC,IAAImC,GAAJ,EAAjC,CAAD,EACCX,GADD,CACK4B,EAAE,IAAIpC,QAAQ,CAACzC,GAAT,CAAae,QAAQ,CAAC8D,EAAD,CAArB,CADX,EAECC,MAFD,CAES5B,CAAD,IAAmB,EAAC,SAAD,KAAC,WAAD,aAAC,CAAEI,MAAH,KAAa,KAFxC,EAGCyB,IAHD,CAGM,CAACC,EAAD,EAAKC,EAAL,KAAYD,EAAE,CAACvD,EAAH,GAAQwD,EAAE,CAACxD,EAH7B,EAICwB,GAJD,CAIKC,CAAC,IAAIA,CAAC,CAACzB,EAJZ,CAAjB;;AAMA,QAAIyD,KAAK;AACP9B,SAAG,EAAEoB,CAAC,CAAC/C,EAAF,CAAKkC,QAAL,EADE;AAGPwB,cAAQ,EAAEX,CAAC,CAACnE;AAHL,OAIJT,WAAW,CAAC4E,CAAD,CAJP,CAAT;;AAQA,QAAIY,KAAK,GAAG1C,cAAc,CAAC1C,GAAf,CAAmBwE,CAAC,CAAC/C,EAArB,CAAZ;;AACA,QAAI2D,KAAJ,aAAIA,KAAJ,eAAIA,KAAK,CAAEjB,IAAX,EAAiB;AACfe,WAAK,CAACG,WAAN,GAAoB,CAAC,GAAGD,KAAJ,CAApB;AACAF,WAAK,CAACI,SAAN,GAAoB,CAAC,GAAGF,KAAJ,EAAWnC,GAAX,CAAeuB,CAAC,KAAK;AAAEc,iBAAS,EAAE,CAACd,CAAD;AAAb,OAAL,CAAhB,CAApB;AACD;;AAGD,QAAIJ,QAAQ,GAAGzB,iBAAiB,CAAC3C,GAAlB,CAAsBwE,CAAC,CAAC/C,EAAxB,CAAf;AACA,QAAI2C,QAAJ,aAAIA,QAAJ,eAAIA,QAAQ,CAAED,IAAd,EAAoBe,KAAK,CAACd,QAAN,GAAiB,CAAC,GAAGA,QAAJ,CAAjB;AAGpB,QAAImB,OAAO,GAAgB,IAAI3B,GAAJ,EAA3B;AACA,4CAAe,CAAC5D,GAAhB,CAAoBwE,CAAC,CAAC/C,EAAtB,iFAA2Bd,OAA3B,CAAmC6E,eAAe,IAAG;AAAA;;AACnD,8CAAe,CAACxF,GAAhB,CAAoBwF,eAApB,iFAAsC7E,OAAtC,CAA8C8E,OAAO,IAAG;AACtDF,eAAO,CAAC5F,GAAR,CAAY8F,OAAZ;AACD,OAFD;AAGD,KAJD;AAQA,QAAIC,eAAe,GAAGd,UAAU,CAACe,IAAX,CAAgB/E,CAAC;AAAA;;AAAA,+BAAIyC,SAAS,CAACrD,GAAV,CAAcY,CAAd,CAAJ,mDAAI,eAAkBoB,MAAtB;AAAA,KAAjB,CAAtB;;AACA,QAAIE,IAAI,SAAJ,QAAI,WAAJ,QAAI,CAAE2B,0BAAN,KAAsC,CAAE6B,eAAF,IAAqBH,OAAO,CAACpB,IAAnE,CAAJ,EAA8E;AAI5ES,gBAAU,CAAC3B,GAAX,CAAerC,CAAC;AAAA;;AAAA,kCAAIyC,SAAS,CAACrD,GAAV,CAAcY,CAAd,CAAJ,oDAAI,gBAAkBuC,WAAtB;AAAA,OAAhB,EACW2B,MADX,CACmBlE,CAAD,IAAoB,CAAC,CAAEA,CADzC,EAEWD,OAFX,CAEmBC,CAAC,IAAIK,iBAAiB,CAACL,CAAD,EAAI2E,OAAJ,EAAanE,cAAb,CAFzC;AAaD;;AAGD,QAAImE,OAAO,CAACpB,IAAZ,EAAkBe,KAAK,CAAClD,MAAN,GAAe,CAAC,GAAGuD,OAAJ,CAAf;AAGlB,QAAM/B,OAAO,GAAGnB,UAAU,CAACrC,GAAX,CAAewE,CAAC,CAACd,SAAjB,CAAhB;;AACA,QAAI,QAAO,SAAP,WAAO,WAAP,mBAAO,CAAE1E,WAAT,OAA0BD,SAA9B,EAAyC;AAIvC,UAAK,CAAEmG,KAAK,CAACjF,KAAR,IAAiB,CAAEiF,KAAK,CAAC/E,GAA9B,EAAmC;AACjC2C,gBAAQ,CAAC9B,IAAT;AACA;AACD;;AAGD,UAAM4E,GAAG,GAAGlE,MAAM,CAACwD,KAAK,CAACjF,KAAP,CAAlB;;AAEA,UAAI,IAAI2F,GAAJ,IAAWA,GAAG,GAAG1G,OAAO,GAAG,CAA/B,EAAkC;AAChC4D,gBAAQ,CAAC9B,IAAT;AACA;AACD;;AAGDoD,cAAQ,SAAR,YAAQ,WAAR,oBAAQ,CAAEzD,OAAV,CAAkBsD,CAAC,IAAG;AAAA;;AACpB,YAAK,CAAEM,WAAW,CAAC/C,GAAZ,CAAgByC,CAAhB,CAAP,EAA2BM,WAAW,CAACL,GAAZ,CAAgBD,CAAhB,EAAmB,IAAIjB,GAAJ,EAAnB;AAC3B,uCAAW,CAAChD,GAAZ,CAAgBiE,CAAhB,uEAAoBC,GAApB,CAAwB0B,GAAxB,EAA6B;AAAE3F,eAAK,EAAEiF,KAAK,CAACjF,KAAf;AAAsBE,aAAG,EAAE+E,KAAK,CAAC/E;AAAjC,SAA7B;AACD,OAHD;AAKD,KAvBD,MAuBO;AAAA;;AAOL,UAAK,CAAEyE,UAAU,CAACiB,MAAlB,EAA0B;AACxB,YAAMhB,EAAE,GAAG,EAAER,oBAAb;AAEAhB,iBAAS,CAACa,GAAV,CAAcW,EAAd;AACEzB,aAAG,EAAEyB,EAAE,CAAClB,QAAH;AADP,WAGOH,OAAO,IAAO;AAAEL,qBAAW,EAAEK;AAAf,SAHrB,GAIOA,OAAO,IAAO;AAAEA;AAAF,SAJrB;AAWAoB,kBAAU,CAAC5D,IAAX,CAAgB6D,EAAhB;AACD;;AAID,UAAMiB,GAAG,GAAGlB,UAAU,CAACmB,IAAX,CAAgBjH,SAAhB,CAAZ;AACA,UAAK,CAAEwF,QAAQ,CAAC9C,GAAT,CAAasE,GAAb,CAAP,EAA0BxB,QAAQ,CAACJ,GAAT,CAAa4B,GAAb,EAAkB,EAAlB;AAC1B,+BAAQ,CAAC9F,GAAT,CAAa8F,GAAb,iEAAmB9E,IAAnB,CAAwBkE,KAAxB;AACD;AAEF,GAtHD;AA4HAX,aAAW,CAAC5D,OAAZ,CAAoB,CAACqF,CAAD,EAAIC,CAAJ,KAAS;AAE3B,QAAMC,OAAO,GAAGrD,UAAU,CAACsD,IAAX,CAAgBlC,CAAC,IAAIA,CAAC,CAACb,GAAF,IAAS6C,CAA9B,CAAhB;;AACA,QAAK,CAAEC,OAAP,EAAgB;AACdpD,cAAQ,CAAC9B,IAAT,iEAAuEiF,CAAvE;AACA;AACD;;AAGD,QAAInE,SAAS,GAAGD,sBAAsB,EAAtC;AACA,QAAIvC,IAAI,GAAgB,EAAxB;AACA0G,KAAC,CAACrF,OAAF,CAAU,CAACG,CAAD,EAAIiB,CAAJ,KAAS;AACjBzC,UAAI,CAAC0B,IAAL,CAAU;AAAE4E,WAAG,EAAE7D;AAAP,OAAV;AACAD,eAAS,CAACC,CAAD,CAAT,GAAejB,CAAf;AACD,KAHD;AAOAoF,WAAQ,CAACpE,SAAT,GAAqBA,SAArB;AACA,QAAIxC,IAAI,CAACuG,MAAL,IAAe3G,OAAnB,EAA4BgH,OAAQ,CAAC5G,IAAT,GAAgBA,IAAhB;AAC7B,GApBD;AA0BAgF,UAAQ,CAAC3D,OAAT,CAAiB,CAACyF,MAAD,EAASN,GAAT,KAAgB;AAC/B,QAAIO,SAAS,GAAGP,GAAG,CAACpF,KAAJ,CAAU5B,SAAV,EAAqBmE,GAArB,CAAyBrC,CAAC,IAAIG,QAAQ,CAACH,CAAD,CAAtC,CAAhB;;AAEA,QAAIyF,SAAS,CAACR,MAAV,GAAmB,CAAvB,EAA0B;AACxB,UAAIS,IAAI,GAAqB,EAA7B;AACA,UAAIC,YAAY,GAAa,EAA7B;AAEA,UAAIC,QAAQ,GAAG,IAAI5C,GAAJ,EAAf;;AACA,UAAI5B,OAAM,GAAK,IAAI4B,GAAJ,EAAf;;AACA,UAAIQ,QAAQ,GAAG,IAAIR,GAAJ,EAAf;AAGAyC,eAAS,CAACpD,GAAV,CAAcrC,CAAC,IAAIyC,SAAS,CAACrD,GAAV,CAAcY,CAAd,CAAnB,EACUkE,MADV,CACkB2B,CAAD,IAA0B,CAAC,CAAEA,CAD9C,EAEU9F,OAFV,CAEkB8F,CAAC,IAAG;AACXA,SAAC,CAACrD,GAAF,IAAiBkD,IAAI,CAACtF,IAAL,CAAUyF,CAAC,CAACrD,GAAZ,CAAjB;AACAqD,SAAC,CAACtD,WAAF,IAAiBoD,YAAY,CAACvF,IAAb,CAAkByF,CAAC,CAACtD,WAApB,CAAjB;AAEAsD,SAAC,CAACjD,OAAF,IAAcgD,QAAQ,CAAC7G,GAAT,CAAa8G,CAAC,CAACjD,OAAf,CAAd;AACAiD,SAAC,CAACzE,MAAF,IAAcyE,CAAC,CAACzE,MAAF,CAASrB,OAAT,CAAiBC,CAAC,IAAMoB,OAAM,CAACrC,GAAP,CAAWiB,CAAX,CAAxB,CAAd;AACA6F,SAAC,CAACrC,QAAF,IAAcqC,CAAC,CAACrC,QAAF,CAAWzD,OAAX,CAAmBC,CAAC,IAAIwD,QAAQ,CAACzE,GAAT,CAAaiB,CAAb,CAAxB,CAAd;AACD,OATV;AAWA,UAAM8F,KAAK,GAAG,EAAErC,oBAAhB;;AACA,UAAMsC,SAAS;AACbvD,WAAG,EAAUkD,IAAI,CAACP,IAAL,CAAUjH,SAAV,CADA;AAEbqE,mBAAW,EAAEoD,YAAY,CAACR,IAAb,CAAkBjH,SAAlB;AAFA,SAIR0H,QAAQ,CAACrC,IAAT,IAAiB;AAAEX,eAAO,EAAG,CAAC,GAAGgD,QAAJ,EAAcT,IAAd,CAAmBjH,SAAnB;AAAZ,OAJT,GAKRkD,OAAM,CAACmC,IAAP,IAAiB;AAAEnC,cAAM,EAAI,CAAC,GAAGA,OAAJ;AAAZ,OALT,GAMRoC,QAAQ,CAACD,IAAT,IAAiB;AAAEC,gBAAQ,EAAE,CAAC,GAAGA,QAAJ;AAAZ,OANT,CAAf;;AAWAf,eAAS,CAACa,GAAV,CAAcwC,KAAd,EAAqBC,SAArB;AAGArC,cAAQ,CAACJ,GAAT,CAAawC,KAAK,CAAC/C,QAAN,EAAb,EAA+B,CAAC,GAAGyC,MAAJ,CAA/B;AACAA,YAAM,CAACP,MAAP,GAAgB,CAAhB;AAGA/C,cAAQ,CAAC9B,IAAT,iCAAuCqF,SAAS,CAACN,IAAV,CAAejH,SAAf,CAAvC;AACD;AACF,GA5CD;AAmDA,MAAI8H,gBAAgB,GAAG,IAAIhD,GAAJ,EAAvB;AACA,MAAIiD,WAAW,GAAwB,EAAvC;AACAvC,UAAQ,CAAC3D,OAAT,CAAiB,CAACyF,MAAD,EAASN,GAAT,KAAgB;AAAA;;AAC/B,QAAIO,SAAS,GAAGP,GAAG,CAACpF,KAAJ,CAAU5B,SAAV,EAAqBmE,GAArB,CAAyBrC,CAAC,IAAIG,QAAQ,CAACH,CAAD,CAAtC,CAAhB;AAEA,QAAIyF,SAAS,CAACR,MAAV,IAAoB,CAApB,IAAyBO,MAAM,CAACP,MAApC,EAA4C,MAAM,6BAAN;AAE5C,QAAIiB,QAAQ,GAAGT,SAAS,CAAC,CAAD,CAAxB;AACA,QAAI5E,EAAE,sBAAS4B,SAAS,CAACrD,GAAV,CAAc8G,QAAd,CAAT,oDAAS,gBAAyB1D,GAAxC;;AAEA,QAAI3B,EAAE,IAAIiD,SAAV,EAAqB;AAInB3B,YAAM,CAAC/B,IAAP,+BAAmCoF,MAAM,CAACnD,GAAP,CAAW8D,CAAC,IAAIA,CAAC,CAAC3D,GAAlB,CAAnC;AACA;AACD;;AAEDgD,UAAM,CAACzF,OAAP,CAAeoG,CAAC,IAAIF,WAAW,CAAC7F,IAAZ,iCAAsB+F,CAAtB;AAAyBC,YAAM,EAAEvF;AAAjC,OAApB;AAEA,QAAI2E,MAAM,CAACP,MAAX,EAAmBe,gBAAgB,CAACjH,GAAjB,CAAqBmH,QAArB;AACpB,GAnBD;;AA0BA,MAAI5E,IAAJ,aAAIA,IAAJ,eAAIA,IAAI,CAAE+E,kBAAV,EAA8B;AAE5B,QAAIC,OAAO,GAAG,CAAC,GAAG7D,SAAJ,EAAeyB,MAAf,CAAsB;AAAA,UAAC,CAACmB,CAAD,CAAD;AAAA,aAASW,gBAAgB,CAACpF,GAAjB,CAAqByE,CAArB,CAAT;AAAA,KAAtB,CAAd;AACA5C,aAAS,GAAG,IAAIL,GAAJ,CAAQkE,OAAR,CAAZ;AACD;;AAGD,SAAO;AAAEA,WAAO,EAAE,CAAC,GAAG7D,SAAS,CAAC8D,MAAV,EAAJ,CAAX;AAAoCf,UAAM,EAAES;AAA5C,GAAP;AACD","names":["separator","arbetstid","toLowerCase","firstDay","numDays","defaultDayStart","defaultDayEnd","generateDate","days","hours","minutes","moment","utc","add","startAndEnd","lesson","dateTimeDate","StartTime","get","start","DayOfWeek","end","clone","Length","parked","parseActualWeeks","val","weeks","split","forEach","x","includes","i","parseInt","push","addGroupsFromName","name","groupSet","groupNamePkMap","regex","matches","exec","has","PK","getDay","mnt","dayOfYear","createDefaultIntervals","intervals","d","groups","lessons","meta","groupPlansMap","planMap","subjectMap","planTeachersMap","groupClassesMap","RSgroups","groupMap","lessonRoomsMap","lessonTeachersMap","lessonGroupsMap","RSteachers","warnings","errors","Map","map","g","displayName","ids","courseMap","bClass","plans","subject","subjPK","FKSubject","toString","Set","deduceGroupsFromCourseName","ID","teacherSet","p","t","set","size","teachers","numAdditionalCourses","eventMap","intervalMap","l","week","undefined","CalcActualWeeks","coursesIds","id","filter","sort","g1","g2","event","duration","rooms","inLocations","locations","classes","scheduleGroupId","classId","courseHasGroups","some","day","length","key","join","v","k","teacher","find","events","courseIds","idss","displayNames","subjects","c","newId","newCourse","populatedCourses","eventsArray","courseId","e","course","ignoreEmptyCourses","courses","values"],"sourceRoot":"","sources":["../../../src/Skola24/from/course-and-events.ts"],"sourcesContent":[null]}
+{"version":3,"file":"course-and-events.js","mappings":"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","names":["separator","arbetstid","toLowerCase","firstDay","numDays","defaultDayStart","defaultDayEnd","generateDate","days","hours","minutes","moment","utc","add","startAndEnd","lesson","dateTimeDate","StartTime","get","start","DayOfWeek","end","clone","Length","parked","parseActualWeeks","val","weeks","split","forEach","x","includes","i","parseInt","push","addGroupsFromName","name","groupSet","groupNamePkMap","regex","matches","exec","has","PK","getDay","mnt","dayOfYear","createDefaultIntervals","intervals","d","groups","lessons","meta","groupPlansMap","planMap","subjectMap","planTeachersMap","groupClassesMap","RSgroups","groupMap","lessonRoomsMap","lessonTeachersMap","lessonGroupsMap","RSteachers","warnings","errors","Map","map","g","displayName","ids","courseMap","bClass","plans","subject","subjPK","FKSubject","toString","Set","deduceGroupsFromCourseName","ID","teacherSet","p","t","set","size","teachers","numAdditionalCourses","eventMap","intervalMap","l","week","undefined","CalcActualWeeks","coursesIds","id","filter","sort","g1","g2","event","duration","rooms","inLocations","locations","classes","scheduleGroupId","classId","courseHasGroups","some","day","length","key","join","v","k","teacher","find","events","courseIds","idss","displayNames","subjects","c","newId","newCourse","populatedCourses","courseId","e","course","ignoreEmptyCourses","courses","keys","courseEntry","eventEntries","_","groupBy","isEqual","values","flat"],"sourceRoot":"","sources":["../../../src/Skola24/from/course-and-events.ts"],"sourcesContent":[null]}

package/dist/Skola24/from/courses.d.ts

@@ -1,11 +1,5 @@
-import moment from 'moment';
+import { TA } from '../types/TA';
+import { TATeacherLink } from '../types/TA-teacher-link';
+import { TAGroupLink } from '../types/TA-group-link';
 import { Types } from '../../core/types';
-import { Plan } from '../types/Plan';
-import { Group } from '../types/Group';
-export default function (groups: Group[], groupPlansMap: Map<number, Set<string>>, planMap: Map<number, Plan>, scheduleDates: {
-    start?: moment.Moment;
-    end?: moment.Moment;
-}, subjectMap: Map<number, string>, planDateMap: Map<number, {
-    start: moment.Moment;
-    end: moment.Moment;
-}>, planTeachersMap: Map<number, Set<string>>, groupClassesMap: Map<string, Set<string>>, warnings: string[], errors: string[]): Map<number, Types.course>;
+export default function (TAs: TA[], TATeacherLinks: TATeacherLink[], TAGroupLinks: TAGroupLink[], groupClassesMap: Map<string, Set<string>>, classes: Types.group[], weeks: number[]): [Types.course[], Map<string, Types.course>];

package/dist/Skola24/from/courses.js

@@ -5,89 +5,51 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 
-var _filterOnPeriod = require("./filter-on-period");
-
-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 _default(groups, groupPlansMap, planMap, scheduleDates, subjectMap, planDateMap, planTeachersMap, groupClassesMap, warnings, errors) {
-  var courseMap = new Map();
-  groups.forEach(x => {
-    var _groupPlansMap$get;
-
-    if (x.bClass) return;
-    var plans = groupPlansMap.get(x.PK);
-
-    if (plans) {
-      var numPans = [...plans].filter(p => (0, _filterOnPeriod.filterOnPeriod)(scheduleDates, planDateMap.get(parseInt(p)))).length;
-      if (!numPans) return;
-    }
-
-    var subject;
-
-    if (plans) {
-      var _planMap$get;
-
-      var subjPK = (_planMap$get = planMap.get(parseInt([...plans][0]))) === null || _planMap$get === void 0 ? void 0 : _planMap$get.FKSubject;
-      if (subjPK) subject = subjectMap.get(subjPK);
+var _assertWeekOverlap = require("./assert-week-overlap");
+
+function _default(TAs, TATeacherLinks, TAGroupLinks, groupClassesMap, classes, weeks) {
+  var courses = TAs.filter(x => (0, _assertWeekOverlap.assertWeekOverlap)(x.ActualWeeks, weeks)).map(x => ({
+    ids: x.TA.toString(),
+    displayName: x.Course || x.Subject
+  }));
+  courses.forEach(x => {
+    var teachers = TATeacherLinks.filter(y => y.TA == parseInt(x.ids)).map(y => y.Teacher);
+    if (teachers.length) x.teachers = teachers;
+  });
+  var groupCourseMap = new Map();
+
+  var _loop = function _loop(i) {
+    var x = courses[i];
+    var groups = TAGroupLinks.filter(y => y.TA == parseInt(x.ids)).map(y => y.Group);
+    if (groups.length > 1) throw "More than one group per course: [" + groups.join(",") + "]";
+
+    if (groups.length) {
+      var group = groups[0];
+
+      if (classes.map(x => x.ids).includes(group)) {
+        x.groups = groups;
+      } else {
+        if (groupClassesMap.has(group)) {
+          x.groups = [...groupClassesMap.get(group)];
+          x.displayName = group;
+        }
+      }
+
+      if (groupCourseMap.has(group)) {
+        var y = groupCourseMap.get(group);
+        y.teachers = [...new Set((x.teachers || []).concat(y.teachers || []))];
+        y.groups = [...new Set((x.groups || []).concat(y.groups || []))];
+        courses.splice(i, 1);
+      } else {
+        groupCourseMap.set(group, x);
+      }
     }
+  };
 
-    var groupSet = groupClassesMap.get(x.PK.toString());
-    var teacherSet = new Set();
-    (_groupPlansMap$get = groupPlansMap.get(x.PK)) === null || _groupPlansMap$get === void 0 ? void 0 : _groupPlansMap$get.forEach(p => {
-      var _planTeachersMap$get;
+  for (var i = courses.length - 1; i >= 0; i--) {
+    _loop(i);
+  }
 
-      (_planTeachersMap$get = planTeachersMap.get(parseInt(p))) === null || _planTeachersMap$get === void 0 ? void 0 : _planTeachersMap$get.forEach(t => teacherSet.add(t));
-    });
-    courseMap.set(x.PK, _objectSpread(_objectSpread(_objectSpread({
-      ids: x.PK.toString(),
-      displayName: x.ID
-    }, subject && {
-      subject
-    }), groupSet && {
-      groups: [...groupSet]
-    }), teacherSet && {
-      teachers: [...teacherSet]
-    }));
-  });
-  return courseMap;
+  return [courses, groupCourseMap];
 }
 //# sourceMappingURL=courses.js.map

package/dist/Skola24/from/courses.js.map

@@ -1 +1 @@
-{"version":3,"file":"courses.js","mappings":";;;;;;;AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwGc,kBACZA,MADY,EAEZC,aAFY,EAGZC,OAHY,EAMZC,aANY,EASZC,UATY,EAUZC,WAVY,EAWZC,eAXY,EAaZC,eAbY,EAcZC,QAdY,EAeZC,MAfY,EAeY;AAIxB,MAAIC,SAAS,GAA8B,IAAIC,GAAJ,EAA3C;AACAX,QAAM,CAACY,OAAPZ,CAAea,CAAC,IAAG;AAAA;;AAEjB,QAAIA,CAAC,CAACC,MAAN,EAAc;AAGd,QAAIC,KAAK,GAAGd,aAAa,CAACe,GAAdf,CAAkBY,CAAC,CAACI,EAApBhB,CAAZ;;AACA,QAAIc,KAAJ,EAAW;AACT,UAAMG,OAAO,GAAG,CAAC,GAAGH,KAAJ,EAAWI,MAAX,CAAkBC,CAAC,IAAI,oCAAejB,aAAf,EAA8BE,WAAW,CAACW,GAAZX,CAAgBgB,QAAQ,CAACD,CAAD,CAAxBf,CAA9B,CAAvB,EAAoFiB,MAApG;AACA,UAAK,CAAEJ,OAAP,EAAgB;AACjB;;AAID,QAAIK,OAAJ;;AACA,QAAIR,KAAJ,EAAW;AAAA;;AACT,UAAIS,MAAM,mBAAGtB,OAAO,CAACc,GAARd,CAAYmB,QAAQ,CAAC,CAAC,GAAGN,KAAJ,EAAW,CAAX,CAAD,CAApBb,CAAH,iDAAGuB,aAAsCC,SAAnD;AACA,UAAIF,MAAJ,EAAYD,OAAO,GAAGnB,UAAU,CAACY,GAAXZ,CAAeoB,MAAfpB,CAAVmB;AACb;;AAGD,QAAII,QAAQ,GAAGpB,eAAe,CAACS,GAAhBT,CAAoBM,CAAC,CAACI,EAAFJ,CAAKe,QAALf,EAApBN,CAAf;AAGA,QAAIsB,UAAU,GAAG,IAAIC,GAAJ,EAAjB;AACA,uCAAa,CAACd,GAAd,CAAkBH,CAAC,CAACI,EAApB,2EAAyBL,OAAzB,CAAiCQ,CAAC,IAAG;AAAA;;AACnC,6CAAe,CAACJ,GAAhB,CAAoBK,QAAQ,CAACD,CAAD,CAA5B,+EAAkCR,OAAlC,CAA0CmB,CAAC,IAAIF,UAAU,CAACG,GAAXH,CAAeE,CAAfF,CAA/C;AADF;AAMAnB,aAAS,CAACuB,GAAVvB,CAAcG,CAAC,CAACI,EAAhBP;AACEwB,SAAG,EAAUrB,CAAC,CAACI,EAAFJ,CAAKe,QAALf,EADfH;AAEEyB,iBAAW,EAAEtB,CAAC,CAACuB;AAFjB1B,OAIOa,OAAO,IAAO;AAAEA;AAAF,KAJrBb,GAKOiB,QAAQ,IAAM;AAAE3B,YAAM,EAAE,CAAC,GAAG2B,QAAJ;AAAV,KALrBjB,GAMOmB,UAAU,IAAI;AAAEQ,cAAQ,EAAE,CAAC,GAAGR,UAAJ;AAAZ,KANrBnB;AA9BF;AA0CA,SAAOA,SAAP;AACD","names":["groups","groupPlansMap","planMap","scheduleDates","subjectMap","planDateMap","planTeachersMap","groupClassesMap","warnings","errors","courseMap","Map","forEach","x","bClass","plans","get","PK","numPans","filter","p","parseInt","length","subject","subjPK","_planMap$get","FKSubject","groupSet","toString","teacherSet","Set","t","add","set","ids","displayName","ID","teachers"],"sourceRoot":"","sources":["../../../src/Skola24/from/courses.ts"],"sourcesContent":[null]}
+{"version":3,"file":"courses.js","mappings":"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","names":["TAs","TATeacherLinks","TAGroupLinks","groupClassesMap","classes","weeks","courses","filter","x","ActualWeeks","map","ids","TA","toString","displayName","Course","Subject","forEach","teachers","y","parseInt","Teacher","length","groupCourseMap","Map","i","groups","Group","join","group","includes","has","get","Set","concat","splice","set","_loop"],"sourceRoot":"","sources":["../../../src/Skola24/from/courses.ts"],"sourcesContent":[null]}

package/dist/Skola24/types/group.d.ts

@@ -1,4 +1,5 @@
 export interface Group {
-    Group: string;
-    Class: boolean;
+    PK: number;
+    ID: string;
+    bClass: boolean;
 }

package/dist/Skola24/types/lesson-group-link.d.ts

@@ -1,4 +1,4 @@
 export interface LessonGroupLink {
-    Lesson: number;
-    Group: string;
+    FKSchedule: number;
+    FKGroup: number;
 }

package/dist/Skola24/types/lesson-room-link.d.ts

@@ -1,4 +1,4 @@
 export interface LessonRoomLink {
-    Lesson: number;
-    Room: string;
+    FKSchedule: number;
+    FKRoom: number;
 }

package/dist/Skola24/types/lesson-teacher-link.d.ts

@@ -1,4 +1,4 @@
 export interface LessonTeacherLink {
-    Lesson: number;
-    Teacher: string;
+    FKSchedule: number;
+    FKTeacher: number;
 }

package/dist/Skola24/types/lesson.d.ts

@@ -1,9 +1,9 @@
 export interface Lesson {
-    Lesson: number;
-    Length?: number;
-    Starttime?: string;
+    PK: number;
+    Length: number;
+    StartTime?: string;
     DayOfWeek?: number;
-    Course?: string;
-    Subject?: string;
-    ActualWeeks: string;
+    FKCourse?: number;
+    FKSubject?: number;
+    CalcActualWeeks?: string;
 }

package/dist/Skola24/types/room.d.ts

@@ -1,4 +1,5 @@
 export interface Room {
-    Room: string;
+    PK: number;
+    ID: string;
     Area?: string;
 }

package/dist/Skola24/types/schedule.d.ts

@@ -1,24 +1,34 @@
-import { Room } from './room';
-import { Teacher } from './teacher';
-import { Group } from './group';
-import { TA } from './TA';
-import { Lesson } from './lesson';
-import { GroupStudentLink } from './group-student-link';
-import { LessonRoomLink } from './lesson-room-link';
-import { LessonTeacherLink } from './lesson-teacher-link';
-import { LessonGroupLink } from './lesson-group-link';
-import { TATeacherLink } from './TA-teacher-link';
-import { TAGroupLink } from './TA-group-link';
+import { Period } from './Period';
+import { Room } from './Room';
+import { Subject } from './Subject';
+import { Teacher } from './Teacher';
+import { Group } from './Group';
+import { Plan } from './Plan';
+import { Course } from './Course';
+import { Lesson } from './Lesson';
+import { GroupGroupLink } from './Group-group-link';
+import { PlanPeriodLink } from './Plan-period-link';
+import { PlanTeacherLink } from './Plan-teacher-link';
+import { PlanGroupLink } from './Plan-group-link';
+import { LessonPeriodLink } from './Lesson-period-link';
+import { LessonRoomLink } from './Lesson-room-link';
+import { LessonTeacherLink } from './Lesson-teacher-link';
+import { LessonGroupLink } from './Lesson-group-link';
 export interface Schedule {
-    room: Room[];
-    teacher: Teacher[];
-    group: Group[];
-    ta: TA[];
-    lesson: Lesson[];
-    group_student: GroupStudentLink[];
-    lesson_room: LessonRoomLink[];
-    lesson_teacher: LessonTeacherLink[];
-    lesson_group: LessonGroupLink[];
-    ta_teacher: TATeacherLink[];
-    ta_group: TAGroupLink[];
+    unit_tblperiod_date: Period[];
+    unit_tblroom: Room[];
+    school_tblsubject: Subject[];
+    school_tblteacher: Teacher[];
+    school_tblgroup: Group[];
+    school_tblplan: Plan[];
+    school_tblcourse: Course[];
+    school_tblschedule: Lesson[];
+    school_tblgroup_group: GroupGroupLink[];
+    school_tblplan_period: PlanPeriodLink[];
+    school_tblplan_teacher: PlanTeacherLink[];
+    school_tblplan_group: PlanGroupLink[];
+    school_tblschedule_period: LessonPeriodLink[];
+    school_tblschedule_room: LessonRoomLink[];
+    school_tblschedule_teacher: LessonTeacherLink[];
+    school_tblschedule_group: LessonGroupLink[];
 }

package/dist/Skola24/types/teacher.d.ts

@@ -1,5 +1,6 @@
 export interface Teacher {
-    Teacher: string;
-    FirstName: string;
-    LastName: string;
+    PK: number;
+    ID: string;
+    FirstName?: string;
+    LastName?: string;
 }

package/dist/core/types/course-events.d.ts

@@ -32,6 +32,8 @@ export interface CourseEventBare {
     displayName?: string;
     visible?: boolean;
     duration?: number;
+    preferredDuration?: number;
+    durationVariance?: number;
     lockedTimes?: LockedTime[];
     intervals?: Interval[];
     days?: Day[] | null;