Merge pull request #61 - Wersja 1.18.2

Wersja 1.18.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stacjownik",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "private": true,
   "scripts": {
     "dev": "vite",

src/scripts/utils/filterUtils.ts

@@ -53,28 +53,20 @@ export const sortStations = (
 
     case 'timetableConfirmed':
       diff =
-        (a.onlineInfo?.scheduledTrains
+        (a.onlineInfo?.scheduledTrainCount.confirmed ?? -1) -
-          ? a.onlineInfo.scheduledTrains.filter((train) => train.stopInfo.confirmed).length
+        (b.onlineInfo?.scheduledTrainCount.confirmed ?? -1);
-          : -1) -
-        (b.onlineInfo?.scheduledTrains
-          ? b.onlineInfo.scheduledTrains.filter((train) => train.stopInfo.confirmed).length
-          : -1);
       break;
 
     case 'timetableUnconfirmed':
       diff =
-        (a.onlineInfo?.scheduledTrains
+        (a.onlineInfo?.scheduledTrainCount.unconfirmed ?? -1) -
-          ? a.onlineInfo.scheduledTrains.filter((train) => !train.stopInfo.confirmed).length
+        (b.onlineInfo?.scheduledTrainCount.unconfirmed ?? -1);
-          : -1) -
-        (b.onlineInfo?.scheduledTrains
-          ? b.onlineInfo.scheduledTrains.filter((train) => !train.stopInfo.confirmed).length
-          : -1);
       break;
 
     case 'timetableAll':
       diff =
-        (a.onlineInfo?.scheduledTrains ? a.onlineInfo.scheduledTrains.length : -1) -
+        (a.onlineInfo?.scheduledTrainCount.all ?? -1) -
-        (b.onlineInfo?.scheduledTrains ? b.onlineInfo.scheduledTrains.length : -1);
+        (b.onlineInfo?.scheduledTrainCount.all ?? -1);
       break;
 
     default:

src/store/store.ts

@@ -135,6 +135,9 @@ export const useStore = defineStore('store', {
           .reduce((list, apiStation) => {
             if (apiStation.region != state.region.id) return list;
 
+            if (apiStation.isOnline !== 1 && Date.now() - apiStation.lastSeen > 1000 * 60 * 3)
+              return list;
+
             const dispatcherStatus = getDispatcherStatus(state as StoreState, apiStation);
 
             if (dispatcherStatus.statusID == DispatcherStatusID.Unknown) return list;