@royalschedule/maps 2.0.11 → 2.0.15

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.
@@ -1,3 +1,8 @@
1
1
  export default class {
2
- static schedules: (input: import("../types/events").Event[]) => import("../../core/types/divisions").Division;
2
+ static schedules: (input: import("../types/events").Event[], options?: {
3
+ interval?: {
4
+ start: number;
5
+ end: number;
6
+ } | undefined;
7
+ } | undefined) => import("../../core/types/divisions").Division;
3
8
  }
@@ -1,4 +1,9 @@
1
1
  import { Event } from '../types/events';
2
2
  import { Types as CoreTypes } from '../../core/types';
3
- declare const _default: (input: Event[]) => CoreTypes.division;
3
+ declare const _default: (input: Event[], options?: {
4
+ interval?: {
5
+ start: number;
6
+ end: number;
7
+ } | undefined;
8
+ } | undefined) => CoreTypes.division;
4
9
  export default _default;
@@ -19,7 +19,20 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
19
19
 
20
20
  var days = ['Mån', 'Tis', 'Ons', 'Tor', 'Fre', 'Lör', 'Sön'];
21
21
 
22
- var _default = input => {
22
+ function _parseWeeks(weeks, set) {
23
+ var method = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'add';
24
+ if (!weeks) return;
25
+ var intervals = weeks.split(',').map(_lodash.default.trim);
26
+ intervals.forEach(interval => {
27
+ if (!interval.includes('-')) return set[method](Number(interval));
28
+ var [start, end] = interval.split('-').map(Number);
29
+ Array(end - start + 1).fill(start).forEach((val, index) => set[method](val + index));
30
+ });
31
+ }
32
+
33
+ var _default = (input, options) => {
34
+ if (!input) throw new Error('(SchoolSoft::From::Schedules) Input was undefined');
35
+ if (_lodash.default.isString(input)) throw new Error('(SchoolSoft::From::Schedules) Input was of type string. Is required to be of object type');
23
36
  var teachers = new Set();
24
37
  var groups = new Set();
25
38
  var locations = new Set();
@@ -27,6 +40,38 @@ var _default = input => {
27
40
  var _locations2;
28
41
 
29
42
  if (!('length' in event)) return acc;
43
+ var weeks = new Set();
44
+ var {
45
+ inweek,
46
+ exweek,
47
+ realweeks
48
+ } = event;
49
+
50
+ try {
51
+ _parseWeeks(inweek, weeks, 'add');
52
+
53
+ _parseWeeks(realweeks, weeks, 'add');
54
+
55
+ if (weeks.size == 0) Array(51).fill(1).forEach((val, index) => weeks.add(val + index));
56
+
57
+ _parseWeeks(exweek, weeks, 'delete');
58
+ } catch (err) {
59
+ console.log(err, inweek);
60
+ }
61
+
62
+ if (options !== null && options !== void 0 && options.interval) {
63
+ var {
64
+ start: _start,
65
+ end: _end
66
+ } = options.interval;
67
+ console.log(event.subject, _lodash.default.sortBy(Array.from(weeks)), _start, _end);
68
+
69
+ if (!Array.from(weeks).some(week => week >= _start && week <= _end)) {
70
+ console.log(event.subject, 'course not in interval');
71
+ return acc;
72
+ }
73
+ }
74
+
30
75
  var start, end;
31
76
  var {
32
77
  starttime,
@@ -42,7 +87,7 @@ var _default = input => {
42
87
  var _day = days.indexOf(day);
43
88
 
44
89
  if (_day > 4) return acc;
45
- start = (0, _getDate.default)(_day, "".concat(starttime.substr(0, 2), ":").concat(starttime.substr(2, 3)));
90
+ start = (0, _getDate.default)(_day, "".concat(starttime.substring(0, 2), ":").concat(starttime.substring(2, 3)));
46
91
  end = start.clone().add(length, 'm');
47
92
  }
48
93
 
@@ -65,15 +110,15 @@ var _default = input => {
65
110
  }
66
111
 
67
112
  if (room) {
68
- _locations = room.split(',').map(x => x.trim());
113
+ _locations = _lodash.default.sortBy(room.split(',').map(x => x.trim()));
69
114
 
70
115
  _locations.forEach(_location => locations.add(_location));
71
116
  }
72
117
 
73
118
  return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
74
119
  ids: event.id,
75
- displayName: event.id,
76
- duration: event.length
120
+ duration: event.length,
121
+ weeks: _lodash.default.sortBy(Array.from(weeks))
77
122
  }, subject && {
78
123
  subject
79
124
  }), start && {
@@ -95,26 +140,68 @@ var _default = input => {
95
140
  var set = new Set(events);
96
141
  var courses = new Set([]);
97
142
 
98
- for (var element of set) {
143
+ var _loop = function _loop(element) {
144
+ var _ref;
145
+
99
146
  set.delete(element);
100
- var _events = [element];
147
+ var events = [element];
101
148
  var {
102
- subject
149
+ subject,
150
+ groups,
151
+ teachers,
152
+ inLocations,
153
+ locations
103
154
  } = element;
155
+ delete element.groups;
156
+ delete element.subject;
104
157
 
105
158
  for (var event of set) {
106
- if (event.subject != element.subject) continue;
107
- if (!_lodash.default.isEqual(_lodash.default.sortBy(event.groups), _lodash.default.sortBy(element.groups))) continue;
108
-
109
- _events.push(event);
110
-
159
+ if (event.subject != subject) continue;
160
+ if (groups !== null && groups !== void 0 && groups.length && !_lodash.default.isEqual(_lodash.default.sortBy(event.groups), _lodash.default.sortBy(groups))) continue;
161
+ if (!(groups !== null && groups !== void 0 && groups.length) && teachers !== null && teachers !== void 0 && teachers.length && !_lodash.default.isEqual(_lodash.default.sortBy(event.teachers), _lodash.default.sortBy(teachers))) continue;
162
+ delete event.groups;
163
+ delete event.subject;
164
+ events.push(event);
111
165
  set.delete(event);
112
166
  }
113
167
 
114
- courses.add({
115
- displayName: subject,
116
- events: _events
168
+ var course = _objectSpread(_objectSpread({
169
+ displayName: "".concat(subject, "-").concat((_ref = groups !== null && groups !== void 0 ? groups : teachers) === null || _ref === void 0 ? void 0 : _ref.join(' '))
170
+ }, groups && {
171
+ groups
172
+ }), {}, {
173
+ events
117
174
  });
175
+
176
+ if (events.every(_ref2 => {
177
+ var {
178
+ teachers: _teachers
179
+ } = _ref2;
180
+ return _lodash.default.isEqual(_lodash.default.sortBy(teachers), _lodash.default.sortBy(_teachers));
181
+ })) {
182
+ var _course$events;
183
+
184
+ course.teachers = teachers;
185
+ (_course$events = course.events) === null || _course$events === void 0 ? void 0 : _course$events.forEach(event => delete event.teachers);
186
+ }
187
+
188
+ if (events.every(_ref3 => {
189
+ var {
190
+ inLocations: _inLocations
191
+ } = _ref3;
192
+ return _lodash.default.isEqual(_lodash.default.sortBy(inLocations), _lodash.default.sortBy(_inLocations));
193
+ })) {
194
+ var _course$events2;
195
+
196
+ course.locations = locations;
197
+ (_course$events2 = course.events) === null || _course$events2 === void 0 ? void 0 : _course$events2.forEach(event => delete event.locations);
198
+ }
199
+
200
+ courses.add(course);
201
+ };
202
+
203
+ for (var element of set) {
204
+ _loop(element);
118
205
  }
119
206
 
120
207
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"schedules.js","mappings":"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","names":["days","input","teachers","Set","groups","locations","events","reduce","acc","event","start","end","starttime","subject","day","length","teacher","group","room","_day","indexOf","substr","clone","add","_teachers","_groups","_locations","split","map","x","trim","forEach","_teacher","_group","_location","concat","ids","id","displayName","duration","inLocations","index","groupIndex","set","courses","element","delete","_","isEqual","sortBy","push","Array","from"],"sourceRoot":"","sources":["../../../src/SchoolSoft/from/schedules.ts"],"sourcesContent":[null]}
1
+ {"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]}
@@ -11,8 +11,9 @@ export interface Event {
11
11
  subject?: string;
12
12
  room?: string;
13
13
  period?: string;
14
+ experiod?: string;
14
15
  inweek?: string;
15
16
  exweek?: string;
16
- exclass?: string;
17
+ exclass?: 0 | 1;
17
18
  realweeks?: string;
18
19
  }
@@ -103,7 +103,6 @@ function identify(schedule) {
103
103
  };
104
104
  if (!schedule) return similarities;
105
105
  var collections = Array.isArray(schedule) ? _reduceSchedule(schedule) : Object.keys(schedule);
106
- console.log('collections', collections);
107
106
  if (!collections.length) return similarities;
108
107
  maps.forEach(_ref => {
109
108
  var {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","mappings":"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","names":["Identity","_a","schedule","_b","RS","input","output","events","Core","groups","locations","teachers","courses","IdunSoft","Grupp","Lärare","Rum","Ämne","Lektion","SchoolSoft","maps","structure","name","map","SchoolSoftMap","IdunSoftMap","RSMap","meta","V1","V2","CoreMap","_reduceSchedule","docs","keys","Set","Array","isArray","flat","forEach","doc","Object","key","add","from","identify","similarities","none","weak","strong","collections","console","log","length","_collections","push","_","isEqual","sortBy","difference","isMatch","determined","every","collection","includes","some"],"sourceRoot":"","sources":["../../../src/core/identify/index.ts"],"sourcesContent":[null]}
1
+ {"version":3,"file":"index.js","mappings":"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","names":["Identity","_a","schedule","_b","RS","input","output","events","Core","groups","locations","teachers","courses","IdunSoft","Grupp","Lärare","Rum","Ämne","Lektion","SchoolSoft","maps","structure","name","map","SchoolSoftMap","IdunSoftMap","RSMap","meta","V1","V2","CoreMap","_reduceSchedule","docs","keys","Set","Array","isArray","flat","forEach","doc","Object","key","add","from","identify","similarities","none","weak","strong","collections","length","_collections","push","_","isEqual","sortBy","difference","isMatch","determined","every","collection","includes","some"],"sourceRoot":"","sources":["../../../src/core/identify/index.ts"],"sourcesContent":[null]}
@@ -18,6 +18,7 @@ export interface CourseEventBare {
18
18
  teachers?: Teacher[] | string[] | null;
19
19
  locations?: AvailableLocation[] | AvailableLocation[][] | string[] | null;
20
20
  inLocations?: Location[] | string[];
21
+ weeks?: number[];
21
22
  density?: number;
22
23
  weight?: number;
23
24
  potentialCenter?: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@royalschedule/maps",
3
- "version": "2.0.11",
3
+ "version": "2.0.15",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
31
31
  "homepage": "https://bitbucket.org/royalschedule/maps#readme",
32
32
  "devDependencies": {
33
33
  "@babel/cli": "^7.17.0",
34
- "@babel/core": "^7.17.0",
34
+ "@babel/core": "^7.17.2",
35
35
  "@babel/preset-env": "^7.16.11",
36
36
  "@types/app-module-path": "^2.2.0",
37
37
  "@types/json2csv": "^5.0.3",
@@ -50,7 +50,7 @@
50
50
  "lodash": "^4.17.21",
51
51
  "module-alias": "^2.2.2",
52
52
  "moment": "^2.29.1",
53
- "mongoose": "^6.2.0",
53
+ "mongoose": "^6.2.1",
54
54
  "papaparse": "^5.3.1",
55
55
  "xlsx": "^0.18.0"
56
56
  }