การประเมินผล

src/app/components/performance-evaluation/evaluation/evaluation.component.html

+<app-page-header [pathTitle]="pathTitle"></app-page-header>
 <div class="bg-card-white">
 </div>
-<ng-container *ngIf="appraisalCompentency.data">
+<div class="block-main-content" *ngIf="appraisalCompentency.data">
     <div class="pb-2rem px-2rem pt-1.5rem w-full min-height-50px justify-between items-center">
         <div class="flex">
             <button type="button" class="ti-btn ti-btn-outline ti-btn-outline-light h-20px m-0 shadow-md text-blue-500"
@@ -393,4 +394,4 @@
             บันทึกข้อมูล
         </button>
     </div>
-</ng-container>
\ No newline at end of file
+</div>
\ No newline at end of file

src/app/components/performance-evaluation/evaluation/evaluation.component.ts

@@ -11,6 +11,7 @@ import Swal from 'sweetalert2';
   styleUrls: ['./evaluation.component.scss']
 })
 export class EvaluationComponent implements OnInit {
+  @Input() pathTitle: string[] = []
   @Input() evaluationRoundId = ""
   @Input() evaluateeId = ""
   @Input() evaluaterId = ""

src/app/components/performance-evaluation/self-evaluation/self-evaluation.component.html

@@ -22,8 +22,8 @@
             </nav>
         </div>
         <div class="pt-50px" *ngIf="appraisalCompentency.dataList.length">
-            <div *ngFor="let item of appraisalCompentency.dataList; let i=index" [id]="'underline-'+(i+1)"
-                role="tabpanel">
+            <div *ngFor="let item of appraisalCompentency.dataList; let i=index  ; let f= first"
+                [id]="'underline-'+(i+1)" role="tabpanel" [class.hidden]="!f">
                 <div class="pb-2">
                     <div class="w-full min-height-50px justify-between items-center pb-2">
                         <div class="px-2rem py-3 bg-soft-secondary font-size-18px font-weight-700 text-primary">
@@ -201,7 +201,8 @@
 
 
 <ng-template #selfEvaluationEdit>
-    <app-evaluation (sendReturnPath)="currentTemplate = this.selfEvaluation"
+    <app-evaluation [pathTitle]="['การประเมินผล', 'ประเมินตนเอง','ประเมิน']"
+        (sendReturnPath)="currentTemplate = selfEvaluation ; pathTitle =  ['การประเมินผล', 'ประเมินตนเอง']"
         [evaluationRoundId]="appraisalCompentency.select?.masfromEvaluationRound?.evaluationRoundId || ''"
         [evaluaterId]="evaluatee.data.employeeId" [evaluateeId]="evaluatee.data.employeeId"
         [competencyTypeId]="competencyTypeId"></app-evaluation>

src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html

@@ -20,13 +20,15 @@
             </div>
         </div>
         <div class="pt-50px  pb-2rem" *ngIf="subordinate.dataList.length">
+            <div *ngFor="let item of subordinate.dataList; let i=index;let f=first" [id]="'underline-'+(i+1)"
+                role="tabpanel" [class.hidden]="!f">
                 <div class="header-title-type p-0 px-2rem">
                     <div class="flex justify-end">
                         <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" style="height: 40px;" [(ngModel)]="search"
+                                    placeholder="Search" style="height: 40px;" [(ngModel)]="search"
                                     (ngModelChange)="searchChange()">
                                 <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">
@@ -63,7 +65,8 @@
                                                     <div class="absolute top-1/2 transform -translate-y-1/2 right-0"
                                                         *ngIf="!l&&!f&&!i">
                                                         <svg class="head-table-icon" xmlns="http://www.w3.org/2000/svg"
-                                                        width="50" height="16" fill="currentColor" viewBox="0 0 16 16">
+                                                            width="50" height="16" fill="currentColor"
+                                                            viewBox="0 0 16 16">
                                                             <path
                                                                 d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z">
                                                             </path>
@@ -127,7 +130,8 @@
                                             <td class="text-center" style="font-size: 12px;">
                                                 <!-- {{item.masfromStatusType.tdesc}} -->
                                             </td>
-                                        <td class="text-center" style="font-size: 12px;">{{item.apsapproveType.tdesc}}
+                                            <td class="text-center" style="font-size: 12px;">
+                                                {{item.apsapproveType.tdesc}}
                                             </td>
                                         </tr>
                                     </tbody>
@@ -149,7 +153,8 @@
                                             class="ri-more-line"></i>
                                     </a>
                                 </ng-container>
-                            <ng-container *ngIf="(f||l)||(item==currentPage-1||item==currentPage||item==currentPage+1)">
+                                <ng-container
+                                    *ngIf="(f||l)||(item==currentPage-1||item==currentPage||item==currentPage+1)">
                                     <a class="page-link" href="javascript:void(0);" [class.active]="item==currentPage"
                                         (click)="currentPage=item">{{item}}
                                     </a>
@@ -178,6 +183,7 @@
                 </div>
             </div>
         </div>
+    </div>
 </ng-container>
 
 <ng-container *ngIf="pageEvalution=='idp'">
@@ -187,7 +193,9 @@
     <app-pms-evalution (sendPageEvalution)="pageEvalution=$event"></app-pms-evalution>
 </ng-container>
 <ng-container *ngIf="pageEvalution=='evaluation'">
-    <app-evaluation (sendReturnPath)="pageEvalution=''" [evaluationRoundId]="formEvaluation.evaluationRoundId"
-        [evaluaterId]="formEvaluation.evaluaterId" [evaluateeId]="formEvaluation.evaluateeId"
+    <app-evaluation [pathTitle]="['การประเมินผล', 'ประเมินโดยหัวหน้า','ประเมิน']"
+        (sendReturnPath)="pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
+        [evaluationRoundId]="formEvaluation.evaluationRoundId" [evaluaterId]="formEvaluation.evaluaterId"
+        [evaluateeId]="formEvaluation.evaluateeId"
         [competencyTypeId]="formEvaluation.competencyTypeId"></app-evaluation>
 </ng-container>
\ No newline at end of file

src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.ts

@@ -35,26 +35,27 @@ export class SupervisorEvaluationComponent {
         this.cdr.detectChanges()
         if (this.subordinate.dataList.length) {
           this.subordinate.select = JSON.parse(JSON.stringify(this.subordinate.dataList[0]))
+          this.cdr.detectChanges()
         }
-        console.log(" 🐒 subordinate.dataList.length:", this.subordinate.dataList.length)
         this.searchChange()
-        this.cdr.detectChanges()
       }, error: error => {
         this.cdr.detectChanges()
       }
     })
   }
-  selectDataList(data: AppraisalSubordinateModel) {
+  selectDataList(data?: AppraisalSubordinateModel) {
     this.subordinate.select = JSON.parse(JSON.stringify(data))
-    this.searchChange()
     this.cdr.detectChanges()
+    this.searchChange()
   }
 
 
   subordinateFilter() {
     if (this.subordinate.select) {
       return this.subordinate.select.masfromevaluationassessment.filter(x => {
-        return x.apsassessy.employeeId.toLowerCase().includes(this.search.toLowerCase()) || x.apsassessy.thFullName.toLowerCase().includes(this.search.toLowerCase())
+        return x.apsassessy.employeeId.toLowerCase().includes(this.search.toLowerCase()) ||
+          x.apsassessy.thFullName.toLowerCase().includes(this.search.toLowerCase()) ||
+          x.apsassessy.position.tdesc.toLowerCase().includes(this.search.toLowerCase())
       })
     }
     return []