scheduler-node-models 1.0.72 → 1.0.74

package/package.json

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

package/scheduler/reports/chargeStatus.js

@@ -287,7 +287,6 @@ class ChargeStatusReport extends general_1.Report {
             });
         });
         let column = 0;
-        console.log(employees.length);
         // 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
@@ -470,13 +469,13 @@ class ChargeStatusReport extends general_1.Report {
         this.setCell(sheet, this.getCellID(5, row), this.getCellID(5, row), style, `${lCode.chargeNumber} ${lCode.extension}`);
         this.setCell(sheet, this.getCellID(6, row), this.getCellID(6, row), lStyle, emp.name.lastname);
         this.setCell(sheet, this.getCellID(7, row), this.getCellID(7, row), style, (emp.companyinfo.rank) ? emp.companyinfo.rank : '');
-        this.setCell(sheet, this.getCellID(0, row), this.getCellID(0, row), style, emp.companyinfo.employeeid);
-        this.setCell(sheet, this.getCellID(0, row), this.getCellID(0, row), style, (emp.companyinfo.alternateid) ? emp.companyinfo.alternateid : '');
+        this.setCell(sheet, this.getCellID(8, row), this.getCellID(8, row), style, emp.companyinfo.employeeid);
+        this.setCell(sheet, this.getCellID(9, row), this.getCellID(9, row), style, (emp.companyinfo.alternateid) ? emp.companyinfo.alternateid : '');
         // This section steps though the forecast report periods to provide the hours worked/
         // or forecasted to work, in the period.  Each period corresponds to an accounting
         // month and its weekly periods.  These are determined by the contract administrator
         // and put in the forecast report object.
-        let column = 11;
+        let column = 10;
         const sumlist = []; // used to provide a total hours from the monthly values
         report.periods.forEach(period => {
             column++;
@@ -497,9 +496,7 @@ class ChargeStatusReport extends general_1.Report {
             else {
                 formula = `${this.getCellID(column + 1, row)}`;
             }
-            let cell = sheet.getCell(column, row);
-            cell.style = style;
-            cell.value = { formula: formula };
+            this.setCell(sheet, this.getCellID(column, row), this.getCellID(column, row), style, new general_1.Formula(formula));
             // step through the weekly periods to get the employee's work hours.
             period.periods.forEach(prd => {
                 column++;
@@ -528,6 +525,7 @@ class ChargeStatusReport extends general_1.Report {
                     hours += emp.getForecastHours(lCode, first, new Date(last.getTime() + (24 * 3600000)), compare);
                 }
                 let cellID = this.getCellID(column, row);
+                this.setCell(sheet, cellID, cellID, style, hours);
                 // this sets an excel conditional formatting relationship for if the resultant
                 // value is equal to zero (0), changes fill color and displays a dash.
                 sheet.addConditionalFormatting({
@@ -570,9 +568,7 @@ class ChargeStatusReport extends general_1.Report {
                     }
                     formula += c;
                 });
-                cell = sheet.getCell(cellID);
-                cell.style = style;
-                cell.value = { formula: formula };
+                this.setCell(sheet, cellID, cellID, style, new general_1.Formula(formula));
                 // these conditional formatting provides fill color change for if the employee
                 // works more than his/her alloted hours or less than alloted hours.
                 sheet.addConditionalFormatting({