scheduler-node-models 1.2.87 → 1.2.89

package/package.json

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

package/scheduler/ingest/excelRowIngest.d.ts

@@ -10,9 +10,10 @@ export declare class ExcelRowIngest {
     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<ExcelRow[]>;
+    processFile(file: File): Promise<void>;
     /**
      * This function is used to provide a list of labor codes for a particular date and
      * for site and company
@@ -21,5 +22,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<ExcelRow>;
+    readCell(row: Row, c: number, colDate: Date, emp: Employee): Promise<void>;
 }

package/scheduler/ingest/excelRowIngest.js

@@ -12,28 +12,28 @@ class ExcelRowIngest {
     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() {
-        const result = [];
+        this.results = [];
         if (this.files.length > 0) {
             const allfiles = this.files.map(async (file, f) => {
-                const results = await this.processFile(file);
-                console.log(results.length);
-                result.push(...results);
+                await this.processFile(file);
             });
             await Promise.allSettled(allfiles);
         }
-        result.sort((a, b) => a.compareTo(b));
-        return result;
+        console.log(this.results.length);
+        this.results.sort((a, b) => a.compareTo(b));
+        return this.results;
     }
     async processFile(file) {
-        const result = [];
         // convert the file into a buffer to allow the exceljs library to create an excel
         // document to read through.
         const filereader = file.stream().getReader();
@@ -61,10 +61,7 @@ class ExcelRowIngest {
                             const emp = this.site.employees.find(e => e.name.getLastFirst().toLowerCase() === name.toLowerCase());
                             if (emp) {
                                 const rowPromises = monthDates.map(async (day, d) => {
-                                    const results = await this.readCell(row, d + 3, day, emp);
-                                    if (results.hours >= 0.0) {
-                                        result.push(results);
-                                    }
+                                    await this.readCell(row, d + 3, day, emp);
                                 });
                                 await Promise.allSettled(rowPromises);
                             }
@@ -79,9 +76,6 @@ class ExcelRowIngest {
         else {
             throw new Error('No worksheet');
         }
-        result.sort((a, b) => a.compareTo(b));
-        console.log(`result: ${result.length}`);
-        return result;
     }
     /**
      * This function is used to provide a list of labor codes for a particular date and
@@ -102,7 +96,6 @@ class ExcelRowIngest {
         return laborcodes;
     }
     async readCell(row, c, colDate, emp) {
-        let answer = new excelRow_1.ExcelRow;
         // create test patterns for hours, if value doesn't match the hours pattern, it will
         // be assumed to be a leave code
         const hPattern = "^[0-9]{1,2}(\.[0-9]+)?$";
@@ -137,7 +130,7 @@ class ExcelRowIngest {
                     eRow.extension = laborcode.extension;
                     eRow.premium = '1';
                     eRow.hours = Number(sValue);
-                    answer = new excelRow_1.ExcelRow(eRow);
+                    this.results.push(new excelRow_1.ExcelRow(eRow));
                 }
             }
             else {
@@ -145,19 +138,17 @@ class ExcelRowIngest {
                 // create the excel row with the employee's standard workday.
                 this.team.workcodes.forEach(wc => {
                     if (wc.isLeave && wc.altcode
-                        && sValue.toLowerCase() === wc.altcode) {
+                        && sValue.toLowerCase() === wc.altcode.toLowerCase()) {
                         const eRow = new excelRow_1.ExcelRow();
                         eRow.date = new Date(colDate);
                         eRow.employee = emp.companyinfo.employeeid;
                         eRow.code = wc.id;
                         eRow.hours = emp.getStandardWorkday(colDate);
-                        answer = new excelRow_1.ExcelRow(eRow);
+                        this.results.push(new excelRow_1.ExcelRow(eRow));
                     }
                 });
             }
         }
-        console.log(JSON.stringify(answer));
-        return answer;
     }
 }
 exports.ExcelRowIngest = ExcelRowIngest;