Merge pull request #83 from Spythere/development

Wersja 1.22.3

package.json

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

src/App.vue

@@ -73,6 +73,12 @@ export default defineComponent({
   },
 
   async mounted() {
+    window.addEventListener('focus', () => {
+      if (Date.now() - this.apiStore.lastFetchData.getTime() < 15000) return;
+
+      this.apiStore.fetchActiveData();
+    });
+
     watch(
       () => this.store.blockScroll,
       (value) => {

src/components/Global/RegionDropdown.vue

@@ -84,7 +84,7 @@ export default defineComponent({
     regionList() {
       return regionsJSON.map((region) => {
         const regionStationCount = this.store.activeSceneryList.filter(
-          (scenery) => scenery.region == region.id
+          (scenery) => scenery.region == region.id && scenery.dispatcherId != -1
         ).length;
 
         const regionTrainCount =

src/components/SceneryView/SceneryTimetable.vue

@@ -74,7 +74,7 @@
           class="timetable-item"
           v-else
           v-for="scheduledTrain in computedScheduledTrains"
-          :key="scheduledTrain.trainId"
+          :key="scheduledTrain.trainId + scheduledTrain.stopInfo.arrivalTimestamp"
           tabindex="0"
           @click.prevent.stop="selectModalTrain(scheduledTrain.trainId, $event.currentTarget)"
           @keydown.enter.prevent="selectModalTrain(scheduledTrain.trainId, $event.currentTarget)"

src/store/apiStore.ts

@@ -24,6 +24,8 @@ export const useApiStore = defineStore('apiStore', {
     donatorsData: [] as API.Donators.Response,
     sceneryData: [] as StationJSONData[],
 
+    lastFetchData: new Date(),
+
     client: undefined as AxiosInstance | undefined,
 
     activeDataScheduler: undefined as number | undefined
@@ -64,20 +66,19 @@ export const useApiStore = defineStore('apiStore', {
     async setupActiveDataFetcher() {
       if (this.activeDataScheduler) return;
 
-      this.dataStatuses.connection = Status.Data.Loading;
-
       this.activeDataScheduler = window.setInterval(() => {
-        if (UPDATE_SECONDS.includes(new Date().getSeconds())) {
+        this.fetchActiveData();
-          this.fetchActiveData();
+      }, 25000);
-        }
-      }, 1000);
     },
 
     async fetchActiveData() {
+      if (!this.activeData) this.dataStatuses.connection = Status.Data.Loading;
+
       try {
         const response = await this.client!.get<API.ActiveData.Response>('api/getActiveData');
 
         this.activeData = response.data;
+        this.lastFetchData = new Date();
         this.dataStatuses.connection = Status.Data.Loaded;
 
         console.log('Fetching active data at ' + new Date().toLocaleTimeString('pl-PL'));

src/store/mainStore.ts

@@ -107,7 +107,10 @@ export const useMainStore = defineStore('store', {
           if (
             acc.findIndex((v) => v.name == name && v.region == train.region) != -1 ||
             apiStore.activeData?.activeSceneries?.findIndex(
-              (sc) => sc.stationName === name && sc.region == train.region
+              (sc) =>
+                sc.stationName === name &&
+                sc.region == train.region &&
+                Date.now() - sc.lastSeen < 1000 * 60 * 2
             ) != -1
           )
             return acc;