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

src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.ts

@@ -135,7 +135,10 @@ export class CompanyRegistrationPageComponent {
   }
   dataListCheck() {
     const dataCheck = this.dataListFilter();
-    this.isDataListCheckedAll = dataCheck.length ? dataCheck.every(x => x.check) : false;
+    this.isDataListCheckedAll = dataCheck.length ? dataCheck.filter(x => x.data.code != '100').every(x => x.check) : false;
+    if (dataCheck.length == 1 && dataCheck.find(x => x.data.code == '100')) {
+      this.isDataListCheckedAll = false
+    }
     this.numDataListChecked = this.dataList.filter(x => x.check).length;
     if (this.dataList.some(x => x.check && x.data.code == '100')) {
       this.numDataListChecked = this.numDataListChecked - 1

src/app/components/competency-assessment/idp-development-plan/set-idp-development-plan/set-idp-development-plan.component.html

@@ -30,7 +30,7 @@
              </div> -->
             <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-success h-10 m-0 shadow-md"
-                    data-hs-overlay="#set-idp-development-plan-alert-add-modal">
+                    data-hs-overlay="#set-idp-development-plan-alert-modal">
                     <i class="ri-save-3-line"></i>
                     Save
                 </button>
@@ -66,7 +66,7 @@
                     <tbody>
                         <tr>
                             <td class="text-base font-bold" style="height: 70px;">ผ่าน<br>(ไม่ติดGAP)</td>
-                            <td><input type="radio" id="idp-radio5" name="score" [value]="5" [(ngModel)]="idpData.score" ></td>
+                            <td><input type="radio" id="idp-radio5" name="score" [value]="5" [(ngModel)]="idpData.score"></td>
                             <td><input type="radio" id="idp-radio4" name="score" [value]="4" [(ngModel)]="idpData.score"></td>
                             <td><input type="radio" id="idp-radio3" name="score" [value]="3" [(ngModel)]="idpData.score"></td>
                             <td><input type="radio" id="idp-radio2" name="score" [value]="2" [(ngModel)]="idpData.score"></td>
@@ -116,7 +116,7 @@
     </div>
 </div>
 
-<div id="set-idp-development-plan-alert-add-modal" class="hs-overlay hidden ti-modal">
+<div id="set-idp-development-plan-alert-modal" class="hs-overlay hidden ti-modal">
     <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
         <div class="max-h-full overflow-hidden ti-modal-content w-full">
             <div class="ti-modal-header">
@@ -125,7 +125,7 @@
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#set-idp-development-plan-alert-add-modal">
+                        data-hs-overlay="#set-idp-development-plan-alert-modal">
                         <span class="sr-only">Close</span>
                         <i class="ti ti-circle-x fs-xxl"></i>
                     </button>
@@ -139,11 +139,11 @@
                 <div class="flex justify-end mt-2rem mb-1rem">
                     <button type="button"
                         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"
-                        data-hs-overlay="#set-idp-development-plan-modal-add">
+                        data-hs-overlay="#set-idp-development-plan-alert-modal">
                         ย้อนกลับ
                     </button>
                     <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#set-idp-development-plan-alert-add-modal" (click)="saveIdp()">
+                        data-hs-overlay="#set-idp-development-plan-alert-modal" (click)="saveIdp()">
                         บันทึกข้อมูล
                     </a>
                 </div>