From c64112c86a394acee2ae0fdc7d6ed6e95dc65d6a Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 9 Mar 2023 14:28:16 +0100
Subject: [PATCH] dziennik RJ: dodatkowe informacje

---
 .../JournalView/JournalTimetablesList.vue     | 33 ++++++++++++-------
 src/locales/en.json                           |  2 +-
 src/locales/pl.json                           |  2 +-
 .../interfaces/api/TimetablesAPIData.ts       |  2 ++
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/components/JournalView/JournalTimetablesList.vue b/src/components/JournalView/JournalTimetablesList.vue
index 078543c..cfd0869 100644
--- a/src/components/JournalView/JournalTimetablesList.vue
+++ b/src/components/JournalView/JournalTimetablesList.vue
@@ -53,12 +53,21 @@
             </b>
           </span>
         </div>
+
         <div class="info-route">
           <b>{{ timetable.route.replace('|', ' - ') }}</b>
         </div>
+
         <hr />
+
         <div class="scenery-list">
-          <span v-for="(scenery, i) in sceneryList" :key="scenery.name" :class="{ confirmed: scenery.confirmed }">
+          <span
+            v-for="(scenery, i) in sceneryList.filter((_, i) =>
+              !item.showExtra.value ? i == 0 || i == sceneryList.length - 1 : true
+            )"
+            :key="scenery.name"
+            :class="{ confirmed: scenery.confirmed }"
+          >
             <span v-if="i > 0"> &gt;</span>
             {{ scenery.name }}
             <!-- Data odjazdu ze stacji początkowej -->
@@ -67,6 +76,7 @@
             <span v-if="i == sceneryList.length - 1" v-html="scenery.endDateHTML"> </span>
           </span>
         </div>
+
         <!-- Status RJ -->
         <div style="margin: 0.5em 0">
           <span>
@@ -88,24 +98,30 @@
             </b>
           </span>
         </div>
+
         <!-- Nick dyżurnego -->
         <div v-if="timetable.authorName">
           <b class="text--grayed">{{ $t('journal.dispatcher-name') }}&nbsp;</b>
           <router-link class="dispatcher-link" :to="`/journal/dispatchers?dispatcherName=${timetable.authorName}`">
             <b>{{ timetable.authorName }}</b>
           </router-link>
+          <span class="text--grayed">
+            ({{
+              new Date(timetable.createdAt).toLocaleString($i18n.locale, { timeStyle: 'short', dateStyle: 'full' })
+            }})
+          </span>
         </div>
 
         <button
           v-if="timetable.stockString"
           class="btn--option btn--show"
-          @click="item.showStock.value = !item.showStock.value"
+          @click="item.showExtra.value = !item.showExtra.value"
         >
           {{ $t('journal.stock-info') }}
-          <img :src="getIcon(`arrow-${item.showStock.value ? 'asc' : 'desc'}`)" alt="Arrow" />
+          <img :src="getIcon(`arrow-${item.showExtra.value ? 'asc' : 'desc'}`)" alt="Arrow" />
         </button>
 
-        <div class="info-extended" v-if="timetable.stockString && item.showStock.value">
+        <div class="info-extended" v-if="timetable.stockString && item.showExtra.value">
           <hr />
           <div>
             <span class="badge info-badge">
@@ -160,7 +176,7 @@ export default defineComponent({
       return this.timetableHistory.map((timetable) => ({
         timetable,
         sceneryList: this.getSceneryList(timetable),
-        showStock: ref(false),
+        showExtra: ref(false),
       }));
     },
   },
@@ -190,12 +206,7 @@ export default defineComponent({
             this.$i18n.locale
           )}</span>)`;
 
-        const abandonedDateHTML = ` (porz. ${this.localeTime(
-          timetable.fulfilled ? timetable.scheduledEndDate : timetable.endDate,
-          this.$i18n.locale
-        )})`;
-
-        return { name, confirmed: i < timetable.confirmedStopsCount, beginDateHTML, endDateHTML, abandonedDateHTML };
+        return { name, confirmed: i < timetable.confirmedStopsCount, beginDateHTML, endDateHTML };
       });
     },
 
diff --git a/src/locales/en.json b/src/locales/en.json
index 26f5f84..43f0ef0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -254,7 +254,7 @@
     "minutes": "{minutes} mins",
     "hours": "{hours}h {minutes} mins",
 
-    "stock-info": "STOCK INFO",
+    "stock-info": "EXTRA INFO",
     "stock-length": "Length",
     "stock-mass": "Mass",
     "stock-max-speed": "Maximum registered speed",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index c3cd4cc..e54f01b 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -258,7 +258,7 @@
     "timetable-fulfilled": "WYPEŁNIONY",
     "timetable-abandoned": "PORZUCONY",
 
-    "stock-info": "INFORMACJE O SKŁADZIE",
+    "stock-info": "DODATKOWE INFORMACJE",
     "stock-length": "Długość",
     "stock-mass": "Masa",
     "stock-max-speed": "Maks. zarejestrowana prędkość",
diff --git a/src/scripts/interfaces/api/TimetablesAPIData.ts b/src/scripts/interfaces/api/TimetablesAPIData.ts
index da13061..42b0fc8 100644
--- a/src/scripts/interfaces/api/TimetablesAPIData.ts
+++ b/src/scripts/interfaces/api/TimetablesAPIData.ts
@@ -1,5 +1,7 @@
 export interface TimetableHistory {
   id: number;
+  createdAt: string;
+  updatedAt: string;
   
   timetableId: number;
   trainNo: number;