@royalschedule/maps 2.4.14 → 2.4.16

package/dist/RS/v2/from/placements.js

@@ -16,16 +16,16 @@ var _default = function _default(configuration) {
   return _lodash.default.reduce(events, (_ref, event) => {
     var _event$dependencies;
     var [eventAcc, lockedAcc] = _ref;
-    var [collection, id] = event.id.split('.');
+    var [collection] = event.id.split('.');
     if (collection == 'events') eventAcc = eventAcc.concat({
-      [idKey]: id,
+      [idKey]: event.id,
       parked: false,
       inLocations: (_event$dependencies = event.dependencies) !== null && _event$dependencies !== void 0 ? _event$dependencies : [],
       start: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.start, 'minutes').toISOString(),
       end: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.end, 'minutes').toISOString()
     });
     if (collection == 'lockedtimes') lockedAcc = lockedAcc.concat({
-      [idKey]: id,
+      [idKey]: event.id,
       start: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.start, 'minutes').toISOString(),
       end: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.end, 'minutes').toISOString()
     });

package/dist/RS/v2/from/placements.js.map

@@ -1 +1 @@
-{"version":3,"file":"placements.js","names":["_moment","_interopRequireDefault","require","_lodash","obj","__esModule","default","_default","configuration","options","arguments","length","undefined","idKey","events","_","reduce","_ref","event","_event$dependencies","eventAcc","lockedAcc","collection","id","split","concat","parked","inLocations","dependencies","start","moment","utc","add","day","toISOString","end","exports"],"sources":["../../../../src/RS/v2/from/placements.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAyD,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAW1C,SAAAA,SAACC,aAA4B,EAAoG;EAAA,IAAlGC,OAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAmB,EAAE;EAEjE,IAAMG,KAAK,GAAEJ,OAAO,CAACI,KAAK,IAAI,IAAI;EAElC,IAAM;IAAEC;EAAM,CAAE,GAAGN,aAAa,aAAbA,aAAa,cAAbA,aAAa,GAAI,EAAE;EAEtC,OAAOO,eAAC,CAACC,MAAM,CAACF,MAAM,EAAE,CAAAG,IAAA,EAAiGC,KAAgB,KAAI;IAAA,IAAAC,mBAAA;IAAA,IAApH,CAACC,QAAQ,EAAEC,SAAS,CAA0E,GAAAJ,IAAA;IACrH,IAAM,CAACK,UAAU,EAAEC,EAAE,CAAC,GAAGL,KAAK,CAACK,EAAE,CAACC,KAAK,CAAC,GAAG,CAAC;IAC5C,IAAIF,UAAU,IAAI,QAAQ,EACxBF,QAAQ,GAAGA,QAAQ,CAACK,MAAM,CAAC;MACzB,CAACZ,KAAK,GAAQU,EAAE;MAChBG,MAAM,EAAQ,KAAK;MACnBC,WAAW,GAAAR,mBAAA,GAAGD,KAAK,CAACU,YAAY,cAAAT,mBAAA,cAAAA,mBAAA,GAAI,EAAE;MACtCU,KAAK,EAASC,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACW,KAAK,EAAE,SAAS,CAAC,CAACK,WAAW,EAAE;MAC7GC,GAAG,EAAWL,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACiB,GAAG,EAAE,SAAS,CAAC,CAACD,WAAW;KAC1G,CAAC;IACJ,IAAIZ,UAAU,IAAI,aAAa,EAC7BD,SAAS,GAAGA,SAAS,CAACI,MAAM,CAAC;MAC3B,CAACZ,KAAK,GAAQU,EAAE;MAChBM,KAAK,EAASC,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACW,KAAK,EAAE,SAAS,CAAC,CAACK,WAAW,EAAE;MAC7GC,GAAG,EAAWL,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACiB,GAAG,EAAE,SAAS,CAAC,CAACD,WAAW;KAC1G,CAAC;IACJ,OAAO,CAACd,QAAQ,EAAEC,SAAS,CAAC;EAC9B,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACd,CAAC;AAAAe,OAAA,CAAA9B,OAAA,GAAAC,QAAA"}
+{"version":3,"file":"placements.js","names":["_moment","_interopRequireDefault","require","_lodash","obj","__esModule","default","_default","configuration","options","arguments","length","undefined","idKey","events","_","reduce","_ref","event","_event$dependencies","eventAcc","lockedAcc","collection","id","split","concat","parked","inLocations","dependencies","start","moment","utc","add","day","toISOString","end","exports"],"sources":["../../../../src/RS/v2/from/placements.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAyD,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAW1C,SAAAA,SAACC,aAA4B,EAAoG;EAAA,IAAlGC,OAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAmB,EAAE;EAEjE,IAAMG,KAAK,GAAEJ,OAAO,CAACI,KAAK,IAAI,IAAI;EAElC,IAAM;IAAEC;EAAM,CAAE,GAAGN,aAAa,aAAbA,aAAa,cAAbA,aAAa,GAAI,EAAE;EAEtC,OAAOO,eAAC,CAACC,MAAM,CAACF,MAAM,EAAE,CAAAG,IAAA,EAAiGC,KAAgB,KAAI;IAAA,IAAAC,mBAAA;IAAA,IAApH,CAACC,QAAQ,EAAEC,SAAS,CAA0E,GAAAJ,IAAA;IACrH,IAAM,CAACK,UAAU,CAAG,GAAGJ,KAAK,CAACK,EAAE,CAACC,KAAK,CAAC,GAAG,CAAC;IAC1C,IAAIF,UAAU,IAAI,QAAQ,EACxBF,QAAQ,GAAGA,QAAQ,CAACK,MAAM,CAAC;MACzB,CAACZ,KAAK,GAAQK,KAAK,CAACK,EAAE;MACtBG,MAAM,EAAQ,KAAK;MACnBC,WAAW,GAAAR,mBAAA,GAAGD,KAAK,CAACU,YAAY,cAAAT,mBAAA,cAAAA,mBAAA,GAAI,EAAE;MACtCU,KAAK,EAASC,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACW,KAAK,EAAE,SAAS,CAAC,CAACK,WAAW,EAAE;MAC7GC,GAAG,EAAWL,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACiB,GAAG,EAAE,SAAS,CAAC,CAACD,WAAW;KAC1G,CAAC;IACJ,IAAIZ,UAAU,IAAI,aAAa,EAC7BD,SAAS,GAAGA,SAAS,CAACI,MAAM,CAAC;MAC3B,CAACZ,KAAK,GAAQK,KAAK,CAACK,EAAE;MACtBM,KAAK,EAASC,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACW,KAAK,EAAE,SAAS,CAAC,CAACK,WAAW,EAAE;MAC7GC,GAAG,EAAWL,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACiB,GAAG,EAAE,SAAS,CAAC,CAACD,WAAW;KAC1G,CAAC;IACJ,OAAO,CAACd,QAAQ,EAAEC,SAAS,CAAC;EAC9B,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACd,CAAC;AAAAe,OAAA,CAAA9B,OAAA,GAAAC,QAAA"}

package/dist/RS/v2/from/schedules.js

@@ -41,25 +41,16 @@ var _default2 = schedule => {
   if (groups) _groups = (0, _groups2.default)(groups, settings);
   if (events) _courses = (0, _collections.default)(events, (_teachers || []).map(x => x.ids).filter(Boolean), (_groups || []).map(x => x.ids).filter(Boolean), settings);
   if (configuration) {
+    var _courses2;
     var [_placements] = (0, _placements2.default)(configuration, {
       idKey: 'ids'
     });
-    var i = -1;
-    events === null || events === void 0 ? void 0 : events.forEach(collection => {
-      var _collection$events;
-      if (Array.isArray(collection)) return;
-      if (!('events' in collection)) return;
-      (_collection$events = collection.events) === null || _collection$events === void 0 ? void 0 : _collection$events.forEach(event => {
-        if (_lodash.default.isNumber(event)) return;
-        i++;
-        var _placedEvent = _placements.find(_ref => {
-          var {
-            ids
-          } = _ref;
-          return ids == event.id;
-        });
-        if (_placedEvent) return Object.assign(event, _placedEvent);
-        return Object.assign(event, _placements[i]);
+    var placementMap = new Map(_placements.map(x => [x.ids, x]));
+    (_courses2 = _courses) === null || _courses2 === void 0 ? void 0 : _courses2.forEach(course => {
+      var _course$events;
+      (_course$events = course.events) === null || _course$events === void 0 ? void 0 : _course$events.forEach(event => {
+        var _placedEvent = placementMap.get(event.ids);
+        if (_placedEvent) Object.assign(event, _placedEvent);
       });
     });
   }

package/dist/RS/v2/from/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["_lodash","_interopRequireDefault","require","_dependencies","_teachers2","_groups2","_collections","_settings","_placements2","obj","__esModule","default","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","_default2","schedule","_periods$split$map","settings","_default","dependencies","groups","events","areas","periods","configuration","meta","output","_courses","_groups","_teachers","_locations","Error","getDependencies","getTeachers","getGroups","getCollections","map","x","ids","Boolean","_placements","mapPlacements","idKey","collection","_collection$events","Array","isArray","event","_","isNumber","_placedEvent","find","_ref","id","assign","overlapGroups","overlapGroup","toString","coalesced","species","collections","c","flatMap","e","_overlapGroup$coalesc","to","toModel","forcedOverlapId","_overlapGroup$species","periodMatrix","split","numPeriods","Math","trunc","sqrt","_periods","times","displayName","ranges","locations","teachers","courses","area","getSettings","exports"],"sources":["../../../../src/RS/v2/from/schedules.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"schedules.js","names":["_lodash","_interopRequireDefault","require","_dependencies","_teachers2","_groups2","_collections","_settings","_placements2","obj","__esModule","default","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","_default2","schedule","_periods$split$map","settings","_default","dependencies","groups","events","areas","periods","configuration","meta","output","_courses","_groups","_teachers","_locations","Error","getDependencies","getTeachers","getGroups","getCollections","map","x","ids","Boolean","_courses2","_placements","mapPlacements","idKey","placementMap","Map","course","_course$events","event","_placedEvent","get","assign","overlapGroups","Array","isArray","overlapGroup","id","toString","coalesced","species","collections","c","flatMap","e","_","isNumber","_overlapGroup$coalesc","to","toModel","forcedOverlapId","_overlapGroup$species","periodMatrix","split","numPeriods","Math","trunc","sqrt","_periods","times","displayName","ranges","locations","teachers","courses","area","getSettings","exports"],"sources":["../../../../src/RS/v2/from/schedules.ts"],"sourcesContent":[null],"mappings":"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"}

package/dist/SS12000/from/duties.js

@@ -6,10 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = duties => {
   if (!Array.isArray(duties)) throw new Error('(SS12000::From::Duties) Teacher input is not of array type');
-  return duties.map(duty => ({
-    ids: duty.id,
-    displayName: duty.displayName
-  }));
+  return duties.map(duty => {
+    var _duty$displayName, _duty$person;
+    return {
+      ids: duty.id,
+      displayName: (_duty$displayName = duty.displayName) !== null && _duty$displayName !== void 0 ? _duty$displayName : (_duty$person = duty.person) === null || _duty$person === void 0 ? void 0 : _duty$person.displayName
+    };
+  });
 };
 exports.default = _default;
 //# sourceMappingURL=duties.js.map

package/dist/SS12000/from/duties.js.map

@@ -1 +1 @@
-{"version":3,"file":"duties.js","names":["duties","Array","isArray","Error","map","duty","ids","id","displayName","exports","default","_default"],"sources":["../../../src/SS12000/from/duties.ts"],"sourcesContent":[null],"mappings":";;;;;;eAIgBA,MAAc,IAAyB;EACrD,IAAI,CAAEC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EACzB,MAAM,IAAIG,KAAK,CAAC,4DAA4D,CAAC;EAE/E,OAAOH,MAAM,CAACI,GAAG,CAAEC,IAAI,KAAM;IAC3BC,GAAG,EAAUD,IAAI,CAACE,EAAG;IACrBC,WAAW,EAAEH,IAAI,CAACG;GACnB,CAAC,CAAC;AACL,CAAC;AAAAC,OAAA,CAAAC,OAAA,GAAAC,QAAA"}
+{"version":3,"file":"duties.js","names":["duties","Array","isArray","Error","map","duty","_duty$displayName","_duty$person","ids","id","displayName","person","exports","default","_default"],"sources":["../../../src/SS12000/from/duties.ts"],"sourcesContent":[null],"mappings":";;;;;;eAIgBA,MAAc,IAAyB;EACrD,IAAI,CAAEC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EACzB,MAAM,IAAIG,KAAK,CAAC,4DAA4D,CAAC;EAE/E,OAAOH,MAAM,CAACI,GAAG,CAAEC,IAAI;IAAA,IAAAC,iBAAA,EAAAC,YAAA;IAAA,OAAM;MAC3BC,GAAG,EAAUH,IAAI,CAACI,EAAG;MACrBC,WAAW,GAAAJ,iBAAA,GAAED,IAAI,CAACK,WAAW,cAAAJ,iBAAA,cAAAA,iBAAA,IAAAC,YAAA,GAAIF,IAAI,CAACM,MAAM,cAAAJ,YAAA,uBAAXA,YAAA,CAAaG;KAC/C;EAAA,CAAC,CAAC;AACL,CAAC;AAAAE,OAAA,CAAAC,OAAA,GAAAC,QAAA"}

package/dist/SS12000/types/duties.d.ts

@@ -1,5 +1,6 @@
 import { Organisation } from './organisation';
 import { DutyRole } from './codes';
+import { Person } from './persons';
 export type Duty = {
     id: string;
     organisation?: Organisation;
@@ -9,5 +10,6 @@ export type Duty = {
     hoursPerYear?: number;
     startDate: string;
     endDate?: string;
+    person?: Person;
     displayName?: string;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@royalschedule/maps",
   "description": "",
-  "version": "2.4.14",
+  "version": "2.4.16",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
@@ -61,7 +61,7 @@
     "module-alias": "^2.2.2",
     "moment": "^2.29.4",
     "moment-range": "^4.0.2",
-    "mongoose": "^7.0.5",
+    "mongoose": "^7.3.1",
     "nanoid": "^3.3.6",
     "papaparse": "^5.4.1",
     "xlsx": "^0.18.5"