@royalschedule/maps 2.0.14 → 2.0.15

package/dist/SchoolSoft/from/index.d.ts

@@ -1,3 +1,8 @@
 export default class {
-    static schedules: (input: import("../types/events").Event[]) => import("../../core/types/divisions").Division;
+    static schedules: (input: import("../types/events").Event[], options?: {
+        interval?: {
+            start: number;
+            end: number;
+        } | undefined;
+    } | undefined) => import("../../core/types/divisions").Division;
 }

package/dist/SchoolSoft/from/schedules.d.ts

@@ -1,4 +1,9 @@
 import { Event } from '../types/events';
 import { Types as CoreTypes } from '../../core/types';
-declare const _default: (input: Event[]) => CoreTypes.division;
+declare const _default: (input: Event[], options?: {
+    interval?: {
+        start: number;
+        end: number;
+    } | undefined;
+} | undefined) => CoreTypes.division;
 export default _default;

package/dist/SchoolSoft/from/schedules.js

@@ -19,7 +19,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var days = ['Mån', 'Tis', 'Ons', 'Tor', 'Fre', 'Lör', 'Sön'];
 
-var _default = input => {
+function _parseWeeks(weeks, set) {
+  var method = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'add';
+  if (!weeks) return;
+  var intervals = weeks.split(',').map(_lodash.default.trim);
+  intervals.forEach(interval => {
+    if (!interval.includes('-')) return set[method](Number(interval));
+    var [start, end] = interval.split('-').map(Number);
+    Array(end - start + 1).fill(start).forEach((val, index) => set[method](val + index));
+  });
+}
+
+var _default = (input, options) => {
   if (!input) throw new Error('(SchoolSoft::From::Schedules) Input was undefined');
   if (_lodash.default.isString(input)) throw new Error('(SchoolSoft::From::Schedules) Input was of type string. Is required to be of object type');
   var teachers = new Set();
@@ -29,6 +40,38 @@ var _default = input => {
     var _locations2;
 
     if (!('length' in event)) return acc;
+    var weeks = new Set();
+    var {
+      inweek,
+      exweek,
+      realweeks
+    } = event;
+
+    try {
+      _parseWeeks(inweek, weeks, 'add');
+
+      _parseWeeks(realweeks, weeks, 'add');
+
+      if (weeks.size == 0) Array(51).fill(1).forEach((val, index) => weeks.add(val + index));
+
+      _parseWeeks(exweek, weeks, 'delete');
+    } catch (err) {
+      console.log(err, inweek);
+    }
+
+    if (options !== null && options !== void 0 && options.interval) {
+      var {
+        start: _start,
+        end: _end
+      } = options.interval;
+      console.log(event.subject, _lodash.default.sortBy(Array.from(weeks)), _start, _end);
+
+      if (!Array.from(weeks).some(week => week >= _start && week <= _end)) {
+        console.log(event.subject, 'course not in interval');
+        return acc;
+      }
+    }
+
     var start, end;
     var {
       starttime,
@@ -74,7 +117,8 @@ var _default = input => {
 
     return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
       ids: event.id,
-      duration: event.length
+      duration: event.length,
+      weeks: _lodash.default.sortBy(Array.from(weeks))
     }, subject && {
       subject
     }), start && {
@@ -97,6 +141,8 @@ var _default = input => {
   var courses = new Set([]);
 
   var _loop = function _loop(element) {
+    var _ref;
+
     set.delete(element);
     var events = [element];
     var {
@@ -120,35 +166,33 @@ var _default = input => {
     }
 
     var course = _objectSpread(_objectSpread({
-      displayName: "".concat(subject, "-").concat(groups === null || groups === void 0 ? void 0 : groups.join(' '))
+      displayName: "".concat(subject, "-").concat((_ref = groups !== null && groups !== void 0 ? groups : teachers) === null || _ref === void 0 ? void 0 : _ref.join(' '))
     }, groups && {
       groups
     }), {}, {
       events
     });
 
-    if (events.every(_ref => {
+    if (events.every(_ref2 => {
       var {
         teachers: _teachers
-      } = _ref;
+      } = _ref2;
       return _lodash.default.isEqual(_lodash.default.sortBy(teachers), _lodash.default.sortBy(_teachers));
     })) {
       var _course$events;
 
-      console.log('all teaches equal');
       course.teachers = teachers;
       (_course$events = course.events) === null || _course$events === void 0 ? void 0 : _course$events.forEach(event => delete event.teachers);
     }
 
-    if (events.every(_ref2 => {
+    if (events.every(_ref3 => {
       var {
         inLocations: _inLocations
-      } = _ref2;
+      } = _ref3;
       return _lodash.default.isEqual(_lodash.default.sortBy(inLocations), _lodash.default.sortBy(_inLocations));
     })) {
       var _course$events2;
 
-      console.log('all locations equal');
       course.locations = locations;
       (_course$events2 = course.events) === null || _course$events2 === void 0 ? void 0 : _course$events2.forEach(event => delete event.locations);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","mappings":"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","names":["days","input","Error","_","isString","teachers","Set","groups","locations","events","reduce","acc","event","start","end","starttime","subject","day","length","teacher","group","room","_day","indexOf","substring","clone","add","_teachers","_groups","_locations","split","map","x","trim","forEach","_teacher","_group","sortBy","_location","concat","ids","id","duration","inLocations","index","groupIndex","set","courses","element","delete","isEqual","push","course","displayName","join","every","console","log","_inLocations","Array","from"],"sourceRoot":"","sources":["../../../src/SchoolSoft/from/schedules.ts"],"sourcesContent":[null]}
+{"version":3,"file":"schedules.js","mappings":"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","names":["days","_parseWeeks","weeks","set","method","intervals","split","map","_","trim","forEach","interval","includes","Number","start","end","Array","fill","val","index","input","options","Error","isString","teachers","Set","groups","locations","events","reduce","acc","event","inweek","exweek","realweeks","size","add","err","console","log","subject","sortBy","from","some","week","starttime","day","length","teacher","group","room","_day","indexOf","substring","clone","_teachers","_groups","_locations","x","_teacher","_group","_location","concat","ids","id","duration","inLocations","groupIndex","courses","element","delete","isEqual","push","course","displayName","join","every","_inLocations"],"sourceRoot":"","sources":["../../../src/SchoolSoft/from/schedules.ts"],"sourcesContent":[null]}

package/dist/SchoolSoft/types/events.d.ts

@@ -11,8 +11,9 @@ export interface Event {
     subject?: string;
     room?: string;
     period?: string;
+    experiod?: string;
     inweek?: string;
     exweek?: string;
-    exclass?: string;
+    exclass?: 0 | 1;
     realweeks?: string;
 }

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

@@ -18,6 +18,7 @@ export interface CourseEventBare {
     teachers?: Teacher[] | string[] | null;
     locations?: AvailableLocation[] | AvailableLocation[][] | string[] | null;
     inLocations?: Location[] | string[];
+    weeks?: number[];
     density?: number;
     weight?: number;
     potentialCenter?: string;

package/package.json

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