scheduler-node-models 1.0.105 → 1.0.107

package/package.json

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

package/scheduler/reports/chargeStatus.js

@@ -156,6 +156,11 @@ class ChargeStatusReport extends general_1.Report {
                 showGridLines: false,
                 horizontalCentered: true,
                 verticalCentered: true
+            },
+            properties: {
+                defaultRowHeight: 20,
+                defaultColWidth: 4,
+                outlineLevelCol: 0
             }
         });
         // set column widths
@@ -410,9 +415,6 @@ class ChargeStatusReport extends general_1.Report {
                 }
             }
         });
-        sheet.properties.defaultRowHeight = 20;
-        sheet.properties.defaultColWidth = 4;
-        sheet.properties.outlineLevelCol = 0;
         return statsRow;
     }
     /**
@@ -514,7 +516,7 @@ class ChargeStatusReport extends general_1.Report {
                     alignment: this.alignments.get('center'),
                     border: this.borders.get('blackthin')
                 };
-                let hours = emp.getWorkedHours(first, new Date(last.getTime() + (24 * 3600000)), lCode.chargeNumber, lCode.extension);
+                let hours = emp.getWorkedHours(first, last, lCode.chargeNumber, lCode.extension);
                 // if the worksheet displays forecast data and the last date is after the 
                 // employee's last recorded actual workday, show as a forecast value and get the
                 // forecast hours added to the actual hours.
@@ -522,7 +524,7 @@ class ChargeStatusReport extends general_1.Report {
                     if (last.getTime() > lastWorked.getTime()) {
                         style.font = this.fonts.get('blue12');
                     }
-                    hours += emp.getForecastHours(lCode, first, new Date(last.getTime() + (24 * 3600000)), this.workcodes);
+                    hours += emp.getForecastHours(lCode, first, last, this.workcodes);
                 }
                 let cellID = this.getCellID(column, row);
                 this.setCell(sheet, cellID, cellID, style, hours);