Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

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

@@ -135,7 +135,7 @@
             </span>
           </td>
           <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)"
+            <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';modalStatusEdit=(item.data.statusFrom.code== '0'?true:false);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 =='1'"
               data-hs-overlay="#evaluation-cycle-person-modal"
@@ -260,23 +260,23 @@
           [(ngModel)]="evaluation_cycle.evaluationRoundId">
 
         <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" [(ngModel)]="evaluation_cycle.tdesc">
+        <input type="text" id="detail_th" class="ti-form-input h-16" [ngClass]="{'bg-input-readonly':!modalStatusEdit}"  [readonly]="!modalStatusEdit" [(ngModel)]="evaluation_cycle.tdesc">
 
         <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
-        <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="evaluation_cycle.edesc">
+        <input type="text" id="detail_eng" class="ti-form-input h-16" [ngClass]="{'bg-input-readonly':!modalStatusEdit}"  [readonly]="!modalStatusEdit" [(ngModel)]="evaluation_cycle.edesc">
 
         <label for="input-label" class="ti-form-label mt-2rem">ปีการประเมิน<span class="text-danger">*</span></label>
         <!-- <input type="text" id="input-label" class="ti-form-input w-1/2"
           oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="evaluation_cycle.apsyear"> -->
-        <select class="ti-form-select" [(ngModel)]="evaluation_cycle.apsyear">
+        <select class="ti-form-select" [(ngModel)]="evaluation_cycle.apsyear" [ngClass]="{'bg-input-readonly':!modalStatusEdit}"  [disabled]="!modalStatusEdit">
           <option *ngFor="let item of yearList" [ngValue]="item">{{ item }}</option>
         </select>
 
         <label for="input-label" class="ti-form-label mt-2rem">เริ่มวันที่<span class="text-danger">*</span></label>
-        <input type="date" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="evaluation_cycle.apsPeriodStart">
+        <input type="date" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="evaluation_cycle.apsPeriodStart" [ngClass]="{'bg-input-readonly':!modalStatusEdit}"  [readonly]="!modalStatusEdit">
 
         <label for="input-label" class="ti-form-label mt-2rem">สิ้นสุดวันที่<span class="text-danger">*</span></label>
-        <input type="date" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="evaluation_cycle.apsPeriodEnd">
+        <input type="date" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="evaluation_cycle.apsPeriodEnd" [ngClass]="{'bg-input-readonly':!modalStatusEdit}"  [readonly]="!modalStatusEdit">
 
         <label for="input-label" class="ti-form-label mt-2rem">ระดับพนักงาน (JL)</label>
         <div *ngFor="let item of evaluation_cycle.personalLevel;let i = index;let f=first;let l = last"
@@ -284,24 +284,24 @@
           <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}"
+                [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}"
                 [(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}"
+                [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}"
                 [(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" type="button" class="flex items-center text-red-500"
+                <button *ngIf="item.plId&&modalStatusEdit" type="button" class="flex items-center text-red-500" 
                   (click)="pl.selectIndex=i;selectPl()">
                   <i class="ti ti-circle-x cursor-pointer"></i>
                 </button>
               </div>
             </div>
           </div>
-          <div class="col-span-1 ml-1" *ngIf="f">
+          <div class="col-span-1 ml-1" *ngIf="f&&modalStatusEdit">
             <ng-component *ngTemplateOutlet="plSearchButton"></ng-component>
           </div>
 

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

@@ -43,18 +43,13 @@ export class EvaluationCycleComponent {
   pl: { loading: boolean, selectIndex: number, dataList: PLModel[] } = { loading: false, selectIndex: -1, dataList: [] }
   currentDate = new Date()
   yearList = [
-    (this.currentDate.getFullYear() - 5) + "",
-    (this.currentDate.getFullYear() - 4) + "",
-    (this.currentDate.getFullYear() - 3) + "",
     (this.currentDate.getFullYear() - 2) + "",
     (this.currentDate.getFullYear() - 1) + "",
     (this.currentDate.getFullYear()) + "",
     (this.currentDate.getFullYear() + 1) + "",
     (this.currentDate.getFullYear() + 2) + "",
-    (this.currentDate.getFullYear() + 3) + "",
-    (this.currentDate.getFullYear() + 4) + "",
-    (this.currentDate.getFullYear() + 5) + "",
   ]
+  modalStatusEdit= false
   constructor(private evaluationCycleService: EvaluationCycleService,
     private toastr: ToastrService,
     private cdr: ChangeDetectorRef,