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

src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.html

@@ -137,28 +137,29 @@
           <td class="flex justify-center items-center">
             <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';setData(item.data)"
               data-hs-overlay="#evaluation-cycle-page-modal"></i>
-            <i class="ti ti-user cursor-pointer i-gray fs-l px-1" *ngIf="item.data.statusFrom.code !='2'" data-hs-overlay="#evaluation-cycle-person-modal"
+            <i class="ti ti-user cursor-pointer i-gray fs-l px-1" *ngIf="item.data.statusFrom.code =='1'" data-hs-overlay="#evaluation-cycle-person-modal"
               (click)="openModal('evaluation-cycle-person-modal',item.data.evaluationRoundId)"></i>
             <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="modalStatus='delete';setData(item.data)"
               data-hs-overlay="#evaluation-cycle-page-alert-modal"></i>
             <!-- <span class="badge text-white m-1" *ngIf="item.data.statusCode.code!='1'"
               [ngClass]="{'bg-primary':item.data.statusCode.code=='1','bg-gray-400':item.data.statusCode.code!='3'}">ปิดรอบประเมิน</span>
             <span class="badge text-white m-1 bg-secondary"  *ngIf="item.data.statusCode.code=='0'">สร้างแบบฟอร์ม</span> -->
-            <span class="badge text-white m-1" *ngIf="item.data.statusCode.code == '0'" [ngClass]="{
-                'bg-primary': item.data.statusCode.code == '0',
-                'text-white': item.data.statusCode.code == '0'
+            <span class="badge text-white m-1 cursor-pointer"  data-hs-overlay="#evaluation-cycle-page-alert-modal" (click)="modalStatus='createForm';setData(item.data)" *ngIf="item.data.statusFrom.code == '0'" [ngClass]="{
+              'bg-secondary': item.data.statusFrom.code == '0',
+              'text-white': item.data.statusFrom.code == '0'
+            }">
+            สร้างแบบฟอร์ม
+          </span>
+
+            <span class="badge text-white m-1" *ngIf="item.data.statusFrom.code == '1'" [ngClass]="{
+                'bg-primary': item.data.statusFrom.code == '1',
+                'text-white': item.data.statusFrom.code == '1'
               }">
               ปิดรอบประเมิน
             </span>
-            <span class="badge text-white m-1 cursor-pointer"  data-hs-overlay="#evaluation-cycle-page-alert-modal" (click)="modalStatus='createForm';setData(item.data)" *ngIf="item.data.statusCode.code == '1'" [ngClass]="{
-                'bg-secondary': item.data.statusCode.code == '1',
-                'text-white': item.data.statusCode.code == '1'
-              }">
-              สร้างแบบฟอร์ม
-            </span>
-            <span class="badge text-white m-1" *ngIf="item.data.statusCode.code == '2'" [ngClass]="{
-                'bg-gray-400': item.data.statusCode.code == '2',
-                'text-white': item.data.statusCode.code == '2'
+            <span class="badge text-white m-1" *ngIf="item.data.statusFrom.code == '2'" [ngClass]="{
+                'bg-gray-400': item.data.statusFrom.code == '2',
+                'text-white': item.data.statusFrom.code == '2'
               }">
               ปิดรอบประเมิน
             </span>

src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.ts

@@ -104,6 +104,7 @@ export class EvaluationCycleComponent {
           check: false,
           data: new MyEvaluationCycleModel(x)
         }));
+        console.log("🚀 ~ EvaluationCycleComponent ~ this.evaluationCycleService.getList ~   this.evaluation_cyclelist:",   this.evaluation_cyclelist)
         this.dataLoading = false
         this.isDataListCheckedAll = false
         this.dataListCheckAll()

src/app/shared/model/evaluation-cycle.model.ts

@@ -41,7 +41,7 @@ export class MyEvaluationCycleModel implements EvaluationCycleModel {
         this.jlId = data?.jlId || "";
         this.active = data?.active || 0;
         this.statusCode = new MyStatusCodeModel(data?.statusCode || {})
-        this.statusFrom = new MyStatusFromModel(data?.statusCode || {})
+        this.statusFrom = new MyStatusFromModel(data?.statusFrom || {})
         this.personalLevel = data?.personalLevel?.map(x => new MyPLModel(x)) || []
 
     }