scheduler-node-models 1.0.144 → 1.0.146

package/package.json

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

package/scheduler/reports/leaveReport.js

@@ -354,8 +354,8 @@ class LeaveReport extends general_1.Report {
                 const num = Number(empHol.tagday.substring(1));
                 holidays.forEach((hol, h) => {
                     if (hol.holiday && hol.holiday.id.toLowerCase() === code
-                        && hol.holiday.sort === num) {
-                        hol.periods.push(new leaves_1.LeavePeriod(new employees_1.Leave(empHol)));
+                        && hol.holiday.sort === num && !empHol.used) {
+                        hol.addLeave(empHol);
                         empHol.used = true;
                         holidays[h] = hol;
                         empHolidays[eh] = empHol;
@@ -367,9 +367,9 @@ class LeaveReport extends general_1.Report {
         empHolidays.forEach((empHol, eh) => {
             if (!empHol.used && empHol.status.toLowerCase() === 'actual') {
                 holidays.forEach((hol, h) => {
-                    if (hol.holiday && hol.holiday.id.toLowerCase() === 'h'
+                    if (!empHol.used && hol.holiday && hol.holiday.id.toLowerCase() === 'h'
                         && !hol.disabled && hol.getHours() + empHol.hours <= 8.0) {
-                        hol.periods.push(new leaves_1.LeavePeriod(new employees_1.Leave(empHol)));
+                        hol.addLeave(empHol);
                         empHol.used = true;
                         holidays[h] = hol;
                         empHolidays[eh] = empHol;
@@ -381,10 +381,10 @@ class LeaveReport extends general_1.Report {
         empHolidays.forEach((empHol, eh) => {
             if (!empHol.used) {
                 holidays.forEach((hol, h) => {
-                    if (hol.holiday && hol.holiday.id.toLowerCase() === 'h'
+                    if (!empHol.used && hol.holiday && hol.holiday.id.toLowerCase() === 'h'
                         && hol.month.getTime() === empHol.leavedate.getTime()
                         && !hol.disabled && hol.getHours() + empHol.hours <= 8.0) {
-                        hol.periods.push(new leaves_1.LeavePeriod(new employees_1.Leave(empHol)));
+                        hol.addLeave(empHol);
                         empHol.used = true;
                         holidays[h] = hol;
                         empHolidays[eh] = empHol;
@@ -399,10 +399,11 @@ class LeaveReport extends general_1.Report {
                 holidays.forEach((hol, h) => {
                     if (!found && !hol.disabled) {
                         if (hol.getHours() + empHol.hours <= 8.0) {
-                            hol.periods.push(new leaves_1.LeavePeriod(new employees_1.Leave(empHol)));
+                            hol.addLeave(empHol);
                             holidays[h] = hol;
                             found = true;
                             empHol.used = true;
+                            empHolidays[eh] = empHol;
                         }
                     }
                 });
@@ -415,7 +416,7 @@ class LeaveReport extends general_1.Report {
                 holidays.forEach((hol, h) => {
                     if (!found && hol.disabled) {
                         found = true;
-                        hol.periods.push(new leaves_1.LeavePeriod(new employees_1.Leave(empHol)));
+                        hol.addLeave(empHol);
                     }
                 });
             }
@@ -423,9 +424,8 @@ class LeaveReport extends general_1.Report {
         // next, place the non-holiday leaves into the months they are using in.
         empOtherLeaves.sort((a, b) => a.compareTo(b));
         empOtherLeaves.forEach(lv => {
-            let lvFound = false;
             months.forEach((month, m) => {
-                if (!lvFound && month.month.getUTCFullYear() === lv.leavedate.getUTCFullYear()
+                if (month.month.getUTCFullYear() === lv.leavedate.getUTCFullYear()
                     && month.month.getUTCMonth() === lv.leavedate.getUTCMonth()) {
                     month.addLeave(lv);
                     months[m] = month;
@@ -460,8 +460,7 @@ class LeaveReport extends general_1.Report {
                 if (hol.holiday.getActual(year)) {
                     const formatter = new Intl.DateTimeFormat('en-US', {
                         month: 'short',
-                        day: '2-digit',
-                        year: '2-digit'
+                        day: '2-digit'
                     });
                     this.setCell(sheet, this.getCellID(col + 1, holRow), this.getCellID(col + 1, holRow), style, formatter.format(hol.holiday.getActual(year)));
                 }
@@ -537,7 +536,7 @@ class LeaveReport extends general_1.Report {
                 }
                 let text = '';
                 let bHours = false;
-                if (prd.start.getTime() === prd.end.getTime()) {
+                if (prd.start.getTime() !== prd.end.getTime()) {
                     text = `${prd.start.getDate()}-${prd.end.getDate()}`;
                 }
                 else {

package/scheduler/reports/leaves.js

@@ -94,8 +94,7 @@ class LeaveMonth {
                 && leave.status.toLowerCase() === prd.status.toLowerCase()
                 && leave.leavedate.getDate() === prd.end.getDate() + 1) {
                 bAdded = true;
-                prd.leaves.push(new employees_1.Leave(leave));
-                prd.end = new Date(leave.leavedate);
+                prd.addLeave(leave);
                 this.periods[p] = prd;
             }
         });