Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-03 13:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Uaktualnienie do wersji API

Browse Source
This commit is contained in:
Spythere
2022-06-21 23:37:11 +02:00
parent 9e18d8bf9a
commit b91e58f9af
8 changed files with 51 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/JournalView/DriverStats.vue
+3 -3
View File
@@ -49,7 +49,7 @@
<script lang="ts">
import { DriverStatsAPIData } from '@/scripts/interfaces/api/DriverStatsAPIData';
import { TimetableHistory, TimetablesAPIData } from '@/scripts/interfaces/api/TimetablesAPIData';
import { TimetableHistory } from '@/scripts/interfaces/api/TimetablesAPIData';
import { URLs } from '@/scripts/utils/apiURLs';
import { useStore } from '@/store/store';
import axios from 'axios';
@@ -86,12 +86,12 @@ export default defineComponent({
await axios.get(`${URLs.stacjownikAPI}/api/getDriverInfo?name=${this.store.driverStatsName}`)
).data;
const recentTimetablesData: TimetablesAPIData = await (
const recentTimetablesData: TimetableHistory[] = await (
await axios.get(`${URLs.stacjownikAPI}/api/getTimetables?driver=${this.store.driverStatsName}`)
).data;
this.store.driverStatsData = statsData.response;
this.lastTimetables = recentTimetablesData.response || [];
this.lastTimetables = recentTimetablesData || [];
},
closeCard() {
src/components/JournalView/JournalDispatchers.vue
+16 -21
View File
@@ -47,7 +47,7 @@
<ul v-else>
<transition-group name="journal-list-anim">
<li v-for="(doc, i) in computedHistoryList" :key="doc._id">
<li v-for="(doc, i) in computedHistoryList" :key="doc.id">
<div class="journal_day" v-if="isAnotherDay(i - 1, i)">
<span>{{ new Date(doc.timestampFrom).toLocaleDateString('pl-PL') }}</span>
</div>
@@ -117,13 +117,8 @@ const PROD_MODE = process.env.VUE_APP_JORUNAL_DISPATCHERS_DEV != '1' || process.
const DISPATCHERS_API_URL = (PROD_MODE ? `${URLs.stacjownikAPI}/api` : 'http://localhost:3001/api') + '/getDispatchers';
interface APIResponse {
errorMessage: string | null;
response: DispatcherHistoryItem[] | null;
}
interface DispatcherHistoryItem {
_id: string;
id: string;
stationName: string;
stationHash: string;
@@ -249,7 +244,7 @@ export default defineComponent({
closeDispatcherStatsCard() {
this.statsCardOpen = false;
},
navigateToScenery(name: string, isOnline: boolean) {
if (!isOnline) return;
@@ -307,18 +302,18 @@ export default defineComponent({
const countFrom = this.historyList.length;
const responseData: APIResponse | null = await (
const responseData: DispatcherHistoryItem[] = await (
await axios.get(`${DISPATCHERS_API_URL}?${this.currentQuery}&countFrom=${countFrom}`)
).data;
if (!responseData?.response) return;
if (!responseData) return;
if (responseData.response.length == 0) {
if (responseData.length == 0) {
this.scrollNoMoreData = true;
return;
}
this.historyList.push(...responseData.response);
this.historyList.push(...responseData);
this.scrollDataLoaded = true;
},
@@ -340,7 +335,7 @@ export default defineComponent({
// Z API: const SORT_TYPES = ['allStopsCount', 'endDate', 'beginDate', 'routeDistance'];
if (this.sorterActive.id == 'timestampFrom') queries.push('sortBy=timestampFrom');
else if (this.sorterActive.id == 'duration') queries.push('sortBy=duration');
else if (this.sorterActive.id == 'duration') queries.push('sortBy=currentDuration');
else queries.push('sortBy=timestampFrom');
queries.push('countLimit=15');
@@ -348,7 +343,7 @@ export default defineComponent({
this.currentQuery = queries.join('&');
try {
const responseData: APIResponse | null = await (
const responseData: DispatcherHistoryItem[] = await (
await axios.get(`${DISPATCHERS_API_URL}?${this.currentQuery}`)
).data;
@@ -358,17 +353,17 @@ export default defineComponent({
return;
}
if (responseData.errorMessage) {
this.historyDataStatus.status = DataStatus.Error;
this.historyDataStatus.error = responseData.errorMessage;
// if (responseData.errorMessage) {
// this.historyDataStatus.status = DataStatus.Error;
// this.historyDataStatus.error = responseData.errorMessage;
return;
}
// return;
// }
if (!responseData.response) return;
if (!responseData) return;
// Response data exists
this.historyList = responseData.response;
this.historyList = responseData;
// Stats display
this.store.dispatcherStatsName =
src/components/JournalView/JournalTimetables.vue
+15 -15
View File
@@ -176,7 +176,7 @@ import { JournalFilterType } from '@/scripts/enums/JournalFilterType';
import routerMixin from '@/mixins/routerMixin';
import { useStore } from '@/store/store';
import DriverStats from './DriverStats.vue';
import { TimetableHistory, TimetablesAPIData } from '@/scripts/interfaces/api/TimetablesAPIData';
import { TimetableHistory } from '@/scripts/interfaces/api/TimetablesAPIData';
const PROD_MODE = process.env.VUE_APP_JOURNAL_TIMETABLES_DEV != '1' || process.env.NODE_ENV === 'production';
@@ -310,18 +310,18 @@ export default defineComponent({
const countFrom = this.historyList.length;
const responseData: TimetablesAPIData | null = await (
const responseData: TimetableHistory[] = await (
await axios.get(`${TIMETABLES_API_URL}?${this.currentQuery}&countFrom=${countFrom}`)
).data;
if (!responseData?.response) return;
if (!responseData) return;
if (responseData.response.length == 0) {
if (responseData.length == 0) {
this.scrollNoMoreData = true;
return;
}
this.historyList.push(...responseData.response);
this.historyList.push(...responseData);
this.scrollDataLoaded = true;
},
@@ -338,8 +338,8 @@ export default defineComponent({
const driver = props.searchers?.find((s) => s.id == 'search-driver')?.value.trim();
const train = props.searchers?.find((s) => s.id == 'search-train')?.value.trim();
if (driver) queries.push(`driver=${driver}`);
if (train) queries.push(`train=${train}`);
if (driver) queries.push(`driverName=${driver}`);
if (train) queries.push(`trainNo=${train}`);
// Z API: const SORT_TYPES = ['allStopsCount', 'endDate', 'beginDate', 'routeDistance'];
if (this.sorterActive.id == 'distance') queries.push('sortBy=routeDistance');
@@ -369,7 +369,7 @@ export default defineComponent({
this.currentQuery = queries.join('&');
try {
const responseData: TimetablesAPIData = await (
const responseData: TimetableHistory[] = await (
await axios.get(`${TIMETABLES_API_URL}?${this.currentQuery}`)
).data;
@@ -379,17 +379,17 @@ export default defineComponent({
return;
}
if (responseData.errorMessage) {
this.historyDataStatus.status = DataStatus.Error;
this.historyDataStatus.error = responseData.errorMessage;
// if (responseData) {
// this.historyDataStatus.status = DataStatus.Error;
// this.historyDataStatus.error = responseData;
return;
}
// return;
// }
if (!responseData.response) return;
if (!responseData) return;
// Response data exists
this.historyList = responseData.response;
this.historyList = responseData;
// Stats display
this.store.driverStatsName =