nowe pobieranie i przetwarzanie statusów dyżurnych

src/components/App/AppHeader.vue

@@ -96,11 +96,13 @@ export default defineComponent({
 
   computed: {
     onlineTrainsCount() {
-      return this.store.trainList.filter((train) => train.online).length;
+      return this.store.trainList.filter((train) => train.region == this.store.region.id).length;
     },
 
     onlineDispatchersCount() {
-      return this.store.onlineSceneryList.length;
+      return this.store.onlineSceneryList.filter(
+        (scenery) => scenery.region == this.store.region.id
+      ).length;
     },
 
     factorU() {

src/components/Global/RegionDropdown.vue

@@ -67,16 +67,15 @@ export default defineComponent({
     selectedItem() {
       return this.regionList[this.selectedItemIndex] || null;
     },
+
     regionList() {
       return regionsJSON.map((region) => {
-        const regionStationCount =
-          this.store.apiData.stations?.filter(
-            (station) => station.region == region.id && station.isOnline
-          ).length || 0;
+        const regionStationCount = this.store.onlineSceneryList.filter(
+          (scenery) => scenery.region == region.id
+        ).length;
 
         const regionTrainCount =
-          this.store.apiData.trains?.filter((train) => train.region == region.id && train.online)
-            .length || 0;
+          this.store.trainList.filter((train) => train.region == region.id).length || 0;
 
         return {
           id: region.id,

src/components/Global/StationStatusBadge.vue

@@ -1,7 +1,7 @@
 <template>
-  <span class="status-badge" :class="statusID" v-if="isOnline">
-    {{ $t(`status.${statusID}`) }}
-    {{ statusID == 'online' ? timestampToString(statusTimestamp!) : '' }}
+  <span class="status-badge" :class="statusName" v-if="isOnline">
+    {{ $t(`status.${statusName}`) }}
+    {{ dispatcherStatus && dispatcherStatus > 5 ? timestampToString(dispatcherStatus) : '' }}
   </span>
 
   <span class="status-badge free" v-else>
@@ -10,22 +10,52 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
+import { DispatcherStatus } from '../../scripts/enums/DispatcherStatus';
 
 export default defineComponent({
   props: {
-    statusID: {
-      type: String
-    },
-    statusTimestamp: {
-      type: Number
+    dispatcherStatus: {
+      type: Number as PropType<DispatcherStatus | number>
     },
     isOnline: {
       type: Boolean
     }
   },
-  mixins: [dateMixin]
+  mixins: [dateMixin],
+
+  computed: {
+    statusName() {
+      if (!this.dispatcherStatus) return 'free';
+
+      switch (this.dispatcherStatus) {
+        case DispatcherStatus.AFK:
+          return 'afk';
+
+        case DispatcherStatus.ENDING:
+          return 'ending';
+
+        case DispatcherStatus.INVALID:
+          return 'invalid';
+
+        case DispatcherStatus.NOT_LOGGED_IN:
+          return 'not-signed';
+
+        case DispatcherStatus.NO_SPACE:
+          return 'no-space';
+
+        case DispatcherStatus.UNAVAILABLE:
+          return 'unavailable';
+
+        case DispatcherStatus.UNKNOWN:
+          return 'unknown';
+
+        default:
+          return 'online';
+      }
+    }
+  }
 });
 </script>
 
@@ -34,10 +64,10 @@ $free: #8a8a8a;
 $ending: #e6c300;
 $no-limit: #117fc9;
 $unav: #ff3d5d;
-$brb: #e6a100;
+$afk: #e6a100;
 $no-space: #222;
 $online: #09a116;
-$unknown: rgb(185, 60, 60);
+$unknown: #b93c3c;
 
 .status-badge {
   border-radius: 1rem;
@@ -69,8 +99,8 @@ $unknown: rgb(185, 60, 60);
     font-size: 0.85em;
   }
 
-  &.brb {
-    background-color: $brb;
+  &.afk {
+    background-color: $afk;
     color: black;
     font-size: 0.95em;
   }
@@ -82,7 +112,8 @@ $unknown: rgb(185, 60, 60);
     font-size: 0.85em;
   }
 
-  &.unknown {
+  &.unknown,
+  &.invalid {
     background-color: $unknown;
     font-size: 0.95em;
   }

src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue

@@ -22,9 +22,8 @@
     </div>
 
     <StationStatusBadge
-      :statusID="onlineScenery?.statusID"
       :isOnline="onlineScenery ? true : false"
-      :statusTimestamp="onlineScenery?.statusTimestamp"
+      :dispatcherStatus="onlineScenery?.dispatcherStatus"
     />
   </section>
 </template>

src/components/StationsView/StationTable.vue

@@ -108,9 +108,8 @@
 
             <td class="station_status">
               <StationStatusBadge
-                :statusID="station.onlineInfo?.statusID"
                 :isOnline="station.onlineInfo ? true : false"
-                :statusTimestamp="station.onlineInfo?.statusTimestamp"
+                :dispatcherStatus="station.onlineInfo?.dispatcherStatus"
               />
             </td>