scheduler-node-models 1.2.85 → 1.2.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scheduler-node-models",
-  "version": "1.2.85",
+  "version": "1.2.87",
   "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, colDate: Date, emp: Employee): Promise<ExcelRow[]>;
+    readCell(row: Row, c: number, colDate: Date, emp: Employee): Promise<ExcelRow>;
 }

package/scheduler/ingest/excelRowIngest.js

@@ -61,10 +61,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) => {
-                                    const results = await this.readExcelRow(row, d + 3, day, emp);
-                                    results.forEach(eRow => {
-                                        result.push(new excelRow_1.ExcelRow(eRow));
-                                    });
+                                    const results = await this.readCell(row, d + 3, day, emp);
+                                    if (results.hours >= 0.0) {
+                                        result.push(results);
+                                    }
                                 });
                                 await Promise.allSettled(rowPromises);
                             }
@@ -101,8 +101,8 @@ class ExcelRowIngest {
         });
         return laborcodes;
     }
-    async readExcelRow(row, c, colDate, emp) {
-        const answer = [];
+    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 +137,7 @@ class ExcelRowIngest {
                     eRow.extension = laborcode.extension;
                     eRow.premium = '1';
                     eRow.hours = Number(sValue);
-                    answer.push(eRow);
+                    answer = new excelRow_1.ExcelRow(eRow);
                 }
             }
             else {
@@ -151,12 +151,12 @@ class ExcelRowIngest {
                         eRow.employee = emp.companyinfo.employeeid;
                         eRow.code = wc.id;
                         eRow.hours = emp.getStandardWorkday(colDate);
-                        answer.push(eRow);
+                        answer = new excelRow_1.ExcelRow(eRow);
                     }
                 });
             }
         }
-        console.log(`Answer: ${answer.length}`);
+        console.log(JSON.stringify(answer));
         return answer;
     }
 }