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

Poprawki w działaniu ładowania pociągów

Browse Source
This commit is contained in:
Spythere
2020-09-10 23:37:43 +02:00
parent e2a09bca2d
commit ead7c1fc54
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/StationsView/StationCard.vue
+4 -3
View File
@@ -182,7 +182,10 @@
>Na stacji</span>
<span style="color: #FF4646" v-else-if="timetable.stopped">Postój</span>
<span style="color: #aaa" v-else-if="!timetable.confirmed">W drodze</span>
<span
style="color: #aaa"
v-else-if="!timetable.confirmed && timetable.currentStationName != stationInfo.stationName"
>W drodze</span>
<span
style="color: red"
@@ -254,8 +257,6 @@ export default class StationCard extends styleMixin {
get computedScheduledTrains() {
console.log(this.stationInfo.stationName, "test");
return this.stationInfo.scheduledTrains.sort((a, b) => {
if (a.arrivalTime > b.arrivalTime) return 1;
else if ((a.arrivalTime < b.arrivalTime)) return -1;
src/store/store.ts
+2 -3
View File
@@ -131,6 +131,7 @@ export default class Store extends VuexModule {
stopObj.terminatesHere = getTimestamp(point.departureTime) == 0 ? true : false;
stopObj.confirmed = point.confirmed;
stopObj.stopped = point.stopped;
stopObj.stopTime = point.pointStopTime;
acc.push(stopObj);
}
@@ -307,7 +308,7 @@ export default class Store extends VuexModule {
this.trainList = updatedTrainList.reduce((acc, updatedTrain) => {
const trainData = this.trainList.find(train => train.trainNo === updatedTrain.trainNo);
if (trainData) acc.push({ ...updatedTrain, ...trainData });
if (trainData) acc.push({ ...trainData, ...updatedTrain });
else acc.push({ ...updatedTrain });
return acc;
@@ -345,8 +346,6 @@ export default class Store extends VuexModule {
return acc;
}, []);
// console.log('gituwa');
return { ...station, scheduledTrains };
});