แก้ไข modal รอบการประเมิน

src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/edit-define-document-form/edit-define-document-form.component.html

@@ -12,10 +12,10 @@
             </div>
             <div class="grid grid-cols-2 gap-6 mb-5">
                 <div class="col-span-1">
-                    <input type="text" id="input-label" class="ti-form-input w-full pr-10 bg-input-readonly" readonly [value]="evaluationRound?.tdesc">
+                    <input type="text" id="input-label" class="ti-form-input w-full pr-10 bg-input-readonly" readonly [value]="evaluationRound.tdesc || ''">
                 </div>
                 <div class="col-span-1">
-                    <input type="text" id="input-label" class="ti-form-input w-full pr-10 bg-input-readonly" readonly [value]="evaluationRound?.apsyear">
+                    <input type="text" id="input-label" class="ti-form-input w-full pr-10 bg-input-readonly" readonly [value]="evaluationRound.apsyear || ''">
                 </div>
             </div>
         </div>

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

@@ -108,14 +108,14 @@
       <div class="col-span-1">
         <div class="flex relative">
           <input type="text" class="ti-form-input pointer-events-none" readonly
-            [ngClass]="{'input-list-f1': f&&!l, 'input-list-c1': !f&&!l, 'input-list-l1': !f&&l, 'input-list-fl1': f&&l,'!bg-input-readonly':!modalStatusEdit}"
+            [ngClass]="{'input-list-f1': f&&!l, 'input-list-c1': !f&&!l, 'input-list-l1': !f&&l, 'input-list-fl1': f&&l,'!bg-input-readonly':modalStatus == 'edit'}"
             [(ngModel)]="item.plId">
           <div
             [ngClass]="{'input-list-line-f': f&&!l, 'input-list-line-c': !f&&!l, 'input-list-line-l': !f&&l, 'input-list-line-fl': f&&l}">
             <div class="input-list-line"></div>
           </div>
           <input type="text" class="ti-form-input pointer-events-none" readonly
-            [ngClass]="{'input-list-f2': f&&!l, 'input-list-c2': !f&&!l, 'input-list-l2': !f&&l, 'input-list-fl2': f&&l,'!bg-input-readonly':!modalStatusEdit}"
+            [ngClass]="{'input-list-f2': f&&!l, 'input-list-c2': !f&&!l, 'input-list-l2': !f&&l, 'input-list-fl2': f&&l,'!bg-input-readonly':modalStatus == 'edit'}"
             [(ngModel)]="item.tdesc">
           <div class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
             <button *ngIf="item.plId && modalStatus !== 'edit'" type="button" class="flex items-center text-red-500"

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

@@ -93,16 +93,19 @@
           *ngIf="modalStatus=='add'&&checkPrimary()">
           รหัสรอบการประเมินซ้ำ
         </ng-container></span></label>
-    <input type="text" id="input-label" class="ti-form-input w-1/2" [ngClass]="{'!bg-input-readonly': modalStatus == 'edit'}"
-      [readonly]="modalStatus =='edit'" [(ngModel)]="pmsMasfromEvaluation.select.pmsEvaluationRoundId">
+    <input type="text" id="input-label" class="ti-form-input w-1/2"
+      [ngClass]="{'!bg-input-readonly': modalStatus == 'edit'}" [readonly]="modalStatus =='edit'"
+      [(ngModel)]="pmsMasfromEvaluation.select.pmsEvaluationRoundId">
 
     <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)<span class="text-danger">*</span></label>
-    <input type="text" id="detail_th" class="ti-form-input h-16" [ngClass]="{'!bg-input-readonly': modalStatus == 'edit'}"
-      [(ngModel)]="pmsMasfromEvaluation.select.tdesc" [readonly]="modalStatus =='edit'">
+    <input type="text" id="detail_th" class="ti-form-input h-16"
+      [ngClass]="{'!bg-input-readonly': modalStatus == 'edit'}" [(ngModel)]="pmsMasfromEvaluation.select.tdesc"
+      [readonly]="modalStatus =='edit'">
 
     <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
-    <input type="text" id="detail_eng" class="ti-form-input h-16" [ngClass]="{'!bg-input-readonly': modalStatus == 'edit'}"
-      [(ngModel)]="pmsMasfromEvaluation.select.edesc" [readonly]="modalStatus =='edit'">
+    <input type="text" id="detail_eng" class="ti-form-input h-16"
+      [ngClass]="{'!bg-input-readonly': modalStatus == 'edit'}" [(ngModel)]="pmsMasfromEvaluation.select.edesc"
+      [readonly]="modalStatus =='edit'">
 
     <label for="input-label" class="ti-form-label mt-2rem">ปีการประเมิน<span class="text-danger">*</span></label>
     <select class="ti-form-select" [(ngModel)]="pmsMasfromEvaluation.select.apsyear"
@@ -125,14 +128,14 @@
       <div class="col-span-1">
         <div class="flex relative">
           <input type="text" class="ti-form-input pointer-events-none" readonly
-            [ngClass]="{'input-list-f1': f&&!l, 'input-list-c1': !f&&!l, 'input-list-l1': !f&&l, 'input-list-fl1': f&&l,'bg-input-readonly':!modalStatusEdit}"
+            [ngClass]="{'input-list-f1': f&&!l, 'input-list-c1': !f&&!l, 'input-list-l1': !f&&l, 'input-list-fl1': f&&l,'!bg-input-readonly':modalStatus == 'edit'}"
             [(ngModel)]="item.plId">
           <div
-            [ngClass]="{'input-list-line-f': f&&!l, 'input-list-line-c': !f&&!l, 'input-list-line-l': !f&&l, 'input-list-line-fl': f&&l,'bg-input-readonly':!modalStatusEdit}">
+            [ngClass]="{'input-list-line-f': f&&!l, 'input-list-line-c': !f&&!l, 'input-list-line-l': !f&&l, 'input-list-line-fl': f&&l}">
             <div class="input-list-line"></div>
           </div>
           <input type="text" class="ti-form-input pointer-events-none" readonly
-            [ngClass]="{'input-list-f2': f&&!l, 'input-list-c2': !f&&!l, 'input-list-l2': !f&&l, 'input-list-fl2': f&&l,'bg-input-readonly':!modalStatusEdit}"
+            [ngClass]="{'input-list-f2': f&&!l, 'input-list-c2': !f&&!l, 'input-list-l2': !f&&l, 'input-list-fl2': f&&l,'!bg-input-readonly':modalStatus == 'edit'}"
             [(ngModel)]="item.tdesc">
           <div class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
             <button *ngIf="item.plId && modalStatus !== 'edit'" type="button" class="flex items-center text-red-500"
@@ -174,7 +177,7 @@
       class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10">
       ย้อนกลับ
     </button>
-    <button *ngIf="modalStatus !== 'edit'" type="button" class="ti-btn ti-btn-success" mat-button
+    <button *ngIf="modalStatus == 'add'" type="button" class="ti-btn ti-btn-success" mat-button
       [class.ti-btn-disabled]="!pmsMasfromEvaluation.select.pmsEvaluationRoundId||!pmsMasfromEvaluation.select.tdesc||(modalStatus=='add'&&checkPrimary())"
       (click)="addPmsMasfromEvaluation()"
       [disabled]="!pmsMasfromEvaluation.select.pmsEvaluationRoundId||!pmsMasfromEvaluation.select.tdesc||(modalStatus=='add'&&checkPrimary())">