scheduler-node-models 1.0.154 → 1.0.156

package/package.json

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

package/scheduler/employees/employee.d.ts

@@ -28,7 +28,7 @@ export interface IEmployee {
     companyinfo: ICompanyInfo;
     assignments?: IAssignment[];
     variations?: IVariation[];
-    balance?: IAnnualLeave[];
+    balances?: IAnnualLeave[];
     leaves?: ILeave[];
     requests?: ILeaveRequest[];
     laborCodes?: IEmployeeLaborCode[];
@@ -47,7 +47,7 @@ export declare class Employee implements IEmployee {
     companyinfo: ICompanyInfo;
     assignments: Assignment[];
     variations: Variation[];
-    balance: AnnualLeave[];
+    balances: AnnualLeave[];
     leaves: Leave[];
     requests: LeaveRequest[];
     laborCodes: EmployeeLaborCode[];

package/scheduler/employees/employee.js

@@ -23,7 +23,7 @@ class Employee {
     companyinfo;
     assignments;
     variations;
-    balance;
+    balances;
     leaves;
     requests;
     laborCodes;
@@ -56,12 +56,12 @@ class Employee {
             });
             this.variations.sort((a, b) => a.compareTo(b));
         }
-        this.balance = [];
-        if (emp && emp.balance && emp.balance.length > 0) {
-            emp.balance.forEach(b => {
-                this.balance.push(new balance_1.AnnualLeave(b));
+        this.balances = [];
+        if (emp && emp.balances && emp.balances.length > 0) {
+            emp.balances.forEach(b => {
+                this.balances.push(new balance_1.AnnualLeave(b));
             });
-            this.balance.sort((a, b) => a.compareTo(b));
+            this.balances.sort((a, b) => a.compareTo(b));
         }
         this.leaves = [];
         if (emp && emp.leaves && emp.leaves.length > 0) {
@@ -182,10 +182,10 @@ class Employee {
             }
         }
         // purge old leave balances
-        this.balance.sort((a, b) => a.compareTo(b));
-        for (let b = this.balance.length - 1; b >= 0; b--) {
-            if (this.balance[b].year < date.getUTCFullYear()) {
-                this.balance.splice(b, 1);
+        this.balances.sort((a, b) => a.compareTo(b));
+        for (let b = this.balances.length - 1; b >= 0; b--) {
+            if (this.balances[b].year < date.getUTCFullYear()) {
+                this.balances.splice(b, 1);
             }
         }
         // return as to whether the employee quit before date
@@ -880,7 +880,7 @@ class Employee {
         let found = false;
         let lastAnnual = 0.0;
         let lastCarry = 0.0;
-        this.balance.forEach(bal => {
+        this.balances.forEach(bal => {
             if (bal.year === year) {
                 found = true;
             }
@@ -908,8 +908,8 @@ class Employee {
                 });
                 bal.carryover = carry;
             }
-            this.balance.push(bal);
-            this.balance.sort((a, b) => a.compareTo(b));
+            this.balances.push(bal);
+            this.balances.sort((a, b) => a.compareTo(b));
         }
     }
     /**
@@ -922,10 +922,10 @@ class Employee {
      */
     updateLeaveBalance(year, annual, carry) {
         let found = false;
-        for (let lb = 0; lb < this.balance.length && !found; lb++) {
-            if (this.balance[lb].year === year) {
-                this.balance[lb].annual = annual;
-                this.balance[lb].carryover = carry;
+        for (let lb = 0; lb < this.balances.length && !found; lb++) {
+            if (this.balances[lb].year === year) {
+                this.balances[lb].annual = annual;
+                this.balances[lb].carryover = carry;
             }
         }
         if (!found) {
@@ -934,9 +934,9 @@ class Employee {
                 annual: annual,
                 carryover: carry
             });
-            this.balance.push(lb);
+            this.balances.push(lb);
         }
-        this.balance.sort((a, b) => a.compareTo(b));
+        this.balances.sort((a, b) => a.compareTo(b));
     }
     /**
      * This function will remove a leave balance from the employee's leave balance list.
@@ -944,13 +944,13 @@ class Employee {
      */
     deleteLeaveBalance(year) {
         let found = -1;
-        this.balance.forEach((bal, i) => {
+        this.balances.forEach((bal, i) => {
             if (bal.year === year) {
                 found = i;
             }
         });
         if (found >= 0) {
-            this.balance.splice(found, 1);
+            this.balances.splice(found, 1);
         }
     }
     /**

package/scheduler/reports/leaveReport.js

@@ -56,7 +56,6 @@ class LeaveReport extends general_1.Report {
                 this.employees.push(emp);
             }
         });
-        console.log(this.employees.length);
         this.employees.sort((a, b) => a.compareTo(b));
         const workbook = new exceljs_1.Workbook();
         workbook.creator = user.getFullName();
@@ -212,11 +211,7 @@ class LeaveReport extends general_1.Report {
     employeePTOHolidaySection(sheet, emp, row, year, showHoliday) {
         let annual = 0.0;
         let carry = 0.0;
-        if (emp.name.lastname.toLowerCase() === 'erne') {
-            console.log(JSON.stringify(emp.balance));
-        }
-        emp.balance.forEach(bal => {
-            console.log(JSON.stringify(bal));
+        emp.balances.forEach(bal => {
             if (bal.year === year) {
                 annual = bal.annual;
                 carry = bal.carryover;