@royalschedule/maps 2.2.34 → 2.2.35

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.
@@ -41,21 +41,36 @@ function _default(src, meta) {
41
41
  });
42
42
  var groupStaffMap = new Map();
43
43
  src.groups_staff.forEach(x => {
44
- groupStaffMap.has(x.groupId) || groupStaffMap.set(x.groupId, []);
45
- groupStaffMap.get(x.groupId).push(x.userId);
44
+ groupStaffMap.has(x.groupId) || groupStaffMap.set(x.groupId, new Set());
45
+ groupStaffMap.get(x.groupId).add(x.userId);
46
+ });
47
+ var studentClassMap = new Map();
48
+ src.classes_students.forEach(x => {
49
+ studentClassMap.has(x.userId) || studentClassMap.set(x.userId, new Set());
50
+ studentClassMap.get(x.userId).add(x.classId);
51
+ });
52
+ var groupClassesMap = new Map();
53
+ src.groups_students.forEach(x => {
54
+ var _studentClassMap$get;
55
+
56
+ groupClassesMap.has(x.groupId) || groupClassesMap.set(x.groupId, new Set());
57
+ (_studentClassMap$get = studentClassMap.get(x.userId)) === null || _studentClassMap$get === void 0 ? void 0 : _studentClassMap$get.forEach(y => groupClassesMap.get(x.groupId).add(y));
46
58
  });
47
59
  var courses = [];
48
60
  src.groups.forEach(x => {
49
- var _groupStaffMap$get;
61
+ var _groupStaffMap$get, _groupClassesMap$get;
50
62
 
51
63
  var courseRange = moment.range(moment.utc(x.StartDate), moment.utc(x.EndDate));
52
64
  if (!scheduleRange.overlaps(courseRange)) return;
53
- var teachers = (_groupStaffMap$get = groupStaffMap.get(x.ID)) === null || _groupStaffMap$get === void 0 ? void 0 : _groupStaffMap$get.map(x => x.toString());
54
- courses.push(_objectSpread({
65
+ var teachers = [...((_groupStaffMap$get = groupStaffMap.get(x.ID)) !== null && _groupStaffMap$get !== void 0 ? _groupStaffMap$get : [])].map(x => x.toString());
66
+ var groups = [...((_groupClassesMap$get = groupClassesMap.get(x.ID)) !== null && _groupClassesMap$get !== void 0 ? _groupClassesMap$get : [])].map(x => x.toString());
67
+ courses.push(_objectSpread(_objectSpread({
55
68
  ids: x.ID.toString(),
56
69
  displayName: x.Name || x.FriendlyName
57
70
  }, teachers && {
58
71
  teachers
72
+ }), groups && {
73
+ groups
59
74
  }));
60
75
  });
61
76
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"schedule.js","mappings":";;;;;;;AAAA;;AACA;;;;;;;;;;;;AAMA,IAAMA,MAAM,GAAG,+BAAaC,MAAb,CAAf;;AAEc,kBACZC,GADY,EAEZC,IAFY,EAEF;AAIV,MAAIC,QAAQ,GAAa,EAAzB;AACA,MAAIC,MAAM,GAAe,EAAzB;AAGA,MAAIC,aAAa,GAAGN,MAAM,CAACO,KAAP,CAAaP,MAAM,CAACQ,GAAP,CAAWL,IAAI,CAACM,GAAhB,CAAb,EAAmCT,MAAM,CAACQ,GAAP,CAAWL,IAAI,CAACO,GAAhB,CAAnC,CAApB;AAKA,MAAIC,QAAQ,GAAkB,EAA9B;AACAT,KAAG,CAACU,KAAJ,CAAUC,OAAV,CAAkBC,CAAC,IAAG;AACpBH,YAAQ,CAACI,IAAT,CAAc;AACZC,SAAG,EAAUF,CAAC,CAACG,EAAF,CAAKC,QAAL,EADD;AAEZC,iBAAW,EAAEL,CAAC,CAACM,SAAF,GAAc,GAAd,GAAoBN,CAAC,CAACO;AAFvB,KAAd;AAID,GALD;AAWA,MAAIC,MAAM,GAAkB,EAA5B;AACApB,KAAG,CAACqB,OAAJ,CAAYV,OAAZ,CAAoBC,CAAC,IAAG;AACtBQ,UAAM,CAACP,IAAP,CAAY;AACVC,SAAG,EAAUF,CAAC,CAACG,EAAF,CAAKC,QAAL,EADH;AAEVC,iBAAW,EAAEL,CAAC,CAACU;AAFL,KAAZ;AAID,GALD;AASA,MAAIC,aAAa,GAAG,IAAIC,GAAJ,EAApB;AACAxB,KAAG,CAACyB,YAAJ,CAAiBd,OAAjB,CAAyBC,CAAC,IAAG;AAC3BW,iBAAa,CAACG,GAAd,CAAkBd,CAAC,CAACe,OAApB,KAAgCJ,aAAa,CAACK,GAAd,CAAkBhB,CAAC,CAACe,OAApB,EAA6B,EAA7B,CAAhC;AACAJ,iBAAa,CAACM,GAAd,CAAkBjB,CAAC,CAACe,OAApB,EAA8Bd,IAA9B,CAAmCD,CAAC,CAACkB,MAArC;AACD,GAHD;AASA,MAAIC,OAAO,GAAmB,EAA9B;AACA/B,KAAG,CAACoB,MAAJ,CAAWT,OAAX,CAAmBC,CAAC,IAAG;AAAA;;AAErB,QAAIoB,WAAW,GAAGlC,MAAM,CAACO,KAAP,CAAaP,MAAM,CAACQ,GAAP,CAAWM,CAAC,CAACqB,SAAb,CAAb,EAAsCnC,MAAM,CAACQ,GAAP,CAAWM,CAAC,CAACsB,OAAb,CAAtC,CAAlB;AACA,QAAK,CAAE9B,aAAa,CAAC+B,QAAd,CAAuBH,WAAvB,CAAP,EAA4C;AAE5C,QAAIvB,QAAQ,yBAAGc,aAAa,CAACM,GAAd,CAAkBjB,CAAC,CAACG,EAApB,CAAH,uDAAG,mBAAyBqB,GAAzB,CAA6BxB,CAAC,IAAIA,CAAC,CAACI,QAAF,EAAlC,CAAf;AAEAe,WAAO,CAAClB,IAAR;AACEC,SAAG,EAAUF,CAAC,CAACG,EAAF,CAAKC,QAAL,EADf;AAEEC,iBAAW,EAAEL,CAAC,CAACU,IAAF,IAAUV,CAAC,CAACyB;AAF3B,OAGM5B,QAAQ,IAAI;AAAEA;AAAF,KAHlB;AAKD,GAZD;AAgBA,SAAO;AAAEA,YAAF;AAAYW,UAAZ;AAAoBW,WAApB;AACE9B,QAAI,kCACGE,MAAM,CAACmC,MAAP,GAAkB;AAAEnC,YAAM,EAAIA;AAAZ,KAAlB,GAA2C,EAD9C,GAEGD,QAAQ,CAACoC,MAAT,GAAkB;AAAEpC,cAAQ,EAAEA;AAAZ,KAAlB,GAA2C,EAF9C;AADN,GAAP;AAMD","names":["moment","Moment","src","meta","warnings","errors","scheduleRange","range","utc","beg","end","teachers","staff","forEach","x","push","ids","ID","toString","displayName","Firstname","Lastname","groups","classes","Name","groupStaffMap","Map","groups_staff","has","groupId","set","get","userId","courses","courseRange","StartDate","EndDate","overlaps","map","FriendlyName","length"],"sourceRoot":"","sources":["../../../src/vKlass/from/schedule.ts"],"sourcesContent":[null]}
1
+ {"version":3,"file":"schedule.js","mappings":"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","names":["moment","Moment","src","meta","warnings","errors","scheduleRange","range","utc","beg","end","teachers","staff","forEach","x","push","ids","ID","toString","displayName","Firstname","Lastname","groups","classes","Name","groupStaffMap","Map","groups_staff","has","groupId","set","Set","get","add","userId","studentClassMap","classes_students","classId","groupClassesMap","groups_students","y","courses","courseRange","StartDate","EndDate","overlaps","map","FriendlyName","length"],"sourceRoot":"","sources":["../../../src/vKlass/from/schedule.ts"],"sourcesContent":[null]}
@@ -18,11 +18,21 @@ export declare type GroupStaffReference = {
18
18
  groupId: number;
19
19
  userId: number;
20
20
  };
21
+ export declare type GroupStudentReference = {
22
+ groupId: number;
23
+ userId: number;
24
+ };
25
+ export declare type ClassStudentReference = {
26
+ classId: number;
27
+ userId: number;
28
+ };
21
29
  export declare type Schedule = {
22
30
  staff: Staff[];
23
31
  groups: Group[];
24
32
  classes: Class[];
25
33
  groups_staff: GroupStaffReference[];
34
+ groups_students: GroupStudentReference[];
35
+ classes_students: ClassStudentReference[];
26
36
  };
27
37
  export declare type Meta = {
28
38
  beg: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@royalschedule/maps",
3
- "version": "2.2.34",
3
+ "version": "2.2.35",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",