@royalschedule/maps 2.2.40 → 2.2.43

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.
@@ -11,6 +11,12 @@ var _moment = _interopRequireDefault(require("moment"));
11
11
 
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
14
+ 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; }
15
+
16
+ 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; }
17
+
18
+ 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; }
19
+
14
20
  var _default = (courseEvents, options) => {
15
21
  var inweek = '';
16
22
 
@@ -20,9 +26,9 @@ var _default = (courseEvents, options) => {
20
26
  end
21
27
  } = options.interval;
22
28
 
23
- var diff = _moment.default.duration((0, _moment.default)(start).diff((0, _moment.default)(end)));
29
+ var diff = _moment.default.duration((0, _moment.default)(end).diff((0, _moment.default)(start)));
24
30
 
25
- inweek = Array(diff.weeks()).fill((0, _moment.default)(start).week()).map((val, index) => val + index).join(',');
31
+ inweek = Array(Math.ceil(diff.asWeeks())).fill((0, _moment.default)(start).week()).map((val, index) => val + index).join(',');
26
32
  }
27
33
 
28
34
  var events = courseEvents.reduce((acc, event) => {
@@ -31,7 +37,9 @@ var _default = (courseEvents, options) => {
31
37
  if (event.parked) return acc;
32
38
  var teachers = event.teachers == null ? event.course.teachers : event.teachers;
33
39
  var room = event.inLocations.filter(x => x !== null).map(locations => locations.ids).join(', ');
34
- return acc.concat({
40
+ return acc.concat(_objectSpread(_objectSpread({}, event.ids && {
41
+ id: event.ids
42
+ }), {}, {
35
43
  groupid: event.course.ids,
36
44
  dayid: _moment.default.utc(event.start).day() - 1,
37
45
  starttime: _moment.default.utc(event.start).format('HHmm'),
@@ -41,7 +49,7 @@ var _default = (courseEvents, options) => {
41
49
  exweek: '',
42
50
  room,
43
51
  inweek: (_event$weeks$join = (_event$weeks = event.weeks) === null || _event$weeks === void 0 ? void 0 : _event$weeks.join(',')) !== null && _event$weeks$join !== void 0 ? _event$weeks$join : inweek
44
- });
52
+ }));
45
53
  }, []);
46
54
 
47
55
  var wb = _xlsx.default.utils.book_new();
@@ -1 +1 @@
1
- {"version":3,"file":"schedules.js","mappings":";;;;;;;AAAA;;AACA;;;;eAUe,CAACA,YAAD,EAA8BC,OAA9B,KAAwG;AACrH,MAAIC,MAAM,GAAW,EAArB;;AAEA,MAAID,OAAJ,aAAIA,OAAJ,eAAIA,OAAO,CAAEE,QAAb,EAAuB;AACrB,QAAM;AAAEC,WAAF;AAASC;AAAT,QAAiBJ,OAAO,CAACE,QAA/B;;AACA,QAAMG,IAAI,GAAGC,gBAAOC,QAAP,CAAgB,qBAAOJ,KAAP,EAAcE,IAAd,CAAmB,qBAAOD,GAAP,CAAnB,CAAhB,CAAb;;AACAH,UAAM,GAAGO,KAAK,CAACH,IAAI,CAACI,KAAL,EAAD,CAAL,CAAoBC,IAApB,CAAyB,qBAAOP,KAAP,EAAcQ,IAAd,EAAzB,EAA+CC,GAA/C,CAAmD,CAACC,GAAD,EAAMC,KAAN,KAAgBD,GAAG,GAAGC,KAAzE,EAAgFC,IAAhF,CAAqF,GAArF,CAAT;AACD;;AAED,MAAIC,MAAM,GAAGjB,YAAY,CAACkB,MAAb,CAAoB,CAACC,GAAD,EAAeC,KAAf,KAAqC;AAAA;;AACpE,QAAIA,KAAK,CAACC,MAAV,EACE,OAAOF,GAAP;AAEF,QAAIG,QAAQ,GAAeF,KAAK,CAACE,QAAN,IAAkB,IAAlB,GAA0BF,KAAK,CAACG,MAAN,CAAyBD,QAAnD,GAA8DF,KAAK,CAACE,QAA/F;AAEA,QAAIE,IAAI,GAAmBJ,KAAK,CAACK,WAAN,CACkBC,MADlB,CAC0BC,CAAD,IAAYA,CAAC,KAAK,IAD3C,EAEkBd,GAFlB,CAEuBe,SAAD,IAAyBA,SAAS,CAACC,GAFzD,EAGkBb,IAHlB,CAGuB,IAHvB,CAA3B;AAKA,WAAOG,GAAG,CAACW,MAAJ,CAAW;AAChBC,aAAO,EAAIX,KAAK,CAACG,MAAN,CAAwBM,GADnB;AAEhBG,WAAK,EAAMzB,gBAAO0B,GAAP,CAAWb,KAAK,CAAChB,KAAjB,EAAwB8B,GAAxB,KAAgC,CAF3B;AAGhBC,eAAS,EAAE5B,gBAAO0B,GAAP,CAAWb,KAAK,CAAChB,KAAjB,EAAwBgC,MAAxB,CAA+B,MAA/B,CAHK;AAIhBC,YAAM,EAAK9B,gBAAO0B,GAAP,CAAWb,KAAK,CAACf,GAAjB,EAAsBC,IAAtB,CAA2BC,gBAAO0B,GAAP,CAAWb,KAAK,CAAChB,KAAjB,CAA3B,EAAoD,SAApD,CAJK;AAKhBkC,eAAS,EAAE,CAAChB,QAAQ,IAAI,EAAb,EAAiBT,GAAjB,CAAsB0B,OAAD,IAAsBA,OAAO,CAACV,GAAnD,EAAwDb,IAAxD,CAA6D,IAA7D,CALK;AAMhBwB,aAAO,mBAAKpB,KAAK,CAACG,MAAX,kDAAK,cAAyBiB,OANrB;AAOhBC,YAAM,EAAK,EAPK;AAQhBjB,UARgB;AAShBtB,YAAM,uCAAEkB,KAAK,CAACV,KAAR,iDAAE,aAAaM,IAAb,CAAkB,GAAlB,CAAF,iEAA4Bd;AATlB,KAAX,CAAP;AAWD,GAtBY,EAsBV,EAtBU,CAAb;;AAwBA,MAAIwC,EAAE,GAAGC,cAAKC,KAAL,CAAWC,QAAX,EAAT;;AAEAF,gBAAKC,KAAL,CAAWE,iBAAX,CAA6BJ,EAA7B,EAAiCC,cAAKC,KAAL,CAAWG,aAAX,CAAyB9B,MAAzB,CAAjC,EAAmE,uBAAnE;;AAEA,SAAOyB,EAAP;AACD,C","names":["courseEvents","options","inweek","interval","start","end","diff","moment","duration","Array","weeks","fill","week","map","val","index","join","events","reduce","acc","event","parked","teachers","course","room","inLocations","filter","x","locations","ids","concat","groupid","dayid","utc","day","starttime","format","length","teacherid","teacher","subject","exweek","wb","XLSX","utils","book_new","book_append_sheet","json_to_sheet"],"sourceRoot":"","sources":["../../../../src/SchoolSoft/file/to/schedules.ts"],"sourcesContent":[null]}
1
+ {"version":3,"file":"schedules.js","mappings":";;;;;;;AAAA;;AACA;;;;;;;;;;eAUe,CAACA,YAAD,EAA8BC,OAA9B,KAAwG;AACrH,MAAIC,MAAM,GAAW,EAArB;;AAEA,MAAID,OAAJ,aAAIA,OAAJ,eAAIA,OAAO,CAAEE,QAAb,EAAuB;AACrB,QAAM;AAAEC,WAAF;AAASC;AAAT,QAAiBJ,OAAO,CAACE,QAA/B;;AACA,QAAMG,IAAI,GAAGC,gBAAOC,QAAP,CAAgB,qBAAOH,GAAP,EAAYC,IAAZ,CAAiB,qBAAOF,KAAP,CAAjB,CAAhB,CAAb;;AACAF,UAAM,GAAGO,KAAK,CAACC,IAAI,CAACC,IAAL,CAAUL,IAAI,CAACM,OAAL,EAAV,CAAD,CAAL,CAAiCC,IAAjC,CAAsC,qBAAOT,KAAP,EAAcU,IAAd,EAAtC,EAA4DC,GAA5D,CAAgE,CAACC,GAAD,EAAMC,KAAN,KAAgBD,GAAG,GAAGC,KAAtF,EAA6FC,IAA7F,CAAkG,GAAlG,CAAT;AACD;;AAED,MAAIC,MAAM,GAAGnB,YAAY,CAACoB,MAAb,CAAoB,CAACC,GAAD,EAAeC,KAAf,KAAqC;AAAA;;AACpE,QAAIA,KAAK,CAACC,MAAV,EACE,OAAOF,GAAP;AAEF,QAAIG,QAAQ,GAAeF,KAAK,CAACE,QAAN,IAAkB,IAAlB,GAA0BF,KAAK,CAACG,MAAN,CAAyBD,QAAnD,GAA8DF,KAAK,CAACE,QAA/F;AAEA,QAAIE,IAAI,GAAmBJ,KAAK,CAACK,WAAN,CACkBC,MADlB,CAC0BC,CAAD,IAAYA,CAAC,KAAK,IAD3C,EAEkBd,GAFlB,CAEuBe,SAAD,IAAyBA,SAAS,CAACC,GAFzD,EAGkBb,IAHlB,CAGuB,IAHvB,CAA3B;AAKA,WAAOG,GAAG,CAACW,MAAJ,iCACFV,KAAK,CAACS,GAAN,IAAa;AAAEE,QAAE,EAAEX,KAAK,CAACS;AAAZ,KADX;AAELG,aAAO,EAAIZ,KAAK,CAACG,MAAN,CAAwBM,GAF9B;AAGLI,WAAK,EAAM5B,gBAAO6B,GAAP,CAAWd,KAAK,CAAClB,KAAjB,EAAwBiC,GAAxB,KAAgC,CAHtC;AAILC,eAAS,EAAE/B,gBAAO6B,GAAP,CAAWd,KAAK,CAAClB,KAAjB,EAAwBmC,MAAxB,CAA+B,MAA/B,CAJN;AAKLC,YAAM,EAAKjC,gBAAO6B,GAAP,CAAWd,KAAK,CAACjB,GAAjB,EAAsBC,IAAtB,CAA2BC,gBAAO6B,GAAP,CAAWd,KAAK,CAAClB,KAAjB,CAA3B,EAAoD,SAApD,CALN;AAMLqC,eAAS,EAAE,CAACjB,QAAQ,IAAI,EAAb,EAAiBT,GAAjB,CAAsB2B,OAAD,IAAsBA,OAAO,CAACX,GAAnD,EAAwDb,IAAxD,CAA6D,IAA7D,CANN;AAOLyB,aAAO,mBAAKrB,KAAK,CAACG,MAAX,kDAAK,cAAyBkB,OAPhC;AAQLC,YAAM,EAAK,EARN;AASLlB,UATK;AAULxB,YAAM,uCAAKoB,KAAK,CAACuB,KAAX,iDAAK,aAAa3B,IAAb,CAAkB,GAAlB,CAAL,iEAA+BhB;AAVhC,OAAP;AAYD,GAvBY,EAuBV,EAvBU,CAAb;;AAyBA,MAAI4C,EAAE,GAAGC,cAAKC,KAAL,CAAWC,QAAX,EAAT;;AAEAF,gBAAKC,KAAL,CAAWE,iBAAX,CAA6BJ,EAA7B,EAAiCC,cAAKC,KAAL,CAAWG,aAAX,CAAyBhC,MAAzB,CAAjC,EAAmE,uBAAnE;;AAEA,SAAO2B,EAAP;AACD,C","names":["courseEvents","options","inweek","interval","start","end","diff","moment","duration","Array","Math","ceil","asWeeks","fill","week","map","val","index","join","events","reduce","acc","event","parked","teachers","course","room","inLocations","filter","x","locations","ids","concat","id","groupid","dayid","utc","day","starttime","format","length","teacherid","teacher","subject","exweek","weeks","wb","XLSX","utils","book_new","book_append_sheet","json_to_sheet"],"sourceRoot":"","sources":["../../../../src/SchoolSoft/file/to/schedules.ts"],"sourcesContent":[null]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@royalschedule/maps",
3
- "version": "2.2.40",
3
+ "version": "2.2.43",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",