diff --git a/src/components/Timetable/TimetableBody.vue b/src/components/Timetable/TimetableBody.vue
deleted file mode 100644
index cbdbce9..0000000
--- a/src/components/Timetable/TimetableBody.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/Timetable/TimetableContent.vue b/src/components/Timetable/TimetableContent.vue
index e7b1cf5..a6f8453 100644
--- a/src/components/Timetable/TimetableContent.vue
+++ b/src/components/Timetable/TimetableContent.vue
@@ -1,297 +1,311 @@
-
-
-
+
+
+
diff --git a/src/components/TimetableViews/CurrentTimetableView.vue b/src/components/TimetableViews/CurrentTimetableView.vue
index b3e5de6..d0db575 100644
--- a/src/components/TimetableViews/CurrentTimetableView.vue
+++ b/src/components/TimetableViews/CurrentTimetableView.vue
@@ -3,19 +3,14 @@
class="overflow-auto p-1 bg-white print:bg-white dark:bg-zinc-950 print:text-black text-black dark:text-white min-h-full"
:class="{ dark: globalStore.darkMode }"
>
-
-
+
+
- {{ $t('headers.line_no') }}
-
-
- {{ $t('headers.line_km') }}
-
- VP
- VL
-
- {{ $t('headers.station') }}
-
- {{ $t('headers.time') }}
-
-
-
-
-
-
-
- {{ $t('headers.loco_1') }}
-
-
- {{ $t('headers.loco_2') }}
-
-
-
- {{ $t('headers.loco_3') }}
-
-
+ {{ globalStore.currentTimetableData!.category }}
+ {{ globalStore.currentTimetableData!.trainNo }} {{ $t('headers.relation') }}
+ {{ globalStore.currentTimetableData!.route.replace('|', ' - ') }}
+
+
+
+
+
+
+
+
-
+
+
+ {{ $t('headers.line_no') }}
+
+
+ {{ $t('headers.line_km') }}
+
+ VP
+ VL
+
+ {{ $t('headers.station') }}
+
+
+ {{ $t('headers.time') }}
+
+
-
-
-
-
+ {{ $t('headers.mass') }}
+ {{ $t('headers.loco_1') }}
+
+
{{ $t('headers.loco_2') }}
-
{{ $t('headers.length') }}
+ {{ $t('headers.loco_3') }}
{{ $t('headers.vmax') }}
-
+
+
+
+
+
+
+ {{ $t('headers.mass') }}
+
+
+
+ {{ $t('headers.length') }}
+ {{ $t('headers.vmax') }}
+
+
-
-
-
-
+
- {{
- i == 0 || computedTimetableRows[i - 1].realLine != row.realLine
- ? row.realLine
- : ' '
- }}
-
+
+
+
-
-
+ {{
+ i == 0 || computedTimetableRows[i - 1].realLine != row.realLine
+ ? row.realLine
+ : ' '
+ }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row.arrivalKm }}
-
-
-
- {{ row.departureKm == '0.000' ? '' : row.departureKm }}
-
-
-
-
-
-
+
-
+
+
- {{
+
+
+
+
+
+
+
-
- {{
- i == 0 ||
- computedTimetableRows[i - 1].departureSpeed != row.arrivalSpeed ||
- computedTimetableRows[i - 1].departureTracks != row.arrivalTracks
- ? row.arrivalSpeed
- : ' '
- }}
-
-
+ {{ row.arrivalKm }}
+
-
-
- {{
- row.departureSpeed != row.arrivalSpeed ||
- row.departureTracks != row.arrivalTracks
- ? row.departureSpeed
- : ' '
- }}
-
-
-
+
- {{
- row.departureSpeed != row.arrivalSpeed ||
- row.departureTracks != row.arrivalTracks
- ? row.departureSpeed
- : ' '
- }}
-
-
-
- {{ row.departureKm == '0.000' ? '' : row.departureKm }}
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{
+ i == 0 ||
+ computedTimetableRows[i - 1].departureSpeed != row.arrivalSpeed ||
+ computedTimetableRows[i - 1].departureTracks != row.arrivalTracks
+ ? row.arrivalSpeed
+ : ' '
+ }}
+
-
+ {{
+ i == 0 ||
+ computedTimetableRows[i - 1].departureSpeed != row.arrivalSpeed ||
+ computedTimetableRows[i - 1].departureTracks != row.arrivalTracks
+ ? row.arrivalSpeed
+ : ' '
+ }}
+
+
+
+
+
+ {{
+ row.departureSpeed != row.arrivalSpeed ||
+ row.departureTracks != row.arrivalTracks
+ ? row.departureSpeed
+ : ' '
+ }}
+
+
+
+ {{
+ row.departureSpeed != row.arrivalSpeed ||
+ row.departureTracks != row.arrivalTracks
+ ? row.departureSpeed
+ : ' '
+ }}
+
+
+
+
-
+
+
-
-
-
-
-
- {{
- (row.scheduledArrivalDate?.getTime() || 0) !=
- (row.scheduledDepartureDate?.getTime() || 0)
- ? row.scheduledArrivalDate?.toLocaleTimeString('pl-PL', {
- hour: '2-digit',
- minute: '2-digit'
- })
- : '|'
- }}
-
- {{ row.driveTime ? Math.floor(row.driveTime / 60000) : '' }}
-
-
-
-
- {{
- row.scheduledDepartureDate?.toLocaleTimeString('pl-PL', {
- hour: '2-digit',
- minute: '2-digit'
- })
- }}
-
- {{ row.stopTime || '' }}
-
+
-
-
+
+
+
+
+
+ {{
+ (row.scheduledArrivalDate?.getTime() || 0) !=
+ (row.scheduledDepartureDate?.getTime() || 0)
+ ? row.scheduledArrivalDate?.toLocaleTimeString('pl-PL', {
+ hour: '2-digit',
+ minute: '2-digit'
+ })
+ : '|'
+ }}
+
+ {{ row.driveTime ? Math.floor(row.driveTime / 60000) : '' }}
+
+
+
+
+ {{
+ row.scheduledDepartureDate?.toLocaleTimeString('pl-PL', {
+ hour: '2-digit',
+ minute: '2-digit'
+ })
+ }}
+
+ {{ row.stopTime || '' }}
+
-
-
-
-
-
-
-
-
- {{ row.headUnits[0] }}
-
-
- {{ row.headUnits[1] ?? ' ' }}
-
-
-
- {{ row.headUnits[2] ?? ' ' }}
-
-
-
-
+
-
-
-
+ {{ row.stockMass }}
+ {{ row.headUnits[0] }}
+
+
{{ row.headUnits[1] ?? ' ' }}
-
{{ row.stockLength }}
+ {{ row.headUnits[2] ?? ' ' }}
- {{ row.stockVmax }}
-
-
+
+
+
+
+
+
+
+
+ {{ row.stockMass }}
+
+
+
+ {{ row.stockLength }}
+
+ {{ row.stockVmax }}
+
+