@acorex/modules 21.0.0-next.7 → 21.0.0-next.8

package/fesm2022/acorex-modules-human-capital-management.mjs

@@ -1,11 +1,11 @@
 import { AXTranslationService } from '@acorex/core/translation';
 import { AXPWorkflowTaskProvider, AXP_WORKFLOW_TASK_PROVIDER } from '@acorex/modules/task-management';
-import { AXPCommandExecutor, AXPCommandEventsService, AXPRuntimeModule } from '@acorex/platform/runtime';
+import { AXPSystemStatuses, AXPStatusProvider, systemStatusToDefinition, AXPSystemStatusType, AXP_STATUS_PROVIDERS, AXP_MENU_PROVIDER } from '@acorex/platform/common';
+import { AXPEntityService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
+import { AXPCommandExecutor, AXPCommandEventsService, AXPRuntimeModule, provideCommandSetups } from '@acorex/platform/runtime';
 import * as i0 from '@angular/core';
 import { inject, Injectable, DestroyRef, signal, NgModule, Injector } from '@angular/core';
 import { AXPLayoutBuilderService } from '@acorex/platform/layout/builder';
-import { AXPEntityService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
-import { AXPSystemStatuses, AXPStatusProvider, systemStatusToDefinition, AXPSystemStatusType, AXP_STATUS_PROVIDERS, AXP_MENU_PROVIDER } from '@acorex/platform/common';
 import { AXPTaskBadgeProvider, AXP_TASK_BADGE_PROVIDERS } from '@acorex/platform/layout/components';
 import { AXP_IDENTIFIER_RULES } from '@acorex/modules/identifier-management';
 import { AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER } from '@acorex/platform/core';
@@ -221,11 +221,13 @@ class AXMLeaveRequestTaskProvider extends AXPWorkflowTaskProvider {
             operator: { type: 'equal', negative: true },
             value: AXPSystemStatuses.Cancelled.name,
         });
-        if (options?.range?.from) {
-            baseFilter.filters?.push({ field: 'startDate', operator: { type: 'gte' }, value: options.range.from });
-        }
+        // Filter for tasks that OVERLAP with the given date range
+        // A task overlaps if: task.startDate <= range.end AND task.endDate >= range.from
         if (options?.range?.end) {
-            baseFilter.filters?.push({ field: 'endDate', operator: { type: 'lte' }, value: options.range.end });
+            baseFilter.filters?.push({ field: 'startDate', operator: { type: 'lte' }, value: options.range.end });
+        }
+        if (options?.range?.from) {
+            baseFilter.filters?.push({ field: 'endDate', operator: { type: 'gte' }, value: options.range.from });
         }
         if (options?.assigneeIds && options.assigneeIds.length > 0) {
             // Filter by manager (assignee) of the employee requesting leave
@@ -250,6 +252,8 @@ class AXMLeaveRequestTaskProvider extends AXPWorkflowTaskProvider {
                 description: item.reason ?? '',
                 startDate: item.startDate ?? new Date(),
                 endDate: item.endDate ?? new Date(),
+                // Leave requests are all-day events by default (they span full days)
+                allDay: true,
                 assignee: {
                     id: item.employee?.userId ?? '',
                     type: 'user',
@@ -269,50 +273,94 @@ class AXMLeaveRequestTaskProvider extends AXPWorkflowTaskProvider {
         return { items: tasks, total };
     }
     async updateTasks(tasksToUpdate) {
-        // No-op for now. Could wire drag-drop to update status/dates.
-        return tasksToUpdate;
+        // Update each task in the backend
+        const updatedTasks = [];
+        for (const task of tasksToUpdate) {
+            try {
+                // Build update payload with all changed fields
+                const updatePayload = {};
+                // Update status if present
+                if (task.status?.id) {
+                    const statusId = task.status.id;
+                    updatePayload['statusId'] = statusId;
+                }
+                // Update dates if present
+                if (task.startDate) {
+                    updatePayload['startDate'] = task.startDate;
+                }
+                if (task.endDate) {
+                    updatePayload['endDate'] = task.endDate;
+                }
+                // Only update if there's something to update
+                if (Object.keys(updatePayload).length > 0) {
+                    await this.leaveRequestData.update(String(task.id), updatePayload);
+                }
+                // Return the task as-is (already updated in the task object)
+                updatedTasks.push(task);
+            }
+            catch (error) {
+                console.error(`[LeaveRequestTaskProvider] Failed to update task ${task.id}:`, error);
+                // Still include the task even if update failed
+                updatedTasks.push(task);
+            }
+        }
+        return updatedTasks;
     }
     async executeCommand(command) {
-        try {
-            if (command.name === 'approveLeave' || command.name === 'rejectLeave' || command.name === 'cancelLeave') {
-                const leaveRequestId = command.options?.['id'] ?? '';
-                // Show appropriate dialog based on action
-                let dialogResult;
-                switch (command.name) {
-                    case 'approveLeave':
-                        dialogResult = await this.dialogService.showApprovalDialog();
-                        break;
-                    case 'rejectLeave':
-                        dialogResult = await this.dialogService.showRejectionDialog();
-                        break;
-                    case 'cancelLeave':
-                        dialogResult = await this.dialogService.showCancellationDialog();
-                        break;
-                }
+        if (!command?.name)
+            return { success: true };
+        const leaveRequestId = command.options?.['id'] ?? '';
+        switch (command.name) {
+            case 'approveLeave': {
+                // Show approval dialog
+                const dialogResult = await this.dialogService.showApprovalDialog();
                 // If dialog was cancelled, return early
                 if (dialogResult?.cancelled) {
                     return { success: false };
                 }
-                const commandKey = `HumanCapitalManagement.LeaveRequest:${command.name === 'approveLeave' ? 'Approve' : command.name === 'rejectLeave' ? 'Reject' : 'Cancel'}`;
-                const result = await this.commandExecutor.execute(commandKey, {
+                // Execute the command - use fallback pattern like JSA
+                const result = await this.commandExecutor.execute('HumanCapitalManagement.LeaveRequest:Approve', {
                     id: leaveRequestId,
                     reason: dialogResult?.reason,
                     note: dialogResult?.note,
                 });
-                if (result?.success) {
-                    return { success: true };
+                // Return result if exists, otherwise default to success (command might not be registered yet)
+                return result ?? { success: true };
+            }
+            case 'rejectLeave': {
+                // Show rejection dialog
+                const dialogResult = await this.dialogService.showRejectionDialog();
+                // If dialog was cancelled, return early
+                if (dialogResult?.cancelled) {
+                    return { success: false };
                 }
-                else {
+                // Execute the command - use fallback pattern like JSA
+                const result = await this.commandExecutor.execute('HumanCapitalManagement.LeaveRequest:Reject', {
+                    id: leaveRequestId,
+                    reason: dialogResult?.reason,
+                    note: dialogResult?.note,
+                });
+                // Return result if exists, otherwise default to success (command might not be registered yet)
+                return result ?? { success: true };
+            }
+            case 'cancelLeave': {
+                // Show cancellation dialog
+                const dialogResult = await this.dialogService.showCancellationDialog();
+                // If dialog was cancelled, return early
+                if (dialogResult?.cancelled) {
                     return { success: false };
                 }
+                // Execute the command - use fallback pattern like JSA
+                const result = await this.commandExecutor.execute('HumanCapitalManagement.LeaveRequest:Cancel', {
+                    id: leaveRequestId,
+                    reason: dialogResult?.reason,
+                    note: dialogResult?.note,
+                });
+                // Return result if exists, otherwise default to success (command might not be registered yet)
+                return result ?? { success: true };
             }
-            return { success: true };
-        }
-        catch (error) {
-            return {
-                success: false,
-            };
         }
+        return { success: true };
     }
     async getActions(task) {
         const actions = [];
@@ -560,6 +608,20 @@ class AXMLeaveRequestFeatureModule {
                 useClass: AXMLeaveRequestStatusProvider,
                 multi: true,
             },
+            provideCommandSetups([
+                {
+                    key: 'HumanCapitalManagement.LeaveRequest:Approve',
+                    command: () => import('./acorex-modules-human-capital-management-approve-leave-request.command-DN2T2hBp.mjs').then((c) => c.ApproveLeaveRequestCommand),
+                },
+                {
+                    key: 'HumanCapitalManagement.LeaveRequest:Reject',
+                    command: () => import('./acorex-modules-human-capital-management-reject-leave-request.command-1Bn0gaZi.mjs').then((c) => c.RejectLeaveRequestCommand),
+                },
+                {
+                    key: 'HumanCapitalManagement.LeaveRequest:Cancel',
+                    command: () => import('./acorex-modules-human-capital-management-cancel-leave-request.command-CYMo0I8p.mjs').then((c) => c.CancelLeaveRequestCommand),
+                },
+            ]),
         ], imports: [CommonModule, AXPRuntimeModule] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXMLeaveRequestFeatureModule, decorators: [{
@@ -582,6 +644,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                             useClass: AXMLeaveRequestStatusProvider,
                             multi: true,
                         },
+                        provideCommandSetups([
+                            {
+                                key: 'HumanCapitalManagement.LeaveRequest:Approve',
+                                command: () => import('./acorex-modules-human-capital-management-approve-leave-request.command-DN2T2hBp.mjs').then((c) => c.ApproveLeaveRequestCommand),
+                            },
+                            {
+                                key: 'HumanCapitalManagement.LeaveRequest:Reject',
+                                command: () => import('./acorex-modules-human-capital-management-reject-leave-request.command-1Bn0gaZi.mjs').then((c) => c.RejectLeaveRequestCommand),
+                            },
+                            {
+                                key: 'HumanCapitalManagement.LeaveRequest:Cancel',
+                                command: () => import('./acorex-modules-human-capital-management-cancel-leave-request.command-CYMo0I8p.mjs').then((c) => c.CancelLeaveRequestCommand),
+                            },
+                        ]),
                     ],
                 }]
         }] });
@@ -842,9 +918,9 @@ class AXMHumanCapitalModuleEntityProvider {
                 case RootConfig.entities.positionAssignment?.name:
                     return (await import('./acorex-modules-human-capital-management-position-assignment.entity-P-IN-w_1.mjs')).factory();
                 case RootConfig.entities.leaveType.name:
-                    return (await import('./acorex-modules-human-capital-management-leave-type.entity-DlCdAtaz.mjs')).factory();
+                    return (await import('./acorex-modules-human-capital-management-leave-type.entity-CY81Nohl.mjs')).factory();
                 case RootConfig.entities.leaveRequest.name:
-                    return (await import('./acorex-modules-human-capital-management-leave-request.entity-BDh7IX7_.mjs')).factory();
+                    return (await import('./acorex-modules-human-capital-management-leave-request.entity-Dm_IKrVw.mjs')).factory();
             }
         }
         return null;