{{ $t('footer.discord') }}
@@ -32,94 +42,81 @@
-
+
diff --git a/src/components/App/AppHeader.vue b/src/components/App/AppHeader.vue
index d10da58..7999e16 100644
--- a/src/components/App/AppHeader.vue
+++ b/src/components/App/AppHeader.vue
@@ -29,11 +29,6 @@
{{ onlineDispatchersCount }}
-
-
/
{{ onlineTrainsCount }}
@@ -68,7 +63,7 @@
+
+
diff --git a/src/components/Global/AnimatedModal.vue b/src/components/Global/AnimatedModal.vue
index 49ca979..af32698 100644
--- a/src/components/Global/AnimatedModal.vue
+++ b/src/components/Global/AnimatedModal.vue
@@ -1,8 +1,8 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Global/RegionDropdown.vue b/src/components/Global/RegionDropdown.vue
index 99fb7e2..766c1f3 100644
--- a/src/components/Global/RegionDropdown.vue
+++ b/src/components/Global/RegionDropdown.vue
@@ -30,7 +30,7 @@
-
-
diff --git a/src/components/Global/TrainThumbnail.vue b/src/components/Global/TrainThumbnail.vue
deleted file mode 100644
index 9156421..0000000
--- a/src/components/Global/TrainThumbnail.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-
- ![]()
-
- ![]()
-
-
-
-
-
diff --git a/src/components/JournalView/DailyStats.vue b/src/components/JournalView/DailyStats.vue
deleted file mode 100644
index bd1e010..0000000
--- a/src/components/JournalView/DailyStats.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-
- {{ $t('app.loading') }}
-
-
-
- {{ $t('journal.daily-stats-info') }}
-
-
-
-
- -
-
-
-
-
-
diff --git a/src/components/JournalView/DispatcherStats.vue b/src/components/JournalView/DispatcherStats.vue
deleted file mode 100644
index abafebe..0000000
--- a/src/components/JournalView/DispatcherStats.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-
-
+
+
+
+ + + {{ $t('app.loading') }} + + + + {{ $t('journal.stats-error') }} + + + + {{ $t('journal.daily-stats.info') }} + + +
+
+
+
+
+
diff --git a/src/components/JournalView/JournalDispatchers/JournalDispatcherStats.vue b/src/components/JournalView/JournalDispatchers/JournalDispatcherStats.vue
new file mode 100644
index 0000000..2e06008
--- /dev/null
+++ b/src/components/JournalView/JournalDispatchers/JournalDispatcherStats.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/JournalView/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchersList.vue
deleted file mode 100644
index 04ead90..0000000
--- a/src/components/JournalView/JournalDispatchersList.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-
- 
- {{ $t('options.filters') }} [F]
+ [F] {{ $t('options.filters') }}
@@ -33,7 +33,7 @@
+
+
+
+
+ +
+
+
+ {{ $t('donations.p2-b1') }}
+
+
+ {{ $t('donations.p2-b2') }}
+
+
+ {{ $t('donations.p2-b3') }}
+
+
+
+ {{ $t('donations.p2-a1') }}
+
+
+
+
+ +
+
+
+ 
+
+
+
+ {{ $t('donations.p4-b1') }}
+
+
+
+ {{ $t('donations.p4-b2') }}
+
+
+
+ + +
+
+
+
+
+
+
+
+
+ {{ displayingName }}
+
+
+
+
+ {{ displayingName }}
+
+ + +
+
+ +
+
+
+
+
+ {{ $t('donations.p4-b1') }}
+
+
+
+ {{ $t('donations.p4-b2') }}
+
+ + + +
+ {{ $t('donations.action-buycoffee') }}
+ 
+ {{ $t('donations.action-paypal') }}
+ - {{ $t('journal.daily-stats-title') }} - {{ new Date().toLocaleDateString($i18n.locale) }} -
-- -
- •
-
-
-
- {{ stats.totalTimetables }}
- {{ $t('journal.timetable-count', stats.totalTimetables) }}
-
-
-
-
- {{ stats.distanceSum?.toFixed(2) }} km
-
-
-
-
-
- •
-
-
-
- {{ stats.maxTimetable.id }}
-
-
-
-
- {{ stats.maxTimetable.authorName }}
-
-
-
- {{ stats.maxTimetable.driverName }}
-
-
- {{ stats.maxTimetable.routeDistance }} km
-
-
-
-
-
- •
-
-
-
- {{ topDispatchers[0].name }}
-
-
-
-
- {{ topDispatchers[0].count }}
- {{ $t('journal.timetable-count', topDispatchers[0].count) }}
-
-
-
-
-
-
- •
-
-
-
- {{ $t('general.and') }}
-
-
- {{ disp.name }}
-
-
- ,
-
-
-
-
-
- {{ topDispatchers[0].count }}
- {{ $t('journal.timetable-count', topDispatchers[0].count) }}
-
-
-
-
-
-
- •
-
-
-
- {{ stats.longestDuties[0].name }}
-
-
-
- {{ stats.longestDuties[0].station }}
-
-
- {{ calculateDuration(stats.longestDuties[0].duration) }}
-
-
-
-
-
- •
-
-
- {{ stats.mostActiveDrivers[0].name }}
-
-
- {{ stats.mostActiveDrivers[0].distance.toFixed(2) }} km
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/JournalView/JournalDailyStats.vue b/src/components/JournalView/JournalDailyStats.vue
new file mode 100644
index 0000000..2e13fdb
--- /dev/null
+++ b/src/components/JournalView/JournalDailyStats.vue
@@ -0,0 +1,271 @@
+
+
-
-
-
-
- Ten dyżurny nie ma jeszcze szczegółowych statystyk!
-
-
-
-
- STATYSTYKI WYSTAWIONYCH ROZKŁADÓW
- -
-
- LICZBA
- {{ store.dispatcherStatsData._count._all }}
-
-
- SUMA (KM)
- {{ store.dispatcherStatsData._sum.routeDistance.toFixed(2) }}km
-
-
- NAJDŁUŻSZY
- {{ store.dispatcherStatsData._max.routeDistance.toFixed(2) }}km
-
-
- ŚREDNIO
- {{ store.dispatcherStatsData._avg.routeDistance.toFixed(2) }}km
-
-
-
- OSTATNIE WYSTAWIONE ROZKŁADY
- -+ {{ $t('journal.daily-stats.title') }} + {{ new Date().toLocaleDateString($i18n.locale) }} +
+ ++ + + {{ $t('app.loading') }} + + + + {{ $t('journal.stats-error') }} + + + + {{ $t('journal.daily-stats.info') }} + + +
+
+ +
+
+
+
+ •
+
+
+
+ {{ stats.totalTimetables }}
+ {{ $t('journal.daily-stats.count', stats.totalTimetables) }}
+
+
+
+
+ {{ stats.distanceSum?.toFixed(2) }} km
+
+
+
+
+
+ •
+
+
+
+ {{ stats.maxTimetable.id }}
+
+
+
+
+ {{ stats.maxTimetable.authorName }}
+
+
+
+ {{ stats.maxTimetable.driverName }}
+
+
+ {{ stats.maxTimetable.routeDistance }} km
+
+
+
+
+
+ •
+
+
+
+ {{ topDispatchers[0].name }}
+
+
+
+
+ {{ topDispatchers[0].count }}
+ {{ $t('journal.daily-stats.count', topDispatchers[0].count) }}
+
+
+
+
+
+
+ •
+
+
+
+ {{ $t('general.and') }}
+
+
+ {{ disp.name }}
+
+
+ ,
+
+
+
+
+
+ {{ topDispatchers[0].count }}
+ {{ $t('journal.daily-stats.count', topDispatchers[0].count) }}
+
+
+
+
+
+
+ •
+
+
+
+ {{ stats.longestDuties[0].name }}
+
+
+
+ {{ stats.longestDuties[0].station }}
+
+
+ {{ calculateDuration(stats.longestDuties[0].duration) }}
+
+
+
+
+
+ •
+
+
+
+ {{ stats.mostActiveDrivers[0].name }}
+
+
+
+ {{ stats.mostActiveDrivers[0].distance.toFixed(2) }} km
+
+
+
+
+ + +
+
+ {{ $t(`journal.daily-stats.${key}`) }}
+ {{
+ Object.entries(stats.globalDiff).find(([k, v]) => k == key)?.[1] || '--'
+ }}
+
+
+
+
+ {{ $t('journal.dispatcher-stats.empty') }}
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
diff --git a/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue
new file mode 100644
index 0000000..63839ed
--- /dev/null
+++ b/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue
@@ -0,0 +1,257 @@
+
+
+
+
+ {{ dispatcherName.toUpperCase() }}
+
+
+
+
+ + +
+
+ {{ $t('journal.dispatcher-stats.services-count') }}
+ {{ stats.services.count }}
+
+
+
+ {{ $t('journal.dispatcher-stats.service-max') }}
+ {{ calculateDuration(stats.services.durationMax) }}
+
+
+
+ {{ $t('journal.dispatcher-stats.service-avg') }}
+ {{ calculateDuration(stats.services.durationAvg) }}
+
+
+
+ + +
+
+ {{ $t('journal.dispatcher-stats.timetables-count') }}
+ {{ stats.issuedTimetables.count }}
+
+
+
+ {{ $t('journal.dispatcher-stats.timetables-sum') }}
+ {{ stats.issuedTimetables.distanceSum.toFixed(2) }}km
+
+
+
+ {{ $t('journal.dispatcher-stats.timetables-max') }}
+ {{ stats.issuedTimetables.distanceMax.toFixed(2) }}km
+
+
+
+ {{ $t('journal.dispatcher-stats.timetables-avg') }}
+ {{ stats.issuedTimetables.distanceAvg.toFixed(2) }}km
+
+
+
+
+
+
+ {{ $t('app.offline') }}
+
+
+
+ {{ $t('app.error') }}
+
+
+
+ {{ $t('app.no-result') }}
+
+
+
+
+
+
+
+
+
+ | {{ $t('journal.history-name') }} | +{{ $t('journal.history-hash') }} | +{{ $t('journal.history-dispatcher') }} | +{{ $t('journal.history-level') }} | +{{ $t('journal.history-rate') }} | +{{ $t('journal.history-region') }} | +{{ $t('journal.history-date') }} | + + + +
|---|---|---|---|---|---|---|
|
+ |
+ #{{ historyItem.stationHash }} | +
+ |
+ + + {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }} + + | ++ {{ historyItem.dispatcherRate }} + | ++ {{ + regions.find((r) => r.id == historyItem.region)?.value || '???' + }} + | +
+
+ {{ $d(historyItem.timestampFrom) }}
+ {{ timestampToString(historyItem.timestampFrom) }}
+ - {{ timestampToString(historyItem.timestampTo) }} ({{
+ calculateDuration(historyItem.currentDuration)
+ }})
+
+
+
+ |
+
+ {{ $t('journal.no-further-data') }}
+
+
+
+ {{ $t('journal.loading-further-data') }}
+
+
-
-
-
-
-
-
-
-
-
diff --git a/src/components/JournalView/JournalOptions.vue b/src/components/JournalView/JournalOptions.vue
index 48a33ac..d427a21 100644
--- a/src/components/JournalView/JournalOptions.vue
+++ b/src/components/JournalView/JournalOptions.vue
@@ -9,7 +9,7 @@
ref="button"
>
-
-
- {{ $t('app.offline') }}
-
-
-
- {{ $t('app.error') }}
-
-
-
- {{ $t('app.no-result') }}
-
-
-
-
-
-
-
-
- | {{ $t('journal.history-name') }} | -{{ $t('journal.history-hash') }} | -{{ $t('journal.history-dispatcher') }} | -{{ $t('journal.history-level') }} | -{{ $t('journal.history-rate') }} | -{{ $t('journal.history-region') }} | -{{ $t('journal.history-date') }} | - - - -
|---|---|---|---|---|---|---|
|
- |
- #{{ historyItem.stationHash }} | -
- |
- - - {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }} - - | -- {{ historyItem.dispatcherRate }} - | -- {{ - regions.find((r) => r.id == historyItem.region)?.value || '???' - }} - | -
-
- {{ $d(historyItem.timestampFrom) }}
- {{ timestampToString(historyItem.timestampFrom) }}
- - {{ timestampToString(historyItem.timestampTo) }} ({{
- calculateDuration(historyItem.currentDuration)
- }})
-
-
-
- |
-
- {{ $t('journal.no-further-data') }}
-
-
-
- {{ $t('journal.loading-further-data') }}
-
-
- {{ $t('options.filters') }} [F]
+ [F] {{ $t('options.filters') }}
@@ -33,7 +33,7 @@
{{ $t('options.search-title') }}
-