@skysoftware-co/bayan-hr-widgets-ui 1.0.26 → 1.0.27

package/fesm2022/skysoftware-co-bayan-hr-widgets-ui.mjs

@@ -2248,7 +2248,9 @@ class MyCalendarWidgetComponent {
     selfWidgetsService;
     baseUrl = '';
     headerContainerClass = '';
+    datasource = null;
     isLoadingChanged = new EventEmitter();
+    //test
     calendarIcon = faCalendarDays;
     legendContainerClass = 'row mb-2';
     legendRowClass = 'd-flex';
@@ -2270,17 +2272,29 @@ class MyCalendarWidgetComponent {
     eventsColor = this.constants.defaultEventsColor;
     hrCalendar;
     scheduleCalenderVacation = [];
-    minDate = new Date();
+    minDate;
     maxDate;
+    baseCalendarData = [];
+    hrVacations = [];
+    calendarLoaded = false;
     constructor(selfWidgetsService) {
         this.selfWidgetsService = selfWidgetsService;
-        const currentDate = moment().date(1).subtract(1, 'month');
-        this.minDate = new Date(currentDate.year(), currentDate.month(), currentDate.date());
-        this.maxDate = new Date(this.minDate.getFullYear() + 1, this.minDate.getMonth() + 1, 0);
+        this.initDateRange();
     }
     ngOnInit() {
         this.loadCalendar();
     }
+    ngOnChanges(changes) {
+        if (changes['datasource'] && this.datasource && this.calendarLoaded) {
+            this.buildCalendarData();
+            this.refreshCalendar();
+        }
+    }
+    initDateRange() {
+        const currentDate = moment().date(1).subtract(1, 'month');
+        this.minDate = new Date(currentDate.year(), currentDate.month(), currentDate.date());
+        this.maxDate = new Date(this.minDate.getFullYear() + 1, this.minDate.getMonth() + 1, 0);
+    }
     getCalendar(month, year, monthsCount) {
         return this.selfWidgetsService.getCalendar(this.baseUrl, month, year, monthsCount);
     }
@@ -2294,46 +2308,54 @@ class MyCalendarWidgetComponent {
                 this.isLoadingChanged.emit(false);
                 this.mapCalendarData(response.ResponseData);
             },
-            error: (error) => {
+            error: () => {
                 this.isLoadingChanged.emit(false);
             },
         });
     }
     mapCalendarData(data) {
-        const result = [];
-        for (const v of data.Vacations) {
-            result.push({
-                VacationType: ScheduleVacationTypes.Vacations,
-                Description: v.VacationTypeName,
-                Color: v.Color,
-                VacationDays: { StartDate: v.StartDate, EndDate: v.EndDate }
-            });
-        }
-        for (const ph of data.PublicHolidays) {
-            result.push({
+        this.baseCalendarData = [
+            ...data.PublicHolidays.map(ph => ({
                 VacationType: ScheduleVacationTypes.PublicHoliday,
                 Description: ph.Description,
                 Color: this.publicHolidayColor,
                 VacationDays: { StartDate: ph.StartDate, EndDate: ph.EndDate }
-            });
-        }
-        for (const od of data.OffDays) {
-            result.push({
+            })),
+            ...data.OffDays.map(od => ({
                 VacationType: ScheduleVacationTypes.DaysOff,
                 Description: this.translatePipe.transform('DayOff'),
                 Color: this.dayOffColor,
                 VacationDays: { StartDate: od, EndDate: od }
-            });
-        }
-        for (const ev of data.Events) {
-            result.push({
-                VacationType: ScheduleVacationTypes.Events,
-                Description: ev.Description,
-                Color: this.eventsColor,
-                VacationDays: { StartDate: ev.StartDate, EndDate: ev.EndDate }
-            });
-        }
-        this.scheduleCalenderVacation = result;
+            }))
+        ];
+        this.hrVacations = (data.Vacations ?? []).map(v => ({
+            VacationType: ScheduleVacationTypes.Vacations,
+            Description: v.VacationTypeName,
+            Color: v.Color,
+            VacationDays: { StartDate: v.StartDate, EndDate: v.EndDate }
+        }));
+        this.calendarLoaded = true;
+        this.buildCalendarData();
+        this.refreshCalendar();
+    }
+    buildCalendarData() {
+        const pendingVacations = this.datasource?.PendingVacationRequests?.map(v => ({
+            VacationType: ScheduleVacationTypes.Vacations,
+            Description: v.VacationTypeName,
+            Color: v.Color,
+            VacationDays: { StartDate: v.StartDate, EndDate: v.EndDate }
+        })) ?? [];
+        const mergedVacations = this.mergeConsecutiveVacations([...this.hrVacations, ...pendingVacations]
+            .sort((a, b) => new Date(a.VacationDays.StartDate).getTime() - new Date(b.VacationDays.StartDate).getTime()));
+        const events = this.datasource?.PendingEventRequests?.map(ev => ({
+            VacationType: ScheduleVacationTypes.Events,
+            Description: ev.Description,
+            Color: this.eventsColor,
+            VacationDays: { StartDate: ev.StartDate, EndDate: ev.EndDate }
+        })) ?? [];
+        this.scheduleCalenderVacation = [...mergedVacations, ...this.baseCalendarData, ...events];
+    }
+    refreshCalendar() {
         setTimeout(() => {
             if (this.hrCalendar?.calendar) {
                 this.hrCalendar.calendar.instance._refresh();
@@ -2341,8 +2363,42 @@ class MyCalendarWidgetComponent {
             }
         }, 100);
     }
+    mergeConsecutiveVacations(vacations) {
+        if (vacations.length === 0)
+            return [];
+        const grouped = new Map();
+        for (const v of vacations) {
+            const key = `${v.Description}|${v.Color ?? ''}`;
+            if (!grouped.has(key))
+                grouped.set(key, []);
+            grouped.get(key).push(v);
+        }
+        const result = [];
+        grouped.forEach((items) => {
+            items.sort((a, b) => new Date(a.VacationDays.StartDate).getTime() - new Date(b.VacationDays.StartDate).getTime());
+            let merged = { ...items[0], VacationDays: { ...items[0].VacationDays } };
+            for (let i = 1; i < items.length; i++) {
+                const current = items[i];
+                const lastEnd = new Date(merged.VacationDays.EndDate);
+                const currentStart = new Date(current.VacationDays.StartDate);
+                const diffDays = (currentStart.getTime() - lastEnd.getTime()) / (1000 * 60 * 60 * 24);
+                if (diffDays <= 1) {
+                    const currentEnd = new Date(current.VacationDays.EndDate);
+                    if (currentEnd.getTime() > lastEnd.getTime()) {
+                        merged.VacationDays.EndDate = current.VacationDays.EndDate;
+                    }
+                }
+                else {
+                    result.push(merged);
+                    merged = { ...current, VacationDays: { ...current.VacationDays } };
+                }
+            }
+            result.push(merged);
+        });
+        return result.sort((a, b) => new Date(a.VacationDays.StartDate).getTime() - new Date(b.VacationDays.StartDate).getTime());
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.20", ngImport: i0, type: MyCalendarWidgetComponent, deps: [{ token: HRSelfWidgetsService }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.20", type: MyCalendarWidgetComponent, isStandalone: true, selector: "hr-my-calendar-widget", inputs: { baseUrl: "baseUrl", headerContainerClass: "headerContainerClass", legendContainerClass: "legendContainerClass", legendRowClass: "legendRowClass", legendItemClass: "legendItemClass", legendDotClass: "legendDotClass", legendLabelClass: "legendLabelClass", publicHolidayDotClass: "publicHolidayDotClass", dayOffDotClass: "dayOffDotClass", eventsDotClass: "eventsDotClass", vacationsContainerClass: "vacationsContainerClass", vacationsItemClass: "vacationsItemClass", vacationsIconClass: "vacationsIconClass", calendarContainerClass: "calendarContainerClass", calendarClass: "calendarClass", publicHolidayColor: "publicHolidayColor", dayOffColor: "dayOffColor", eventsColor: "eventsColor" }, outputs: { isLoadingChanged: "isLoadingChanged" }, viewQueries: [{ propertyName: "hrCalendar", first: true, predicate: HREmployeeCalendarComponent, descendants: true }], ngImport: i0, template: "<hr-card-header\r\n  [icon]=\"calendarIcon\"\r\n  [title]=\"'Calendar' | HRTranslate\"\r\n  [containerClass]=\"'d-flex align-items-center mb-3 ' + headerContainerClass\">\r\n</hr-card-header>\r\n<hr-employee-calendar\r\n  [showEvents]=\"true\"\r\n  [showUpComingVacations]=\"true\"\r\n  [scheduleCalenderVacation]=\"scheduleCalenderVacation\"\r\n  [minDate]=\"minDate\"\r\n  [maxDate]=\"maxDate\"\r\n  [legendContainerClass]=\"legendContainerClass\"\r\n  [legendRowClass]=\"legendRowClass\"\r\n  [legendItemClass]=\"legendItemClass\"\r\n  [legendDotClass]=\"legendDotClass\"\r\n  [legendLabelClass]=\"legendLabelClass\"\r\n  [publicHolidayDotClass]=\"publicHolidayDotClass\"\r\n  [dayOffDotClass]=\"dayOffDotClass\"\r\n  [eventsDotClass]=\"eventsDotClass\"\r\n  [vacationsContainerClass]=\"vacationsContainerClass\"\r\n  [vacationsItemClass]=\"vacationsItemClass\"\r\n  [vacationsIconClass]=\"vacationsIconClass\"\r\n  [calendarContainerClass]=\"calendarContainerClass\"\r\n  [calendarClass]=\"calendarClass\">\r\n</hr-employee-calendar>\r\n", dependencies: [{ kind: "component", type: HREmployeeCalendarComponent, selector: "hr-employee-calendar", inputs: ["showEvents", "showUpComingVacations", "scheduleCalenderVacation", "minDate", "maxDate", "legendContainerClass", "legendRowClass", "legendItemClass", "legendDotClass", "legendLabelClass", "publicHolidayDotClass", "dayOffDotClass", "eventsDotClass", "vacationsContainerClass", "vacationsItemClass", "vacationsIconClass", "calendarContainerClass", "calendarClass"] }, { kind: "component", type: HRCardHeaderComponent, selector: "hr-card-header", inputs: ["icon", "title", "containerClass", "iconClass", "titleClass"] }, { kind: "pipe", type: HRTranslatePipe, name: "HRTranslate" }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.20", type: MyCalendarWidgetComponent, isStandalone: true, selector: "hr-my-calendar-widget", inputs: { baseUrl: "baseUrl", headerContainerClass: "headerContainerClass", datasource: "datasource", legendContainerClass: "legendContainerClass", legendRowClass: "legendRowClass", legendItemClass: "legendItemClass", legendDotClass: "legendDotClass", legendLabelClass: "legendLabelClass", publicHolidayDotClass: "publicHolidayDotClass", dayOffDotClass: "dayOffDotClass", eventsDotClass: "eventsDotClass", vacationsContainerClass: "vacationsContainerClass", vacationsItemClass: "vacationsItemClass", vacationsIconClass: "vacationsIconClass", calendarContainerClass: "calendarContainerClass", calendarClass: "calendarClass", publicHolidayColor: "publicHolidayColor", dayOffColor: "dayOffColor", eventsColor: "eventsColor" }, outputs: { isLoadingChanged: "isLoadingChanged" }, viewQueries: [{ propertyName: "hrCalendar", first: true, predicate: HREmployeeCalendarComponent, descendants: true }], usesOnChanges: true, ngImport: i0, template: "<hr-card-header\r\n  [icon]=\"calendarIcon\"\r\n  [title]=\"'Calendar' | HRTranslate\"\r\n  [containerClass]=\"'d-flex align-items-center mb-3 ' + headerContainerClass\">\r\n</hr-card-header>\r\n<hr-employee-calendar\r\n  [showEvents]=\"true\"\r\n  [showUpComingVacations]=\"true\"\r\n  [scheduleCalenderVacation]=\"scheduleCalenderVacation\"\r\n  [minDate]=\"minDate\"\r\n  [maxDate]=\"maxDate\"\r\n  [legendContainerClass]=\"legendContainerClass\"\r\n  [legendRowClass]=\"legendRowClass\"\r\n  [legendItemClass]=\"legendItemClass\"\r\n  [legendDotClass]=\"legendDotClass\"\r\n  [legendLabelClass]=\"legendLabelClass\"\r\n  [publicHolidayDotClass]=\"publicHolidayDotClass\"\r\n  [dayOffDotClass]=\"dayOffDotClass\"\r\n  [eventsDotClass]=\"eventsDotClass\"\r\n  [vacationsContainerClass]=\"vacationsContainerClass\"\r\n  [vacationsItemClass]=\"vacationsItemClass\"\r\n  [vacationsIconClass]=\"vacationsIconClass\"\r\n  [calendarContainerClass]=\"calendarContainerClass\"\r\n  [calendarClass]=\"calendarClass\">\r\n</hr-employee-calendar>\r\n", dependencies: [{ kind: "component", type: HREmployeeCalendarComponent, selector: "hr-employee-calendar", inputs: ["showEvents", "showUpComingVacations", "scheduleCalenderVacation", "minDate", "maxDate", "legendContainerClass", "legendRowClass", "legendItemClass", "legendDotClass", "legendLabelClass", "publicHolidayDotClass", "dayOffDotClass", "eventsDotClass", "vacationsContainerClass", "vacationsItemClass", "vacationsIconClass", "calendarContainerClass", "calendarClass"] }, { kind: "component", type: HRCardHeaderComponent, selector: "hr-card-header", inputs: ["icon", "title", "containerClass", "iconClass", "titleClass"] }, { kind: "pipe", type: HRTranslatePipe, name: "HRTranslate" }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.20", ngImport: i0, type: MyCalendarWidgetComponent, decorators: [{
             type: Component,
@@ -2351,6 +2407,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.20", ngImpo
                 type: Input
             }], headerContainerClass: [{
                 type: Input
+            }], datasource: [{
+                type: Input
             }], isLoadingChanged: [{
                 type: Output
             }], legendContainerClass: [{