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

Fix: niepoprawne wyświetlanie statusów dyżurnych

Browse Source
This commit is contained in:
Spythere
2022-05-03 21:24:59 +02:00
parent 04c48c7a70
commit 8fed956820
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/utils/storeUtils.ts
+2 -2
View File
@@ -6,7 +6,7 @@ export const getLocoURL = (locoType: string): string => (`https://rj.td2.info.pl
export const getStatusID = (stationStatus: any): string => { export const getStatusID = (stationStatus: any): string => {
if (!stationStatus) return "unknown"; if (!stationStatus) return "unknown";
if (stationStatus == -1) return "unavailable"; if (stationStatus == -1) return "not-signed";
const statusCode = stationStatus[2]; const statusCode = stationStatus[2];
const statusTimestamp = stationStatus[3]; const statusTimestamp = stationStatus[3];
@@ -31,7 +31,7 @@ export const getStatusID = (stationStatus: any): string => {
break; break;
} }
return "not-signed"; return "unavailable";
}; };
export const getStatusTimestamp = (stationStatus: any): number => { export const getStatusTimestamp = (stationStatus: any): number => {
src/store/index.ts
+4 -2
View File
@@ -166,9 +166,11 @@ export const store = createStore<State>({
const prevDispatcherStatus = this.state.lastDispatcherStatuses.find(dispatcher => dispatcher.hash === stationAPI.stationHash); const prevDispatcherStatus = this.state.lastDispatcherStatuses.find(dispatcher => dispatcher.hash === stationAPI.stationHash);
const stationStatus = data.dispatchers?.find((status: string[]) => status[0] == stationAPI.stationHash && status[1] == this.state.region.id) || -1; const stationStatus = data.dispatchers?.find((status: string[]) => status[0] == stationAPI.stationHash && status[1] == this.state.region.id) || -1;
const statusTimestamp = prevDispatcherStatus && !data.dispatchers ? prevDispatcherStatus.statusTimestamp : getStatusTimestamp(stationStatus);
const statusID = prevDispatcherStatus && !data.dispatchers ? prevDispatcherStatus.statusID : getStatusID(stationStatus);
const statusTimestamp = getStatusTimestamp(stationStatus == -1 && prevDispatcherStatus ? prevDispatcherStatus.statusTimestamp : stationStatus); console.log(stationName, prevDispatcherStatus);
const statusID = getStatusID(stationStatus == -1 && prevDispatcherStatus ? prevDispatcherStatus.statusID : stationStatus);
prevDispatcherStatuses.push({ prevDispatcherStatuses.push({
hash: stationAPI.stationHash, hash: stationAPI.stationHash,