From 8425cd4371942f43a5b8ab73e3fa7ce8f36578d6 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Wed, 21 Jun 2023 18:26:16 +0200
Subject: [PATCH] =?UTF-8?q?przyjazdy/odjazdy=20stacji=20po=C5=9Brednich=20?=
 =?UTF-8?q?RJ=20w=20dzienniku?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JournalView/JournalTimetablesList.vue     | 24 ++++++++++++++-----
 .../interfaces/api/TimetablesAPIData.ts       |  3 +++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/components/JournalView/JournalTimetablesList.vue b/src/components/JournalView/JournalTimetablesList.vue
index 6746c44..2789d9c 100644
--- a/src/components/JournalView/JournalTimetablesList.vue
+++ b/src/components/JournalView/JournalTimetablesList.vue
@@ -45,7 +45,7 @@
             <b
               class="info-status"
               :class="{
-                fulfilled: timetable.fulfilled || timetable.currentDistance >= timetable.routeDistance * 0.9,
+                fulfilled: timetable.fulfilled,
                 terminated: timetable.terminated && !timetable.fulfilled,
                 active: !timetable.terminated,
               }"
@@ -53,7 +53,7 @@
               {{
                 !timetable.terminated
                   ? $t('journal.timetable-active')
-                  : timetable.fulfilled || timetable.currentDistance >= timetable.routeDistance * 0.9
+                  : timetable.fulfilled
                   ? $t('journal.timetable-fulfilled')
                   : `${$t('journal.timetable-abandoned')} ${localeTime(timetable.endDate, $i18n.locale)}`
               }}
@@ -77,18 +77,30 @@
           >
             <span v-if="i > 0">
               &gt;
-              <span v-if="!item.showExtra.value && i == 1 && sceneryList.length > 2"
-                >... (+{{ sceneryList.length - 2 }}) &gt;</span
-              >
+              <span v-if="!item.showExtra.value && i == 1 && sceneryList.length > 2">
+                ... (+{{ sceneryList.length - 2 }}) &gt;
+              </span>
             </span>
             {{ scenery.name }}
+
             <!-- Data odjazdu ze stacji początkowej -->
             <span v-if="i == 0" v-html="scenery.beginDateHTML"></span>
+
             <!-- Data przyjazdu do stacji końcowej -->
             <span
-              v-if="i == sceneryList.length - 1 || (i == 1 && !item.showExtra.value)"
+              v-else-if="i == sceneryList.length - 1 || (i == 1 && !item.showExtra.value)"
               v-html="scenery.endDateHTML"
             ></span>
+
+            <!-- Data przyjazdu i odjazdu ze stacji pośredniej -->
+            <span v-if="item.showExtra.value && i > 0 && i < sceneryList.length - 1">
+              <span v-if="timetable.checkpointArrivals && i < timetable.checkpointArrivals.length">
+                &lpar;p. {{ localeTime(timetable.checkpointArrivals[i], $i18n.locale)
+                }}<span v-if="timetable.checkpointDepartures && i < timetable.checkpointDepartures.length">
+                  / o. {{ localeTime(timetable.checkpointDepartures[i], $i18n.locale) }}</span
+                >&rpar;
+              </span>
+            </span>
           </span>
         </div>
 
diff --git a/src/scripts/interfaces/api/TimetablesAPIData.ts b/src/scripts/interfaces/api/TimetablesAPIData.ts
index 8a32b84..a45502c 100644
--- a/src/scripts/interfaces/api/TimetablesAPIData.ts
+++ b/src/scripts/interfaces/api/TimetablesAPIData.ts
@@ -49,6 +49,9 @@ export interface TimetableHistory {
   currentSceneryHash?: string;
 
   routeSceneries?: string;
+
+  checkpointArrivals?: string[];
+  checkpointDepartures?: string[];
 }
 
 export interface SceneryTimetableHistory {