แก้ไขให้ข้อมูลเรียงลำดับ (แก้ไขกลุ่มสมรรถนะ)

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

@@ -88,10 +88,16 @@ export class EditGroupCompetenciesComponent {
         return match;
       })
       .sort((a, b) => {
-        return a.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId
-        .localeCompare(b.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId);
+        const topicA = a.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId.toLowerCase();
+        const topicB = b.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId.toLowerCase();
+        
+        const expectationA = a.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation.toLowerCase();
+        const expectationB = b.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation.toLowerCase();
+
+        return topicA.localeCompare(topicB) || expectationA.localeCompare(expectationB);
       });
   }
+  
 
 
   getIndicatorsCoursesList() {