diff --git a/HRM.UI/ClientApp/src/app/app.api.service.ts b/HRM.UI/ClientApp/src/app/app.api.service.ts index e0d0086..b188d3c 100644 --- a/HRM.UI/ClientApp/src/app/app.api.service.ts +++ b/HRM.UI/ClientApp/src/app/app.api.service.ts @@ -13,7 +13,8 @@ export class ApiService { public isSSO = false; public versionDeployement = false; - public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01"; + // public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01"; + public versionNumber = `V-20250421-`+"01"; public static BASE_URL = ''; public base_url = ''; // public currentLink = ''; diff --git a/HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.html b/HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.html index 524f43f..98aeef3 100644 --- a/HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.html +++ b/HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.html @@ -59,13 +59,21 @@
- + +
-
+ + + +
+
+
+ + + + + + + + + + + +
+
+
+ + \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.ts b/HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.ts index 29fde1f..5cf2a97 100644 --- a/HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.ts +++ b/HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.ts @@ -26,6 +26,7 @@ export class AttendanceProcessComponent { lastProcessDate: Date; processStatus: string = ""; withEmployee: boolean = false; + showModal: boolean = false; constructor(public attnService: AttendanceServices, public datatransferservice: DataTransferService, public loadingPanel: loadingPanelService, public notificationService: HRMNotificationService, @@ -43,6 +44,7 @@ export class AttendanceProcessComponent { this.attnService.getNotYetAssiged().subscribe( (x) => { this.employees = x; + debugger }, (x) => { }, @@ -137,4 +139,7 @@ export class AttendanceProcessComponent { this.withEmployee = true; } + public onClickNotInWorkPlanEmployee() { + this.showModal = true; + } } diff --git a/HRM.UI/ClientApp/src/app/attendance/attendance.module.ts b/HRM.UI/ClientApp/src/app/attendance/attendance.module.ts index 006e6a6..afac0cd 100644 --- a/HRM.UI/ClientApp/src/app/attendance/attendance.module.ts +++ b/HRM.UI/ClientApp/src/app/attendance/attendance.module.ts @@ -6,6 +6,8 @@ import { InputsModule, TextBoxModule } from '@progress/kendo-angular-inputs'; import { ChartsModule } from '@progress/kendo-angular-charts'; import { CardModule as kendoCardModule } from '@progress/kendo-angular-layout'; import { DialogsModule } from '@progress/kendo-angular-dialog'; +import { DialogModule } from 'primeng/dialog'; +import { ScrollPanelModule } from 'primeng/scrollpanel'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { PanelModule } from 'primeng/panel'; import { DropDownsModule } from '@progress/kendo-angular-dropdowns'; @@ -81,6 +83,8 @@ import { OrganizationManagementModule } from '../organization-management/organiz FormsModule, ReactiveFormsModule, DialogsModule, + DialogModule, + ScrollPanelModule, CommonModule, GridModule, InputsModule, diff --git a/HRM.UI/ClientApp/src/assets/theme/theme-indigo.css b/HRM.UI/ClientApp/src/assets/theme/theme-indigo.css index 87d6a3d..2ec43c6 100644 --- a/HRM.UI/ClientApp/src/assets/theme/theme-indigo.css +++ b/HRM.UI/ClientApp/src/assets/theme/theme-indigo.css @@ -3954,7 +3954,7 @@ p-treeselect.ng-invalid.ng-dirty > .p-treeselect { border-bottom: 0 none; /* background: #ffffff; color: #495057; */ - padding: 12px 16px; + padding: 10px 16px; border-top-right-radius: 4px; border-top-left-radius: 4px; background: #52527a; @@ -3990,7 +3990,7 @@ p-treeselect.ng-invalid.ng-dirty > .p-treeselect { .p-dialog .p-dialog-content { background: #ffffff; color: #495057; - padding: 0 1.5rem 2rem 1.5rem; + padding: 1rem 1.5rem 1rem 1.5rem; } .p-dialog .p-dialog-footer { border-top: 0 none; diff --git a/HRM.UI/ClientApp/src/styles.scss b/HRM.UI/ClientApp/src/styles.scss index 598e112..8c4359e 100644 --- a/HRM.UI/ClientApp/src/styles.scss +++ b/HRM.UI/ClientApp/src/styles.scss @@ -436,4 +436,13 @@ Menu Custom Code End min-height: 700px; /* max-height: 100%; background-color: white !important; */ -} \ No newline at end of file +} +.link-button { + background: none; + border: none; + color: #007bff; + text-decoration: underline; + cursor: pointer; + padding: 0; + font-size: inherit; + } \ No newline at end of file diff --git a/HRM.UI/Controllers/Attendance/AttendanceController.cs b/HRM.UI/Controllers/Attendance/AttendanceController.cs index 0ccedfa..9387ff3 100644 --- a/HRM.UI/Controllers/Attendance/AttendanceController.cs +++ b/HRM.UI/Controllers/Attendance/AttendanceController.cs @@ -950,6 +950,17 @@ namespace HRM.UI.Controllers.Attendance { //items = _employeeWorkPlanSetupService.NotYetAssigned((int)currentUser.PayrollTypeID); items = _employeeService.NotYetAssigned((int)currentUser.PayrollTypeID); + List grades = new GradeService().Get(EnumStatus.Regardless); + int count = 0; + items.ForEach(emp => + { + if (emp.GradeID != null) + { + Grade gr = grades.Find(g => g.ID == emp.GradeID); + emp.GradeName = gr.Name != null ? gr.Name : ""; + emp.SortOrder = ++count; + } + }); } catch (Exception e) {