Fix issue with numbers in the table and rooms sort

hse-mtc · Sep 27, 2024 · 66362f2 · 66362f2
1 parent ec28565
commit 66362f2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/front-end/src/components/Personnel/Students/Students.vue b/front-end/src/components/Personnel/Students/Students.vue
@@ -61,7 +61,7 @@
         scrollable
         scroll-height="600px"
         :value="students"
-        :sort-field="fullname"
+        :sort-field="milgroupField"
         :sort-order="1"
         class="p-datatable-striped p-datatable-gridlines p-datatable-sm"
         :row-class="() => 'clickable'"
@@ -73,9 +73,10 @@
           header-style="width: 68px"
           body-style="width: 68px"
           column-key="index"
+          :sortable="false"
         >
-          <template #body="{ data }">
-            {{ students.indexOf(data) + 1 }}
+          <template #body="{ index }">
+            {{ index + 1 }}
           </template>
         </PrimeColumn>
         <PrimeColumn

diff --git a/front-end/src/store/modules/reference.js b/front-end/src/store/modules/reference.js
@@ -362,7 +362,34 @@ class Reference extends VuexModule {
     return await getFetchRequest(
       getRooms,
       data => {
-        data.sort((a, b) => a - b);
+        console.log(data);
+        data.sort((a, b) => {
+          const titleA = a.title;
+          const titleB = b.title;
+
+          const numA = Number(titleA);
+          const numB = Number(titleB);
+
+          const isNumA = !Number.isNaN(numA);
+          const isNumB = !Number.isNaN(numB);
+
+          if (isNumA && isNumB) {
+            return numA - numB;
+          }
+
+          if (isNumA) {
+            return -1;
+          }
+
+          if (isNumB) {
+            return 1;
+          }
+
+          if (titleA < titleB) { return -1; }
+          if (titleA > titleB) { return 1; }
+
+          return titleA.localeCompare(titleB);
+        });
         this.SET_ROOMS(data);
         this.SET_IS_LOADED({ field: "_roomsLoaded", value: true });
       },