scheduler-node-models 1.0.108 → 1.0.110

package/package.json

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

package/scheduler/reports/chargeStatus.d.ts

@@ -54,7 +54,7 @@ export declare class ChargeStatusReport extends Report {
      * @param compare A map of workcode array, used to determine leaves and other non-work
      * periods.
      */
-    employeeRow(sheet: Worksheet, lCode: LaborCode, row: number, emp: Employee, report: Forecast, current: boolean, compare: Map<string, Workcode>): number;
+    employeeRow(sheet: Worksheet, lCode: LaborCode, row: number, emp: Employee, report: Forecast, current: boolean, compare: Map<string, Workcode>, lastWorked: Date): number;
     /**
      * This function will create the statistics page for the cover of the workbook, which
      * will hold all the formulas for overall labor usage.

package/scheduler/reports/chargeStatus.js

@@ -288,16 +288,18 @@ class ChargeStatusReport extends general_1.Report {
         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());
+                }
+            });
             employees.forEach(emp => {
                 // employee has used this labor code, if they have some actual or forecast hours.
                 const actual = emp.getWorkedHours(report.startDate, report.endDate, lCode.chargeNumber, lCode.extension);
                 const forecast = emp.getForecastHours(lCode, report.startDate, report.endDate, this.workcodes);
                 if (actual > 0 || forecast > 0) {
                     row++;
-                    if (emp.getLastWorkday().getTime() > lastWorked.getTime()) {
-                        lastWorked = new Date(emp.getLastWorkday());
-                    }
-                    const col = this.employeeRow(sheet, lCode, row, emp, report, current, this.workcodes);
+                    const col = this.employeeRow(sheet, lCode, row, emp, report, current, this.workcodes, lastWorked);
                     if (col > column) {
                         column = col;
                     }
@@ -432,8 +434,7 @@ class ChargeStatusReport extends general_1.Report {
      * @param compare A map of workcode array, used to determine leaves and other non-work
      * periods.
      */
-    employeeRow(sheet, lCode, row, emp, report, current, compare) {
-        const lastWorked = emp.getLastWorkday();
+    employeeRow(sheet, lCode, row, emp, report, current, compare, lastWorked) {
         // create two style objects for filling in the employee's employment information as
         // pertains to the object
         let style = {
@@ -503,7 +504,7 @@ class ChargeStatusReport extends general_1.Report {
             period.periods.forEach(prd => {
                 column++;
                 let last = new Date(prd);
-                let first = new Date(last.getTime() - (7 * 24 * 3600000));
+                let first = new Date(last.getTime() - (6 * 24 * 3600000));
                 if (first.getTime() < report.startDate.getTime()) {
                     first = new Date(Date.UTC(report.startDate.getFullYear(), report.startDate.getMonth(), report.startDate.getDate()));
                 }