scheduler-node-models 1.2.83 → 1.2.85

package/package.json

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

package/scheduler/ingest/excelRowIngest.d.ts

@@ -21,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[]>;
-    readExcelRow(row: Row, c: number, emp: Employee): Promise<ExcelRow[]>;
+    readExcelRow(row: Row, c: number, colDate: Date, emp: Employee): Promise<ExcelRow[]>;
 }

package/scheduler/ingest/excelRowIngest.js

@@ -48,6 +48,10 @@ class ExcelRowIngest {
         const workbook = new exceljs_1.Workbook();
         await workbook.xlsx.load(fileBinary.buffer);
         const worksheet = workbook.getWorksheet('Sheet1');
+        const monthDates = [];
+        for (let d = 0; d <= 31; d++) {
+            monthDates.push(new Date(this.docDate.getTime() + (d * 24 * 3600000)));
+        }
         if (worksheet) {
             worksheet.eachRow(async (row, r) => {
                 if (row.getCell(1) && row.getCell(1) !== null && row.getCell(1).value !== null) {
@@ -56,12 +60,13 @@ class ExcelRowIngest {
                         if (this.site.employees) {
                             const emp = this.site.employees.find(e => e.name.getLastFirst().toLowerCase() === name.toLowerCase());
                             if (emp) {
-                                for (let c = 3; c < 34; c++) {
-                                    const results = await this.readExcelRow(row, c, emp);
-                                    results.forEach(r => {
-                                        result.push(new excelRow_1.ExcelRow(r));
+                                const rowPromises = monthDates.map(async (day, d) => {
+                                    const results = await this.readExcelRow(row, d + 3, day, emp);
+                                    results.forEach(eRow => {
+                                        result.push(new excelRow_1.ExcelRow(eRow));
                                     });
-                                }
+                                });
+                                await Promise.allSettled(rowPromises);
                             }
                         }
                         else {
@@ -96,13 +101,12 @@ class ExcelRowIngest {
         });
         return laborcodes;
     }
-    async readExcelRow(row, c, emp) {
-        const result = [];
+    async readExcelRow(row, c, colDate, emp) {
+        const answer = [];
         // 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]+)?$";
         const hourRE = new RegExp(hPattern);
-        const colDate = new Date(this.docDate.getTime() + (24 * 3600000 * (c - 3)));
         // Step through the days of the month to create the excel rows to add
         // for this employee
         const sValue = row.getCell(c).toString().trim();
@@ -133,7 +137,7 @@ class ExcelRowIngest {
                     eRow.extension = laborcode.extension;
                     eRow.premium = '1';
                     eRow.hours = Number(sValue);
-                    result.push(eRow);
+                    answer.push(eRow);
                 }
             }
             else {
@@ -147,12 +151,13 @@ class ExcelRowIngest {
                         eRow.employee = emp.companyinfo.employeeid;
                         eRow.code = wc.id;
                         eRow.hours = emp.getStandardWorkday(colDate);
-                        result.push(eRow);
+                        answer.push(eRow);
                     }
                 });
             }
         }
-        return result;
+        console.log(`Answer: ${answer.length}`);
+        return answer;
     }
 }
 exports.ExcelRowIngest = ExcelRowIngest;