เปลี่ยนการจัดกลุ่มหัวข้อประเมิน จาก JL เป็น JD

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

@@ -146,7 +146,7 @@
     <ng-template #plSearchButton>
       <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 !m-0 h-full"
-        style="height: 44.8px !important;" (click)="openDialogPL();modal.search='';searchModalChange(plListFilter())">
+        style="height: 44.8px !important;" (click)="openDialogPL();PLsearchmodal.search='';searchModalChange(plListFilter())">
         <i class="ri-search-line cursor-pointer text-gray"></i>
       </button>
     </ng-template>

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

@@ -135,7 +135,7 @@ export class EvaluationCycleComponent {
     this.pl.loading = false
     this.jobcodeService.getGroupAssessmentList().subscribe({
       next: response => {
-        this.pl.dataList = response.map((x: any) => new MyJobcodeModel(x))
+        this.pl.dataList = response.map((x: any) => new MyJobcodeModel(x)).filter(e => e.statusCom)
         this.pl.loading = false
         this.searchChange()
         this.cdr.detectChanges()
@@ -235,7 +235,7 @@ export class EvaluationCycleComponent {
       reverseButtons: true,
     }).then((result) => {
       if (result.isConfirmed) {
-        if (this.evaluation_cycle.personalLevel.length === 0) {
+        if (this.evaluation_cycle.jd.length === 0) {
           this.plListFilter().forEach(x => this.selectPl(x));
         }
 

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

@@ -166,7 +166,7 @@
     <ng-template #plSearchButton>
       <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 !m-0 h-full"
-        style="height: 44.8px !important;" (click)="openPLDialog();modal.search='';searchModalChange(plListFilter())">
+        style="height: 44.8px !important;" (click)="openPLDialog();PLsearchmodal.search='';searchModalChange(plListFilter())">
         <i class="ri-search-line cursor-pointer text-gray"></i>
       </button>
     </ng-template>

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

@@ -139,7 +139,7 @@ export class ManagementCycleComponent {
     this.pl.loading = false
     this.jobcodeService.getGroupAssessmentList().subscribe({
       next: response => {
-        this.pl.dataList = response.map((x: any) => new MyJobcodeModel(x))
+        this.pl.dataList = response.map((x: any) => new MyJobcodeModel(x)).filter(x => x.statusCom && x.statusPms)
         this.pl.loading = false
         // this.searchChange()
         this.cdr.detectChanges()
@@ -262,7 +262,7 @@ export class ManagementCycleComponent {
         this.dataLoading = true;
         const selectedKeys = Array.from(this.selectedItems.data.keys());
         const body = this.pmsMasfromEvaluation.dataList.filter(x => selectedKeys.includes(x.pmsEvaluationRoundId) && this.selectedItems.data.get(x.pmsEvaluationRoundId)).map(x => new MyPmsMasfromEvaluationModel(x))
-      
+
 
         this.pmsMasfromEvaluationCycleService.delete(body).subscribe({
           next: response => {