UPDATE จัดรอบการประเมิน

src/app/components/performance-management-evaluation/evaluation-cycle-performance/document-form/edit-evaluation-form/edit-evaluation-form.component.html

@@ -82,12 +82,12 @@
                         <tr
                             *ngFor="let item of assessmentListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
                             <td class="flex justify-center items-center">
-                                {{item.masfromEvaluationRoundModel.evaluationRoundId}}</td>
+                                {{item.masfromEvaluationRound.evaluationRoundId}}</td>
                             <td>{{item.apsassessy.fname}} {{item.apsassessy.lname}}</td>
                             <td class="text-center">{{item.apsassessy.position.tdesc}}</td>
                             <td class="text-center">{{item.personalLevel.tdesc}}</td>
                             <td class="flex justify-center items-center space-x-2">
-                                <i class="ti ti-edit cursor-pointer i-gray fs-xl px-1"  (click)="openAddRoundModel(item.masfromEvaluationRoundModel.evaluationRoundId,item.apsassessy.employeeId,'form-pm-emp')"  ></i>
+                                <i class="ti ti-edit cursor-pointer i-gray fs-xl px-1"  (click)="openAddRoundModel(item.masfromEvaluationRound.evaluationRoundId,item.apsassessy.employeeId,'form-pm-emp')"  ></i>
                                 <input type="checkbox" id="hs-small-switch{{i+1}}" [(ngModel)]="item.active"  
                                     class="ti-switch checked:bg-none checked:bg-green-600 checked:hover:bg-green-600 checked:focus:bg-green-600 focus:border-green-600 dark:checked:bg-green-600 checked:before:bg-green-200 dark:checked:before:bg-green-200 shrink-0 w-11 h-6 before:w-5 before:h-5">
                             </td>

src/app/components/performance-management-evaluation/evaluation-cycle-performance/document-form/edit-evaluation-form/edit-evaluation-form.component.ts

 import { ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angular/core';
 import { ToastrService } from 'ngx-toastr';
 import { AppraisalFormModel } from 'src/app/shared/model/appraisal-form.model';
+import { AppraisalModel } from 'src/app/shared/model/appraisal.model';
 import { EvaluationCycleModel, MyEvaluationCycleModel } from 'src/app/shared/model/evaluation-cycle.model';
 import { EvaluationAssessmentService } from 'src/app/shared/services/evaluation-assessment.service';
 import { EvaluationCycleService } from 'src/app/shared/services/evaluation-cycle.service';
@@ -21,7 +22,7 @@ export class EditEvaluationFormComponent {
   page = Array.from({ length: 1 }, (_, i) => i + 1);
   search = ""
 
-  assessmentList: AppraisalFormModel[] = []
+  assessmentList: AppraisalModel[] = []
 
   evaluationRound:EvaluationCycleModel = new MyEvaluationCycleModel()
 
@@ -75,7 +76,7 @@ export class EditEvaluationFormComponent {
       x.apsassessy.lname.toLowerCase().includes(this.search.toLowerCase()) ||
       x.apsassessy.efname.toLowerCase().includes(this.search.toLowerCase()) ||
       x.apsassessy.elname.toLowerCase().includes(this.search.toLowerCase()) ||
-      x.masfromEvaluationRoundModel.evaluationRoundId.toLowerCase().includes(this.search.toLowerCase()) ||
+      x.masfromEvaluationRound.evaluationRoundId.toLowerCase().includes(this.search.toLowerCase()) ||
       x.apsassessy.employeeId.toLowerCase().includes(this.search.toLowerCase())
     )
   }