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

src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html

@@ -158,7 +158,7 @@
                                 </label>
                             </td>
                             <td style="font-size: 12px; width: 60%;">
-                                {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc}}
+                                {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.tdesc}}
                             </td>
                             <td style="font-size: 12px;text-align: center;">
                                 {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation}}
@@ -316,7 +316,7 @@
                                     <td style="font-size: 12px; width: 60%;">
                                         {{item.data.competencyIndicatorsCourses0.tdesc}}
                                     </td>
-                                    <td style="font-size: 12px;text-align: center;">
+                                    <td style="font-size: 12px;text-align: center; width: 20%;">
                                         {{item.data.competencyIndicatorsCourses0.expectation}}</td>
                                     <td class="flex justify-center">
                                         <div class="px-1">

src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.ts

@@ -78,15 +78,22 @@ export class EditGroupCompetenciesComponent {
     this.page = Array.from({ length: Math.ceil(filteredData.length / 10) }, (_, i) => i + 1);
   }
   dataListFilter() {
-    return this.dataList.filter(x => {
-      const data = x.data
-      const match = data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId.toLowerCase().includes(this.search.toLowerCase()) ||
-        data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
-        data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation.toLocaleLowerCase().includes(this.search.toLocaleLowerCase())
-      return match;
-    });
+    return this.dataList
+      .filter(x => {
+        const data = x.data;
+        const match =
+          data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId.toLowerCase().includes(this.search.toLowerCase()) ||
+          data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
+          data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation.toLowerCase().includes(this.search.toLowerCase());
+        return match;
+      })
+      .sort((a, b) => {
+        return a.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId
+        .localeCompare(b.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId);
+      });
   }
 
+
   getIndicatorsCoursesList() {
     this.dataModalLoading = true
     this.indicatorsCoursesService.getList().subscribe({
@@ -131,7 +138,6 @@ export class EditGroupCompetenciesComponent {
     this.groupCompetencies.groupAssessment1List = this.dataList.map(x => x.data);
     this.groupAssessmentService.post(this.groupCompetencies).subscribe({
       next: (response) => {
-        console.log(response)
         if (response.success) {
           this.showAlert(response.message, 'success');
         } else {