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

filtry aktywnych RJ

Browse Source
This commit is contained in:
Spythere
2024-02-11 15:30:19 +01:00
parent dcff3b088f
commit 3ac8d60c5c
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/utils/filterUtils.ts
+20 -5
View File
@@ -96,7 +96,7 @@ export const filterStations = (station: Station, filters: Filter) => {
if (filters['free'] && (!station.onlineInfo || station.onlineInfo.dispatcherId == -1))
return false;
if (station.onlineInfo && station.onlineInfo.dispatcherId != -1) {
if (station.onlineInfo) {
const { dispatcherStatus } = station.onlineInfo;
const excludeEnding =
@@ -112,12 +112,21 @@ export const filterStations = (station: Station, filters: Filter) => {
const excludeNoSpace =
dispatcherStatus == Status.ActiveDispatcher.NO_SPACE && filters['noSpaceStatus'];
const excludeOccupied = station.onlineInfo && filters['occupied'];
const excludeOccupied = filters['occupied'] && dispatcherStatus != Status.ActiveDispatcher.FREE;
// const isActiveFree =
// dispatcherStatus == Status.ActiveDispatcher.FREE && filters['withActiveTimetables'];
const excludeActiveTTs =
(dispatcherStatus == Status.ActiveDispatcher.FREE ||
station.onlineInfo.scheduledTrainCount.all != 0) &&
filters['withActiveTimetables'];
if (excludeEnding || excludeAFK || excludeNoSpace || excludeNotSigned || excludeOccupied)
if (
excludeEnding ||
excludeAFK ||
excludeNoSpace ||
excludeNotSigned ||
excludeOccupied ||
excludeActiveTTs
)
return false;
if (
@@ -127,6 +136,12 @@ export const filterStations = (station: Station, filters: Filter) => {
return false;
}
const excludeNoActiveTTs =
filters['withoutActiveTimetables'] &&
(!station.onlineInfo || station.onlineInfo.scheduledTrainCount.all == 0);
if (excludeNoActiveTTs) return false;
if (
(station.generalInfo?.availability == 'nonPublic' || !station.generalInfo) &&
filters['nonPublic']