scheduler-node-models 1.2.94 → 1.2.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scheduler-node-models",
-  "version": "1.2.94",
+  "version": "1.2.96",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [

package/scheduler/ingest/excelRow.d.ts

@@ -32,3 +32,23 @@ export declare class ExcelRow implements IExcelRow {
     compareTo(other?: ExcelRow): number;
     toString(): string;
 }
+/**
+ * This interface will contain the rows of information for employees reported on a single
+ * SAP Ingest spreadsheet or a Manual Excel spreadsheet, plus the start and ending dates
+ * for the spreadsheet, which equates to the first date reported on the sheet and the last.
+ */
+export interface IExcelRowPeriod {
+    start: Date;
+    end: Date;
+    rows: IExcelRow[];
+}
+/**
+ * This class implements the IExcelRowPeriod interface and provides either default
+ * values for the build or fills the information into the object.
+ */
+export declare class ExcelRowPeriod implements IExcelRowPeriod {
+    start: Date;
+    end: Date;
+    rows: ExcelRow[];
+    constructor(period?: IExcelRowPeriod);
+}

package/scheduler/ingest/excelRow.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExcelRow = void 0;
+exports.ExcelRowPeriod = exports.ExcelRow = void 0;
 class ExcelRow {
     date;
     employee;
@@ -59,3 +59,24 @@ class ExcelRow {
     }
 }
 exports.ExcelRow = ExcelRow;
+/**
+ * This class implements the IExcelRowPeriod interface and provides either default
+ * values for the build or fills the information into the object.
+ */
+class ExcelRowPeriod {
+    start;
+    end;
+    rows;
+    constructor(period) {
+        this.start = (period) ? new Date(period.start) : new Date(Date.UTC(9999, 11, 30));
+        this.end = (period) ? new Date(period.end) : new Date(0);
+        this.rows = [];
+        if (period && period.rows.length > 0) {
+            period.rows.forEach(row => {
+                this.rows.push(new ExcelRow(row));
+            });
+            this.rows.sort((a, b) => a.compareTo(b));
+        }
+    }
+}
+exports.ExcelRowPeriod = ExcelRowPeriod;

package/scheduler/ingest/excelRowIngest.d.ts

@@ -1,19 +1,18 @@
 import { Row } from "exceljs";
 import { ISite, Site } from "../sites";
 import { ITeam, Team } from "../teams";
-import { ExcelRow } from "./excelRow";
+import { ExcelRow, ExcelRowPeriod } from "./excelRow";
 import { LaborCode } from "../labor";
 import { Employee } from "../employees";
 export declare class ExcelRowIngest {
-    files: File[];
+    files: Express.Multer.File[];
     team: Team;
     site: Site;
     company: string;
     docDate: Date;
-    results: ExcelRow[];
-    constructor(date: Date, files?: File[], team?: ITeam, site?: ISite, company?: string);
-    Process(): Promise<ExcelRow[]>;
-    processFile(file: File): Promise<void>;
+    constructor(date: Date, files?: Express.Multer.File[], team?: ITeam, site?: ISite, company?: string);
+    Process(): Promise<ExcelRowPeriod[]>;
+    processFile(file: Express.Multer.File): Promise<ExcelRowPeriod>;
     /**
      * This function is used to provide a list of labor codes for a particular date and
      * for site and company
@@ -22,5 +21,5 @@ export declare class ExcelRowIngest {
      * @returns A list of labor codes that can be assigned to an employee.
      */
     getForecast(date: Date): Promise<LaborCode[]>;
-    readCell(row: Row, c: number, colDate: Date, emp: Employee): Promise<void>;
+    readCell(row: Row, c: number, colDate: Date, emp: Employee): Promise<ExcelRow | null>;
 }

package/scheduler/ingest/excelRowIngest.js

@@ -6,36 +6,36 @@ const sites_1 = require("../sites");
 const teams_1 = require("../teams");
 const excelRow_1 = require("./excelRow");
 const labor_1 = require("../labor");
+const stream_1 = require("stream");
 class ExcelRowIngest {
     files;
     team;
     site;
     company;
     docDate;
-    results;
     constructor(date, files, team, site, company) {
         this.files = (files) ? files : [];
         this.team = (team) ? new teams_1.Team(team) : new teams_1.Team();
         this.site = (site) ? new sites_1.Site(site) : new sites_1.Site();
         this.company = (company) ? company : '';
         this.docDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), 1));
-        this.results = [];
     }
     async Process() {
-        this.results = [];
+        const results = [];
         if (this.files.length > 0) {
             const allfiles = this.files.map(async (file, f) => {
-                await this.processFile(file);
+                const result = await this.processFile(file);
+                results.push(result);
             });
             await Promise.allSettled(allfiles);
         }
-        this.results.sort((a, b) => a.compareTo(b));
-        return this.results;
+        return results;
     }
     async processFile(file) {
+        const result = new excelRow_1.ExcelRowPeriod();
         // convert the file into a buffer to allow the exceljs library to create an excel
         // document to read through.
-        const filereader = file.stream().getReader();
+        const filereader = stream_1.Readable.from(file.buffer);
         const fileDataU8 = [];
         while (true) {
             const { done, value } = await filereader.read();
@@ -49,7 +49,13 @@ class ExcelRowIngest {
         const worksheet = workbook.getWorksheet('Sheet1');
         const monthDates = [];
         for (let d = 0; d < 31; d++) {
-            monthDates.push(new Date(this.docDate.getTime() + (d * 24 * 3600000)));
+            const nDate = new Date(this.docDate.getTime() + (d * 24 * 3600000));
+            if (nDate.getTime() < result.start.getTime()) {
+                result.start = new Date(nDate);
+            }
+            if (nDate.getTime() > result.end.getTime()) {
+                result.end = new Date(nDate);
+            }
         }
         if (worksheet) {
             worksheet.eachRow(async (row, r) => {
@@ -60,7 +66,10 @@ class ExcelRowIngest {
                             const emp = this.site.employees.find(e => e.name.getLastFirst().toLowerCase() === name.toLowerCase());
                             if (emp) {
                                 const rowPromises = monthDates.map(async (day, d) => {
-                                    await this.readCell(row, d + 3, day, emp);
+                                    const erow = await this.readCell(row, d + 3, day, emp);
+                                    if (erow !== null) {
+                                        result.rows.push(new excelRow_1.ExcelRow(erow));
+                                    }
                                 });
                                 await Promise.allSettled(rowPromises);
                             }
@@ -75,6 +84,8 @@ class ExcelRowIngest {
         else {
             throw new Error('No worksheet');
         }
+        result.rows.sort((a, b) => a.compareTo(b));
+        return result;
     }
     /**
      * This function is used to provide a list of labor codes for a particular date and
@@ -129,7 +140,7 @@ class ExcelRowIngest {
                     eRow.extension = laborcode.extension;
                     eRow.premium = '1';
                     eRow.hours = Number(sValue);
-                    this.results.push(new excelRow_1.ExcelRow(eRow));
+                    return new excelRow_1.ExcelRow(eRow);
                 }
             }
             else {
@@ -143,11 +154,12 @@ class ExcelRowIngest {
                         eRow.employee = emp.companyinfo.employeeid;
                         eRow.code = wc.id;
                         eRow.hours = emp.getStandardWorkday(colDate);
-                        this.results.push(new excelRow_1.ExcelRow(eRow));
+                        return new excelRow_1.ExcelRow(eRow);
                     }
                 });
             }
         }
+        return null;
     }
 }
 exports.ExcelRowIngest = ExcelRowIngest;

package/scheduler/ingest/sapIngest.d.ts

@@ -1,9 +1,9 @@
 import { ITeam, Team } from "../teams";
-import { ExcelRow } from "./excelRow";
+import { ExcelRowPeriod } from "./excelRow";
 export declare class SAPIngest {
-    files: File[];
+    files: Express.Multer.File[];
     team: Team;
-    constructor(files?: File[], team?: ITeam);
-    Process(): Promise<ExcelRow[]>;
-    processFile(file: File): Promise<ExcelRow[]>;
+    constructor(files?: Express.Multer.File[], team?: ITeam);
+    Process(): Promise<ExcelRowPeriod[]>;
+    processFile(file: Express.Multer.File): Promise<ExcelRowPeriod>;
 }

package/scheduler/ingest/sapIngest.js

@@ -4,6 +4,7 @@ exports.SAPIngest = void 0;
 const teams_1 = require("../teams");
 const excelRow_1 = require("./excelRow");
 const exceljs_1 = require("exceljs");
+const stream_1 = require("stream");
 class SAPIngest {
     files;
     team;
@@ -16,18 +17,17 @@ class SAPIngest {
         if (this.files.length > 0) {
             const allfiles = this.files.map(async (file, f) => {
                 const results = await this.processFile(file);
-                result.push(...results);
+                result.push(results);
             });
             await Promise.allSettled(allfiles);
         }
-        result.sort((a, b) => a.compareTo(b));
         return result;
     }
     async processFile(file) {
-        const result = [];
+        const result = new excelRow_1.ExcelRowPeriod();
         // convert the file into a buffer to allow the exceljs library to create an excel
         // document to read through.
-        const filereader = file.stream().getReader();
+        const filereader = stream_1.Readable.from(file.buffer);
         const fileDataU8 = [];
         while (true) {
             const { done, value } = await filereader.read();
@@ -114,11 +114,17 @@ class SAPIngest {
                                 }
                             }
                         });
-                        result.push(eRow);
+                        if (eRow.date.getTime() < result.start.getTime()) {
+                            result.start = new Date(eRow.date);
+                        }
+                        if (eRow.date.getTime() > result.end.getTime()) {
+                            result.end = new Date(eRow.date);
+                        }
+                        result.rows.push(eRow);
                     }
                 });
             }
-            result.sort((a, b) => a.compareTo(b));
+            result.rows.sort((a, b) => a.compareTo(b));
         }
         return result;
     }

package/scheduler/sites/web/index.d.ts

@@ -0,0 +1 @@
+export * from './requests';

package/scheduler/sites/web/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./requests"), exports);

package/scheduler/sites/web/requests.d.ts

@@ -0,0 +1,6 @@
+export interface SiteUpdate {
+    team: string;
+    site: string;
+    field: string;
+    value: string;
+}

package/scheduler/sites/web/requests.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });