From 737b1a78733c40fa9cddaa1e5b56531e18a895df Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Fri, 4 Feb 2022 15:56:30 +0100
Subject: [PATCH] =?UTF-8?q?Przywr=C3=B3cono=20widok=20historii=20rozk?=
 =?UTF-8?q?=C5=82ad=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts       |  4 ++--
 src/views/JournalView.vue | 43 ++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 62c71f5..753668c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -22,8 +22,8 @@ const routes: Array<RouteRecordRaw> = [
   },
   {
     path: "/journal",
-    name: "ErrorView",
-    component: () => import("@/views/ErrorView.vue"),
+    name: "JournalView",
+    component: () => import("@/views/JournalView.vue"),
   },
   {
     path: '/:catchAll(.*)',
diff --git a/src/views/JournalView.vue b/src/views/JournalView.vue
index 651f665..6519428 100644
--- a/src/views/JournalView.vue
+++ b/src/views/JournalView.vue
@@ -24,8 +24,7 @@
                       <span @click="navigateToTrain(!item.terminated ? item.trainNo : null)" style="cursor: pointer">
                         <b class="text--primary">{{ item.trainCategoryCode }}&nbsp;</b>
                         <b>{{ item.trainNo }}</b>
-                        | {{ item.driverName }}
-                        | {{ item.timetableId }}
+                        | <span>{{ item.driverName }}</span> | <span class="text--grayed">#{{ item.timetableId }}</span>
                       </span>
 
                       <div>
@@ -43,6 +42,26 @@
                           {{ i > 0 ? ' > ' : '' }} {{ scenery.name }}
                         </span>
                       </div>
+
+                      <div class="schedule-dates">
+                        <!-- Data odjazdu ze stacji początkowej -->
+                        <b>{{ item.route.split('|')[0] }}:</b>
+                        <s v-if="item.beginDate != item.scheduledBeginDate" class="text--grayed">
+                          {{ localeTime(item.scheduledBeginDate, $i18n.locale) }}
+                        </s>
+                        <span>{{ localeTime(item.beginDate, $i18n.locale) }} </span>&bull;
+
+                        <!-- Data przyjazdu na stację końcową / porzucenia -->
+                        <b v-if="(item.fulfilled && item.terminated) || !item.terminated"
+                          >{{ item.route.split('|').slice(-1)[0] }}:</b
+                        >
+                        <i v-else>{{ $t('history.timetable-abandoned') }} </i>
+
+                        <s v-if="item.endDate != item.scheduledEndDate && item.terminated" class="text--grayed">
+                          {{ localeTime(item.scheduledEndDate, $i18n.locale) }}
+                        </s>
+                        <span>{{ localeTime(item.endDate, $i18n.locale) }} </span>
+                      </div>
                     </span>
 
                     <b
@@ -63,27 +82,9 @@
                     </b>
                   </div>
 
-                  <div class="schedule-dates" style="margin-top: 1em;">
+                  <div style="margin-top: 1em;">
                     <div>{{ $t('history.timetable-day') }} {{ localeDay(item.beginDate, $i18n.locale) }}</div>
 
-                    <!-- Data odjazdu ze stacji początkowej -->
-                    <b>{{ item.route.split('|')[0] }}:</b>
-                    <s v-if="item.beginDate != item.scheduledBeginDate" class="text--grayed">
-                      {{ localeTime(item.scheduledBeginDate, $i18n.locale) }}
-                    </s>
-                    <span>{{ localeTime(item.beginDate, $i18n.locale) }} </span>&bull;
-
-                    <!-- Data przyjazdu na stację końcową / porzucenia -->
-                    <b v-if="(item.fulfilled && item.terminated) || !item.terminated"
-                      >{{ item.route.split('|').slice(-1)[0] }}:</b
-                    >
-                    <i v-else>{{ $t('history.timetable-abandoned') }} </i>
-
-                    <s v-if="item.endDate != item.scheduledEndDate" class="text--grayed">
-                      {{ localeTime(item.scheduledEndDate, $i18n.locale) }}
-                    </s>
-                    <span>{{ localeTime(item.endDate, $i18n.locale) }} </span>
-
                     <!-- Nick dyżurnego -->
                     <div v-if="item.authorName" class="text--grayed">
                       <b>{{ $t('history.dispatcher-name') }} {{ item.authorName }}</b>