From a0054aed14b9511bb8d665c0a2535801e88a1cca Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 2 Jun 2023 00:51:03 +0200 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20optymalizacja=20zapyta=C5=84=20histo?= =?UTF-8?q?rii=20RJ=20scenerii?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SceneryView/SceneryTimetablesHistory.vue | 47 ++++--------------- .../interfaces/api/TimetablesAPIData.ts | 8 ++-- 2 files changed, 14 insertions(+), 41 deletions(-) diff --git a/src/components/SceneryView/SceneryTimetablesHistory.vue b/src/components/SceneryView/SceneryTimetablesHistory.vue index b158b8c..fdc11b6 100644 --- a/src/components/SceneryView/SceneryTimetablesHistory.vue +++ b/src/components/SceneryView/SceneryTimetablesHistory.vue @@ -4,16 +4,16 @@ - - - - - - + + + + + + - + @@ -40,31 +40,6 @@
{{ $t('scenery.timetables-history-id') }}{{ $t('scenery.timetables-history-number')}}{{ $t('scenery.timetables-history-route')}}{{ $t('scenery.timetables-history-driver')}}{{ $t('scenery.timetables-history-author')}}{{ $t('scenery.timetables-history-date')}}{{ $t('scenery.timetables-history-id') }}{{ $t('scenery.timetables-history-number') }}{{ $t('scenery.timetables-history-route') }}{{ $t('scenery.timetables-history-driver') }}{{ $t('scenery.timetables-history-author') }}{{ $t('scenery.timetables-history-date') }}
#{{ historyItem.id }}
{{ $t('scenery.history-list-empty') }}
- - @@ -99,19 +74,15 @@ export default defineComponent({ methods: { async fetchAPIData(countFrom = 0, countLimit = 15) { try { - const requestString = `${URLs.stacjownikAPI}/api/getSceneryTimetables?name=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`; + const requestString = `${URLs.stacjownikAPI}/api/getIssuedTimetables?name=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`; const historyAPIData: SceneryTimetableHistory = await (await axios.get(requestString)).data; - this.sceneryHistoryList = historyAPIData.sceneryTimetables; + this.sceneryHistoryList = historyAPIData.timetables; this.dataStatus = DataStatus.Loaded; } catch (error) { console.error(error); } }, - - test() { - console.log('test'); - }, }, components: { Loading }, }); diff --git a/src/scripts/interfaces/api/TimetablesAPIData.ts b/src/scripts/interfaces/api/TimetablesAPIData.ts index 11859f6..8a32b84 100644 --- a/src/scripts/interfaces/api/TimetablesAPIData.ts +++ b/src/scripts/interfaces/api/TimetablesAPIData.ts @@ -47,10 +47,12 @@ export interface TimetableHistory { hashesString?: string; currentSceneryName?: string; currentSceneryHash?: string; + + routeSceneries?: string; } export interface SceneryTimetableHistory { - sceneryTimetables: TimetableHistory[]; - totalCount: number; - sceneryName: string; + timetables: TimetableHistory[]; + // totalCount: number; + // sceneryName: string; } From 5d6785813af12f8e1c729e64a446fb661a521eb7 Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 2 Jun 2023 01:07:44 +0200 Subject: [PATCH 2/3] fix: odznaki TWR/SKR; dodano do dziennika --- .../JournalView/JournalTimetablesList.vue | 18 ++++++++++++ src/components/TrainsView/TrainInfo.vue | 29 ++----------------- src/locales/en.json | 4 ++- src/locales/pl.json | 4 ++- src/styles/badge.scss | 19 ++++++++++++ 5 files changed, 46 insertions(+), 28 deletions(-) diff --git a/src/components/JournalView/JournalTimetablesList.vue b/src/components/JournalView/JournalTimetablesList.vue index d762435..6746c44 100644 --- a/src/components/JournalView/JournalTimetablesList.vue +++ b/src/components/JournalView/JournalTimetablesList.vue @@ -16,6 +16,12 @@ style="cursor: pointer" > #{{ timetable.id }} + + + TWR + SKR + + {{ timetable.trainCategoryCode }} @@ -342,6 +348,7 @@ hr { .general-train { display: flex; + flex-wrap: wrap; align-items: center; gap: 0.25em; } @@ -381,6 +388,13 @@ ul.stock-list { } } +.badges { + display: flex; + gap: 0.25em; + + // badge.scss +} + .stock-history { display: flex; flex-wrap: wrap; @@ -418,6 +432,10 @@ ul.stock-list { text-align: center; } + .general-train { + justify-content: center; + } + .info-route { display: flex; justify-content: center; diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue index 37be2b5..5f9d3c8 100644 --- a/src/components/TrainsView/TrainInfo.vue +++ b/src/components/TrainsView/TrainInfo.vue @@ -6,8 +6,8 @@ #{{ train.timetableData.timetableId }} - TWR - SKR + TWR + SKR @@ -118,7 +118,6 @@ export default defineComponent({ @import '../../styles/responsive.scss'; @import '../../styles/badge.scss'; - .image-warning { height: 1em; @@ -182,26 +181,6 @@ export default defineComponent({ gap: 0.25em; } -.train-badge { - padding: 0.1em 0.2em; - border-radius: 0.2em; - font-weight: bold; - - font-size: 0.9em; - - &.twr { - background-color: var(--clr-twr); - } - - &.skr { - background-color: var(--clr-skr); - } - - &.offline { - background-color: #9c362b; - } -} - .train-driver { &.supporter { color: orange; @@ -218,9 +197,7 @@ export default defineComponent({ .timetable_warnings { display: flex; - gap: 0.2em; - - color: black; + gap: 0.25em; } .timetable_progress { diff --git a/src/locales/en.json b/src/locales/en.json index 4a07119..3cf188f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,7 +1,9 @@ { "general": { "and": " and ", - "refresh": "REFRESH" + "refresh": "REFRESH", + "TWR": "High risk freight train", + "SKR": "Train with exceeded gauge" }, "app": { "sceneries": "SCENERIES", diff --git a/src/locales/pl.json b/src/locales/pl.json index c756ad5..98ca1b9 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -1,7 +1,9 @@ { "general": { "and": " oraz ", - "refresh": "ODŚWIEŻ" + "refresh": "ODŚWIEŻ", + "TWR": "Towar niebezpieczny wysokiego ryzyka", + "SKR": "Przekroczona skrajnia" }, "app": { "sceneries": "SCENERIE", diff --git a/src/styles/badge.scss b/src/styles/badge.scss index bc00ce0..45dc2e3 100644 --- a/src/styles/badge.scss +++ b/src/styles/badge.scss @@ -55,3 +55,22 @@ background-color: forestgreen; } } + +.train-badge { + padding: 0.1em 0.2em; + border-radius: 0.2em; + font-weight: bold; + + font-size: 0.9em; + + &.twr { + background-color: var(--clr-twr); + box-shadow: 0 0 5px 1px var(--clr-twr); + color: black; + } + + &.skr { + background-color: var(--clr-skr); + box-shadow: 0 0 5px 1px var(--clr-skr); + } +} From ea7c49dfb3737e61cb8dfb19f03e0f0182a9c5ed Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 2 Jun 2023 01:10:01 +0200 Subject: [PATCH 3/3] bump: 1.15.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aadf96f..9ceb932 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.14.3", + "version": "1.15.0", "private": true, "scripts": { "dev": "vite",