scheduler-node-models 1.0.113 → 1.0.115

package/package.json

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

package/scheduler/reports/chargeStatus.js

@@ -283,11 +283,11 @@ class ChargeStatusReport extends general_1.Report {
         // create list of leave and work codes for comparison to determine working or
         // not working criteria
         let row = 4;
+        let lastWorked = new Date(0);
         let column = 0;
         // this report is listed by labor code, then employees with hours
         report.laborCodes.forEach(lCode => {
             // step through the employees to see if they have hours for this labor code
-            let lastWorked = new Date(0);
             employees.forEach(emp => {
                 if (emp.getLastWorkday().getTime() > lastWorked.getTime()) {
                     lastWorked = new Date(emp.getLastWorkday());
@@ -305,13 +305,16 @@ class ChargeStatusReport extends general_1.Report {
                     }
                 }
             });
-            if (stats && statsRow) {
-                // this is used to create the dates in the statistics labor rows
-                const dFormat = new Intl.DateTimeFormat('en-US', {
-                    month: '2-digit',
-                    day: '2-digit',
-                    year: 'numeric'
-                });
+        });
+        if (stats && statsRow) {
+            // this is used to create the dates in the statistics labor rows
+            const dFormat = new Intl.DateTimeFormat('en-US', {
+                month: '2-digit',
+                day: '2-digit',
+                year: 'numeric'
+            });
+            for (let l = 0; l < report.laborCodes.length; l++) {
+                const lCode = report.laborCodes[l];
                 const codeText = `${lCode.chargeNumber} ${lCode.extension}`;
                 // determine the period to date total hours that should have been used based
                 // upon an even spread of hours throughout the period.
@@ -383,16 +386,16 @@ class ChargeStatusReport extends general_1.Report {
                     // this branch will add only the forecast data formulas to the statistics.  It 
                     // will first find the correct row based on the labor code, then determine the 
                     // fill style to use, then add the formula. Columns H to K
-                    let row = 0;
-                    for (let r = 3; r <= statsRow && row === 0; r++) {
+                    let srow = 0;
+                    for (let r = 3; r <= statsRow && srow === 0; r++) {
                         const cell = stats.getCell(r, 1);
                         if (cell.text.toLowerCase() === codeText.toLowerCase()) {
-                            row = r;
+                            srow = r;
                         }
                     }
                     // row greater than zero means the labor code was found and 
-                    if (row > 0) {
-                        const bLight = (row % 2) === 0;
+                    if (srow > 0) {
+                        const bLight = (srow % 2) === 0;
                         // forecast information next four columns, total hours, total forecasted 
                         // hours, +/- hours, percentage of hours to date.
                         if (bLight) {
@@ -402,21 +405,21 @@ class ChargeStatusReport extends general_1.Report {
                             style.fill = this.fills.get('ltgreen');
                         }
                         style.numFmt = this.numformats.get('sum');
-                        this.setCell(stats, this.getCellID(7, row), this.getCellID(7, row), style, totalHours);
+                        this.setCell(stats, this.getCellID(7, srow), this.getCellID(7, srow), style, totalHours);
                         let formula = `SUMIF(${sheetLabel}!${this.getCellID(5, 5)}:`
                             + `${this.getCellID(5, row)}, "*${codeText}*", ${sheetLabel}!`
                             + `${this.getCellID(column, 5)}:${this.getCellID(column, row)})`;
-                        this.setCell(stats, this.getCellID(8, row), this.getCellID(8, row), style, new general_1.Formula(formula));
+                        this.setCell(stats, this.getCellID(8, srow), this.getCellID(8, srow), style, new general_1.Formula(formula));
                         formula = `${this.getCellID(7, row)} - ${this.getCellID(8, row)}`;
-                        this.setCell(stats, this.getCellID(9, row), this.getCellID(9, row), style, new general_1.Formula(formula));
+                        this.setCell(stats, this.getCellID(9, srow), this.getCellID(9, srow), style, new general_1.Formula(formula));
                         style.numFmt = this.numformats.get('pct');
                         const oformula = new general_1.Formula(`IFERROR(${this.getCellID(8, row)}/`
                             + `${this.getCellID(7, row)},"N/A")`);
-                        this.setCell(stats, this.getCellID(10, row), this.getCellID(10, row), style, oformula);
+                        this.setCell(stats, this.getCellID(10, srow), this.getCellID(10, srow), style, oformula);
                     }
                 }
             }
-        });
+        }
         return statsRow;
     }
     /**