From 83bdadfe02364537d0b053c9693e55374a1af31a Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 3 Dec 2021 18:39:48 +0100 Subject: [PATCH] =?UTF-8?q?Naprawiono=20b=C5=82=C4=85d=20z=20brakiem=20RJ?= =?UTF-8?q?=20dla=20innych=20serwer=C3=B3w=20ni=C5=BC=20PL1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StationsView/StationTable.vue | 1 + src/main.ts | 2 +- src/scripts/utils/apiURLs.ts | 2 +- src/store/index.ts | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue index 6036cc5..00a2ef7 100644 --- a/src/components/StationsView/StationTable.vue +++ b/src/components/StationsView/StationTable.vue @@ -206,6 +206,7 @@ import { computed, ComputedRef, defineComponent } from '@vue/runtime-core'; import { useStore } from '@/store'; import { GETTERS } from '@/constants/storeConstants'; import Station from '@/scripts/interfaces/Station'; +import Train from '@/scripts/interfaces/Train'; export default defineComponent({ props: { diff --git a/src/main.ts b/src/main.ts index db98ae9..48d7a2a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -20,7 +20,7 @@ const i18n = createI18n({ const clickOutsideDirective: Directive = { beforeMount(el, binding) { - + el.clickOutsideEvent = (event: Event) => { if (!(el == event.target || el.contains(event.target))) { binding.value(); diff --git a/src/scripts/utils/apiURLs.ts b/src/scripts/utils/apiURLs.ts index 66c6ebe..740aba7 100644 --- a/src/scripts/utils/apiURLs.ts +++ b/src/scripts/utils/apiURLs.ts @@ -3,5 +3,5 @@ export const URLs = { stations: "https://api.td2.info.pl:9640/?method=getStationsOnline", trains: "https://api.td2.info.pl:9640/?method=getTrainsOnline", dispatchers: "https://api.td2.info.pl:9640/?method=readFromSWDR&value=getDispatcherStatusList%3B1", - getTimetableURL: (trainNo: string | number) => `https://api.td2.info.pl:9640/?method=readFromSWDR&value=getTimetable%3B${trainNo}%3Beu` + getTimetableURL: (trainNo: string | number, region = "eu") => `https://api.td2.info.pl:9640/?method=readFromSWDR&value=getTimetable%3B${trainNo}%3B${region}` }; \ No newline at end of file diff --git a/src/store/index.ts b/src/store/index.ts index af7cb66..368aa9c 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -179,7 +179,7 @@ export const store = createStore({ async fetchTimetableData({ commit }) { const reducedList = this.state.trainList.reduce(async (acc: Promise, train: Train) => { - const timetable: TimetableAPIData = await (await axios.get(URLs.getTimetableURL(train.trainNo))).data.message; + const timetable: TimetableAPIData = await (await axios.get(URLs.getTimetableURL(train.trainNo, this.state.region.id))).data.message; const trainInfo = timetable.trainInfo; if (!timetable || !trainInfo) return acc;