scheduler-node-models 1.0.90 → 1.0.91

package/package.json

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

package/scheduler/employees/employee.d.ts

@@ -12,7 +12,7 @@ import { ISpecialty, Specialty } from "./specialty";
 import { ILeave, Leave } from "./leave";
 import { Workday } from "./workday";
 import { AnnualLeave, IAnnualLeave } from "./balance";
-import { CompareWorkCode, Workcode } from '../labor/workcode';
+import { Workcode } from '../labor/workcode';
 import { ChangeLeaveRequestResponse } from "./web";
 import { LaborCode } from "../labor/laborcode";
 /**
@@ -217,7 +217,7 @@ export declare class Employee implements IEmployee {
      * whether or not they are leave codes.
      * @returns A numeric (float) value for the number of hours the employee is forecast.
      */
-    getForecastHours(labor: LaborCode, start: Date, end: Date, codes: CompareWorkCode[]): number;
+    getForecastHours(labor: LaborCode, start: Date, end: Date, codes: Map<string, Workcode>): number;
     /**************************************************************************************
      * Work Records section
      **************************************************************************************/

package/scheduler/employees/employee.js

@@ -763,7 +763,7 @@ class Employee {
         // 2) see if they were supposed to be working on this
         //		date, compare workday code to workcodes to ensure
         //		they weren't on leave.  If not on leave, add
-        // 		standard work day.
+        // 		assigned hours.
         let current = new Date(start);
         while (current.getTime() <= end.getTime()) {
             if (current.getTime() > lastWorked.getTime()) {
@@ -775,11 +775,10 @@ class Employee {
                         const wd = this.getWorkday(current);
                         if (wd && wd.code !== '') {
                             codes.forEach(code => {
-                                if (code.code.toLowerCase() === wd.code.toLowerCase() && !code.isLeave) {
-                                    const std = this.getStandardWorkday(current);
+                                if (code.id.toLowerCase() === wd.code.toLowerCase() && !code.isLeave) {
                                     this.assignments.forEach(asgmt => {
                                         if (asgmt.useAssignment(current, nextday, labor)) {
-                                            answer += std;
+                                            answer += wd.hours;
                                         }
                                     });
                                 }

package/scheduler/reports/chargeStatus.d.ts

@@ -1,7 +1,7 @@
 import { Workbook, Worksheet } from "exceljs";
 import { Report } from "../../general";
 import { ISite } from "../sites";
-import { CompareWorkCode, IWorkcode, LaborCode } from "../labor";
+import { IWorkcode, LaborCode, Workcode } from "../labor";
 import { Employee, IEmployee } from "../employees";
 import { User } from "../../users";
 import { Forecast } from "../sites/reports";
@@ -51,10 +51,10 @@ export declare class ChargeStatusReport extends Report {
      * used in constructing the employee's row.
      * @param current The boolean value which signifies whether only actual work performed
      * or add in forecast work hours in this report sheet.
-     * @param compare A short workcode array, used to determine leaves and other non-work
+     * @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: CompareWorkCode[]): number;
+    employeeRow(sheet: Worksheet, lCode: LaborCode, row: number, emp: Employee, report: Forecast, current: boolean, compare: Map<string, Workcode>): 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

@@ -279,13 +279,6 @@ 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;
-        const compareCodes = [];
-        this.workcodes.forEach(wc => {
-            compareCodes.push({
-                code: wc.id,
-                isLeave: wc.isLeave
-            });
-        });
         let column = 0;
         // this report is listed by labor code, then employees with hours
         report.laborCodes.forEach(lCode => {
@@ -294,14 +287,14 @@ class ChargeStatusReport extends general_1.Report {
             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, compareCodes);
+                const forecast = emp.getForecastHours(lCode, report.startDate, report.endDate, this.workcodes);
                 if (actual > 0 || forecast > 0) {
                     console.log(`${emp.name.lastname} = ${actual} - ${forecast}`);
                     row++;
                     if (emp.getLastWorkday().getTime() > lastWorked.getTime()) {
                         lastWorked = new Date(emp.getLastWorkday());
                     }
-                    const col = this.employeeRow(sheet, lCode, row, emp, report, current, compareCodes);
+                    const col = this.employeeRow(sheet, lCode, row, emp, report, current, this.workcodes);
                     if (col > column) {
                         column = col;
                     }
@@ -433,7 +426,7 @@ class ChargeStatusReport extends general_1.Report {
      * used in constructing the employee's row.
      * @param current The boolean value which signifies whether only actual work performed
      * or add in forecast work hours in this report sheet.
-     * @param compare A short workcode array, used to determine leaves and other non-work
+     * @param compare A map of workcode array, used to determine leaves and other non-work
      * periods.
      */
     employeeRow(sheet, lCode, row, emp, report, current, compare) {
@@ -528,7 +521,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)), compare);
+                    hours += emp.getForecastHours(lCode, first, new Date(last.getTime() + (24 * 3600000)), this.workcodes);
                 }
                 let cellID = this.getCellID(column, row);
                 this.setCell(sheet, cellID, cellID, style, hours);