scheduler-node-models 1.0.155 → 1.0.157

package/package.json

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

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();
@@ -248,17 +247,17 @@ class LeaveReport extends general_1.Report {
         const months = [];
         for (let i = 0; i < 12; i++) {
             const dtMonth = new Date(Date.UTC(year, i, 1));
-            months.push(new leaves_1.LeaveMonth(dtMonth, false));
+            months.push(new leaves_1.LeaveMonth(dtMonth, std, false));
         }
         months.sort((a, b) => a.compareTo(b));
         const holidays = [];
         this.holidays.forEach(hol => {
             const dt = hol.getActual(year);
             if (dt) {
-                holidays.push(new leaves_1.LeaveMonth(dt, false, hol));
+                holidays.push(new leaves_1.LeaveMonth(dt, std, false, hol));
             }
             else {
-                holidays.push(new leaves_1.LeaveMonth(new Date(0), false, hol));
+                holidays.push(new leaves_1.LeaveMonth(new Date(0), std, false, hol));
             }
         });
         holidays.sort((a, b) => a.compareTo(b));

package/scheduler/reports/leaves.d.ts

@@ -16,7 +16,8 @@ export declare class LeaveMonth {
     holiday?: Holiday;
     disabled: boolean;
     periods: LeavePeriod[];
-    constructor(start: Date, disabled: boolean, holiday?: Holiday);
+    standard: number;
+    constructor(start: Date, std: number, disabled: boolean, holiday?: Holiday);
     compareTo(other?: LeaveMonth): number;
     getHours(type?: string, actuals?: boolean): number;
     addLeave(leave: Leave): void;

package/scheduler/reports/leaves.js

@@ -57,8 +57,10 @@ class LeaveMonth {
     holiday;
     disabled;
     periods;
-    constructor(start, disabled, holiday) {
+    standard;
+    constructor(start, std, disabled, holiday) {
         this.month = new Date(start);
+        this.standard = std;
         this.disabled = disabled;
         this.periods = [];
         this.holiday = undefined;
@@ -89,15 +91,17 @@ class LeaveMonth {
     }
     addLeave(leave) {
         let bAdded = false;
-        this.periods.forEach((prd, p) => {
-            if (!bAdded && leave.code.toLowerCase() === prd.code.toLowerCase()
-                && leave.status.toLowerCase() === prd.status.toLowerCase()
-                && leave.leavedate.getDate() === prd.end.getDate() + 1) {
-                bAdded = true;
-                prd.addLeave(leave);
-                this.periods[p] = prd;
-            }
-        });
+        if (leave.hours === this.standard) {
+            this.periods.forEach((prd, p) => {
+                if (!bAdded && leave.code.toLowerCase() === prd.code.toLowerCase()
+                    && leave.status.toLowerCase() === prd.status.toLowerCase()
+                    && leave.leavedate.getDate() === prd.end.getDate() + 1) {
+                    bAdded = true;
+                    prd.addLeave(leave);
+                    this.periods[p] = prd;
+                }
+            });
+        }
         if (!bAdded) {
             this.periods.push(new LeavePeriod(leave));
         }