scheduler-node-models 1.0.106 → 1.0.108

package/package.json

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

package/scheduler/employees/employee.js

@@ -804,6 +804,8 @@ class Employee {
      * @returns The numeric value for the total hours of actual work
      */
     getWorkedHours(start, end, chgno, ext) {
+        start = new Date(Date.UTC(start.getFullYear(), start.getMonth(), start.getDate()));
+        end = new Date(Date.UTC(end.getFullYear(), end.getMonth(), end.getDate()));
         let answer = 0.0;
         if (this.work) {
             this.work.forEach(wk => {

package/scheduler/reports/chargeStatus.js

@@ -516,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.
@@ -524,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);