@royalschedule/maps 2.0.22 → 2.0.23

package/dist/PlanDigital/from/schedules.js

@@ -9,6 +9,20 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getWeeks(period) {
+  switch (period) {
+    case 'Ht':
+      return _lodash.default.range(1, 23);
+
+    case 'Vt':
+      return _lodash.default.range(32, 52);
+
+    case 'LÅ':
+    default:
+      return [..._lodash.default.range(1, 23), ..._lodash.default.range(34, 51)];
+  }
+}
+
 var _default = (input, options) => {
   if (!input) throw new Error('(PlanDigital::From::Schedules) Input was undefined');
   if (_lodash.default.isString(input)) throw new Error('(PlanDigital::From::Schedules) Input was of type string. Is required to be of object type');
@@ -21,12 +35,29 @@ var _default = (input, options) => {
     var subject = course['Kurskod'];
     var displayName = course['Kursnamn'];
     var events = [];
+    var weeks = [];
 
-    if (course['Poäng']) {
-      var points = course['Poäng'];
+    if (course['Period']) {
       var period = course['Period'];
+      weeks = _getWeeks(period);
 
-      switch (period) {
+      if (options !== null && options !== void 0 && options.interval) {
+        var {
+          start,
+          end
+        } = options.interval;
+        if (start > 52 || start <= 0) throw new Error("(SchoolSoft::From::Schedules) Interval::start is invalid. value ".concat(start));
+        if (end > 52 || end <= 0) throw new Error("(SchoolSoft::From::Schedules) Interval::end is invalid. value ".concat(end));
+
+        if (start > end) {
+          if (!Array.from(weeks).some(week => week >= start && week <= 52 || week <= end)) return acc;
+        } else {
+          if (!Array.from(weeks).some(week => week >= start && week <= end)) return acc;
+        }
+      }
+
+      var points = course['Poäng'];
+      if (points) switch (period) {
         case 'Ht':
         case 'Vt':
           if (points == 100) {
@@ -74,6 +105,7 @@ var _default = (input, options) => {
     return acc.concat(_lodash.default.pickBy({
       subject,
       displayName,
+      weeks,
       events,
       teachers,
       groups

package/dist/PlanDigital/from/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","mappings":";;;;;;;AACA;;;;eAQe,CAACA,KAAD,EAAkBC,OAAlB,KAAiG;AAE9G,MAAI,CAAED,KAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,oDAAV,CAAN;AAEF,MAAIC,gBAAEC,QAAF,CAAWJ,KAAX,CAAJ,EACE,MAAM,IAAIE,KAAJ,CAAU,2FAAV,CAAN;AAEF,MAAIG,SAAS,GAAkB,IAAIC,GAAJ,EAA/B;AACA,MAAIC,UAAU,GAAiB,IAAID,GAAJ,EAA/B;AACA,MAAIE,QAAQ,GAAmB,IAAIF,GAAJ,EAA/B;AAEA,MAAIG,OAAO,GAAGT,KAAK,CAACU,MAAN,CAAa,CAACC,GAAD,EAA0BC,MAA1B,KAA4C;AAAA;;AASrE,QAAMC,OAAO,GAAOD,MAAM,CAAC,SAAD,CAA1B;AAGA,QAAME,WAAW,GAAGF,MAAM,CAAC,UAAD,CAA1B;AAEA,QAAIG,MAAM,GAA4B,EAAtC;;AAEA,QAAIH,MAAM,CAAC,OAAD,CAAV,EAAqB;AACnB,UAAMI,MAAM,GAAGJ,MAAM,CAAC,OAAD,CAArB;AACA,UAAMK,MAAM,GAAGL,MAAM,CAAC,QAAD,CAArB;;AACA,cAAQK,MAAR;AACE,aAAK,IAAL;AACA,aAAK,IAAL;AACE,cAAID,MAAM,IAAI,GAAd,EAAmB;AACjBD,kBAAM,GAAGG,KAAK,CAAC,CAAD,CAAL,CAASC,IAAT,CAAc,EAAd,EAAkBC,GAAlB,CAAsBC,QAAQ,KAAK;AAAEA;AAAF,aAAL,CAA9B,CAAT;AACA;AACD;;AACD,cAAIL,MAAM,IAAI,EAAd,EAAkB;AAChBD,kBAAM,GAAGG,KAAK,CAAC,CAAD,CAAL,CAASC,IAAT,CAAc,EAAd,EAAkBC,GAAlB,CAAsBC,QAAQ,KAAK;AAAEA;AAAF,aAAL,CAA9B,CAAT;AACA;AACD;;AACD;;AACF,aAAK,IAAL;AACE,cAAIL,MAAM,IAAI,GAAd,EAAmB;AACjBD,kBAAM,GAAGG,KAAK,CAAC,CAAD,CAAL,CAASC,IAAT,CAAc,EAAd,EAAkBC,GAAlB,CAAsBC,QAAQ,KAAK;AAAEA;AAAF,aAAL,CAA9B,CAAT;AACA;AACD;;AACD,cAAIL,MAAM,IAAI,EAAd,EAAkB;AAChBD,kBAAM,GAAGG,KAAK,CAAC,CAAD,CAAL,CAASC,IAAT,CAAc,EAAd,EAAkBC,GAAlB,CAAsBC,QAAQ,KAAK;AAAEA;AAAF,aAAL,CAA9B,CAAT;AACA;AACD;;AACD;;AACF;AACE;AAvBJ;AAyBD;;AAED,QAAMC,MAAM,oBAAQV,MAAM,CAAC,OAAD,CAAd,kDAAQ,cAAiBW,KAAjB,CAAuB,GAAvB,EAA4BH,GAA5B,CAAgCjB,gBAAEqB,IAAlC,CAApB;AACA,QAAMC,QAAQ,mBAAMb,MAAM,CAAC,MAAD,CAAZ,iDAAM,aAAgBW,KAAhB,CAAsB,GAAtB,EAA2BH,GAA3B,CAA+BjB,gBAAEqB,IAAjC,CAApB;AAEA,QAAIC,QAAJ,EACEA,QAAQ,CAACC,OAAT,CAAiBC,QAAQ,IAAIpB,UAAU,CAACqB,GAAX,CAAeD,QAAf,CAA7B;AAEF,QAAIL,MAAJ,EACEA,MAAM,CAACI,OAAP,CAAeG,MAAM,IAAIrB,QAAQ,CAACoB,GAAT,CAAaC,MAAb,CAAzB;AAEF,WAAOlB,GAAG,CAACmB,MAAJ,CACL3B,gBAAE4B,MAAF,CAAS;AACPlB,aADO;AAGPC,iBAHO;AAIPC,YAJO;AAKPU,cALO;AAMPH;AANO,KAAT,EAOCnB,gBAAE6B,QAPH,CADK,CAAP;AASD,GAhEa,EAgEX,EAhEW,CAAd;AAkEA,SAAO;AACLvB,WAAO,EAAIS,KAAK,CAACe,IAAN,CAAWxB,OAAX,CADN;AAELgB,YAAQ,EAAGP,KAAK,CAACe,IAAN,CAAW1B,UAAX,EAAwBa,GAAxB,CAA4Bc,GAAG,KAAK;AAAEA,SAAF;AAAOpB,iBAAW,EAAEoB;AAApB,KAAL,CAA/B,CAFN;AAGLZ,UAAM,EAAKJ,KAAK,CAACe,IAAN,CAAWzB,QAAX,EAAwBY,GAAxB,CAA4Bc,GAAG,KAAK;AAAEA,SAAF;AAAOpB,iBAAW,EAAEoB;AAApB,KAAL,CAA/B;AAHN,GAAP;AAKD,C","names":["input","options","Error","_","isString","courseSet","Set","teacherSet","groupSet","courses","reduce","acc","course","subject","displayName","events","points","period","Array","fill","map","duration","groups","split","trim","teachers","forEach","_teacher","add","_group","concat","pickBy","identity","from","ids"],"sourceRoot":"","sources":["../../../src/PlanDigital/from/schedules.ts"],"sourcesContent":[null]}
+{"version":3,"file":"schedules.js","mappings":"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","names":["_getWeeks","period","_","range","input","options","Error","isString","courseSet","Set","teacherSet","groupSet","courses","reduce","acc","course","subject","displayName","events","weeks","interval","start","end","Array","from","some","week","points","fill","map","duration","groups","split","trim","teachers","forEach","_teacher","add","_group","concat","pickBy","identity","ids"],"sourceRoot":"","sources":["../../../src/PlanDigital/from/schedules.ts"],"sourcesContent":[null]}

package/package.json

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