From bc3a603ba2bcbd297eed95411824609020584768 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sat, 27 Aug 2022 13:44:04 +0200
Subject: [PATCH] Poprawiono sortowanie stacji

---
 src/scripts/managers/stationFilterManager.ts |  7 ++--
 src/views/StationsView.vue                   | 35 +++++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/scripts/managers/stationFilterManager.ts b/src/scripts/managers/stationFilterManager.ts
index aaf59f5..b79aa50 100644
--- a/src/scripts/managers/stationFilterManager.ts
+++ b/src/scripts/managers/stationFilterManager.ts
@@ -4,6 +4,9 @@ import StorageManager from './storageManager';
 
 const sortStations = (a: Station, b: Station, sorter: { index: number; dir: number }) => {
   switch (sorter.index) {
+    case 0:
+      return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
+
     case 1:
       if ((a.generalInfo?.reqLevel || 0) > (b.generalInfo?.reqLevel || 0)) return sorter.dir;
       if ((a.generalInfo?.reqLevel || 0) < (b.generalInfo?.reqLevel || 0)) return -sorter.dir;
@@ -49,8 +52,8 @@ const sortStations = (a: Station, b: Station, sorter: { index: number; dir: numb
     default:
       break;
   }
-
-  return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
+ 
+  return a.name.localeCompare(b.name);
 };
 
 const filterStations = (station: Station, filters: Filter) => {
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index ada2d66..e0d3a7a 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -14,7 +14,7 @@
         </div>
 
         <StationTable
-          :stations="computedStations"
+          :stations="computedStationList"
           :sorterActive="filterManager.getSorter()"
           :setFocusedStation="setFocusedStation"
           :changeSorter="changeSorter"
@@ -25,13 +25,11 @@
 </template>
 
 <script lang="ts">
-
 import inputData from '../data/options.json';
 
-import { computed, ComputedRef, defineComponent, reactive } from 'vue';
+import { defineComponent, reactive } from 'vue';
 import { useStore } from '../store/store';
 import StationFilterManager from '../scripts/managers/stationFilterManager';
-import Station from '../scripts/interfaces/Station';
 import StorageManager from '../scripts/managers/storageManager';
 import StationTable from '../components/StationsView/StationTable.vue';
 import StationFilterCard from '../components/StationsView/StationFilterCard.vue';
@@ -43,29 +41,35 @@ export default defineComponent({
     StationFilterCard,
     SelectBox,
   },
+
   data: () => ({
     filterCardOpen: false,
     modalHidden: true,
     STORAGE_KEY: 'options_saved',
     inputs: inputData,
+    focusedStationName: '',
   }),
 
   setup() {
     const store = useStore();
     const filterManager = reactive(new StationFilterManager());
-    const focusedStationName = '';
-
-    const computedStations: ComputedRef<Station[]> = computed(
-      () => filterManager.getFilteredStationList(store.stationList, store.region.id)
-      // .filter((station) => !station.onlineInfo || station.onlineInfo.region == store.region.id)
-    );
 
     return {
-      computedStations,
       filterManager,
-      focusedStationName,
+      store,
     };
   },
+
+  computed: {
+    computedStationList() {
+      const list = this.filterManager.getFilteredStationList(this.store.stationList, this.store.region.id);
+
+      console.log(list.map((station) => `${station.name} ${station.onlineInfo?.statusTimestamp}`));
+
+      return list;
+    },
+  },
+
   mounted() {
     if (!StorageManager.isRegistered(this.STORAGE_KEY)) return;
 
@@ -83,27 +87,34 @@ export default defineComponent({
       slider.value = value;
     });
   },
+
   methods: {
     toggleCardsState(name: string): void {
       if (name == 'filter') {
         this.filterCardOpen = !this.filterCardOpen;
       }
     },
+
     changeSorter(index: number) {
       this.filterManager.changeSorter(index);
     },
+
     changeFilterValue(filter: { name: string; value: number }) {
       this.filterManager.changeFilterValue(filter);
     },
+
     resetFilters() {
       this.filterManager.resetFilters();
     },
+
     invertFilters() {
       this.filterManager.invertFilters();
     },
+
     closeCard() {
       this.filterCardOpen = false;
     },
+
     setFocusedStation(name: string) {
       this.focusedStationName = this.focusedStationName == name ? '' : name;
     },