Wersja 1.20.3

Wersja 1.20.3

package.json

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

src/components/TrainsView/StopLabel.vue

@@ -3,13 +3,17 @@
     <span class="name" v-html="stop.nameHtml"></span>
 
     <span
-      class="date arrival"
       v-if="stop.position != 'begin'"
-      :class="{
+      class="date arrival"
-        delayed: stop.arrivalDelay > 0 && stop.status != 'unconfirmed',
+      :data-status="
-        preponed: stop.arrivalDelay < 0 && stop.status != 'unconfirmed',
+        stop.arrivalDelay > 0 && stop.status != 'unconfirmed'
-        'on-time': stop.arrivalDelay == 0 && stop.status == 'confirmed'
+          ? 'delayed'
-      }"
+          : stop.arrivalDelay < 0 && stop.status != 'unconfirmed'
+          ? 'preponed'
+          : stop.arrivalDelay == 0 && stop.status == 'confirmed'
+          ? 'on-time'
+          : ''
+      "
     >
       <span v-if="stop.arrivalDelay != 0 && stop.status != 'unconfirmed'">
         <s>{{ timestampToString(stop.arrivalScheduled) }}</s>
@@ -23,20 +27,37 @@
     </span>
 
     <span
+      v-if="
+        stop.duration ||
+        (stop.status == 'stopped' &&
+          stop.position != 'begin' &&
+          stop.departureDelay != stop.arrivalDelay)
+      "
       class="date stop"
-      v-if="stop.duration || stop.status == 'stopped'"
+      :data-stop-types="stop.type.replace(', ', '-')"
-      :class="stop.type.replace(', ', '-')"
+      :data-stop-status="
+        stop.departureDelay - stop.arrivalDelay > 0 && !stop.duration ? 'delayed' : ''
+      "
     >
-      {{ stop.duration }} {{ stop.type == '' ? 'pt' : stop.type }}
+      {{ stop.duration || stop.departureDelay - stop.arrivalDelay }}
+      {{ stop.type == '' ? 'pt' : stop.type }}
     </span>
 
     <span
+      v-if="
+        stop.position != 'end' &&
+        (stop.duration != 0 || stop.status == 'stopped' || stop.departureDelay != stop.arrivalDelay)
+      "
       class="date departure"
-      v-if="stop.position != 'end' && (stop.duration != 0 || stop.status == 'stopped')"
+      :data-status="
-      :class="{
+        stop.departureDelay > 0 && stop.status == 'confirmed'
-        delayed: stop.departureDelay > 0 && stop.status == 'confirmed',
+          ? 'delayed'
-        preponed: stop.departureDelay < 0 && stop.status == 'confirmed'
+          : stop.departureDelay < 0 && stop.status == 'confirmed'
-      }"
+          ? 'preponed'
+          : stop.departureDelay == 0 && stop.status == 'confirmed'
+          ? 'on-time'
+          : ''
+      "
     >
       <span v-if="stop.departureDelay != 0 && stop.status == 'confirmed'">
         <s>{{ timestampToString(stop.departureScheduled) }}</s>
@@ -78,6 +99,10 @@ $stopDefaultClr: #252525;
 $stopNameClr: #22a8d1;
 
 .stop-label {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+
   &[data-sbl='true'] {
     .date {
       display: none;
@@ -90,10 +115,6 @@ $stopNameClr: #22a8d1;
     }
   }
 
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-
   .name {
     background: $stopNameClr;
     padding: 0.3em 0.5em;
@@ -112,18 +133,22 @@ $stopNameClr: #22a8d1;
   }
 
   .stop {
-    &.ph,
+    &[data-stop-types='ph'],
-    &.ph-pm,
+    &[data-stop-types='ph-pm'],
-    &.pm {
+    &[data-stop-types='pm'] {
       background: $stopExchangeClr;
     }
 
     background: $stopDefaultClr;
+
+    &[data-stop-status='delayed'] {
+      color: $delayedClr;
+    }
   }
 
   .arrival,
   .departure {
-    &.delayed {
+    &[data-status='delayed'] {
       s {
         color: #999;
       }
@@ -133,7 +158,7 @@ $stopNameClr: #22a8d1;
       }
     }
 
-    &.preponed {
+    &[data-status='preponed'] {
       s {
         color: #999;
       }

src/components/TrainsView/TrainSchedule.vue

@@ -30,19 +30,12 @@
             <StopLabel :stop="stop" />
           </span>
 
-          <div class="stop_line" v-if="i < scheduleStops.length - 1">
+          <div class="stop_line">
             <!-- Grid placeholder -->
-            <div>
+            <div></div>
-              <!-- <div class="speed-departure" v-if="stop.currentDepartureRoute">
-                {{ stop.currentDepartureRoute.routeSpeed }}
-              </div>
-              <div class="speed-next-arrival" v-if="stop.nextArrivalRoute">
-                {{ stop.nextArrivalRoute.routeSpeed }}
-              </div> -->
-            </div>
 
             <div class="progress">
-              <div class="line line_connection"></div>
+              <div class="line line_connection" v-if="i < scheduleStops.length - 1"></div>
             </div>
 
             <div class="bottom-line-info">
@@ -121,13 +114,6 @@ export interface TrainScheduleStop {
   sceneryHash: string;
   distance: number;
 
-  // arrivalTrackCount: number;
-  // departureTrackCount: number;
-
-  // currentArrivalRoute?: StationRoutesInfo;
-  // currentDepartureRoute?: StationRoutesInfo;
-  // nextArrivalRoute?: StationRoutesInfo;
-
   arrivalLine: string | null;
   departureLine: string | null;
 
@@ -157,8 +143,6 @@ export default defineComponent({
   computed: {
     scheduleStops(): TrainScheduleStop[] {
       let currentSceneryIndex = 0;
-      // let lastDepartureTrackCount = 2;
-      // let lastArrivalTrackCount = 2;
 
       return (
         this.train.timetableData?.followingStops.map((stop, i, arr) => {
@@ -170,33 +154,6 @@ export default defineComponent({
           )
             currentSceneryIndex++;
 
-          // const sceneryInfo = this.apiStore.sceneryData.find(
-          //   (sd) =>
-          //     sd.name.toLocaleLowerCase() ==
-          //     this.timetableSceneryNames[currentSceneryIndex].toLocaleLowerCase()
-          // );
-
-          // const nextSceneryInfo = this.apiStore.sceneryData.find(
-          //   (sd) =>
-          //     sd.name.toLocaleLowerCase() ==
-          //     this.timetableSceneryNames[currentSceneryIndex + 1]?.toLocaleLowerCase()
-          // );
-
-          // const currentDepartureRoute = sceneryInfo?.routesInfo.find(
-          //   (r) => r.routeName == stop.departureLine
-          // );
-
-          // const currentArrivalRoute = sceneryInfo?.routesInfo.find(
-          //   (r) => r.routeName == stop.arrivalLine
-          // );
-
-          // const nextArrivalRoute = nextSceneryInfo?.routesInfo.find(
-          //   (r) => r.routeName == arr[i + 1]?.arrivalLine
-          // );
-
-          // lastDepartureTrackCount = currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount;
-          // lastArrivalTrackCount = currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount;
-
           return {
             nameHtml: stop.stopName,
             nameRaw: stop.stopNameRAW,
@@ -217,16 +174,6 @@ export default defineComponent({
             arrivalLine: stop.arrivalLine,
             departureLine: stop.departureLine,
 
-            // arrivalSpeed: nextArrivalRoute?.routeSpeed ?? null,
-            // departureSpeed: currentDepartureRoute?.routeSpeed ?? null,
-
-            // arrivalTrackCount: currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount,
-            // departureTrackCount: currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount,
-
-            // currentArrivalRoute,
-            // currentDepartureRoute,
-            // nextArrivalRoute,
-
             type: stop.stopType,
             distance: stop.stopDistance,
             isActive: this.activeMinorStops.includes(i),

src/data/mockActiveData.json

@@ -8732,7 +8732,7 @@
             "departureDelay": 0,
             "beginsHere": true,
             "terminatesHere": false,
-            "confirmed": 0,
+            "confirmed": 1,
             "stopped": 0,
             "stopTime": null
           },
@@ -9380,7 +9380,7 @@
             "stopType": "",
             "stopDistance": 123.62,
             "pointId": "1663532077406",
-            "comments": null,
+            "comments": "test121",
             "mainStop": true,
             "arrivalLine": "Sk",
             "arrivalTimestamp": 1701889320000,

src/locales/en.json

@@ -12,7 +12,7 @@
     "p4": "Every person who decides to contribute at least {b1} (in case of PayPal it must be a payment including additional transaction fees) for the development of Stacjownik, will receive (upon a personal request) {img}{b2} of username in the app and on my Discord server (after verifying the payment author, preferably by providing the username directly with the payment).",
     "p4-b1": "5 PLN",
     "p4-b2": "a symbolic highlight",
-    "p5": "Thank you and enjoy the app!<br />~ Spythegre",
+    "p5": "Thank you and enjoy the app!<br />~ Spythere",
     "action-exit": "Maybe next time...",
     "action-paypal": "DONATE WITH PAYPAL",
     "action-buycoffee": "BUY ME A COFFEE!",