From 188857d33571ae52bc5b53d3e29a6df920b5542f Mon Sep 17 00:00:00 2001 From: Spythere Date: Wed, 6 Dec 2023 20:29:28 +0100 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20rozk=C5=82ady=20jazdy=20pokazuj?= =?UTF-8?q?=C4=85=20si=C4=99=20na=20innych=20serwerach?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- src/components/SceneryView/SceneryTimetable.vue | 3 ++- src/store/typings.ts | 2 ++ src/store/utils.ts | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad74a6c..8010dac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "stacjownik", - "version": "1.19.0", + "version": "1.19.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "stacjownik", - "version": "1.19.0", + "version": "1.19.1", "dependencies": { "core-js": "^3.32.2", "dotenv": "^16.3.1", diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue index 1c05dd1..aa340a8 100644 --- a/src/components/SceneryView/SceneryTimetable.vue +++ b/src/components/SceneryView/SceneryTimetable.vue @@ -255,7 +255,8 @@ export default defineComponent({ ?.filter( (train) => train.checkpointName.toLocaleLowerCase() == - (this.chosenCheckpoint || this.station.name).toLocaleLowerCase() + (this.chosenCheckpoint || this.station.name).toLocaleLowerCase() && + train.region == this.store.region.id ) .sort((a, b) => { if (a.stopStatusID > b.stopStatusID) return 1; diff --git a/src/store/typings.ts b/src/store/typings.ts index ac9475b..397ac8e 100644 --- a/src/store/typings.ts +++ b/src/store/typings.ts @@ -164,6 +164,8 @@ export interface ScheduledTrain { stopLabel: string; stopStatus: StopStatus; stopStatusID: number; + + region: string; } export enum StopStatus { diff --git a/src/store/utils.ts b/src/store/utils.ts index ae24d51..bf23475 100644 --- a/src/store/utils.ts +++ b/src/store/utils.ts @@ -175,6 +175,8 @@ export function getCheckpointTrain( stopStatus: trainStopStatus.stopStatus, stopStatusID: trainStopStatus.stopStatusID, + region: train.region, + arrivingLine, departureLine, From 0dc2c505dbe4b3006f554531e45758770580f07d Mon Sep 17 00:00:00 2001 From: Spythere Date: Thu, 7 Dec 2023 16:16:06 +0100 Subject: [PATCH 2/3] =?UTF-8?q?poprawki=20do=20braku=20pokazywania=20si?= =?UTF-8?q?=C4=99=20niezapisanych=20scenerii?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 - .../SceneryView/SceneryDispatchersHistory.vue | 21 +- src/components/SceneryView/SceneryHeader.vue | 18 +- src/components/SceneryView/SceneryInfo.vue | 14 +- .../SceneryInfo/SceneryInfoIcons.vue | 52 +- .../SceneryView/SceneryTimetable.vue | 16 +- .../SceneryView/SceneryTimetablesHistory.vue | 19 +- src/data/mockActiveData.json | 10472 ++++++++++++++++ src/locales/en.json | 4 +- src/locales/pl.json | 4 +- src/store/mainStore.ts | 94 +- src/store/stationFiltersStore.ts | 16 +- src/typings/api.ts | 17 +- src/views/SceneryView.vue | 15 +- 14 files changed, 10678 insertions(+), 85 deletions(-) create mode 100644 src/data/mockActiveData.json diff --git a/src/App.vue b/src/App.vue index 6db40fa..756db8d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -74,7 +74,6 @@ export default defineComponent({ this.store.activeData.activeSceneries = []; this.store.activeData.trains = []; - this.store.activeData.connectedSocketCount = 0; this.store.setStatuses(); }); diff --git a/src/components/SceneryView/SceneryDispatchersHistory.vue b/src/components/SceneryView/SceneryDispatchersHistory.vue index b608838..586f7a9 100644 --- a/src/components/SceneryView/SceneryDispatchersHistory.vue +++ b/src/components/SceneryView/SceneryDispatchersHistory.vue @@ -33,6 +33,8 @@ > {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }} + + ? {{ historyItem.dispatcherRate }} @@ -84,12 +86,10 @@ export default defineComponent({ components: { Loading }, props: { station: { - type: Object as PropType, - required: true + type: Object as PropType }, onlineScenery: { - type: Object as PropType, - required: false + type: Object as PropType } }, @@ -113,10 +113,17 @@ export default defineComponent({ countFrom = 0, countLimit = 30 ): Promise { + if (!this.station && !this.onlineScenery) { + this.dataStatus = Status.Data.Loaded; + return null; + } + try { this.dataStatus = Status.Data.Loading; - const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`; + const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${ + this.station?.name || this.onlineScenery?.name + }&countFrom=${countFrom}&countLimit=${countLimit}`; const historyAPIData: API.DispatcherHistory.Response = await ( await axios.get(requestString) ).data; @@ -130,7 +137,9 @@ export default defineComponent({ } }, navigateToHistory() { - this.$router.push(`/journal/dispatchers?sceneryName=${this.station.name}`); + this.$router.push( + `/journal/dispatchers?sceneryName=${this.station?.name || this.onlineScenery?.name}` + ); } } }); diff --git a/src/components/SceneryView/SceneryHeader.vue b/src/components/SceneryView/SceneryHeader.vue index 7c093e0..d3e86ba 100644 --- a/src/components/SceneryView/SceneryHeader.vue +++ b/src/components/SceneryView/SceneryHeader.vue @@ -1,11 +1,11 @@