@royalschedule/maps 2.0.3 → 2.0.4

package/dist/Admentum/from/events.d.ts

@@ -0,0 +1,3 @@
+import { Types } from '../../core/types';
+import { Lesson } from '../types/lesson';
+export default function (lessons: Lesson[], courses: Types.course[], teachers: Types.course[], importErrors: string[], importWarnings: string[]): Types.courseEvent[];

package/dist/Admentum/from/events.js

@@ -0,0 +1,86 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+
+var _moment = _interopRequireDefault(require("moment"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+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; }
+
+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; }
+
+var firstDay = _moment.default.utc('1970-01-05');
+
+function fromTimeString(day, timeString) {
+  var [hours, minutes, seconds] = timeString.split(':').map(time => parseInt(time));
+  return firstDay.clone().add(day, 'day').set('hour', hours).set('minute', minutes);
+}
+
+function _default(lessons, courses, teachers, importErrors, importWarnings) {
+  var group2course = new Map();
+  courses.forEach(c => group2course.set(c.ids, c));
+  var teacherSet = new Set();
+  teachers.forEach(t => teacherSet.add(t.ids));
+  var events = [];
+  lessons.forEach(l => {
+    var _course$teachers, _l$info$room;
+
+    if (l.info.groups.length != 1) {
+      var warn = "The lesson with id \"".concat(l.id, " contained ").concat(l.info.groups.length, " number of groups (schedule_groups = courses) and was therefore omitted: a lesson shall contain only a single group.");
+      importWarnings.push(warn);
+      return;
+    }
+
+    var course_id = l.info.groups[0].id.toString();
+    var course = group2course.get(course_id);
+
+    if (!course) {
+      var _warn = "The lesson with id \"".concat(l.id, "\" referenced the unknown/faulty schedule_group (course) \"").concat(course_id, "\" and was therefore ignored.");
+
+      importWarnings.push(_warn);
+      return;
+    }
+
+    var start = fromTimeString(l.weekday, l.info.start);
+    var end = fromTimeString(l.weekday, l.info.end);
+    var duration = l.info.duration;
+    var eventTeachers;
+
+    if (!course.teachers || !((_course$teachers = course.teachers) !== null && _course$teachers !== void 0 && _course$teachers.every(x => l.info.teachers.some(y => y.id.toString() == x)))) {
+      eventTeachers = l.info.teachers.map(x => x.id.toString());
+
+      for (var teacher of eventTeachers) {
+        if (!teacherSet.has(teacher)) {
+          var _warn2 = "The lesson with id \"".concat(l.id, "\" referenced the unknown teacher \"").concat(teacher, "\" and was therefore ignored.");
+
+          importWarnings.push(_warn2);
+          return;
+        }
+      }
+    }
+
+    var location = (_l$info$room = l.info.room) === null || _l$info$room === void 0 ? void 0 : _l$info$room.id.toString();
+    events.push(_objectSpread(_objectSpread({
+      ids: l.id.toString(),
+      start,
+      end,
+      duration,
+      course: course_id
+    }, location && {
+      inLocations: [location],
+      locations: [{
+        locations: [location]
+      }]
+    }), eventTeachers && {
+      teachers: eventTeachers
+    }));
+  });
+  return events;
+}
+//# sourceMappingURL=events.js.map

package/dist/Admentum/from/events.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/Admentum/from/events.ts"],"names":[],"mappings":"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","sourceRoot":"","file":"events.js"}

package/dist/Admentum/from/schedules.js

@@ -13,6 +13,8 @@ var _groups2 = _interopRequireDefault(require("./groups"));
 
 var _courses2 = _interopRequireDefault(require("./courses"));
 
+var _events2 = _interopRequireDefault(require("./events"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -32,10 +34,10 @@ function _default(schedule) {
   var importErrors = [];
   var importWarnings = [];
   var locations = (0, _locations2.default)(schedule.rooms, importErrors, importWarnings);
-  var teachers = (0, _teachers2.default)(schedule.schedule_groups, importErrors, importWarnings);
+  var teachers = (0, _teachers2.default)(schedule.schedule_groups, schedule.lessons, importErrors, importWarnings);
   var groups = (0, _groups2.default)(schedule.primary_groups, importErrors, importWarnings);
   var courses = (0, _courses2.default)(schedule.schedule_groups, school, importErrors, importWarnings);
-  var events = [];
+  var events = (0, _events2.default)(schedule.lessons, courses, teachers, importErrors, importWarnings);
   return _objectSpread(_objectSpread(_objectSpread({}, {
     groups,
     teachers,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/Admentum/from/schedules.ts"],"names":[],"mappings":";;;;;;;AAEA;;AACA;;AACA;;AACA;;;;;;;;;;AAKc,kBACZ,QADY,EACM;AAMlB,MAAI,QAAQ,CAAC,OAAT,CAAiB,MAAjB,IAA2B,CAA/B,EAAkC;AAChC,WAAO;AAAE,MAAA,YAAY,EAAE,oBAAa,QAAQ,CAAC,OAAT,CAAiB,MAA9B;AAAhB,KAAP;AACD;;AACD,MAAI,MAAM,GAAG,QAAQ,CAAC,OAAT,CAAiB,CAAjB,CAAb;AAGA,MAAI,YAAY,GAAe,EAA/B;AACA,MAAI,cAAc,GAAa,EAA/B;AAEA,MAAM,SAAS,GAAyB,yBAAW,QAAQ,CAAC,KAApB,EAA2C,YAA3C,EAAyD,cAAzD,CAAxC;AACA,MAAM,QAAQ,GAA0B,wBAAU,QAAQ,CAAC,eAAnB,EAA2C,YAA3C,EAAyD,cAAzD,CAAxC;AACA,MAAM,MAAM,GAA4B,sBAAQ,QAAQ,CAAC,cAAjB,EAA2C,YAA3C,EAAyD,cAAzD,CAAxC;AACA,MAAM,OAAO,GAA2B,uBAAS,QAAQ,CAAC,eAAlB,EAAmC,MAAnC,EAA2C,YAA3C,EAAyD,cAAzD,CAAxC;AAEA,MAAM,MAAM,GAA4B,EAAxC;AAEA,uDAAY;AAAE,IAAA,MAAF;AAAU,IAAA,QAAV;AAAoB,IAAA,SAApB;AAA+B,IAAA,OAA/B;AAAwC,IAAA;AAAxC,GAAZ,GACa,YAAY,CAAC,MAAb,GAAwB;AAAE,IAAA;AAAF,GAAxB,GAA6C,EAD1D,GAEa,cAAc,CAAC,MAAf,GAAwB;AAAE,IAAA;AAAF,GAAxB,GAA6C,EAF1D;AAGD","sourceRoot":"","file":"schedules.js"}
+{"version":3,"sources":["../../../src/Admentum/from/schedules.ts"],"names":[],"mappings":";;;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;AAKc,kBACZ,QADY,EACM;AAMlB,MAAI,QAAQ,CAAC,OAAT,CAAiB,MAAjB,IAA2B,CAA/B,EAAkC;AAChC,WAAO;AAAE,MAAA,YAAY,EAAE,oBAAa,QAAQ,CAAC,OAAT,CAAiB,MAA9B;AAAhB,KAAP;AACD;;AACD,MAAI,MAAM,GAAG,QAAQ,CAAC,OAAT,CAAiB,CAAjB,CAAb;AAGA,MAAI,YAAY,GAAe,EAA/B;AACA,MAAI,cAAc,GAAa,EAA/B;AAEA,MAAM,SAAS,GAA4B,yBAAW,QAAQ,CAAC,KAApB,EAAsD,YAAtD,EAAoE,cAApE,CAA3C;AACA,MAAM,QAAQ,GAA6B,wBAAU,QAAQ,CAAC,eAAnB,EAAoC,QAAQ,CAAC,OAA7C,EAAsD,YAAtD,EAAoE,cAApE,CAA3C;AACA,MAAM,MAAM,GAA+B,sBAAQ,QAAQ,CAAC,cAAjB,EAAsD,YAAtD,EAAoE,cAApE,CAA3C;AACA,MAAM,OAAO,GAA8B,uBAAS,QAAQ,CAAC,eAAlB,EAAmC,MAAnC,EAAsD,YAAtD,EAAoE,cAApE,CAA3C;AACA,MAAM,MAAM,GAA+B,sBAAQ,QAAQ,CAAC,OAAjB,EAA0B,OAA1B,EAAmC,QAAnC,EAAsD,YAAtD,EAAoE,cAApE,CAA3C;AAEA,uDAAY;AAAE,IAAA,MAAF;AAAU,IAAA,QAAV;AAAoB,IAAA,SAApB;AAA+B,IAAA,OAA/B;AAAwC,IAAA;AAAxC,GAAZ,GACa,YAAY,CAAC,MAAb,GAAwB;AAAE,IAAA;AAAF,GAAxB,GAA6C,EAD1D,GAEa,cAAc,CAAC,MAAf,GAAwB;AAAE,IAAA;AAAF,GAAxB,GAA6C,EAF1D;AAGD","sourceRoot":"","file":"schedules.js"}

package/dist/Admentum/from/teachers.d.ts

@@ -1,3 +1,4 @@
-import { ScheduleGroup } from '../types/schedule-group';
 import { Types } from '../../core/types';
-export default function (scheduleGroups: ScheduleGroup[], importErrors: string[], importWarnings: string[]): Types.teacher[];
+import { ScheduleGroup } from '../types/schedule-group';
+import { Lesson } from '../types/lesson';
+export default function (scheduleGroups: ScheduleGroup[], lessons: Lesson[], importErrors: string[], importWarnings: string[]): Types.teacher[];

package/dist/Admentum/from/teachers.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 
-function _default(scheduleGroups, importErrors, importWarnings) {
+function _default(scheduleGroups, lessons, importErrors, importWarnings) {
   var teacherSet = new Map();
   scheduleGroups.forEach(scheduleGroup => {
     scheduleGroup.teachers.forEach(teacher => {
@@ -15,6 +15,14 @@ function _default(scheduleGroups, importErrors, importWarnings) {
       });
     });
   });
+  lessons.forEach(lesson => {
+    lesson.teachers.forEach(teacher => {
+      teacherSet.set(teacher.id, {
+        ids: teacher.id.toString(),
+        displayName: teacher.first_name + " " + teacher.last_name
+      });
+    });
+  });
   return Array.from(teacherSet.values());
 }
 //# sourceMappingURL=teachers.js.map

package/dist/Admentum/from/teachers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/Admentum/from/teachers.ts"],"names":[],"mappings":";;;;;;;AAGc,kBACZ,cADY,EAEZ,YAFY,EAGZ,cAHY,EAGY;AAGxB,MAAI,UAAU,GAA+B,IAAI,GAAJ,EAA7C;AAEA,EAAA,cAAc,CAAC,OAAf,CAAuB,aAAa,IAAG;AACrC,IAAA,aAAa,CAAC,QAAd,CAAuB,OAAvB,CAA+B,OAAO,IAAG;AACvC,MAAA,UAAU,CAAC,GAAX,CAAe,OAAO,CAAC,EAAvB,EAA2B;AACzB,QAAA,GAAG,EAAU,OAAO,CAAC,EAAR,CAAW,QAAX,EADY;AAEzB,QAAA,WAAW,EAAE,OAAO,CAAC,UAAR,GAAqB,GAArB,GAA2B,OAAO,CAAC;AAFvB,OAA3B;AAID,KALD;AAMD,GAPD;AASA,SAAO,KAAK,CAAC,IAAN,CAAW,UAAU,CAAC,MAAX,EAAX,CAAP;AACD","sourceRoot":"","file":"teachers.js"}
+{"version":3,"sources":["../../../src/Admentum/from/teachers.ts"],"names":[],"mappings":";;;;;;;AAIc,kBACZ,cADY,EAEZ,OAFY,EAGZ,YAHY,EAIZ,cAJY,EAIY;AAGxB,MAAI,UAAU,GAA+B,IAAI,GAAJ,EAA7C;AAEA,EAAA,cAAc,CAAC,OAAf,CAAuB,aAAa,IAAG;AACrC,IAAA,aAAa,CAAC,QAAd,CAAuB,OAAvB,CAA+B,OAAO,IAAG;AACvC,MAAA,UAAU,CAAC,GAAX,CAAe,OAAO,CAAC,EAAvB,EAA2B;AACzB,QAAA,GAAG,EAAU,OAAO,CAAC,EAAR,CAAW,QAAX,EADY;AAEzB,QAAA,WAAW,EAAE,OAAO,CAAC,UAAR,GAAqB,GAArB,GAA2B,OAAO,CAAC;AAFvB,OAA3B;AAID,KALD;AAMD,GAPD;AASA,EAAA,OAAO,CAAC,OAAR,CAAgB,MAAM,IAAG;AACvB,IAAA,MAAM,CAAC,QAAP,CAAgB,OAAhB,CAAwB,OAAO,IAAG;AAChC,MAAA,UAAU,CAAC,GAAX,CAAe,OAAO,CAAC,EAAvB,EAA2B;AACzB,QAAA,GAAG,EAAU,OAAO,CAAC,EAAR,CAAW,QAAX,EADY;AAEzB,QAAA,WAAW,EAAE,OAAO,CAAC,UAAR,GAAqB,GAArB,GAA2B,OAAO,CAAC;AAFvB,OAA3B;AAID,KALD;AAMD,GAPD;AASA,SAAO,KAAK,CAAC,IAAN,CAAW,UAAU,CAAC,MAAX,EAAX,CAAP;AACD","sourceRoot":"","file":"teachers.js"}

package/dist/Admentum/types/course-section.d.ts

@@ -1,10 +0,0 @@
-export interface Course {
-    id: number;
-}
-export interface ScheduleGroup {
-    id: number;
-}
-export interface CourseSection {
-    course: Course;
-    schedule_group: ScheduleGroup;
-}

package/dist/Admentum/types/course-section.js

@@ -1,6 +1,2 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
 //# sourceMappingURL=course-section.js.map

package/dist/Admentum/types/lesson.d.ts

@@ -0,0 +1,22 @@
+import { User } from './user';
+export interface LessonInfo {
+    start: string;
+    end: string;
+    duration: number;
+    room?: {
+        id: number;
+    };
+    teachers: {
+        id: number;
+    }[];
+    groups: {
+        id: number;
+    }[];
+}
+export interface Lesson {
+    id: number;
+    weekday: number;
+    date: string;
+    info: LessonInfo;
+    teachers: User[];
+}

package/dist/Admentum/types/lesson.js

@@ -0,0 +1,6 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+//# sourceMappingURL=lesson.js.map

package/dist/Admentum/types/lesson.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","sourceRoot":"","file":"lesson.js"}

package/dist/Admentum/types/schedule.d.ts

@@ -1,15 +1,15 @@
 import { School } from './school';
 import { Room } from './room';
-import { CourseSection } from './course-section';
 import { PrimaryGroup } from './primary-group';
 import { ScheduleGroup } from './schedule-group';
+import { Lesson } from './lesson';
 export interface Schedule {
     schedule: {
         id: number;
     };
     schools: School[];
     rooms: Room[];
-    course_sections: CourseSection[];
     primary_groups: PrimaryGroup[];
     schedule_groups: ScheduleGroup[];
+    lessons: Lesson[];
 }

package/package.json

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