UPDATE จัดรอบ pms

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

@@ -240,7 +240,6 @@ export class EvaluationCycleComponent {
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
-          this.getEvaluationCycleList()
         } else {
           this.dataLoading = false
           this.showAlert(response.message, 'error')

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

@@ -32,7 +32,7 @@
       </div>
       <div class="px-1">
         <button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
-          data-hs-overlay="#management-evaluation-cycle-page-modal" (click)="modalStatus='add';setData()">
+          data-hs-overlay="#management-evaluation-cycle-page-modal" (click)="modalStatus='add';modalStatusEdit=true;setData()">
           <i class="ri-add-line"></i>
           Add
         </button>
@@ -135,10 +135,11 @@
             </span>
           </td>
           <td class="flex justify-center items-center">
-            <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" *ngIf="item.data.statusFrom.code =='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="#management-evaluation-cycle-page-modal"></i>
-            <i class="ti ti-user cursor-pointer i-gray fs-l px-1" data-hs-overlay="#evaluation-cycle-person-modal"
+
+            <i class="ti ti-user cursor-pointer i-gray fs-l px-1" data-hs-overlay="#evaluation-cycle-person-modal" *ngIf="item.data.statusFrom.code =='1'"
               (click)="openModal('evaluation-cycle-person-modal',item.data.pmsEvaluationRoundId)"></i>
             <!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="modalStatus='delete';setData(item.data)"
               data-hs-overlay="#management-evaluation-cycle-page-alert-modal"></i> -->
@@ -260,25 +261,25 @@
           [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
           [(ngModel)]="pmsMasfromEvaluation.pmsEvaluationRoundId">
 
-        <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)<span
+        <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)]="pmsMasfromEvaluation.tdesc">
+        <input type="text" id="detail_th" class="ti-form-input h-16" [ngClass]="{'bg-input-readonly':!modalStatusEdit}"  [(ngModel)]="pmsMasfromEvaluation.tdesc" [readonly]="!modalStatusEdit"> 
 
-        <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
-        <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="pmsMasfromEvaluation.edesc">
+        <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':!modalStatusEdit}"  [(ngModel)]="pmsMasfromEvaluation.edesc" [readonly]="!modalStatusEdit">
 
         <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)]="pmsMasfromEvaluation.apsyear"> -->
-        <select class="ti-form-select" [(ngModel)]="pmsMasfromEvaluation.apsyear">
+        <select class="ti-form-select" [(ngModel)]="pmsMasfromEvaluation.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)]="pmsMasfromEvaluation.apsPeriodStart">
+          [(ngModel)]="pmsMasfromEvaluation.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)]="pmsMasfromEvaluation.apsPeriodEnd">
+        <input type="date" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="pmsMasfromEvaluation.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 pmsMasfromEvaluation.personalLevel;let i = index;let f=first;let l = last"
@@ -286,24 +287,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}">
+                [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}">
                 <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>
         </div>
@@ -329,6 +330,7 @@
             <i class="ri-search-line cursor-pointer text-gray"></i>
           </button>
         </ng-template>
+        <span class="text-danger mt-1">**หมายเหตุ ถ้าไม่เลือกระดับ JL ระบบจะทำการเลือกทั้งหมด</span>
         
         <div class="flex justify-end mt-2rem mb-1rem">
           <button type="button"
@@ -337,7 +339,7 @@
             ย้อนกลับ
           </button>
           <button type="button" class="ti-btn ti-btn-success"
-            data-hs-overlay="#management-evaluation-cycle-page-alert-modal"
+            data-hs-overlay="#management-evaluation-cycle-page-alert-modal" *ngIf="modalStatusEdit"
             [class.ti-btn-disabled]="!pmsMasfromEvaluation.pmsEvaluationRoundId||!pmsMasfromEvaluation.tdesc||!pmsMasfromEvaluation.apsyear||!pmsMasfromEvaluation.apsPeriodStart||!pmsMasfromEvaluation.apsPeriodEnd"
             [disabled]="!pmsMasfromEvaluation.pmsEvaluationRoundId||!pmsMasfromEvaluation.tdesc||!pmsMasfromEvaluation.apsyear||!pmsMasfromEvaluation.apsPeriodStart||!pmsMasfromEvaluation.apsPeriodEnd">
             บันทึกข้อมูล

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

@@ -47,6 +47,8 @@ export class ManagementCycleComponent {
         (this.currentDate.getFullYear()) + "",
         (this.currentDate.getFullYear() + 1) + "",
     ]
+
+    modalStatusEdit= false
     constructor(private pmsMasfromEvaluationCycleService: PmsMasfromEvaluationCycleService,
         private toastr: ToastrService,
         private cdr: ChangeDetectorRef,
@@ -151,6 +153,9 @@ export class ManagementCycleComponent {
         this.pmsMasfromEvaluation = new MyPmsMasfromEvaluationModel(data)
     }
     addPmsMasfromEvaluation() {
+        if (this.pmsMasfromEvaluation.personalLevel.length == 0) {
+            this.plListFilter().forEach(x => this.selectPl(x))
+          }
         const body = new MyPmsMasfromEvaluationModel(this.pmsMasfromEvaluation)
         this.dataLoading = true
         this.pmsMasfromEvaluationCycleService.post(body).subscribe({
@@ -237,6 +242,21 @@ export class ManagementCycleComponent {
             next: response => {
                 if (response.success) {
                     this.showAlert(response.message, 'success')
+                } else {
+                    this.dataLoading = false
+                    this.showAlert(response.message, 'error')
+                    this.cdr.detectChanges()
+                }
+            }, error: error => {
+                this.showAlert(error.message, 'error')
+                this.dataLoading = false
+                this.cdr.detectChanges()
+            }
+        })
+        this.pmsMasfromEvaluationCycleService.postCreateForm(body).subscribe({
+            next: response => {
+              if (response.success) {
+                this.showAlert(response.message, 'success')
                 this.getPmsMasfromEvaluationCycleList()
               } else {
                 this.dataLoading = false

src/app/shared/services/pms-masfrom-evaluation.service.ts

@@ -44,5 +44,7 @@ export class PmsMasfromEvaluationCycleService {
   getIndicators(plId: string): Observable<any[]> {
     return this.http.get<any[]>(this.urlApi + "/indicators/list/" + plId)
   }
-
+  postCreateForm(body: PmsMasfromEvaluationModel): Observable<AlertModel> {
+        return this.http.post<AlertModel>(this.urlApi+'/create-form', body)
+      }
 }