diff --git a/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html b/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html
index 7d4769f..735e0fa 100644
--- a/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html
+++ b/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html
@@ -3,7 +3,7 @@
<div class="px-1">
<div class="relative shadow-md">
<input type="text" id="hs-leading-icon" name="hs-leading-icon"
- class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
+ class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by Name"
[(ngModel)]="search" (ngModelChange)="searchEMP()">
<div
class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
diff --git a/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.ts b/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.ts
index 2a96d26..4e8e504 100644
--- a/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.ts
+++ b/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.ts
@@ -116,6 +116,7 @@ export class SetApproversComponent {
employee_listFilter() {
return this.employee_list.filter(x => x.fname.toLowerCase().includes(this.search.toLowerCase()) ||
x.lname.toLowerCase().includes(this.search.toLowerCase()))
+
}
searchEMP() {
this.employeeModal.currentPage = 1
@@ -159,12 +160,20 @@ export class SetApproversComponent {
this.page = Array.from({ length: Math.ceil(this.groupapprove_listFilter().length / 10) }, (_, i) => i + 1);
}
groupapprove_listFilter() {
- return this.groupapprove_list.filter(x => x.apsapprove1.employeeId || x.apsapprove2.employeeId || x.apsapprove3.employeeId || x.apsapprove4.employeeId || x.apsapprove5.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
- x.apsapprove1.fname || x.apsapprove1.lname.toLowerCase().includes(this.search.toLowerCase()) ||
- x.apsapprove2.fname || x.apsapprove2.lname.toLowerCase().includes(this.search.toLowerCase()) ||
- x.apsapprove3.fname || x.apsapprove3.lname.toLowerCase().includes(this.search.toLowerCase()) ||
- x.apsapprove4.fname || x.apsapprove4.lname.toLowerCase().includes(this.search.toLowerCase()) ||
- x.apsapprove5.fname || x.apsapprove5.lname.toLowerCase().includes(this.search.toLowerCase()))
+ return this.groupapprove_list.filter(x =>
+ x.apsassessy.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
+ x.apsapprove1.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
+ x.apsapprove2.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
+ x.apsapprove3.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
+ x.apsapprove4.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
+ x.apsapprove5.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
+ (x.apsassessy.fname.toLowerCase() + " " + x.apsassessy.lname.toLowerCase()).includes(this.search.toLowerCase()) ||
+ (x.apsapprove1.fname.toLowerCase() + " " + x.apsapprove1.lname.toLowerCase()).includes(this.search.toLowerCase()) ||
+ (x.apsapprove2.fname.toLowerCase() + " " + x.apsapprove2.lname.toLowerCase()).includes(this.search.toLowerCase()) ||
+ (x.apsapprove3.fname.toLowerCase() + " " + x.apsapprove3.lname.toLowerCase()).includes(this.search.toLowerCase()) ||
+ (x.apsapprove4.fname.toLowerCase() + " " + x.apsapprove4.lname.toLowerCase()).includes(this.search.toLowerCase()) ||
+ (x.apsapprove5.fname.toLowerCase() + " " + x.apsapprove5.lname.toLowerCase()).includes(this.search.toLowerCase())
+ )
}
selectGroupapprove(groupapprove?: GroupApproveModel) {
diff --git a/src/app/components/performance-evaluation/supervisor-evaluation/round-one/round-one.component.html b/src/app/components/performance-evaluation/supervisor-evaluation/round-one/round-one.component.html
index 600e2df..1f2f5e1 100644
--- a/src/app/components/performance-evaluation/supervisor-evaluation/round-one/round-one.component.html
+++ b/src/app/components/performance-evaluation/supervisor-evaluation/round-one/round-one.component.html
@@ -29,7 +29,7 @@
<thead>
<tr>
<ng-container
- *ngFor="let item of ['รหัสพนักงาน','ชื่อพนักงาน','ตำเเหน่งงาน','ประเมิน','เเผนพัฒนา','PMS','ผลประเมิน','เกรด','สถานะ','สถานะผู้ประเมิน']; let f = first; let l = last; let i = index">
+ *ngFor="let item of ['รหัสพนักงาน','ชื่อพนักงาน','ตำเเหน่งงาน','ประเมิน','เเผนพัฒนา','ผลประเมิน','เกรด','สถานะ','สถานะผู้ประเมิน']; let f = first; let l = last; let i = index">
<th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary"
[class.!text-center]="f||l||'ประเมิน'||'เเผนพัฒนา'||'PMS'">
<span class="text-sm">{{ item }}</span>
@@ -59,20 +59,10 @@
<td style="font-size: 12px; width: 175px;">{{item[1]}}</td>
<td style="font-size: 12px;">{{item[2]}}</td>
<td class="flex justify-center">
- <button type="button" class="ti-btn rounded-sm ti-btn-secondary"
- style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;"
- (click)="returnPage('c')">
- CC
- </button>
- <button type="button" class="ti-btn rounded-sm ti-btn-warning"
- style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;"
- (click)="returnPage('c')">
- MC
- </button>
<button type="button" class="ti-btn rounded-sm ti-btn-success"
style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;"
(click)="returnPage('c')">
- PC
+ ประเมิน
</button>
</td>
<td style="width: 160px; text-align: center; vertical-align: middle;">
@@ -81,13 +71,6 @@
IDP
</button>
</td>
- <td class="text-center">
- <button type="button" class="ti-btn rounded-sm ti-btn-success"
- style="height: 15px; width: 55px; font-size: 12px; display: flex; align-items: center; justify-content: center;"
- (click)="returnPage('pms')">
- ประเมิน
- </button>
- </td>
<td class="text-center" style="font-size: 12px;">{{item[6]}}</td>
<td class="text-center" style="font-size: 12px;">{{item[7]}}</td>
<td class="text-center" style="font-size: 12px;">{{item[8]}}</td>
diff --git a/src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html b/src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html
index d838b6e..b2351a9 100644
--- a/src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html
+++ b/src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html
@@ -4,30 +4,12 @@
</div>
<div class="block-main-content">
<div class="font-size-18px font-weight-700 pt-1.5rem text-primary px-2rem">
- ประเมินผล ประจำปี 2024
+ ประเมินผล ประจำปี {{currentDate.getFullYear()}}
</div>
- <div class="pt-0.75rem">
- <div class="border-b border-gray-200 dark:border-white/10 px-2rem">
- <nav class=" flex space-x-2 rtl:space-x-reverse">
- <a class="border justify-center rounded-top-4px bg-primary text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 active"
- href="javascript:void(0);" id="card-type-item-1" data-hs-tab="#underline-1"
- aria-controls="underline-1">
- รอบการประเมินที่ 1/2
- </a>
- <a class="border justify-center rounded-top-4px bg-primary text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 active"
- href="javascript:void(0);" id="card-type-item-1" data-hs-tab="#underline-1"
- aria-controls="underline-1">
- รอบการประเมินที่ 2/2
- </a>
- </nav>
- </div>
- <div class="pt-50px px-2rem">
- <div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
- <app-round-one [pathTitle]="pathTitle" (sendPathTitle)="pathTitle=$event"
- (sendPageEvalution)="pageEvalution=$event" (sendEmployeeId)="employeeId=$event"></app-round-one>
- </div>
- <div id="underline-2" role="tabpanel" aria-labelledby="underline-item-2">
- </div>
+ <div class="pt-50px px-2rem">
+ <div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
+ <app-round-one [pathTitle]="pathTitle" (sendPathTitle)="pathTitle=$event"
+ (sendPageEvalution)="pageEvalution=$event" (sendEmployeeId)="employeeId=$event"></app-round-one>
</div>
</div>
</div>
diff --git a/src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.ts b/src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.ts
index b34e2eb..f15bd70 100644
--- a/src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.ts
+++ b/src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.ts
@@ -9,4 +9,5 @@ export class SupervisorEvaluationComponent {
pathTitle = ['การประเมินผล', 'ประเมินโดยหัวหน้า']
pageEvalution = ''
employeeId?: string
+ currentDate = new Date()
}