scheduler-node-models 1.0.99 → 1.0.101

package/package.json

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

package/scheduler/employees/assignment.js

@@ -92,9 +92,9 @@ class Assignment {
         let answer = false;
         if (labor && date2) {
             this.laborcodes.forEach(lc => {
-                console.log(`${labor.chargeNumber} ${lc.chargeNumber} & ${labor.extension === lc.extension}`);
-                if (labor.chargeNumber && lc.chargeNumber && labor.extension && lc.extension) {
-                    if (labor.chargeNumber.toLowerCase() === lc.chargeNumber.toLowerCase()
+                console.log(`${labor.chargeNumber} ${lc.chargenumber} & ${labor.extension === lc.extension}`);
+                if (labor.chargeNumber && lc.chargenumber && labor.extension && lc.extension) {
+                    if (labor.chargeNumber.toLowerCase() === lc.chargenumber.toLowerCase()
                         && labor.extension.toLowerCase() === lc.extension.toLowerCase()
                         && date.getTime() <= this.endDate.getTime()
                         && date2.getTime() >= this.startDate.getTime()) {
@@ -268,7 +268,7 @@ class Assignment {
         // first check to see if the charge number and extension is listed in this assignment.
         let found = false;
         for (let l = 0; l < this.laborcodes.length && !found; l++) {
-            if (this.laborcodes[l].chargeNumber.toLowerCase() === chgno.toLowerCase()
+            if (this.laborcodes[l].chargenumber.toLowerCase() === chgno.toLowerCase()
                 && this.laborcodes[l].extension.toLowerCase() === ext.toLowerCase()) {
                 found = true;
             }
@@ -276,7 +276,7 @@ class Assignment {
         // if not found, add it as an employee labor code object.
         if (!found) {
             this.laborcodes.push(new labor_1.EmployeeLaborCode({
-                chargeNumber: chgno,
+                chargenumber: chgno,
                 extension: ext
             }));
             this.laborcodes.sort((a, b) => a.compareTo(b));
@@ -291,7 +291,7 @@ class Assignment {
     removeLaborCode(chgno, ext) {
         let found = -1;
         for (let l = 0; l < this.laborcodes.length && !found; l++) {
-            if (this.laborcodes[l].chargeNumber.toLowerCase() === chgno.toLowerCase()
+            if (this.laborcodes[l].chargenumber.toLowerCase() === chgno.toLowerCase()
                 && this.laborcodes[l].extension.toLowerCase() === ext.toLowerCase()) {
                 found = l;
             }

package/scheduler/employees/employee.js

@@ -417,7 +417,7 @@ class Employee {
                 wday = asgmt.getWorkday(date);
                 labor?.forEach(lc => {
                     asgmt.laborcodes.forEach(alc => {
-                        if (lc.chargeNumber.toLowerCase() === alc.chargeNumber.toLowerCase()
+                        if (lc.chargenumber.toLowerCase() === alc.chargenumber.toLowerCase()
                             && lc.extension.toLowerCase() === alc.extension.toLowerCase()) {
                             bPrimary = true;
                         }
@@ -613,7 +613,7 @@ class Employee {
         this.assignments.forEach(asgmt => {
             if (asgmt.useAssignment(date)) {
                 asgmt.laborcodes.forEach(lc => {
-                    if (labor.chargeNumber.toLowerCase() === lc.chargeNumber.toLowerCase()
+                    if (labor.chargenumber.toLowerCase() === lc.chargenumber.toLowerCase()
                         && labor.extension.toLowerCase() === lc.extension.toLowerCase()) {
                         answer = true;
                     }
@@ -632,7 +632,7 @@ class Employee {
         let found = false;
         this.assignments.forEach(asgmt => {
             asgmt.laborcodes.forEach(lc => {
-                if (lc.chargeNumber.toLowerCase() === chargeNumber.toLowerCase()
+                if (lc.chargenumber.toLowerCase() === chargeNumber.toLowerCase()
                     && lc.extension.toLowerCase() === extension.toLowerCase()) {
                     found = true;
                 }
@@ -653,7 +653,7 @@ class Employee {
         this.assignments.forEach(asgmt => {
             if (asgmt.useAssignment(date)) {
                 asgmt.laborcodes.forEach(lc => {
-                    if (lc.chargeNumber.toLowerCase() === chgNo.toLowerCase()
+                    if (lc.chargenumber.toLowerCase() === chgNo.toLowerCase()
                         && lc.extension.toLowerCase() === ext.toLowerCase()) {
                         found = true;
                     }
@@ -730,9 +730,6 @@ class Employee {
         end = new Date(Date.UTC(end.getFullYear(), end.getMonth(), end.getDate()));
         // Check for assignment during period
         let found = false;
-        if (this.name.lastname.toLowerCase() === 'erne') {
-            console.log(`${start} - ${end} - ${JSON.stringify(labor)}`);
-        }
         this.assignments.forEach(asgmt => {
             if (asgmt.useAssignment(start, end, labor)) {
                 found = true;
@@ -741,18 +738,12 @@ class Employee {
         if (!found) {
             return 0.0;
         }
-        if (this.name.lastname.toLowerCase() === 'erne') {
-            console.log('use assignment');
-        }
         // check if labor code is applicable during period
         if (!labor.startDate || !labor.endDate
             || labor.endDate.getTime() < start.getTime()
             || labor.startDate.getTime() > end.getTime()) {
             return 0.0;
         }
-        if (this.name.lastname.toLowerCase() === 'erne') {
-            console.log('labor code');
-        }
         // determine last worked day from work records
         let lastWorked = new Date(0);
         if (this.work && this.work.length > 0) {
@@ -766,9 +757,6 @@ class Employee {
                 lastWorked = new Date(lv.leavedate);
             }
         });
-        if (this.name.lastname.toLowerCase() === 'erne') {
-            console.log('lastWorked');
-        }
         // now step through the days of the period to:
         // 1) see if they had worked any charge numbers during
         //		the period, if working add 0 hours
@@ -785,7 +773,6 @@ class Employee {
                     if (current.getTime() >= labor.startDate.getTime()
                         && current.getTime() <= labor.endDate.getTime()) {
                         const wd = this.getWorkday(current);
-                        console.log(JSON.stringify(wd));
                         if (wd && wd.code !== '') {
                             codes.forEach(code => {
                                 if (code.id.toLowerCase() === wd.code.toLowerCase() && !code.isLeave) {
@@ -800,6 +787,7 @@ class Employee {
                     }
                 }
             }
+            current = new Date(current.getTime() + (24 * 3600000));
         }
         return answer;
     }

package/scheduler/employees/labor.d.ts

@@ -7,7 +7,7 @@
  * This interface will be used to assign an employee a labor code.
  */
 export interface IEmployeeLaborCode {
-    chargeNumber: string;
+    chargenumber: string;
     extension: string;
 }
 /**
@@ -16,7 +16,7 @@ export interface IEmployeeLaborCode {
  * extension (string value to entend the charge number to specific work assignments)
  */
 export declare class EmployeeLaborCode implements IEmployeeLaborCode {
-    chargeNumber: string;
+    chargenumber: string;
     extension: string;
     constructor(elc?: IEmployeeLaborCode);
     /**

package/scheduler/employees/labor.js

@@ -12,10 +12,10 @@ exports.EmployeeLaborCode = void 0;
  * extension (string value to entend the charge number to specific work assignments)
  */
 class EmployeeLaborCode {
-    chargeNumber;
+    chargenumber;
     extension;
     constructor(elc) {
-        this.chargeNumber = (elc) ? elc.chargeNumber : '';
+        this.chargenumber = (elc) ? elc.chargenumber : '';
         this.extension = (elc) ? elc.extension : '';
     }
     /**
@@ -28,10 +28,10 @@ class EmployeeLaborCode {
      */
     compareTo(other) {
         if (other) {
-            if (this.chargeNumber === other.chargeNumber) {
+            if (this.chargenumber === other.chargenumber) {
                 return (this.extension < other.extension) ? -1 : 1;
             }
-            return (this.chargeNumber < other.chargeNumber) ? -1 : 1;
+            return (this.chargenumber < other.chargenumber) ? -1 : 1;
         }
         return -1;
     }

package/scheduler/sites/reports/section.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Section = void 0;
+const employees_1 = require("../../employees");
 const labor_1 = require("../../labor");
 /**
  * This class implements the data members and actions for CofS report sections.
@@ -63,7 +64,9 @@ class Section {
                 let bPrimary = false;
                 this.laborcodes.forEach(lc => {
                     hours += emp.getWorkedHours(start, end, lc.chargeNumber, lc.extension);
-                    if (emp.isPrimaryCode(start, lc)) {
+                    if (emp.isPrimaryCode(start, new employees_1.EmployeeLaborCode({
+                        chargenumber: lc.chargeNumber, extension: lc.extension
+                    }))) {
                         bPrimary = true;
                     }
                 });
@@ -99,6 +102,12 @@ class Section {
      * an array of strings for remarks created during the row creation.
      */
     createEmployeeSectionData(count, coCount, emp, start, end, workcodes) {
+        const empLaborCodes = [];
+        this.laborcodes.forEach(lc => {
+            empLaborCodes.push(new employees_1.EmployeeLaborCode({ chargenumber: lc.chargeNumber,
+                extension: lc.extension
+            }));
+        });
         const remarks = [];
         let output = '';
         let total = 0.0;
@@ -141,7 +150,7 @@ class Section {
                 }
             }
             else {
-                const wd = emp.getWorkday(current, 'actuals', this.laborcodes);
+                const wd = emp.getWorkday(current, 'actuals', empLaborCodes);
                 if (wd && wd.code !== '') {
                     let wc = workcodes.get(wd.code);
                     if (wc && wc.altcode && wc.altcode !== '') {