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

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.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 []