Merge pull request #120 from Spythere/development

v1.29.0

index.html

@@ -22,6 +22,11 @@
 
     <link rel="icon" href="favicon.ico" />
 
+    <link rel="stylesheet" href="fa/css/fontawesome.css" />
+    <link rel="stylesheet" href="fa/css/brands.css" />
+    <link rel="stylesheet" href="fa/css/regular.css" />
+    <link rel="stylesheet" href="fa/css/solid.css" />
+
     <!-- Static OpenGraph meta -->
     <meta name="description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
     <meta property="og:url" content="https://stacjownik-td2.web.app/" />

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stacjownik",
-  "version": "1.28.3",
+  "version": "1.29.0",
   "private": true,
   "type": "module",
   "scripts": {

public/fa/css/regular.css

@@ -0,0 +1,19 @@
+/*!
+ * Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2024 Fonticons, Inc.
+ */
+:root, :host {
+  --fa-style-family-classic: 'Font Awesome 6 Free';
+  --fa-font-regular: normal 400 1em/1 'Font Awesome 6 Free'; }
+
+@font-face {
+  font-family: 'Font Awesome 6 Free';
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.ttf") format("truetype"); }
+
+.far,
+.fa-regular {
+  font-weight: 400; }

public/fa/css/solid.css

@@ -0,0 +1,19 @@
+/*!
+ * Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2024 Fonticons, Inc.
+ */
+:root, :host {
+  --fa-style-family-classic: 'Font Awesome 6 Free';
+  --fa-font-solid: normal 900 1em/1 'Font Awesome 6 Free'; }
+
+@font-face {
+  font-family: 'Font Awesome 6 Free';
+  font-style: normal;
+  font-weight: 900;
+  font-display: block;
+  src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
+
+.fas,
+.fa-solid {
+  font-weight: 900; }

public/images/icon-srjp.svg

@@ -0,0 +1,5 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="512" height="512" rx="256" fill="#151414"/>
+<path d="M72.4253 291.986V279.965H120.201C123.283 279.965 124.824 278.424 124.824 275.342V264.246C124.824 261.266 123.54 259.571 120.971 259.16L90.9189 252.995C78.5898 250.529 72.4253 242.259 72.4253 228.183V219.553C72.4253 202.292 81.0557 193.662 98.3164 193.662H133.608L143.934 201.675V213.696H99.2411C96.1588 213.696 94.6177 215.237 94.6177 218.32V228.337C94.6177 231.214 95.9019 232.909 98.4705 233.423L128.523 239.433C140.852 241.899 147.016 250.17 147.016 264.246V274.109C147.016 291.37 138.386 300 121.125 300H82.7509L72.4253 291.986ZM167.651 300V193.662H219.433C236.694 193.662 245.324 202.292 245.324 219.553V237.122C245.324 249.964 240.546 257.978 230.991 261.163L248.406 295.377L245.786 300H226.676L207.874 263.013H189.843V300H167.651ZM189.843 242.978H218.508C221.591 242.978 223.132 241.437 223.132 238.355V218.32C223.132 215.237 221.591 213.696 218.508 213.696H189.843V242.978ZM262.96 274.109V253.766H285.153V275.342C285.153 278.424 286.694 279.965 289.776 279.965H310.736C313.818 279.965 315.359 278.424 315.359 275.342V213.696H286.386V193.662H337.551V274.109C337.551 291.37 328.921 300 311.66 300H288.852C271.591 300 262.96 291.37 262.96 274.109ZM361.948 300V193.662H413.731C430.991 193.662 439.622 202.292 439.622 219.553V240.204C439.622 257.465 430.991 266.095 413.731 266.095H384.141V300H361.948ZM384.141 246.06H412.806C415.888 246.06 417.429 244.519 417.429 241.437V218.32C417.429 215.237 415.888 213.696 412.806 213.696H384.141V246.06Z" fill="white"/>
+<path d="M304.958 332.848V322.831H348.418V332.848H332.236V376H321.14V332.848H304.958ZM356.61 376V322.831H376.799C391.285 322.831 398.529 330.074 398.529 344.561V354.27C398.529 368.757 391.285 376 376.799 376H356.61ZM367.706 365.983H377.415C384.093 365.983 387.432 362.643 387.432 355.965V342.866C387.432 336.187 384.093 332.848 377.415 332.848H367.706V365.983ZM407.35 376V358.662C407.35 351.624 410.432 347.489 416.597 346.256L430.852 343.405C432.136 343.148 432.779 342.3 432.779 340.862V335.16C432.779 333.619 432.008 332.848 430.467 332.848H408.891V326.838L414.054 322.831H430.929C439.56 322.831 443.875 327.146 443.875 335.776V340.785C443.875 347.823 440.792 351.958 434.628 353.191L420.372 356.042C419.088 356.299 418.446 357.147 418.446 358.585V365.983H443.875V376H407.35Z" fill="#E63E3E"/>
+</svg>

src/components/App/AppHeader.vue

@@ -18,7 +18,12 @@
 
         <span class="header_brand">
           <router-link to="/">
-            <img src="/images/stacjownik-header-logo.svg" alt="Stacjownik" />
+            <img
+              v-if="isChristmas"
+              src="/images/stacjownik-header-logo-christmas.svg"
+              alt="Stacjownik logo (christmas)"
+            />
+            <img v-else src="/images/stacjownik-header-logo.svg" alt="Stacjownik logo" />
           </router-link>
         </span>
 
@@ -69,7 +74,10 @@ import Clock from './Clock.vue';
 import RegionDropdown from '../Global/RegionDropdown.vue';
 
 export default defineComponent({
+  components: { StatusIndicator, Clock, RegionDropdown },
+
   emits: ['changeLang'],
+
   props: {
     currentLang: {
       type: String,
@@ -98,9 +106,14 @@ export default defineComponent({
       return this.store.activeSceneryList.filter(
         (scenery) => scenery.region == this.store.region.id && scenery.dispatcherId != -1
       ).length;
+    },
+
+    isChristmas() {
+      const date = new Date();
+
+      return date.getUTCMonth() == 11 && date.getUTCDate() >= 20 && date.getUTCDate() <= 31;
     }
-  },
+  }
-  components: { StatusIndicator, Clock, RegionDropdown }
 });
 </script>
 <style lang="scss" scoped>

src/components/Global/DonationCard.vue

@@ -187,7 +187,7 @@ a.discord {
   text-decoration: underline;
 }
 
-.actions {
+.actions-container {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
   gap: 0.5em;

src/components/JournalView/JournalOptions.vue

@@ -33,7 +33,7 @@
           <h1 class="option-title">{{ $t('options.search-title') }}</h1>
           <div class="search_content">
             <div class="search" v-for="(_, propName) in searchersValues" :key="propName">
-              <label v-if="propName == 'search-date'" for="search-date">{{
+              <label v-if="propName == 'search-date-from'" for="search-date">{{
                 $t(`options.search-${optionsType}-date`)
               }}</label>
 
@@ -45,13 +45,13 @@
                   @focus="preventKeyDown = true"
                   @blur="preventKeyDown = false"
                   :placeholder="$t(`options.${propName}`)"
-                  :type="propName == 'search-date' ? 'date' : 'text'"
+                  :type="propName.toString().startsWith('search-date') ? 'date' : 'text'"
-                  :min="propName == 'search-date' ? '2022-02-01' : undefined"
+                  :min="propName.toString().startsWith('search-date') ? '2022-02-01' : undefined"
                   :id="`${propName}`"
                   :list="propName.toString()"
                 />
 
-                <button class="search-exit" v-if="propName != 'search-date'">
+                <button class="search-exit" v-if="!propName.toString().startsWith('search-date')">
                   <img
                     src="/images/icon-exit.svg"
                     alt="exit-icon"
@@ -188,14 +188,14 @@ export default defineComponent({
       if (!value || value == '') return;
       if (value.length < 3) return;
 
-      this.startSearchTimeout('driver', value);
+      if (this.showOptions) this.startSearchTimeout('driver', value);
     },
 
     async 'searchersValues.search-dispatcher'(value: string | undefined) {
       if (!value || value == '') return;
       if (value.length < 3) return;
 
-      this.startSearchTimeout('dispatcher', value);
+      if (this.showOptions) this.startSearchTimeout('dispatcher', value);
     }
   },
 
@@ -283,7 +283,6 @@ export default defineComponent({
     },
 
     searchConfirm() {
-      this.$emit('onSearchConfirm');
       this.handleRouteParams();
     },
 

src/components/JournalView/JournalTimetables/EntryDetails.vue

@@ -24,42 +24,23 @@
       <div class="g-separator"></div>
 
       <div class="stock-specs">
-        <span class="badge" v-if="timetable.authorName">
+        <span class="badge specs-badge" v-if="timetable.authorName">
           <span>{{ $t('journal.dispatcher-name') }}</span>
           <span>{{ timetable.authorName }}</span>
         </span>
 
-        <span class="badge" v-if="timetable.maxSpeed">
+        <span class="badge specs-badge" v-if="timetable.trainMaxSpeed">
+          <span>{{ $t('journal.stock-timetable-speed') }}</span>
+          <span> {{ timetable.trainMaxSpeed }}km/h </span>
+        </span>
+
+        <span class="badge specs-badge" v-if="timetable.maxSpeed">
           <span>{{ $t('journal.stock-max-speed') }}</span>
           <span>{{ timetable.maxSpeed }}km/h</span>
         </span>
-
-        <span class="badge" v-if="timetable.stockLength">
-          <span>{{ $t('journal.stock-length') }}</span>
-          <span>
-            {{
-              currentHistoryIndex == 0
-                ? timetable.stockLength
-                : stockHistory[currentHistoryIndex].stockLength || timetable.stockLength
-            }}m
-          </span>
-        </span>
-
-        <span class="badge" v-if="timetable.stockMass">
-          <span>{{ $t('journal.stock-mass') }}</span>
-          <span>
-            {{
-              Math.floor(
-                (currentHistoryIndex == 0
-                  ? timetable.stockMass
-                  : stockHistory[currentHistoryIndex].stockMass || timetable.stockMass) / 1000
-              )
-            }}t
-          </span>
-        </span>
       </div>
 
-      <div class="stock-dangers" v-if="timetable.twr || timetable.skr">
+      <div class="stock-dangers" v-if="timetable.warningNotes">
         <div class="g-separator"></div>
 
         <b>{{ $t('journal.stock-dangers') }}:</b>
@@ -93,9 +74,40 @@
       <!-- Historia zmian w składzie -->
       <div v-if="timetable.stockString || stockHistory.length != 0">
         <div class="g-separator"></div>
+
         <b>{{ $t('journal.stock-preview') }}:</b>
 
-        <div class="stock-history" v-if="stockHistory.length > 1">
+        <div class="stock-specs" style="margin-top: 0.5em">
+          <span class="badge specs-badge" v-if="timetable.stockLength">
+            <span>{{ $t('journal.stock-length') }}</span>
+            <span>
+              {{
+                currentHistoryIndex == 0
+                  ? timetable.stockLength
+                  : stockHistory[currentHistoryIndex].stockLength || timetable.stockLength
+              }}m
+            </span>
+          </span>
+
+          <span class="badge specs-badge" v-if="timetable.stockMass">
+            <span>{{ $t('journal.stock-mass') }}</span>
+            <span>
+              {{
+                Math.floor(
+                  (currentHistoryIndex == 0
+                    ? timetable.stockMass
+                    : stockHistory[currentHistoryIndex].stockMass || timetable.stockMass) / 1000
+                )
+              }}t
+            </span>
+          </span>
+        </div>
+
+        <div class="stock-history">
+          <button class="btn btn--action" @click="copyStockToClipboard()">
+            <i class="fa-regular fa-copy"></i> {{ $t('journal.stock-copy') }}
+          </button>
+
           <button
             v-for="(sh, i) in stockHistory"
             :key="i"
@@ -128,6 +140,7 @@ import StockList from '../../Global/StockList.vue';
 import { API } from '../../../typings/api';
 import { RouteLocationRaw } from 'vue-router';
 import EntryStops from './EntryStops.vue';
+import { useI18n } from 'vue-i18n';
 
 export default defineComponent({
   components: { StockList, EntryStops },
@@ -146,7 +159,8 @@ export default defineComponent({
   },
   data() {
     return {
-      currentHistoryIndex: 0
+      currentHistoryIndex: 0,
+      i18n: useI18n()
     };
   },
   computed: {
@@ -167,6 +181,7 @@ export default defineComponent({
           };
         });
     },
+
     driverRouteLocation(): RouteLocationRaw | null {
       if (this.timetable.terminated) return null;
       return {
@@ -185,6 +200,25 @@ export default defineComponent({
 
     toggleExtraInfo() {
       this.$emit('toggleExtraInfo', this.timetable.id);
+    },
+
+    copyStockToClipboard() {
+      const currentStockString =
+        this.stockHistory[this.currentHistoryIndex]?.stockString ?? this.timetable.stockString;
+
+      if (!currentStockString) {
+        alert(this.i18n.t('journal.stock-clipboard-failure'));
+        return;
+      }
+
+      navigator.clipboard
+        .writeText(currentStockString)
+        .then(() => {
+          prompt(this.i18n.t('journal.stock-clipboard-success'), currentStockString);
+        })
+        .catch(() => {
+          alert(this.i18n.t('journal.stock-clipboard-failure'));
+        });
     }
   }
 });
@@ -224,14 +258,21 @@ export default defineComponent({
   display: flex;
   flex-wrap: wrap;
   gap: 0.5em;
+}
 
-  .badge {
+.specs-badge {
-    margin: 0;
+  margin: 0;
 
-    span:last-child {
+  span:first-child {
-      color: black;
+    color: white;
-      background-color: $accentCol;
+    background-color: #666;
-    }
+    border-radius: 0.25em 0 0 0.25em;
+  }
+
+  span:last-child {
+    color: black;
+    background-color: $accentCol;
+    border-radius: 0 0.25em 0.25em 0;
   }
 }
 

src/components/JournalView/JournalTimetables/EntryStatus.vue

@@ -21,7 +21,7 @@
       >
     </span>
 
-    <span class="text--grayed" v-if="timetable.currentSceneryName">
+    <span class="entry-location" v-if="timetable.currentSceneryName">
       <b>
         {{ $t(`journal.${timetable.terminated ? 'last-seen-at' : 'currently-at'}`) }}
         {{ timetable.currentSceneryName.replace(/.[a-zA-Z0-9]+.sc/, '') }}
@@ -71,4 +71,9 @@ export default defineComponent({
     justify-content: center;
   }
 }
+
+.entry-location {
+  text-align: center;
+  color: #ccc;
+}
 </style>

src/components/JournalView/JournalTimetables/EntryStops.vue

@@ -221,6 +221,10 @@ export default defineComponent({
 .stop-name {
   font-weight: bold;
   color: #ccc;
+
+  i {
+    display: none;
+  }
 }
 
 .stop-date {

src/components/JournalView/typings.ts

@@ -1,10 +1,14 @@
 export namespace Journal {
-  export type DispatcherSearchKey = 'search-dispatcher' | 'search-station' | 'search-date';
+  export type DispatcherSearchKey =
+    | 'search-dispatcher'
+    | 'search-station'
+    | 'search-date-from'
+    | 'search-date-to';
 
   export type TimetableSearchKey =
     | 'search-driver'
     | 'search-train'
-    | 'search-date'
+    | 'search-date-from'
     | 'search-dispatcher'
     | 'search-issuedFrom'
     | 'search-terminatingAt'
@@ -80,4 +84,3 @@ export namespace Journal {
     isConfirmed: boolean;
   }
 }
-

src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue

@@ -19,8 +19,25 @@
         :data-status="status"
       >
         <router-link :to="train.driverRouteLocation" class="a-block">
-          <span class="user_train">{{ train.trainNo }}</span>
+          <span class="user_train"> {{ train.trainNo }}</span>
-          <span class="user_name">{{ train.driverName }}</span>
+          <span class="user_name">
+            {{ train.driverName }}
+            <i
+              v-if="train.timetableData != undefined && train.lastSeen <= Date.now() - 120000"
+              class="fa-solid fa-user-slash"
+              style="color: lightcoral"
+              data-tooltip-type="BaseTooltip"
+              :data-tooltip-content="$t('app.tooltip-driver-offline')"
+            ></i>
+
+            <i
+              v-if="train.currentStationName.indexOf('.sc') != -1"
+              class="fa-solid fa-ban"
+              style="color: lightcoral"
+              data-tooltip-type="BaseTooltip"
+              :data-tooltip-content="$t('app.tooltip-scenery-offline')"
+            ></i>
+          </span>
         </router-link>
       </li>
     </transition-group>
@@ -66,8 +83,13 @@ export default defineComponent({
             this.station?.generalInfo?.checkpoints.includes(stop.stopNameRAW)
         );
 
+        const sceneryName =
+          train.currentStationName.indexOf('.sc') != -1
+            ? train.currentStationName.split(' ').slice(0, -1).join(' ')
+            : train.currentStationName;
+
         const status = stop
-          ? getTrainStopStatus(stop, train.currentStationName, this.onlineScenery!.name)
+          ? getTrainStopStatus(stop, sceneryName, this.onlineScenery!.name)
           : 'no-timetable';
 
         return {

src/components/Tooltip/VehiclePreviewTooltip.vue

@@ -1,11 +1,7 @@
 <template>
   <div class="tooltip-content">
     <div class="image-box">
-      <div v-if="imageState == 'loading'" class="loading-info">
+      <Loading v-if="imageState == 'loading'" class="loading-info" />
-        {{ $t('vehicle-preview.loading') }}
-      </div>
-
-      <div v-if="imageState == 'error'" class="loading-info">{{ $t('vehicle-preview.error') }}</div>
 
       <img
         v-if="tooltipStore.type"
@@ -34,8 +30,11 @@
 import { defineComponent } from 'vue';
 import { useTooltipStore } from '../../store/tooltipStore';
 import { useApiStore } from '../../store/apiStore';
+import Loading from '../Global/Loading.vue';
 
 export default defineComponent({
+  components: { Loading },
+
   data() {
     return {
       tooltipStore: useTooltipStore(),
@@ -60,9 +59,12 @@ export default defineComponent({
     },
 
     onImageError(e: Event) {
+      if (!e.target || !(e.target instanceof HTMLImageElement) || this.imageState == 'error')
+        return;
+
       this.imageState = 'error';
 
-      (e.target as HTMLElement).style.display = 'none';
+      e.target.src = '/images/no-vehicle-image.png';
     }
   },
 
@@ -99,14 +101,13 @@ export default defineComponent({
 
 .image-box {
   position: relative;
-  min-height: 150px;
+  min-height: 170px;
 }
 
 .loading-info {
   position: absolute;
   left: 50%;
-  top: 50%;
+  top: 35%;
-  font-size: 1.15em;
   transform: translate(-50%, -50%);
 }
 

src/components/TrainsView/StopLabel.vue

@@ -4,10 +4,12 @@
     :data-minor="stop.isSBL || (stop.nameRaw.endsWith(', po') && !stop.duration)"
   >
     <router-link v-if="/(, podg$|<strong>)/.test(stop.nameHtml)" :to="sceneryHref">
-      <span class="stop-name" v-html="stop.nameHtml"></span>
+      <b class="stop-name">
+        {{ stop.nameRaw }}
+      </b>
     </router-link>
 
-    <span v-else class="stop-name" v-html="stop.nameHtml"></span>
+    <span v-else class="stop-name">{{ stop.nameRaw }}</span>
 
     <span
       v-if="stop.position != 'begin'"
@@ -45,7 +47,10 @@
     <span
       v-if="
         stop.position != 'end' &&
-        (stop.duration != 0 || stop.status == 'stopped' || stop.departureDelay != stop.arrivalDelay)
+        (stop.duration != 0 ||
+          stop.position == 'begin' ||
+          stop.status == 'stopped' ||
+          stop.departureDelay != stop.arrivalDelay)
       "
       class="date departure"
       :data-status-delayed="stop.departureDelay > 0"
@@ -68,16 +73,16 @@
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent } from 'vue';
+import { PropType, defineComponent, stop } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
-import { TrainScheduleStop } from './typings';
+import { TrainSchedulePoint } from './typings';
 
 export default defineComponent({
   mixins: [dateMixin],
 
   props: {
     stop: {
-      type: Object as PropType<TrainScheduleStop>,
+      type: Object as PropType<TrainSchedulePoint>,
       required: true
     }
   },
@@ -139,6 +144,10 @@ s {
       color: #aaa;
       padding: 0;
     }
+
+    i {
+      display: none;
+    }
   }
 
   .stop {

src/components/TrainsView/TrainInfo.vue

@@ -1,216 +1,203 @@
 <template>
   <div class="train-info" :data-extended="extended">
-    <section class="train-general">
+    <div class="general-top-bar">
-      <div class="general-top-bar">
+      <div class="top-bar-header">
-        <div class="top-bar-header">
+        <b class="warning-timeout" v-if="train.isTimeout" :title="$t('trains.timeout')">?</b>
-          <b class="warning-timeout" v-if="train.isTimeout" :title="$t('trains.timeout')">?</b>
+        <span class="timetable-id" v-if="train.timetableData">
-          <span class="timetable-id" v-if="train.timetableData">
+          #{{ train.timetableData.timetableId }}
-            #{{ train.timetableData.timetableId }}
+        </span>
-          </span>
 
-          <span
+        <span
-            class="train-badge twr"
+          class="train-badge twr"
-            v-if="train.timetableData?.TWR"
+          v-if="train.timetableData?.TWR"
-            data-tooltip-type="BaseTooltip"
+          data-tooltip-type="BaseTooltip"
-            :data-tooltip-content="$t('warnings.TWR')"
+          :data-tooltip-content="$t('warnings.TWR')"
-          >
+        >
-            TWR
+          TWR
-          </span>
+        </span>
 
-          <span
+        <span
-            class="train-badge tn"
+          class="train-badge tn"
-            v-if="train.timetableData?.hasDangerousCargo"
+          v-if="train.timetableData?.hasDangerousCargo"
-            data-tooltip-type="BaseTooltip"
+          data-tooltip-type="BaseTooltip"
-            :data-tooltip-content="$t('warnings.TN')"
+          :data-tooltip-content="$t('warnings.TN')"
-          >
+        >
-            TN
+          TN
-          </span>
+        </span>
 
-          <span
+        <span
-            class="train-badge pn"
+          class="train-badge pn"
-            v-if="train.timetableData?.hasExtraDeliveries"
+          v-if="train.timetableData?.hasExtraDeliveries"
-            data-tooltip-type="BaseTooltip"
+          data-tooltip-type="BaseTooltip"
-            :data-tooltip-content="$t('warnings.PN')"
+          :data-tooltip-content="$t('warnings.PN')"
-          >
+        >
-            PN
+          PN
-          </span>
+        </span>
 
+        <b
+          v-if="train.timetableData"
+          data-tooltip-type="BaseTooltip"
+          :data-tooltip-content="getCategoryExplanation(train.timetableData.category)"
+          class="text--primary tooltip-help"
+        >
+          {{ train.timetableData.category }}
+        </b>
+
+        <b class="train-number">{{ train.trainNo }}</b>
+
+        <span>&bull;</span>
+
+        <div class="train-driver">
           <b
-            v-if="train.timetableData"
+            class="level-badge driver"
-            data-tooltip-type="BaseTooltip"
+            :style="calculateExpStyle(train.driverLevel, train.isSupporter)"
-            :data-tooltip-content="getCategoryExplanation(train.timetableData.category)"
-            class="text--primary tooltip-help"
           >
-            {{ train.timetableData.category }}
+            {{ train.driverLevel < 2 ? 'L' : `${train.driverLevel}` }}
           </b>
 
-          <b class="train-number">{{ train.trainNo }}</b>
+          <b
+            v-if="apiStore.donatorsData.includes(train.driverName)"
+            data-tooltip-type="DonatorTooltip"
+            :data-tooltip-content="$t('donations.driver-message')"
+          >
+            {{ train.driverName }}
+            <img src="/images/icon-diamond.svg" alt="donator diamond icon" />
+          </b>
 
-          <span>&bull;</span>
+          <span v-else>{{ train.driverName }}</span>
-
-          <div class="train-driver">
-            <b
-              class="level-badge driver"
-              :style="calculateExpStyle(train.driverLevel, train.isSupporter)"
-            >
-              {{ train.driverLevel < 2 ? 'L' : `${train.driverLevel}` }}
-            </b>
-
-            <b
-              v-if="apiStore.donatorsData.includes(train.driverName)"
-              data-tooltip-type="DonatorTooltip"
-              :data-tooltip-content="$t('donations.driver-message')"
-            >
-              {{ train.driverName }}
-              <img src="/images/icon-diamond.svg" alt="donator diamond icon" />
-            </b>
-
-            <span v-else>{{ train.driverName }}</span>
-          </div>
         </div>
       </div>
+    </div>
 
-      <div class="general-timetable" v-if="train.timetableData">
+    <div class="general-timetable" v-if="train.timetableData">
-        <strong>{{ train.timetableData.route.replace('|', ' - ') }}</strong>
+      <strong>{{ train.timetableData.route.replace('|', ' - ') }}</strong>
-        <span
+      <span
-          v-if="getSceneriesWithComments(train.timetableData).length > 0"
+        v-if="getSceneriesWithComments(train.timetableData).length > 0"
-          data-tooltip-type="BaseTooltip"
+        data-tooltip-type="BaseTooltip"
-          :data-tooltip-content="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(
+        :data-tooltip-content="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(
-            train.timetableData
+          train.timetableData
-          )})`"
+        )})`"
-        >
-          <img class="image-warning" src="/images/icon-warning.svg" />
-        </span>
-      </div>
-
-      <hr style="margin: 0.25em 0" />
-
-      <div class="general-stops" v-if="train.timetableData">
-        <span v-if="train.timetableData.followingStops.length > 2">
-          {{ $t('trains.via-title') }}
-          <span v-html="getTrainStopsHtml(train.timetableData.followingStops)"></span>
-        </span>
-      </div>
-
-      <div class="general-status">
-        <div class="status-timetable-progress" v-if="train.timetableData">
-          <ProgressBar :progressPercent="confirmedPercentage(train.timetableData.followingStops)" />
-
-          <span class="progress-distance">
-            <span>{{ currentDistance(train.timetableData.followingStops) }} km</span>
-            <span>/</span>
-            <span class="text--primary">{{ train.timetableData.routeDistance }} km </span>
-            <span>|</span>
-            <span v-html="currentDelay(train.timetableData.followingStops)"></span>
-          </span>
-        </div>
-
-        <div class="status-badges">
-          <div v-if="!train.currentStationHash" class="train-badge offline">
-            <img src="/images/icon-offline.svg" alt="offline train icon" />
-            {{ $t('trains.scenery-offline') }}
-          </div>
-
-          <div v-if="!train.online" class="train-badge offline">
-            <img src="/images/icon-offline.svg" alt="offline train icon" />
-            Offline {{ lastSeenMessage(train.lastSeen) }}
-          </div>
-        </div>
-      </div>
-
-      <div class="general-stats" v-if="extended">
-        <div>
-          <img src="/images/icon-length.svg" alt="length icon" />
-          {{ train.length }}m
-        </div>
-
-        <div>
-          <img src="/images/icon-mass.svg" alt="mass icon" />
-          {{ (train.mass / 1000).toFixed(1) }}t
-        </div>
-
-        <div>
-          <img src="/images/icon-speed.svg" alt="speed icon" />
-          {{ train.speed }} km/h
-
-          <span v-if="stockSpeedLimit != Infinity">
-            &bull;
-            <em
-              class="text--grayed"
-              style="text-decoration: underline dotted"
-              tabindex="0"
-              :data-tooltip="$t('trains.vmax-tooltip')"
-            >
-              {{ stockSpeedLimit }} km/h
-            </em>
-          </span>
-        </div>
-      </div>
-
-      <div class="text--grayed" style="margin-top: 0.25em">
-        {{ displayTrainPosition(train) }}
-      </div>
-
-      <div
-        class="train-dangers"
-        v-if="extended && train.timetableData && train.timetableData.warningNotes"
       >
-        <div class="dangers-badges">
+        <img class="image-warning" src="/images/icon-warning.svg" />
-          <div v-if="train.timetableData?.TWR">
+      </span>
-            <div class="train-badge twr">TWR</div>
+    </div>
-            - {{ $t('warnings.TWR') }}
-          </div>
 
-          <div v-if="train.timetableData?.hasDangerousCargo">
+    <hr style="margin: 0.25em 0" />
-            <div class="train-badge tn">TN</div>
-            - {{ $t('warnings.TN') }}
-          </div>
 
-          <div v-if="train.timetableData?.hasExtraDeliveries">
+    <div class="general-stops" v-if="train.timetableData">
-            <div class="train-badge pn">PN</div>
+      <span v-if="train.timetableData.followingStops.length > 2">
-            - {{ $t('warnings.PN') }}
+        {{ $t('trains.via-title') }}
-          </div>
+        <span v-html="getTrainStopsHtml(train.timetableData.followingStops)"></span>
+      </span>
+    </div>
+
+    <div class="general-status">
+      <div class="status-timetable-progress" v-if="train.timetableData">
+        <ProgressBar :progressPercent="confirmedPercentage(train.timetableData.followingStops)" />
+
+        <span class="progress-distance">
+          <span>{{ currentDistance(train.timetableData.followingStops) }} km</span>
+          <span>/</span>
+          <span class="text--primary">{{ train.timetableData.routeDistance }} km </span>
+          <span>|</span>
+          <span v-html="currentDelay(train.timetableData.followingStops)"></span>
+        </span>
+      </div>
+
+      <div class="status-badges">
+        <div v-if="!train.currentStationHash" class="train-badge offline">
+          <i class="fa-solid fa-ban"></i>
+          {{ $t('trains.scenery-offline') }}
         </div>
 
-        <div class="dangers-notes">
+        <div v-if="!train.online" class="train-badge offline">
-          <h4>{{ $t('warnings.header-title') }}</h4>
+          <i class="fa-solid fa-user-slash"></i>
-          <p>
+          Offline {{ lastSeenMessage(train.lastSeen) }}
-            <i>{{ train.timetableData?.warningNotes }}</i>
-          </p>
         </div>
       </div>
-    </section>
+    </div>
 
-    <section class="train-stats" v-if="!extended">
+    <div class="general-stats" v-if="extended">
-      <StockList :trainStockList="train.stockList" :tractionOnly="true" />
+      <div>
+        <img src="/images/icon-length.svg" alt="length icon" />
+        {{ train.length }}m
+      </div>
 
       <div>
-        <span>{{ train.speed }}km/h</span>
+        <img src="/images/icon-mass.svg" alt="mass icon" />
+        {{ (train.mass / 1000).toFixed(1) }}t
+      </div>
 
-        <div>
+      <div>
-          <span> {{ train.length }}m</span>
+        <img src="/images/icon-speed.svg" alt="speed icon" />
+        {{ train.speed }} km/h
+
+        <span v-if="stockSpeedLimit != Infinity">
           &bull;
-          <span> {{ (train.mass / 1000).toFixed(1) }}t</span>
+          <em
-          <span v-if="train.stockList.length > 1">
+            class="text--grayed"
-            &bull;
+            style="text-decoration: underline dotted"
-            {{ $t('trains.cars') }}: {{ train.stockList.length - 1 }}
+            tabindex="0"
-          </span>
+            :data-tooltip="$t('trains.vmax-tooltip')"
+          >
+            vMax:
+            {{ stockSpeedLimit }} km/h
+          </em>
+        </span>
+      </div>
+    </div>
+
+    <div class="text--grayed" style="margin-top: 0.25em">
+      {{ displayTrainPosition(train) }}
+    </div>
+
+    <div
+      class="train-dangers"
+      v-if="extended && train.timetableData && train.timetableData.warningNotes"
+    >
+      <div class="dangers-badges">
+        <div v-if="train.timetableData?.TWR">
+          <div class="train-badge twr">TWR</div>
+          - {{ $t('warnings.TWR') }}
+        </div>
+
+        <div v-if="train.timetableData?.hasDangerousCargo">
+          <div class="train-badge tn">TN</div>
+          - {{ $t('warnings.TN') }}
+        </div>
+
+        <div v-if="train.timetableData?.hasExtraDeliveries">
+          <div class="train-badge pn">PN</div>
+          - {{ $t('warnings.PN') }}
         </div>
       </div>
-    </section>
+
+      <div class="dangers-notes">
+        <h4>{{ $t('warnings.header-title') }}</h4>
+        <p>
+          <i>{{ train.timetableData?.warningNotes }}</i>
+        </p>
+      </div>
+    </div>
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import styleMixin from '../../mixins/styleMixin';
-import trainInfoMixin from '../../mixins/trainInfoMixin';
-import ProgressBar from '../Global/ProgressBar.vue';
 import { useMainStore } from '../../store/mainStore';
 import { useApiStore } from '../../store/apiStore';
-import StockList from '../Global/StockList.vue';
 import { Train } from '../../typings/common';
+import speedLimits from '../../data/speedLimits.json';
+import styleMixin from '../../mixins/styleMixin';
+import trainInfoMixin from '../../mixins/trainInfoMixin';
 import trainCategoryMixin from '../../mixins/trainCategoryMixin';
+import ProgressBar from '../Global/ProgressBar.vue';
+import StockList from '../Global/StockList.vue';
+
+export type SpeedLimitLocoType = keyof typeof speedLimits;
+
+const isCompatibleLoco = (locoType: string): locoType is SpeedLimitLocoType =>
+  locoType in speedLimits;
 
 export default defineComponent({
   mixins: [trainInfoMixin, styleMixin, trainCategoryMixin],
@@ -235,13 +222,36 @@ export default defineComponent({
 
   computed: {
     stockSpeedLimit() {
-      return this.train.stockList.reduce((acc, stockName) => {
+      let isPassenger = true;
-        const vehicleSpeed =
+
-          this.apiStore.vehiclesData?.find((v) => v.name == stockName.split(':')[0])?.group.speed ??
+      const vehicleMaxSpeed = this.train.stockList.reduce((acc, stockName) => {
-          300;
+        const vehicleData = this.apiStore.vehiclesData?.find(
+          (v) => v.name == stockName.split(':')[0]
+        );
+
+        if (!vehicleData) return acc;
+        if (vehicleData.type == 'wagon-freight') isPassenger = false;
+
+        const vehicleSpeed = vehicleData.group.speed;
 
         return Math.min(vehicleSpeed, acc);
-      }, 300);
+      }, Infinity);
+
+      const headLoco = this.train.stockList[0].slice(0, this.train.stockList[0].indexOf('-'));
+
+      if (!isCompatibleLoco(headLoco)) return vehicleMaxSpeed;
+
+      if (this.train.stockList.length == 1) return speedLimits[headLoco]['none'];
+
+      const speedTable = speedLimits[headLoco][isPassenger ? 'passenger' : 'cargo'];
+
+      if (!speedTable) return vehicleMaxSpeed;
+
+      let massKey = Object.keys(speedTable).findLast(
+        (massKey) => this.train.mass >= Number(massKey)
+      );
+
+      return massKey ? ((speedTable as any)[massKey] as number) : vehicleMaxSpeed;
     },
     journalRouteLocation() {
       return {
@@ -256,7 +266,6 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/responsive.scss';
 @import '../../styles/badge.scss';
 
 .image-warning {
@@ -265,17 +274,6 @@ export default defineComponent({
   vertical-align: middle;
 }
 
-.train-stats {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  flex-direction: column;
-  text-align: center;
-
-  line-height: 1.5em;
-}
-
 .train-dangers {
   margin-top: 0.5em;
 }
@@ -299,15 +297,9 @@ export default defineComponent({
 }
 
 .train-info {
-  display: grid;
+  display: flex;
-  grid-template-columns: 2fr 1fr;
+  flex-direction: column;
-  grid-template-rows: 1fr;
+  gap: 0.25em;
-
-  &[data-extended='true'] {
-    grid-template-columns: 1fr;
-  }
-
-  padding: 1em;
 
   background-color: #1a1a1a;
   gap: 0.5em;
@@ -337,12 +329,6 @@ export default defineComponent({
   padding: 0 0.25em;
 }
 
-.train-general {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25em;
-}
-
 .general-stops {
   font-size: 0.8em;
 }
@@ -419,11 +405,4 @@ export default defineComponent({
   display: flex;
   gap: 0.25em;
 }
-
-@include smallScreen() {
-  .train-info {
-    grid-template-columns: 1fr;
-    gap: 1em 0;
-  }
-}
 </style>

src/components/TrainsView/TrainOptions.vue

@@ -178,6 +178,12 @@ export default defineComponent({
       this.trainFilterList.forEach((filter) => {
         filter.isActive = true;
       });
+
+      this.sorterActive.id = 'routeDistance';
+      this.sorterActive.dir = -1;
+
+      this.searchedDriver = '';
+      this.searchedTrain = '';
     },
 
     onInputClear(id: 'driver' | 'train') {

src/components/TrainsView/TrainSchedule.vue

@@ -1,19 +1,19 @@
 <template>
-  <div class="train-schedule" @click="toggleShowState">
+  <div class="train-schedule">
-    <StockList :trainStockList="train.stockList" />
-
     <div class="schedule-wrapper" v-if="train.timetableData">
       <div class="stops">
         <div
-          v-for="(stop, i) in scheduleStops"
+          v-for="(stop, i) in scheduleStopsV2"
           :key="i"
           class="stop"
           :data-status="stop.status"
+          :data-sbl="stop.isSBL && stop.sceneryName == scheduleStopsV2[i + 1]?.sceneryName"
           :data-position="stop.position"
           :data-delayed="stop.departureDelay > 0"
           :data-stop-type="stop.type"
-          :data-minor-stop-active="stop.isActive"
+          :data-is-active="stop.isActive"
-          :data-last-confirmed="stop.isLastConfirmed"
+          :data-track-count-departure="stop.departureLineInfo?.routeTracks ?? 2"
+          :data-track-count-arrival="stop.arrivalLineInfo?.routeTracks ?? 2"
         >
           <span class="stop_info">
             <span class="distance">
@@ -34,7 +34,7 @@
             <div></div>
 
             <div class="progress">
-              <div class="line line_connection" v-if="i < scheduleStops.length - 1"></div>
+              <div class="line line_connection" v-if="i < scheduleStopsV2.length - 1"></div>
             </div>
 
             <div class="bottom-line-info">
@@ -44,17 +44,20 @@
               </div>
 
               <!-- Routes  -->
+
               <span
                 v-if="
                   stop.departureLine &&
-                  scheduleStops[i + 1] != undefined &&
+                  (scheduleStopsV2[i + 1]?.arrivalLineInfo?.routeSpeed !=
-                  !/-|_|(^it\d+)|(^sbl)/gi.test(stop.departureLine)
+                    stop.arrivalLineInfo?.routeSpeed ||
+                    stop.sceneryName != scheduleStopsV2[i + 1]?.sceneryName)
                 "
               >
                 <div class="scenery-route">
                   <span>{{ stop.departureLine }}</span>
+
                   <span v-if="stop.departureLineInfo">
-                    | {{ stop.departureLineInfo.routeSpeed }}
+                    <span> | {{ stop.departureLineInfo.routeSpeed }}</span>
 
                     <img
                       :src="
@@ -62,7 +65,7 @@
                           ? '/images/icon-catenary.svg'
                           : '/images/icon-we4a.png'
                       "
-                      width="10"
+                      width="14"
                       data-tooltip-type="BaseTooltip"
                       :data-tooltip-content="
                         $t(
@@ -74,7 +77,7 @@
                     <img
                       v-if="stop.departureLineInfo.isRouteSBL"
                       src="/images/icon-sbl-transparent.svg"
-                      width="10"
+                      width="14"
                       data-tooltip-type="BaseTooltip"
                       :data-tooltip-content="$t('trains.sbl-tooltip')"
                     />
@@ -82,39 +85,48 @@
                 </div>
 
                 <div
-                  v-if="stop.sceneryName != scheduleStops[i + 1]?.sceneryName"
+                  v-if="stop.sceneryName != scheduleStopsV2[i + 1]?.sceneryName"
                   class="scenery-change-name"
                 >
-                  <span>{{ scheduleStops[i + 1].sceneryName }}</span>
+                  <span>{{ scheduleStopsV2[i + 1].sceneryName }}</span>
-                  <span v-if="stop.departureLineInfo?.routeTracks == 1"> &UpDownArrow;</span>
+
-                  <span v-else> &DownArrowUpArrow;</span>
+                  <i
+                    v-if="!scheduleStopsV2[i + 1].isSceneryOnline"
+                    class="fa-solid fa-ban fa-sm"
+                    data-tooltip-type="BaseTooltip"
+                    :data-tooltip-content="$t('app.tooltip-scenery-offline')"
+                    style="color: salmon; margin-left: 0.25em"
+                  ></i>
                 </div>
 
-                <div class="scenery-route">
+                <div
-                  <span> {{ scheduleStops[i + 1].arrivalLine }}</span>
+                  class="scenery-route"
+                  v-if="stop.sceneryName != scheduleStopsV2[i + 1]?.sceneryName"
+                >
+                  <span> {{ scheduleStopsV2[i + 1].arrivalLine }}</span>
 
-                  <span v-if="scheduleStops[i + 1].arrivalLineInfo">
+                  <span v-if="scheduleStopsV2[i + 1].arrivalLineInfo">
-                    | {{ scheduleStops[i + 1].arrivalLineInfo!.routeSpeed }}
+                    <span> | {{ scheduleStopsV2[i + 1].arrivalLineInfo!.routeSpeed }} </span>
 
                     <img
                       :src="
-                        scheduleStops[i + 1].arrivalLineInfo!.isElectric
+                        scheduleStopsV2[i + 1].arrivalLineInfo?.isElectric
                           ? '/images/icon-catenary.svg'
                           : '/images/icon-we4a.png'
                       "
                       data-tooltip-type="BaseTooltip"
                       :data-tooltip-content="
                         $t(
-                          `trains.${!scheduleStops[i + 1].arrivalLineInfo!.isElectric ? 'no-' : ''}catenary-tooltip`
+                          `trains.${!scheduleStopsV2[i + 1].arrivalLineInfo?.isElectric ? 'no-' : ''}catenary-tooltip`
                         )
                       "
-                      width="10"
+                      width="14"
                     />
 
                     <img
-                      v-if="scheduleStops[i + 1].arrivalLineInfo!.isRouteSBL"
+                      v-if="scheduleStopsV2[i + 1].arrivalLineInfo!.isRouteSBL"
                       src="/images/icon-sbl-transparent.svg"
-                      width="10"
+                      width="14"
                       data-tooltip-type="BaseTooltip"
                       :data-tooltip-content="$t('trains.sbl-tooltip')"
                     />
@@ -136,8 +148,8 @@ import StopLabel from './StopLabel.vue';
 import StockList from '../Global/StockList.vue';
 import { useMainStore } from '../../store/mainStore';
 import { useApiStore } from '../../store/apiStore';
-import { StationRoutesInfo, Train } from '../../typings/common';
+import { StationRoutesInfo, TimetablePathElement, Train } from '../../typings/common';
-import { TrainScheduleStop } from './typings';
+import { TrainSchedulePoint } from './typings';
 
 export default defineComponent({
   components: { StopLabel, StockList },
@@ -159,68 +171,173 @@ export default defineComponent({
     };
   },
 
+  methods: {
+    getPathSceneryData(pathEl: TimetablePathElement) {
+      const sceneryData =
+        this.store.stationList?.find((sc) => sc.name == pathEl.stationName) ?? null;
+
+      if (!sceneryData || !sceneryData.generalInfo) return null;
+
+      const activeScenery = this.apiStore.activeData?.activeSceneries?.find(
+        (sc) => sc.stationName == pathEl.stationName
+      );
+
+      const arrivalLineData = pathEl.arrivalRouteExt
+        ? (sceneryData.generalInfo.routes.all.find(
+            (rt) => rt.routeName == pathEl.arrivalRouteExt
+          ) ?? null)
+        : null;
+
+      const departureLineData = pathEl.departureRouteExt
+        ? (sceneryData.generalInfo.routes.all.find(
+            (rt) => rt.routeName == pathEl.departureRouteExt
+          ) ?? null)
+        : null;
+
+      return {
+        generalInfo: sceneryData.generalInfo,
+        isOnline:
+          activeScenery &&
+          (activeScenery.isOnline == 1 || activeScenery.lastSeen >= Date.now() - 60000),
+        arrivalLineData,
+        departureLineData
+      };
+    }
+  },
+
   computed: {
-    scheduleStops(): TrainScheduleStop[] {
+    scheduleStopsV2() {
       if (!this.train.timetableData) return [];
 
-      const { timetablePath } = this.train.timetableData;
+      const { timetablePath, followingStops } = this.train.timetableData;
+
+      const stopRows: TrainSchedulePoint[] = [];
+
       let currentPathIndex = 0;
+      let currentPath = timetablePath[0];
 
-      return (
+      let pathData = this.getPathSceneryData(currentPath);
-        this.train.timetableData?.followingStops.map((stop, i, arr) => {
-          const isExternal =
-            i < arr.length - 1 &&
-            stop.departureLine === timetablePath[currentPathIndex].departureRouteExt;
 
-          const sceneryName = timetablePath[currentPathIndex].stationName;
+      let arrivalLineInfo: StationRoutesInfo | null = null;
-          const sceneryInfo = this.apiStore.sceneryData.find((st) => st.name == sceneryName);
+      let departureLineInfo: StationRoutesInfo | null = null;
 
-          const arrivalLineInfo = sceneryInfo?.routesInfo.find(
+      let isActive = false;
-            (r) => r.routeName == stop.arrivalLine
-          );
 
-          const departureLineInfo = sceneryInfo?.routesInfo.find(
+      if (pathData?.departureLineData) {
-            (r) => r.routeName == stop.departureLine
+        arrivalLineInfo = pathData.departureLineData;
-          );
+        departureLineInfo = pathData.departureLineData;
+      }
 
-          if (isExternal) currentPathIndex++;
+      for (const stop of followingStops) {
+        let isExternal = false;
 
-          return {
+        if (
-            nameHtml: stop.stopName,
+          stop.arrivalLine &&
-            nameRaw: stop.stopNameRAW,
+          currentPath.arrivalRouteExt &&
+          stop.arrivalLine == currentPath.arrivalRouteExt
+        ) {
+          isExternal = true;
 
-            arrivalScheduled: stop.arrivalTimestamp,
+          if (pathData?.arrivalLineData) {
-            arrivalReal: stop.arrivalRealTimestamp,
+            arrivalLineInfo = pathData.arrivalLineData;
+          }
+        }
 
-            departureScheduled: stop.departureTimestamp,
+        let correctedDepartureLineData: StationRoutesInfo | null = null;
-            departureReal: stop.departureRealTimestamp,
 
-            departureDelay: stop.departureDelay,
+        const internalRouteInfo = stop.departureLine
-            arrivalDelay: stop.arrivalDelay,
+          ? pathData?.generalInfo.routes.all.find(
+              (route) => route.isInternal && route.routeName == stop.departureLine
+            )
+          : undefined;
 
-            duration: stop.stopTime,
+        if (internalRouteInfo) {
+          correctedDepartureLineData = internalRouteInfo;
+          departureLineInfo = internalRouteInfo;
+        }
 
-            comments: stop.comments ?? null,
+        let rowData: TrainSchedulePoint = {
+          nameHtml: stop.stopName,
+          nameRaw: stop.stopNameRAW,
 
-            arrivalLine: stop.arrivalLine,
+          arrivalScheduled: stop.arrivalTimestamp,
-            departureLine: stop.departureLine,
+          arrivalReal: stop.arrivalRealTimestamp,
 
-            arrivalLineInfo: arrivalLineInfo,
+          departureScheduled: stop.departureTimestamp,
-            departureLineInfo: departureLineInfo,
+          departureReal: stop.departureRealTimestamp,
 
-            isExternal,
+          departureDelay: stop.departureDelay,
+          arrivalDelay: stop.arrivalDelay,
 
-            type: stop.stopType,
+          duration: stop.stopTime ?? 0,
-            distance: stop.stopDistance,
+          type: stop.stopType,
-            isActive: this.activeMinorStops.includes(i),
+          distance: stop.stopDistance,
-            isLastConfirmed: this.lastConfirmed === i && !stop.terminatesHere,
+
-            isSBL: /sbl/gi.test(stop.stopName),
+          comments: stop.comments ?? null,
-            position: stop.beginsHere ? 'begin' : stop.terminatesHere ? 'end' : 'en-route',
+
-            sceneryName,
+          arrivalLine: stop.arrivalLine,
-            status: stop.confirmed ? 'confirmed' : stop.stopped ? 'stopped' : 'unconfirmed'
+          departureLine: stop.departureLine,
-          };
+
-        }) ?? []
+          arrivalLineInfo: arrivalLineInfo,
-      );
+          departureLineInfo,
+
+          isExternal,
+
+          isActive: isActive,
+
+          isSBL: /sbl/gi.test(stop.stopName),
+          position: stop.beginsHere ? 'begin' : stop.terminatesHere ? 'end' : 'en-route',
+          status: stop.confirmed ? 'confirmed' : stop.stopped ? 'stopped' : 'unconfirmed',
+
+          sceneryName: currentPath.stationName,
+          isSceneryOnline: pathData?.isOnline ?? false
+        };
+
+        if (internalRouteInfo) {
+          arrivalLineInfo = departureLineInfo;
+        }
+
+        if (
+          stopRows[stopRows.length - 1]?.status == 'confirmed' &&
+          rowData.status != 'confirmed' &&
+          rowData.status != 'stopped'
+        )
+          stopRows[stopRows.length - 1].isActive = true;
+
+        if (
+          stopRows[stopRows.length - 1]?.isActive == true &&
+          !/(^<strong>|, podg$)/.test(rowData.nameHtml)
+        )
+          rowData.isActive = true;
+
+        stopRows.push(rowData);
+
+        if (
+          stop.departureLine &&
+          currentPath.departureRouteExt &&
+          stop.departureLine == currentPath.departureRouteExt
+        ) {
+          // Reverse search for last scenery checkpoint
+          if (pathData?.departureLineData) {
+            stopRows[stopRows.length - 1].isExternal = true;
+
+            for (let i = stopRows.length - 1; i > 0; i--) {
+              stopRows[i].departureLineInfo = pathData.departureLineData;
+
+              if (/(^<strong>|, podg$)/.test(stopRows[i].nameHtml)) {
+                break;
+              }
+
+              stopRows[i].arrivalLineInfo = pathData.departureLineData;
+            }
+          }
+
+          currentPath = timetablePath[++currentPathIndex];
+          pathData = this.getPathSceneryData(currentPath);
+        }
+      }
+
+      return stopRows;
     },
 
     lastConfirmed() {
@@ -252,12 +369,6 @@ export default defineComponent({
 
       return activeMinorStopList;
     }
-  },
-
-  methods: {
-    toggleShowState() {
-      this.$emit('click');
-    }
   }
 });
 </script>
@@ -281,10 +392,6 @@ $blinkAnim: 0.5s ease-in-out alternate infinite blink;
   }
 }
 
-.train-schedule {
-  padding: 1em;
-}
-
 .schedule-wrapper {
   overflow-y: auto;
   width: 100%;
@@ -303,6 +410,10 @@ $blinkAnim: 0.5s ease-in-out alternate infinite blink;
 }
 
 .stop {
+  &[data-sbl='true'] {
+    display: none;
+  }
+
   // Begin stop
   &[data-position='begin'] {
     .node {
@@ -334,20 +445,19 @@ $blinkAnim: 0.5s ease-in-out alternate infinite blink;
     border-color: $haltClr;
   }
 
-  &[data-minor-stop-active='true'] {
+  // &[data-minor-stop-active='true'] {
-    .progress > .line {
+  //   .progress > .line {
-      animation: $blinkAnim;
+  //     animation: $blinkAnim;
-    }
+  //   }
 
-    & + div {
+  //   & + div {
-      .progress > .line_node-top {
+  //     .progress > .line_node-top {
-        animation: $blinkAnim;
+  //       animation: $blinkAnim;
-      }
+  //     }
-    }
+  //   }
-  }
+  // }
 
-  // Last confirmed outpost / checkpoint
+  &[data-is-active='true'] {
-  &[data-last-confirmed='true'] {
     .progress > .line_connection {
       animation: $blinkAnim;
     }
@@ -368,6 +478,7 @@ $blinkAnim: 0.5s ease-in-out alternate infinite blink;
     .progress > .node {
       border-color: $confirmedClr;
     }
+
     .progress > .line {
       border-left: 2px solid $confirmedClr;
       border-right: 2px solid $confirmedClr;
@@ -388,19 +499,22 @@ $blinkAnim: 0.5s ease-in-out alternate infinite blink;
   // Unused so far
   &[data-track-count-departure='2'] {
     .progress > .line {
-      width: 6px;
+      width: 8px;
+      border-width: 3px;
     }
   }
 
   &[data-track-count-arrival='2'] {
     .progress > .line_node-top {
-      width: 6px;
+      width: 8px;
+      border-width: 3px;
     }
   }
 
   &[data-track-count-arrival='1'] {
     .progress > .line_node-top {
-      width: 4px;
+      width: 2px;
+      border-width: 2px;
     }
   }
 
@@ -528,8 +642,7 @@ $blinkAnim: 0.5s ease-in-out alternate infinite blink;
     align-items: center;
   }
 
-  img {
+  img[data-tooltip] {
-    width: 1em;
     cursor: help;
   }
 }

src/components/TrainsView/TrainStats.vue

@@ -249,7 +249,6 @@ h3 {
 }
 
 @include smallScreen {
-  h1,
   .no-data {
     text-align: center;
   }

src/components/TrainsView/TrainTable.vue

@@ -1,5 +1,12 @@
 <template>
-  <transition name="status-anim" mode="out-in" tag="div" class="train-table">
+  <transition
+    name="status-anim"
+    mode="out-in"
+    tag="div"
+    class="train-table"
+    @scroll="onScroll"
+    ref="trainTableRef"
+  >
     <div :key="apiStore.dataStatuses.connection">
       <div class="table-warning" key="offline" v-if="store.isOffline">
         {{ $t('app.offline') }}
@@ -13,15 +20,7 @@
       </div>
 
       <transition-group name="list-anim" tag="ul">
-        <li
+        <TrainTableItem v-for="train in trains" :key="train.id" :train="train" />
-          class="train-row"
-          v-for="train in trains"
-          :key="train.id"
-        >
-          <router-link class="a-block" :to="train.driverRouteLocation">
-            <TrainInfo :train="train" :extended="false" />
-          </router-link>
-        </li>
       </transition-group>
     </div>
   </transition>
@@ -30,13 +29,15 @@
 <script lang="ts">
 import { defineComponent, inject, PropType, Ref } from 'vue';
 import { useMainStore } from '../../store/mainStore';
-import Loading from '../Global/Loading.vue';
-import TrainInfo from './TrainInfo.vue';
-import { Status, Train } from '../../typings/common';
 import { useApiStore } from '../../store/apiStore';
+import { Status, Train } from '../../typings/common';
+
+import Loading from '../Global/Loading.vue';
+import TrainTableItem from './TrainTableItem.vue';
+import TrainInfo from './TrainInfo.vue';
 
 export default defineComponent({
-  components: { Loading, TrainInfo },
+  components: { Loading, TrainInfo, TrainTableItem },
 
   props: {
     trains: {
@@ -45,6 +46,10 @@ export default defineComponent({
     }
   },
 
+  data: () => ({
+    scrollTop: 0
+  }),
+
   setup() {
     const store = useMainStore();
     const apiStore = useApiStore();
@@ -64,6 +69,16 @@ export default defineComponent({
     };
   },
 
+  activated() {
+    (this.$refs['trainTableRef'] as HTMLElement).scrollTop = this.scrollTop;
+  },
+
+  methods: {
+    onScroll(e: Event) {
+      this.scrollTop = (e.target as HTMLElement).scrollTop;
+    }
+  },
+
   computed: {
     dataStatus() {
       if (this.store.isOffline) return Status.Data.Offline;
@@ -98,10 +113,4 @@ export default defineComponent({
 
   background: #1a1a1a;
 }
-
-li.train-row {
-  background-color: var(--clr-secondary);
-  margin-bottom: 1em;
-  width: 100%;
-}
 </style>

src/components/TrainsView/TrainTableItem.vue

@@ -0,0 +1,76 @@
+<template>
+  <li class="train-item">
+    <router-link class="a-block" :to="train.driverRouteLocation">
+      <div class="item-wrapper">
+        <TrainInfo :train="train" />
+
+        <div class="train-stats">
+          <StockList :trainStockList="train.stockList" :tractionOnly="true" />
+
+          <div>
+            <span>{{ train.speed }}km/h</span>
+
+            <div>
+              <span> {{ train.length }}m</span>
+              &bull;
+              <span> {{ (train.mass / 1000).toFixed(1) }}t</span>
+              <span v-if="train.stockList.length > 1">
+                &bull;
+                {{ $t('trains.cars') }}: {{ train.stockList.length - 1 }}
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </router-link>
+  </li>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue';
+import { Train } from '../../typings/common';
+import TrainInfo from './TrainInfo.vue';
+import StockList from '../Global/StockList.vue';
+
+defineProps({
+  train: {
+    type: Object as PropType<Train>,
+    required: true
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/responsive.scss';
+
+.train-item {
+  background-color: #1a1a1a;
+  margin-bottom: 1em;
+  width: 100%;
+  padding: 1em;
+}
+
+.item-wrapper {
+  display: grid;
+  grid-template-columns: 2fr 1fr;
+  grid-template-rows: 1fr;
+}
+
+.train-stats {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  flex-direction: column;
+  text-align: center;
+
+  line-height: 1.5em;
+}
+
+@include smallScreen() {
+  .item-wrapper {
+    grid-template-columns: 1fr;
+    gap: 1em 0;
+  }
+}
+</style>

src/components/TrainsView/typings.ts

@@ -151,6 +151,8 @@ export interface TrainScheduleStop {
   isSBL: boolean;
 
   sceneryName: string | null;
+  isSceneryOnline: boolean;
+
   distance: number;
 
   arrivalLine: string | null;
@@ -162,4 +164,36 @@ export interface TrainScheduleStop {
   isExternal: boolean;
 
   comments: string | null;
+}
+
+export interface TrainSchedulePoint {
+  nameHtml: string;
+  nameRaw: string;
+
+  status: 'confirmed' | 'unconfirmed' | 'stopped';
+  position: 'begin' | 'end' | 'en-route';
+  type: string;
+  duration: number;
+  distance: number;
+  arrivalScheduled: number;
+  arrivalReal: number;
+  departureScheduled: number;
+  departureReal: number;
+
+  comments: string | null;
+
+  arrivalDelay: number;
+  departureDelay: number;
+  arrivalLine: string | null;
+  departureLine: string | null;
+
+  arrivalLineInfo: StationRoutesInfo | null;
+  departureLineInfo: StationRoutesInfo | null;
+
+  isExternal: boolean,
+
+  isActive: boolean;
+  isSBL: boolean;
+  sceneryName: string | null;
+  isSceneryOnline: boolean;
 }

src/data/speedLimits.json

@@ -0,0 +1,156 @@
+{
+   "EU07": {
+      "passenger": {
+         "650000": 125
+      },
+      "cargo": {
+         "2000000": 70
+      },
+      "none": 110
+   },
+   "4E": {
+      "passenger": {
+         "650000": 125
+      },
+      "cargo": {
+         "2000000": 70
+      },
+      "none": 110
+   },
+   "EU07E": {
+      "passenger": {
+         "650000": 125
+      },
+      "cargo": {
+         "2000000": 70
+      },
+      "none": 110
+   },
+   "EP07": {
+      "passenger": {
+         "650000": 125
+      },
+      "cargo": null,
+      "none": 110
+   },
+   "EP08": {
+      "passenger": {
+         "650000": 140
+      },
+      "cargo": null,
+      "none": 110
+   },
+   "EP09": {
+      "passenger": {
+         "650000": 160
+      },
+      "cargo": null,
+      "none": 160
+   },
+   "ET22": {
+      "passenger": {
+         "650000": 125
+      },
+      "cargo": {
+         "1200000": 100,
+         "3100000": 70
+      },
+      "none": 125
+   },
+   "201E": {
+      "passenger": {
+         "650000": 125
+      },
+      "cargo": {
+         "1200000": 100,
+         "3100000": 70
+      },
+      "none": 125
+   },
+   "ET41": {
+      "passenger": {
+         "700000": 125
+      },
+      "cargo": {
+         "4000000": 70,
+         "3500000": 80,
+         "2500000": 90,
+         "2000000": 100
+      },
+      "none": 110
+   },
+   "SM42": {
+      "passenger": {
+         "95000": 90,
+         "200000": 80,
+         "300000": 70,
+         "450000": 60,
+         "750000": 50,
+         "1130000": 40,
+         "1720000": 30,
+         "2400000": 20
+      },
+      "cargo": {
+         "95000": 90,
+         "200000": 80,
+         "300000": 70,
+         "450000": 60,
+         "750000": 50,
+         "1130000": 40,
+         "1720000": 30,
+         "2400000": 20
+      },
+      "none": 90
+   },
+   "M62": {
+      "passenger": {
+         "500000": 100,
+         "800000": 80,
+         "1200000": 60,
+         "2000000": 40,
+         "3000000": 20
+      },
+      "cargo": {
+         "500000": 100,
+         "800000": 80,
+         "1200000": 60,
+         "2000000": 40,
+         "3000000": 20
+      },
+      "none": 100
+   },
+   "ST44": {
+      "passenger": {
+         "500000": 100,
+         "800000": 80,
+         "1200000": 60,
+         "2000000": 40,
+         "3000000": 20
+      },
+      "cargo": {
+         "500000": 100,
+         "800000": 80,
+         "1200000": 60,
+         "2000000": 40,
+         "3000000": 20
+      },
+      "none": 100
+   },
+   "CTLR4C": {
+      "passenger": {
+         "500000": 100,
+         "800000": 80,
+         "1200000": 60,
+         "2000000": 40,
+         "3000000": 20
+      },
+      "cargo": {
+         "500000": 100,
+         "800000": 80,
+         "1200000": 60,
+         "2000000": 40,
+         "3000000": 20
+      },
+      "none": 100
+   }
+}

src/locales/en.json

@@ -23,7 +23,7 @@
   "warnings": {
     "TWR": "Train with high risk cargo",
     "SKR": "Train with exceeded gauge",
-    "PN": "Train with extra deliveries", 
+    "PN": "Train with extra deliveries",
     "TN": "Train with dangerous cargo",
     "header-title": "Freight notes:"
   },
@@ -48,7 +48,9 @@
     "no-result": "No results for current search!",
     "migration-warning": "Stacjownik services will be unavailable 2/06/2022 between 1-3am (CEST time) due to the migration of API hostings!",
     "migration-confirm": "Roger that!",
-    "offline": "App is in the offline mode!"
+    "offline": "App is in the offline mode!",
+    "tooltip-driver-offline": "Driver is offline",
+    "tooltip-scenery-offline": "Scenery is offline"
   },
   "footer": {
     "discord": "Stacjownik Discord server"
@@ -57,20 +59,16 @@
     "EI": "domestic express",
     "EC": "international express",
     "EN": "domestic night express",
-
     "MP": "intervoivodeship bullet",
     "MO": "intervoivodeship regio",
     "MM": "international bullet",
     "MH": "intervoivodeship night bullet",
-
     "RP": "voivodeship bullet",
     "RM": "international voivodeship regio",
     "RO": "voivodeship regio",
     "RA": "voivodeship regio (urban)",
-
     "PW": "empty passenger",
     "PX": "empty passenger test drive",
-
     "TC": "international freight (intermodal)",
     "TG": "international freight (organized cargo)",
     "TR": "international freight (unorganized cargo)",
@@ -80,18 +78,14 @@
     "TK": "freight (for stations & sidings)",
     "TS": "empty freight test drive",
     "TH": "locomotive rolling stock (over 3 vehicles)",
-
     "LT": "freight locomotive only",
     "LP": "passenger locomotive only",
     "LS": "shunting locomotive only",
     "LZ": "shunting locomotive only",
-
     "ZN": "inspection / diagnostic type",
     "ZU": "other maintenance type",
     "ZG": "emergency (deprecated)",
-
     "AP": "voivodeship regio (deprecated)",
-
     "E": "electric loco",
     "J": "EMU",
     "S": "diesel loco",
@@ -130,7 +124,6 @@
     "mechaniczne": "levers (mechanical)",
     "mechaniczne+SPK": "levers + SPK",
     "mechaniczne+SCS": "levers + SCS",
-
     "abbrevs": {
       "SPK": "SPK",
       "SCS": "SCS",
@@ -159,14 +152,11 @@
   "options": {
     "filters": "FILTERS",
     "donate": "DONATE",
-
     "search-button": "SEARCH",
     "reset-button": "RESET",
-
     "sort-title": "SORT BY:",
     "filter-title": "FILTER BY:",
     "search-title": "SEARCH:",
-
     "search-train-no": "Train no. / #",
     "search-train": "Train no.",
     "search-driver": "Driver name",
@@ -176,10 +166,10 @@
     "search-issuedFrom": "Issuing scenery name",
     "search-via": "Via scenery name",
     "search-terminatingAt": "Terminating scenery name",
-    "search-timetables-date": "Timetable date (UTC+2 / CEST)",
+    "search-timetables-date": "Timetable date",
-    "search-dispatchers-date": "Service date (UTC+2 / CEST)",
+    "search-dispatchers-date": "Service date (from / to)",
-    "search-date": "Date (UTC+2 / CEST)",
+    "search-date-from": "Date (UTC+2 / CEST)",
-
+    "search-date-to": "Date (UTC+2 / CEST)",
     "sort-mass": "mass",
     "sort-speed": "speed",
     "sort-length": "length",
@@ -188,13 +178,11 @@
     "sort-progress": "route progress",
     "sort-delay": "current delay",
     "sort-id": "timetable id",
-
     "sort-allStopsCount": "total stops",
     "sort-beginDate": "date",
     "sort-timetableId": "timetable ID",
     "sort-timestampFrom": "date",
     "sort-currentDuration": "duration",
-
     "filter-noComments": "NO COMMENTS",
     "filter-withComments": "COMMENTS",
     "filter-twr": "TWR",
@@ -209,13 +197,10 @@
     "filter-other": "OTHER",
     "filter-noTimetable": "NO TIMETABLE",
     "filter-withTimetable": "TIMETABLE",
-
     "filter-reset": "RESET FILTERS",
     "filter-clear": "CLEAR FILTERS",
-
     "filter-section-timetable-status": "TIMETABLE STATUS",
     "filter-section-special": "SPECIAL TYPE",
-
     "filter-all-statuses": "ALL",
     "filter-abandoned": "ABANDONED",
     "filter-fulfilled": "FULFILLED",
@@ -223,7 +208,6 @@
   },
   "filters": {
     "desc": " &bull; Left mouse click: select / unselect chosen filter <br /> &bull; Double left click: unselect all filters but chosen from a <b class='text--primary'>group</b> <br /> &bull; <span style='color: coral'>RESET</span>: reset all filters from a <b class='text--primary'>group</b>",
-
     "sections": {
       "quick": "QUICK FILTERS",
       "stationType": "STATION TYPE",
@@ -238,18 +222,14 @@
       "timetables": "ACTIVE TIMETABLES",
       "spawns": "OPEN SPAWNS"
     },
-
     "changed-filters-count": "Changed filters:",
     "no-changed-filters": "No changed filters",
-
     "all-available": "ALL AVAILABLE",
     "all-free": "CURRENTLY FREE",
-
     "endingStatus": "ENDS SOON",
     "afkStatus": "AFK",
     "noSpaceStatus": "NO SPACE",
     "unavailableStatus": "UNAVAILABLE",
-
     "title": "STATION FILTERS",
     "default": "IN-GAME",
     "notDefault": "ADDITIONAL",
@@ -258,7 +238,6 @@
     "unavailable": "UNSUPPORTED",
     "nonPublic": "NON-PUBLIC",
     "abandoned": "ABANDONED",
-
     "SPK": "SPK",
     "SPK-R": "SPK + MANUAL",
     "SPK-M": "SPK + MECH.",
@@ -268,29 +247,22 @@
     "SPE": "SPE",
     "manual": "MANUAL",
     "mechanical": "MECHANICAL",
-
     "SUP": "SUP (RASP-UZK)",
     "noSUP": "WITHOUT SUP",
-
     "ASDEK": "ASDEK",
     "noASDEK": "NO ASDEK",
-
     "SBL": "AUTOMATIC (SBL)",
     "PBL": "SEMIAUTOMATIC (PBL)",
-
     "modern": "MODERN",
     "semaphores": "SEMAPHORES",
     "mixed": "MIXED",
     "historical": "HISTORICAL",
     "free": "FREE",
     "occupied": "OCCUPIED",
-
     "withActiveTimetables": "ACTIVE",
     "withoutActiveTimetables": "NO ACTIVE",
-
     "junction": "JUNCTIONS",
     "nonJunction": "OTHER",
-
     "sliders": {
       "minLevel": "MIN. REQUIRED DISPATCHER LEVEL",
       "maxLevel": "MAX. REQUIRED DISPATCHER LEVEL",
@@ -301,13 +273,11 @@
       "minTwoWayCatenary": "MIN. CATENARY DOUBLE TRACK ROUTES",
       "minTwoWay": "MIN. OTHER DOUBLE TRACK ROUTES"
     },
-
     "sceneries-search": "SCENERY SEARCH:",
     "sceneries-placeholder": "Enter scenery name...",
     "authors-search": "SEARCH BY AUTHOR NAME (other filters apply):",
     "authors-placeholder": "Enter the author nickname...",
     "search-button-title": "SEARCH",
-
     "minimum-hours-title": "SHOW ONLY SCENERIES UNTIL:",
     "now": "NOW",
     "hour": "h",
@@ -370,7 +340,6 @@
     "no-trains": "No trains to show here!",
     "loading": "Loading train data...",
     "offline": "Offline ride",
-
     "stats": "TRAFFIC STATISTICS",
     "stats-speed": "TRAINS SPEED (MIN, AVG, MAX) [km/h]",
     "stats-length": "TIMETABLES LENGTH (MIN, AVG, MAX) [km]",
@@ -378,23 +347,17 @@
     "stats-special-twr": "HIGH RISK",
     "stats-special-skr": "EXCEEDED STRUCT. GAUGE",
     "stats-locos": "MOST COMMON UNITS",
-
     "current-scenery": "on scenery",
     "current-signal": "at signal",
     "current-track": "on track",
-
+    "vmax-tooltip": "Maximum speed based on vehicles and acceptable train mass",
-    "vmax-tooltip": "Maximum train speed based on rolling stock vehicles - braked weight is not included",
-   
     "catenary-tooltip": "Electrified route",
     "no-catenary-tooltip": "Non-electrified route",
     "sbl-tooltip": "Route with SBL\n(automatic block signalling)",
-
     "delayed": "Delayed: ",
     "preponed": "Ahead of schedule: ",
     "on-time": "On time",
-
     "route-progress": "Progress: ",
-
     "detailed-timetable": "Detailed timetable for train no. ",
     "via-title": "Via: ",
     "no-timetable": "no current timetable",
@@ -407,23 +370,23 @@
     "timetable-comments": "Exploitation comments available for this train",
     "comment": "Exploitation comments for: ",
     "table-limit": "For performance reasons there's a limit of 10 trains shown at the same time.",
-
     "last-seen-now": "since now",
     "last-seen-min": "since one minute",
     "last-seen-ago": "since {minutes} minutes",
-
     "scenery-offline": "Offline ride",
     "timeout": "An error occured while trying to refresh SWDR timetable data!",
-
     "driver-journal-link": "DRIVER JOURNAL",
+    "driver-srjp-link": "SRJP",
     "driver-return-link": "GO BACK",
-
     "driver-not-found-header": "Train not found! :/",
     "driver-not-found-desc-1": "This train has already been terminated, changed its number or is offline.",
     "driver-not-found-desc-2": "You can browse timetable history in the",
     "driver-not-found-journal": "TIMETABLES JOURNAL",
     "driver-not-found-others": "Player {driver} is online as:",
-    "driver-not-found-return": "GO BACK TO THE MAIN SITE"
+    "driver-not-found-return": "GO BACK TO THE MAIN SITE",
+    "stock-copy": "COPY THE STOCK",
+    "stock-clipboard-success": "Successfully copied the railway stock in a text form to your clipboard!",
+    "stock-clipboard-failure": "Oops! Something happened and the railway stock couldn't be copied to your clipboard! :/"
   },
   "train-stats": {
     "stats-button": "STATISTICS",
@@ -445,14 +408,10 @@
     "loading": "Loading dispatcher history data...",
     "no-history": "No dispatcher history found!",
     "data-refreshed-at": "Data refreshed at",
-
     "section-timetables": "TIMETABLES",
     "section-dispatchers": "DISPATCHERS",
-
     "no-further-data": "No further data for current parameters",
     "loading-further-data": "Loading...",
-    
-
     "route-length": "Route length:",
     "station-count": "Stations:",
     "dispatcher-name": "Author",
@@ -461,29 +420,25 @@
     "timetable-fulfilled": "FULFILLED",
     "timetable-abandoned": "ABANDONED",
     "timetable-online-button": "ONLINE TIMETABLE",
-
     "online-since": "ONLINE SINCE",
     "duty-lasted": "The duty lasted",
-
     "hours": "{value} hour | {value} hours",
     "minutes": "{value} min | {value} mins",
     "seconds": "{value} s",
-
     "entry-details": "DETAILS",
     "no-entry-details": "NO DETAILS AVAILABLE",
-
     "stock-length": "Length",
     "stock-mass": "Mass",
     "stock-max-speed": "Max. speed",
-
+    "stock-timetable-speed": "Timetable speed",
     "stock-dangers": "ADDITIONAL NOTES",
     "stock-preview": "STOCK PREVIEW",
-
+    "stock-copy": "COPY THE STOCK",
+    "stock-clipboard-success": "Successfully copied the railway stock in a text form to your clipboard:",
+    "stock-clipboard-failure": "Oops! Something happened and the railway stock couldn't be copied to your clipboard! :/",
     "load-data": "Load further data...",
-
     "last-seen-at": "Last seen at",
     "currently-at": "Currently at",
-
     "driver-stats": {
       "button": "DRIVER STATS",
       "title": "{name}'s DRIVER STATS",
@@ -494,7 +449,6 @@
       "distance": "DISTANCE",
       "stations": "STATIONS"
     },
-
     "daily-stats": {
       "button": "DAILY STATS",
       "title": "STATS OF THE DAY",
@@ -506,14 +460,12 @@
       "most-active-driver": "The most active driver: {driver} (total driven distance: {distance})",
       "longest-duties": "The longest service: {dispatcher} at {station} (duration: {duration})",
       "count": "timetable | timetables",
-
       "rippedSwitches": "RIPPED SWITCHES",
       "derailments": "DERAILMENTS",
       "skippedStopSignals": "SKIPPED STOP SIGNALS",
       "radioStops": "RADIOSTOPS",
       "kills": "KILLS"
     },
-
     "dispatcher-stats": {
       "button": "DISPATCHER STATS",
       "title": "{name}'s DISPATCHER STATS",
@@ -527,13 +479,10 @@
       "timetables-max": "LONGEST TIMETABLE",
       "timetables-avg": "AVG TIMETABLE DISTANCE"
     },
-
     "stats-loading": "Fetching statistics...",
     "stats-error": "Oops! An unexpected error occurred while trying to fetch statistics! :/",
-
     "timetable-location-signal": "signal:",
     "timetable-location-route": "route:",
-
     "history-name": "Scenery name",
     "history-hash": "Hash",
     "history-dispatcher": "Dispatcher",
@@ -560,30 +509,22 @@
     "project-title": "Project name",
     "one-way-routes": "One way routes",
     "two-way-routes": "Two way routes",
-
     "option-active-timetables": "Active timetables",
     "option-timetables-history": "Timetables history PL1",
     "option-dispatchers-history": "Dispatchers history PL1",
-
     "timetable-via": "ALL TIMETABLES",
     "timetable-issuedFrom": "BEGINS HERE",
     "timetable-terminatingAt": "TERMINATES HERE",
-
     "timetable-issued-date": "Issued",
     "timetable-issued-by": " by:",
     "timetable-issued-for": " for driver:",
-
     "dispatcher-rate": "Rate:",
     "dispatcher-status-changes": "Status changes:",
-
     "req-level": "all dispatcher levels | dispatcher level {lvl} required | dispatcher level {lvl} required",
     "history-list-empty": "No recorded scenery history!",
-
     "forum-topic": "Official {name} forum topic",
-
     "pragotron-link": "Timetable pallet board",
     "tablice-link": "Timetable summary board (by Thundo)",
-
     "bottom-info": "Show full history in the Journal tab"
   },
   "availability": {
@@ -600,10 +541,8 @@
     "terminated": "Timetable terminated",
     "begins": "BEGINS HERE",
     "terminates": "TERMINATES\nHERE",
-
     "from": "FROM",
     "to": "TO",
-
     "desc-arriving": "The train is not here yet. It's going to come from: {prevStationName} (szlak {prevDepartureLine})",
     "desc-online": "The train is at the station. It's going to leave to: {nextStationName} (szlak {nextArrivalLine})",
     "desc-stopped": "The train is at the station and is stopped. It's going to leave towards: {nextStationName} (szlak {nextArrivalLine})",
@@ -618,4 +557,4 @@
     "search-train": "Train no.",
     "search-driver": "Driver name"
   }
-}
+}

src/locales/pl.json

@@ -21,7 +21,7 @@
     "driver-message": "Maszynista wspierający projekt Stacjownika!"
   },
   "warnings": {
-    "TWR": "Pociąg z towarami niebezpiecznie wysokiego ryzyka",
+    "TWR": "Pociąg z towarami niebezpiecznymi wysokiego ryzyka",
     "SKR": "Pociąg z przekroczoną skrajnią",
     "PN": "Pociąg z przesyłkami nadzwyczajnymi",
     "TN": "Pociąg z towarami niebezpiecznymi",
@@ -45,7 +45,9 @@
     "loading": "Pobieranie danych...",
     "error": "Wystąpił problem z załadowaniem danych!",
     "no-result": "Brak wyników o podanych kryteriach!",
-    "offline": "Aplikacja w trybie offline!"
+    "offline": "Aplikacja w trybie offline!",
+    "tooltip-driver-offline": "Maszynista offline",
+    "tooltip-scenery-offline": "Sceneria offline"
   },
   "footer": {
     "discord": "Serwer Discord Stacjownika"
@@ -54,20 +56,16 @@
     "EI": "ekspres krajowy",
     "EC": "ekspres międzynarodowy",
     "EN": "ekspres krajowy nocny",
-
     "MP": "międzywojewódzki pospieszny",
     "MO": "międzywojewódzki osobowy",
     "MM": "międzynarodowy pospieszny",
     "MH": "międzywojewódzki pospieszny (nocny)",
-
     "RP": "wojewódzki pospieszny",
     "RO": "wojewódzki osobowy",
     "RM": "wojewódzki osobowy międzynarodowy",
     "RA": "wojewódzki osobowy aglomeracyjny",
-
     "PW": "pasażerski próżny - służbowy",
     "PX": "pasażerski próżny próbny",
-
     "TC": "towarowy międzynarodowy intermodalny",
     "TG": "towarowy międzynarodowy masowy",
     "TR": "towarowy międzynarodowy niemasowy",
@@ -77,18 +75,14 @@
     "TK": "towarowy zdawczy",
     "TS": "towarowy próżny próbny",
     "TH": "skład lokomotyw (powyżej 3 pojazdów)",
-
     "LT": "lokomotywa towarowa luzem",
     "LP": "lokomotywa pasażerska luzem",
     "LS": "lokomotywa manewrowa luzem",
     "LZ": "lokomotywa dla poc. utrzymaniowo-naprawczych",
-
     "ZN": "inspekcyjny / diagnostyczny",
     "ZU": "inny utrzymaniowy",
     "ZG": "ratunkowy (kat. wycofana)",
-
     "AP": "wojewódzki osobowy (kat. wycofana)",
-
     "E": "elektrowóz",
     "J": "EZT",
     "S": "spalinowóz",
@@ -127,7 +121,6 @@
     "mechaniczne": "mechaniczne",
     "mechaniczne+SPK": "mechaniczne z SPK",
     "mechaniczne+SCS": "mechaniczne z SCS",
-
     "abbrevs": {
       "SPK": "SPK",
       "SCS": "SCS",
@@ -156,14 +149,11 @@
   "options": {
     "filters": "FILTRY",
     "donate": "WESPRZYJ",
-
     "search-button": "SZUKAJ",
     "reset-button": "ZRESETUJ",
-
     "sort-title": "SORTUJ WG:",
     "filter-title": "FILTRUJ WG:",
     "search-title": "SZUKAJ:",
-
     "search-train-no": "Nr pociągu",
     "search-train": "Nr pociągu / #",
     "search-driver": "Nick maszynisty",
@@ -173,10 +163,10 @@
     "search-issuedFrom": "Sceneria początkowa",
     "search-via": "Przez scenerię",
     "search-terminatingAt": "Sceneria końcowa",
-    "search-timetables-date": "Data rozkładu jazdy (UTC+2 / CEST)",
+    "search-timetables-date": "Data rozkładu jazdy",
-    "search-dispatchers-date": "Data służby (UTC+2 / CEST)",
+    "search-dispatchers-date": "Data służby (od / do)",
-    "search-date": "Data (UTC+2 / CEST)",
+    "search-date-from": "Data (UTC+2 / CEST)",
-
+    "search-date-to": "Data (UTC+2 / CEST)",
     "sort-routeDistance": "kilometraż",
     "sort-allStopsCount": "stacje",
     "sort-beginDate": "data",
@@ -184,7 +174,6 @@
     "sort-timestampFrom": "data",
     "sort-currentDuration": "czas dyżuru",
     "sort-id": "id rozkładu",
-
     "sort-mass": "masa",
     "sort-speed": "prędkość",
     "sort-length": "długość",
@@ -192,7 +181,6 @@
     "sort-progress": "przebyta trasa",
     "sort-delay": "opóźnienie",
     "sort-comments": "uwagi ekspl.",
-
     "filter-withComments": "UWAGI EKSPLOATACYJNE",
     "filter-noComments": "BEZ UWAG",
     "filter-twr": "TWR",
@@ -207,13 +195,10 @@
     "filter-other": "INNE",
     "filter-noTimetable": "BEZ RJ",
     "filter-withTimetable": "ROZKŁAD JAZDY",
-
     "filter-reset": "ZRESETUJ FILTRY",
     "filter-clear": "WYŁĄCZ FILTRY",
-
     "filter-section-timetable-status": "STATUS ROZKŁADU JAZDY",
     "filter-section-special": "TYPY SPECJALNE",
-
     "filter-all-specials": "WSZYSTKIE",
     "filter-abandoned": "PORZUCONE",
     "filter-fulfilled": "WYPEŁNIONE",
@@ -221,7 +206,6 @@
   },
   "filters": {
     "desc": " &bull; Kliknięcie: zaznaczenie / odznaczenie filtru <br /> &bull; Podwójne kliknięcie: odznaczenie reszty filtrów z <b class='text--primary'>grupy</b> <br /> &bull; <span style='color: coral'>RESET</span>: zresetowanie filtrów z <b class='text--primary'>grupy</b>",
-
     "sections": {
       "quick": "SZYBKIE FILTRY",
       "stationType": "RODZAJ STACJI",
@@ -236,18 +220,14 @@
       "timetables": "AKTYWNE ROZKŁADY JAZDY",
       "spawns": "OTWARTE SPAWNY"
     },
-
     "changed-filters-count": "Zmienione filtry:",
     "no-changed-filters": "Brak zmienionych filtrów",
-
     "all-available": "WSZYSTKIE DOSTĘPNE",
     "all-free": "WSZYSTKIE WOLNE",
-
     "endingStatus": "KOŃCZY",
     "afkStatus": "Z/W",
     "noSpaceStatus": "BRAK MIEJSCA",
     "unavailableStatus": "NIEDOSTĘPNY",
-
     "title": "FILTRUJ STACJE",
     "default": "DOMYŚLNA",
     "notDefault": "POZA PACZKĄ",
@@ -256,7 +236,6 @@
     "unavailable": "NIEDOSTĘPNA",
     "nonPublic": "NIEPUBLICZNA",
     "abandoned": "WYCOFANA",
-
     "SPK": "SPK",
     "SPK-R": "SPK + RĘCZNE",
     "SPK-M": "SPK + MECH.",
@@ -265,16 +244,12 @@
     "SCS-M": "SCS + MECH.",
     "SPE": "SPE",
     "manual": "RĘCZNE",
-
     "SUP": "SUP (RASP-UZK)",
     "noSUP": "BEZ SUP",
-
     "ASDEK": "ASDEK",
     "noASDEK": "BEZ ASDEK-a",
-
     "SBL": "SAMOCZYNNA",
     "PBL": "PÓŁSAMOCZYNNA",
-
     "mechanical": "MECHANICZNE",
     "modern": "WSPÓŁCZESNA",
     "semaphores": "KSZTAŁTOWA",
@@ -282,13 +257,10 @@
     "historical": "HISTORYCZNA",
     "free": "WOLNA",
     "occupied": "ZAJĘTA",
-
     "withActiveTimetables": "AKTYWNE",
     "withoutActiveTimetables": "BEZ AKTYWNYCH",
-
     "junction": "WĘZŁOWE",
     "nonJunction": "INNE",
-
     "sliders": {
       "minLevel": "MIN. WYMAGANY POZIOM DYŻURNEGO",
       "maxLevel": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
@@ -299,7 +271,6 @@
       "minTwoWayCatenary": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
       "minTwoWay": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
     },
-
     "sceneries-search": "WYSZUKAJ SCENERIĘ:",
     "sceneries-placeholder": "Wpisz nazwę scenerii...",
     "authors-search": "WYSZUKAJ AUTORA (uwzględnia inne filtry):",
@@ -365,23 +336,17 @@
     "no-trains": "Brak pociągów do wyświetlenia!",
     "loading": "Pobieranie danych o pociągach...",
     "offline": "Przejazd offline",
-
     "current-scenery": "na scenerii",
     "current-signal": "przy semaforze",
     "current-track": "na szlaku",
-
+    "vmax-tooltip": "Maksymalna prędkość obliczona na podstawie pojazdów w składzie i masy dopuszczalnej",
-    "vmax-tooltip": "Maksymalna prędkość na podstawie pojazdów w składzie - nie bierze pod uwagę masy hamowania",
-
     "catenary-tooltip": "Szlak zelektryfikowany",
     "no-catenary-tooltip": "Szlak niezelektryfikowany",
     "sbl-tooltip": "Szlak posiadający\nsamoczynną blokadę liniową",
-
     "delayed": "Opóźniony: ",
     "preponed": "Przed czasem: ",
     "on-time": "Planowo",
-
     "route-progress": "Postęp: ",
-
     "detailed-timetable": "Szczegółowy rozkład jazdy pociągu ",
     "via-title": "Przez: ",
     "no-timetable": "brak rozkładu jazdy",
@@ -392,24 +357,23 @@
     "loco-diesel": "Spalinowóz",
     "timetable-comments": "Pociąg z uwagami eksploatacyjnymi",
     "comment": "Uwagi eksploatacyjne dla: ",
-
     "last-seen-now": "od niedawna",
     "last-seen-min": "od minuty",
     "last-seen-ago": "od {minutes} minut",
-
     "scenery-offline": "Przejazd offline",
-
     "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR",
-
     "driver-journal-link": "DZIENNIK MASZYNISTY",
+    "driver-srjp-link": "SRJP",
     "driver-return-link": "POWRÓT",
-
     "driver-not-found-header": "Nie znaleziono pociągu! :/",
     "driver-not-found-desc-1": "Ten pociąg prawdopodobnie zakończył już swój bieg, zmienił numer lub jest offline.",
     "driver-not-found-desc-2": "Historię rozkładów jazdy możesz przejrzeć w",
     "driver-not-found-journal": "DZIENNIKU RJ",
     "driver-not-found-others": "Gracz {driver} jest online jako:",
-    "driver-not-found-return": "WRÓĆ NA STRONĘ GŁÓWNĄ"
+    "driver-not-found-return": "WRÓĆ NA STRONĘ GŁÓWNĄ",
+    "stock-copy": "SKOPIUJ SKŁAD",
+    "stock-clipboard-success": "Pomyślnie skopiowano skład w postaci tekstowej do schowka!",
+    "stock-clipboard-failure": "Ups! Nie udało się skopiować składu do schowka! :/"
   },
   "train-stats": {
     "stats-button": "STATYSTYKI",
@@ -431,19 +395,15 @@
     "loading": "Ładowanie historii dyżurów...",
     "no-history": "Brak historii dyżurów dla tej scenerii!",
     "data-refreshed-at": "Dane odświeżone o",
-
     "section-timetables": "ROZKŁADY JAZDY",
     "section-dispatchers": "DYŻURNI",
-
     "no-further-data": "Brak dalszych wyników dla podanych parametrów",
     "loading-further-data": "Ładowanie...",
-
     "online-since": "ONLINE OD",
     "duty-lasted": "Dyżur trwał",
     "hours": "{value} godz.",
     "minutes": "{value} min.",
     "seconds": "{value} sek.",
-
     "route-length": "Kilometraż:",
     "station-count": "Stacje:",
     "dispatcher-name": "Autor",
@@ -452,22 +412,20 @@
     "timetable-fulfilled": "WYPEŁNIONY",
     "timetable-abandoned": "PORZUCONY",
     "timetable-online-button": "RJ ONLINE",
-
     "entry-details": "SZCZEGÓŁY",
     "no-entry-details": "BRAK DOSTĘPNYCH SZCZEGÓŁÓW",
-
     "stock-length": "Długość",
     "stock-mass": "Masa",
     "stock-max-speed": "Prędkość maks.",
-
+    "stock-timetable-speed": "Prędkość RJ",
     "stock-dangers": "DODATKOWE UWAGI",
     "stock-preview": "PODGLĄD SKŁADU",
-
+    "stock-copy": "SKOPIUJ SKŁAD",
+    "stock-clipboard-success": "Pomyślnie skopiowano skład w postaci tekstowej do schowka:",
+    "stock-clipboard-failure": "Ups! Nie udało się skopiować składu do schowka! :/",
     "load-data": "Pobierz dalszą historię...",
-
     "last-seen-at": "Ostatnio widziany na: ",
     "currently-at": "Obecnie na scenerii: ",
-
     "driver-stats": {
       "button": "STAT. MASZYNISTY",
       "title": "STATYSTYKI MASZYNISTY {name}",
@@ -478,7 +436,6 @@
       "distance": "DYSTANS",
       "stations": "STACJE"
     },
-
     "daily-stats": {
       "button": "STATYSTYKI DNIA",
       "title": "STATYSTYKI DNIA",
@@ -490,14 +447,12 @@
       "most-active-driver": "Najaktywniejszy maszynista: {driver} (łączny przejechany dystans: {distance})",
       "longest-duties": "Najdłuższa służba: {dispatcher} na scenerii {station} (czas trwania: {duration})",
       "count": "rozkład jazdy | rozkładów jazdy",
-
       "rippedSwitches": "ROZPRUTE ZWROTNICE",
       "derailments": "WYKOLEJENIA",
       "skippedStopSignals": "POMINIĘTE S1",
       "radioStops": "RADIOSTOPY",
       "kills": "POTRĄCENIA"
     },
-
     "dispatcher-stats": {
       "button": "STATYSTYKI DYŻURNEGO",
       "title": "STATYSTYKI DYŻURNEGO {name}",
@@ -510,13 +465,10 @@
       "timetables-max": "NAJDŁUŻSZY WYSTAWIONY RJ",
       "timetables-avg": "ŚREDNIA WYSTAWIONYCH RJ"
     },
-
     "stats-loading": "Pobieranie statystyk...",
     "stats-error": "Ups! Wystąpił błąd podczas próby pobrania statystyk!",
-
     "timetable-location-signal": "semafor:",
     "timetable-location-route": "szlak:",
-
     "history-name": "Sceneria",
     "history-hash": "Hash",
     "history-dispatcher": "Dyżurny",
@@ -543,30 +495,22 @@
     "project-title": "Projekt",
     "one-way-routes": "Szlaki jednotorowe",
     "two-way-routes": "Szlaki dwutorowe",
-
     "option-active-timetables": "Aktywne rozkłady jazdy",
     "option-timetables-history": "Historia rozkładów PL1",
     "option-dispatchers-history": "Historia dyżurów PL1",
-
     "timetable-via": "WSZYSTKIE RJ",
     "timetable-issuedFrom": "ROZPOCZYNA BIEG",
     "timetable-terminatingAt": "KOŃCZY BIEG",
-
     "timetable-issued-date": "Wystawiony",
     "timetable-issued-by": " przez:",
     "timetable-issued-for": " dla maszynisty:",
-
     "dispatcher-rate": "Ocena:",
     "dispatcher-status-changes": "Zmiany statusów:",
-
     "req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego",
     "history-list-empty": "Brak historii dla tej scenerii!",
-
     "forum-topic": "Oficjalny wątek scenerii {name}",
-
     "pragotron-link": "Paletowa tablica informacyjna",
     "tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)",
-
     "bottom-info": "Pokaż pełną historię w zakładce Dziennika"
   },
   "availability": {
@@ -583,10 +527,8 @@
     "terminated": "Rozkład jazdy zakończony",
     "begins": "ROZPOCZYNA\nBIEG",
     "terminates": "KOŃCZY BIEG",
-
     "from": "Z",
     "to": "DO",
-
     "desc-arriving": "Pociągu nie ma jeszcze na tej scenerii. Przyjedzie z: {prevStationName} (szlak {prevDepartureLine})",
     "desc-online": "Pociąg jest na tej scenerii. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
     "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
@@ -599,4 +541,4 @@
   "history": {
     "title": "DZIENNIK ROZKŁADÓW JAZDY"
   }
-}
+}

src/store/mainStore.ts

@@ -43,7 +43,7 @@ export const useMainStore = defineStore('mainStore', {
       sceneriesTrains.clear();
 
       return (apiStore.activeData?.trains ?? [])
-        .filter((train) => train.timetable || train.online)
+        .filter((train) => train.timetable || train.lastSeen >= Date.now() - 60000)
         .map((train) => {
           const stock = train.stockString.split(';');
           const locoType = stock ? stock[0] : train.stockString;
@@ -97,6 +97,7 @@ export const useMainStore = defineStore('mainStore', {
                   warningNotes: timetable.warningNotes,
                   hasDangerousCargo: timetable.hasDangerousCargo,
                   hasExtraDeliveries: timetable.hasExtraDeliveries,
+                  trainMaxSpeed: timetable.trainMaxSpeed,
 
                   timetablePath: timetable.path.split(';').map((pathElementString) => {
                     const [arrival, station, departure] = pathElementString.split(',');
@@ -112,13 +113,18 @@ export const useMainStore = defineStore('mainStore', {
               : undefined
           } as Train;
 
+          const stationNameKey =
+            train.currentStationName.indexOf('.sc') != -1
+              ? train.currentStationName.split(' ').slice(0, -1).join(' ')
+              : train.currentStationName;
+
           // Sceneries trains map
-          if (sceneriesTrains.has(train.currentStationName)) {
+          if (sceneriesTrains.has(stationNameKey)) {
-            sceneriesTrains.set(train.currentStationName, [
+            sceneriesTrains.set(stationNameKey, [
-              ...sceneriesTrains.get(train.currentStationName)!,
+              ...sceneriesTrains.get(stationNameKey)!,
               trainObj
             ]);
-          } else sceneriesTrains.set(train.currentStationName, [trainObj]);
+          } else sceneriesTrains.set(stationNameKey, [trainObj]);
 
           // Checkpoints trains map
           if (trainObj.timetableData) {
@@ -216,13 +222,15 @@ export const useMainStore = defineStore('mainStore', {
         return acc;
       }, [] as ActiveScenery[]);
 
+      const referenceTimestamp = Date.now();
+
       const onlineActiveSceneries = apiStore.activeData?.activeSceneries.reduce((list, scenery) => {
         if (scenery.isOnline !== 1 && Date.now() - scenery.lastSeen > 1000 * 60 * 2) return list;
         if (scenery.dispatcherStatus == Status.ActiveDispatcher.UNKNOWN) return list;
 
         const dispatcherTimestamp =
           scenery.dispatcherStatus == Status.ActiveDispatcher.NO_LIMIT
-            ? Date.now() + 25500000
+            ? referenceTimestamp + 25500000
             : scenery.dispatcherStatus > 5
               ? scenery.dispatcherStatus
               : null;
@@ -315,6 +323,8 @@ export const useMainStore = defineStore('mainStore', {
       return apiStore.sceneryData.map((scenery) => {
         const routes = scenery.routesInfo.reduce(
           (acc, route) => {
+            acc['all'].push(route);
+
             if (route.hidden) return acc;
 
             const tracksKey = route.routeTracks == 2 ? 'double' : 'single';
@@ -345,6 +355,7 @@ export const useMainStore = defineStore('mainStore', {
             doubleElectrifiedNames: [],
             doubleOtherNames: [],
             sblNames: [],
+            all: [],
             minRouteSpeed: 0,
             maxRouteSpeed: 0
           } as StationRoutes

src/styles/global.scss

@@ -227,7 +227,7 @@ a.a-button {
     font-weight: bold;
 
     &:hover {
-      background-color: #424242;
+      background-color: #505050;
     }
 
     &:disabled {

src/typings/api.ts

@@ -196,9 +196,7 @@ export namespace API {
       timetableId: number;
       category: string;
       route: string;
-
       stopList: TimetableStop[];
-
       TWR: boolean;
       SKR: boolean;
       hasDangerousCargo: boolean;
@@ -206,6 +204,7 @@ export namespace API {
       warningNotes: string | null;
       sceneries: string[];
       path: string;
+      trainMaxSpeed: number;
     }
   }
 
@@ -270,6 +269,7 @@ export namespace API {
       warningNotes: string | null;
       hasDangerousCargo: boolean;
       hasExtraDeliveries: boolean;
+      trainMaxSpeed?: number;
     }
 
     export type Response = Data[];

src/typings/common.ts

@@ -1,4 +1,5 @@
 import { RouteLocationRaw } from 'vue-router';
+import { StationJSONData } from '../store/typings';
 
 export type Availability = 'default' | 'unavailable' | 'nonPublic' | 'abandoned' | 'nonDefault';
 export type ScenerySpawnType = 'passenger' | 'freight' | 'loco' | 'all';
@@ -90,6 +91,7 @@ export interface TrainTimetableData {
   routeDistance: number;
   sceneries: string[];
   timetablePath: TimetablePathElement[];
+  trainMaxSpeed: number;
 }
 
 export interface Station {
@@ -122,6 +124,7 @@ export interface StationGeneralInfo {
 export interface StationRoutes {
   single: StationRoutesInfo[];
   double: StationRoutesInfo[];
+  all: StationRoutesInfo[];
 
   singleElectrifiedNames: string[];
   singleOtherNames: string[];
@@ -142,6 +145,7 @@ export interface StationRoutesInfo {
   routeSpeed: number;
   routeTracks: number;
   hidden?: boolean;
+  realLineNo?: number;
 }
 
 export interface ActiveScenery {

src/views/DriverView.vue

@@ -2,27 +2,50 @@
   <section class="driver-view">
     <div class="view-wrapper">
       <div v-if="chosenTrain">
-        <div class="actions">
+        <div class="actions-container">
-          <a class="a-button btn--image" @click="$router.back()">
+          <div class="actions actions-left">
-            <img src="/images/icon-back.svg" alt="train icon" />
+            <a class="a-button btn--image" @click="$router.back()">
-            <span>
+              <img src="/images/icon-back.svg" alt="train icon" />
-              {{ $t('trains.driver-return-link') }}
+              <span>
-            </span>
+                {{ $t('trains.driver-return-link') }}
-          </a>
+              </span>
+            </a>
+          </div>
 
-          <router-link
+          <div class="actions actions-right">
-            :to="`/journal/timetables?search-driver=${chosenTrain.driverName}`"
+            <a
-            class="a-button btn--image"
+              class="a-button btn--image"
-          >
+              :href="`https://srjp-td2.web.app/?id=${chosenTrain.id}`"
-            <span class="hidable">
+              target="_blank"
-              {{ $t('trains.driver-journal-link') }}
+            >
-            </span>
+              <span class="hidable">
-            <img src="/images/icon-train.svg" alt="train icon" />
+                {{ $t('trains.driver-srjp-link') }}
-          </router-link>
+              </span>
+
+              <img src="/images/icon-srjp.svg" alt="srjp icon" />
+            </a>
+
+            <router-link
+              :to="`/journal/timetables?search-driver=${chosenTrain.driverName}`"
+              class="a-button btn--image"
+            >
+              <span class="hidable">
+                {{ $t('trains.driver-journal-link') }}
+              </span>
+
+              <img src="/images/icon-train.svg" alt="train icon" />
+            </router-link>
+          </div>
         </div>
 
         <div class="train-card">
-          <TrainInfo :train="chosenTrain" :extended="true" ref="trainInfo" />
+          <TrainInfo :train="chosenTrain" :extended="true" />
+
+          <button class="btn btn--action" style="margin: 1em 0" @click="copyStockToClipboard()">
+            <i class="fa-regular fa-copy"></i> {{ $t('trains.stock-copy') }}
+          </button>
+
+          <StockList :trainStockList="chosenTrain.stockList" />
           <TrainSchedule :train="chosenTrain" />
         </div>
       </div>
@@ -69,11 +92,13 @@
 import { computed } from 'vue';
 import TrainInfo from '../components/TrainsView/TrainInfo.vue';
 import TrainSchedule from '../components/TrainsView/TrainSchedule.vue';
+import StockList from '../components/Global/StockList.vue';
 import Loading from '../components/Global/Loading.vue';
 import { useMainStore } from '../store/mainStore';
 import { useApiStore } from '../store/apiStore';
 import { Status } from '../typings/common';
 import { regions as regionsJSON } from '../data/options.json';
+import { useI18n } from 'vue-i18n';
 
 const props = defineProps({
   trainId: {
@@ -88,6 +113,8 @@ const props = defineProps({
 const mainStore = useMainStore();
 const apiStore = useApiStore();
 
+const i18n = useI18n();
+
 const chosenTrain = computed(() =>
   mainStore.trainList.find((train) => train.id == props.trainId || train.modalId == props.modalId)
 );
@@ -99,6 +126,24 @@ const otherDriverTrains = computed(() => {
       (train.timetableData || train.online || train.lastSeen >= Date.now() - 60000)
   );
 });
+
+function copyStockToClipboard() {
+  const stockString = chosenTrain.value?.stockList.join(';');
+
+  if (!stockString) {
+    alert(i18n.t('trains.stock-clipboard-failure'));
+    return;
+  }
+
+  navigator.clipboard
+    .writeText(stockString)
+    .then(() => {
+      prompt(i18n.t('trains.stock-clipboard-success'), stockString);
+    })
+    .catch(() => {
+      alert(i18n.t('trains.stock-clipboard-failure'));
+    });
+}
 </script>
 
 <style lang="scss" scoped>
@@ -113,14 +158,19 @@ $viewBgCol: #1a1a1a;
   min-height: calc(100vh - 7em);
 }
 
-.actions {
+.actions-container {
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
   gap: 0.5em;
 }
 
-.actions > a {
+.actions {
+  display: flex;
+  gap: 0.5em;
+}
+
+.actions-container > .actions > a {
   background-color: $viewBgCol;
   padding: 0.5em;
   border-radius: 0.5em 0.5em 0 0;
@@ -131,6 +181,7 @@ $viewBgCol: #1a1a1a;
 }
 
 .train-card {
+  padding: 1em;
   background-color: $viewBgCol;
   border-radius: 0 0 0.5em 0.5em;
 }
@@ -159,7 +210,7 @@ $viewBgCol: #1a1a1a;
 }
 
 @include smallScreen {
-  .actions > a > span.hidable {
+  span.hidable {
     display: none;
   }
 }

src/views/JournalDispatchers.vue

@@ -65,6 +65,8 @@ interface DispatchersQueryParams {
   stationHash?: string;
   timestampFrom?: number;
   timestampTo?: number;
+  dateFrom?: string;
+  dateTo?: string;
   countFrom?: number;
   countLimit?: number;
   sortBy?: Journal.DispatcherSorter['id'];
@@ -127,7 +129,8 @@ export default defineComponent({
     const searchersValues = reactive({
       'search-dispatcher': '',
       'search-station': '',
-      'search-date': ''
+      'search-date-from': '',
+      'search-date-to': ''
     } as Journal.DispatcherSearchType);
 
     provide('sorterActive', sorterActive);
@@ -189,7 +192,8 @@ export default defineComponent({
     handleRouteParams() {
       this.$router.push({
         query: {
-          'search-date': this.searchersValues['search-date'] || undefined,
+          'search-date-from': this.searchersValues['search-date-from'] || undefined,
+          'search-date-to': this.searchersValues['search-date-to'] || undefined,
           'search-station': this.searchersValues['search-station'] || undefined,
           'search-dispatcher': this.searchersValues['search-dispatcher'] || undefined
         }
@@ -235,7 +239,8 @@ export default defineComponent({
     },
 
     setOptions(options: { [key: string]: string }) {
-      this.searchersValues['search-date'] = options['search-date'] ?? '';
+      this.searchersValues['search-date-from'] = options['search-date-from'] ?? '';
+      this.searchersValues['search-date-to'] = options['search-date-to'] ?? '';
       this.searchersValues['search-station'] = options['search-station'] ?? '';
       this.searchersValues['search-dispatcher'] = options['search-dispatcher'] ?? '';
 
@@ -267,22 +272,18 @@ export default defineComponent({
       this.scrollDataLoaded = true;
     },
 
-    async fetchHistoryData() {
+    async fetchHistoryData() {      
       const queryParams: DispatchersQueryParams = {};
 
       const dispatcherName = this.searchersValues['search-dispatcher'].trim() || undefined;
       const stationName = this.searchersValues['search-station'].trim() || undefined;
-      const dateString = this.searchersValues['search-date'].trim() || undefined;
+      const dateFromString = this.searchersValues['search-date-from'].trim() || undefined;
-
+      const dateToString = this.searchersValues['search-date-to'].trim() || undefined;
-      const timestampFrom = dateString
-        ? Date.parse(new Date(dateString).toISOString()) - 120 * 60 * 1000
-        : undefined;
-
-      const timestampTo = timestampFrom ? timestampFrom + 86400000 : undefined;
 
       queryParams['dispatcherName'] = dispatcherName;
-      queryParams['timestampFrom'] = timestampFrom;
+      queryParams['dateFrom'] = dateFromString;
-      queryParams['timestampTo'] = timestampTo;
+      queryParams['dateTo'] = dateToString ? `${dateToString}T23:00:00` : undefined;
+
       queryParams['countLimit'] = 30;
 
       if (stationName && stationName.startsWith('#'))

src/views/JournalTimetables.vue

@@ -215,7 +215,7 @@ export default defineComponent({
       'search-issuedFrom': '',
       'search-via': '',
       'search-terminatingAt': '',
-      'search-date': ''
+      'search-date-from': ''
     } as Journal.TimetableSearchType);
 
     const countFromIndex = ref(0);
@@ -352,7 +352,7 @@ export default defineComponent({
       const driverName = this.searchersValues['search-driver'].trim() || undefined;
       const trainNo = this.searchersValues['search-train'].trim() || undefined;
       const authorName = this.searchersValues['search-dispatcher'].trim() || undefined;
-      const dateFrom = this.searchersValues['search-date'].trim() || undefined;
+      const dateFrom = this.searchersValues['search-date-from'].trim() || undefined;
       const issuedFrom = this.searchersValues['search-issuedFrom'].trim() || undefined;
       const via = this.searchersValues['search-via'].trim() || undefined;
       const terminatingAt = this.searchersValues['search-terminatingAt'].trim() || undefined;

src/views/TrainsView.vue

@@ -133,4 +133,10 @@ export default defineComponent({
   position: relative;
   margin-bottom: 0.5em;
 }
+
+@include smallScreen {
+  .trains_topbar {
+    justify-content: space-between;
+  }
+}
 </style>