From 241648ec49237f28f6035bec1755596612de797b Mon Sep 17 00:00:00 2001 From: Spythere Date: Wed, 6 Mar 2024 18:33:30 +0100 Subject: [PATCH] asdek: filtry --- src/components/StationsView/typings.ts | 2 ++ src/data/options.json | 20 +++++++++++++++++--- src/locales/en.json | 3 +++ src/locales/pl.json | 7 +++++-- src/scripts/utils/stationFilterUtils.ts | 5 ++++- src/store/stationFiltersStore.ts | 2 ++ 6 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/components/StationsView/typings.ts b/src/components/StationsView/typings.ts index d2192cd..f19cc3f 100644 --- a/src/components/StationsView/typings.ts +++ b/src/components/StationsView/typings.ts @@ -16,6 +16,8 @@ export interface Filter { SPE: boolean; SUP: boolean; noSUP: boolean; + ASDEK: boolean; + noASDEK: boolean; ręczne: boolean; 'ręczne+SPK': boolean; 'ręczne+SCS': boolean; diff --git a/src/data/options.json b/src/data/options.json index 87e654b..4542930 100644 --- a/src/data/options.json +++ b/src/data/options.json @@ -1,14 +1,14 @@ { "optionSections": [ + "status", + "timetables", "reality", "package-access", "access", "control", - "addons", "blockades", "signals", - "status", - "timetables" + "addons" ], "options": [ @@ -139,6 +139,20 @@ "value": true, "defaultValue": true }, + { + "id": "ASDEK", + "name": "ASDEK", + "section": "addons", + "value": true, + "defaultValue": true + }, + { + "id": "noASDEK", + "name": "noASDEK", + "section": "addons", + "value": true, + "defaultValue": true + }, { "id": "SBL", "name": "SBL", diff --git a/src/locales/en.json b/src/locales/en.json index 2756bdf..6c62edf 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -198,6 +198,9 @@ "SUP": "SUP (RASP-UZK)", "noSUP": "WITHOUT SUP", + "ASDEK": "ASDEK", + "noASDEK": "NO ASDEK", + "SBL": "AUTOMATIC (SBL)", "PBL": "SEMIAUTOMATIC (PBL)", diff --git a/src/locales/pl.json b/src/locales/pl.json index 4068725..be0b2c6 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -187,6 +187,9 @@ "SUP": "SUP (RASP-UZK)", "noSUP": "BEZ SUP", + "ASDEK": "ASDEK", + "noASDEK": "BEZ ASDEK-a", + "SBL": "SAMOCZYNNA", "PBL": "PÓŁSAMOCZYNNA", @@ -199,8 +202,8 @@ "free": "WOLNA", "occupied": "ZAJĘTA", - "withActiveTimetables": "AKTYWNE RJ", - "withoutActiveTimetables": "BEZ AKTYWNYCH RJ", + "withActiveTimetables": "AKTYWNE", + "withoutActiveTimetables": "BEZ AKTYWNYCH", "sliders": { "min-lvl": "MIN. WYMAGANY POZIOM DYŻURNEGO", diff --git a/src/scripts/utils/stationFilterUtils.ts b/src/scripts/utils/stationFilterUtils.ts index 1ac4fd8..141edbe 100644 --- a/src/scripts/utils/stationFilterUtils.ts +++ b/src/scripts/utils/stationFilterUtils.ts @@ -167,7 +167,7 @@ export const filterStations = (station: Station, filters: Filter) => { return false; if (station.generalInfo) { - const { routes, availability, controlType, lines, reqLevel, signalType, SUP, authors } = + const { routes, availability, controlType, lines, reqLevel, signalType, SUP, ASDEK, authors } = station.generalInfo; if (availability == 'unavailable' && filters['unavailable'] && !station.onlineInfo) @@ -216,6 +216,9 @@ export const filterStations = (station: Station, filters: Filter) => { if (filters['SUP'] && SUP) return false; if (filters['noSUP'] && !SUP) return false; + if (filters['ASDEK'] && ASDEK) return false; + if (filters['noASDEK'] && !ASDEK) return false; + if (filters['SBL'] && routes.sblNames.length > 0) return false; if (filters['PBL'] && routes.sblNames.length == 0) return false; diff --git a/src/store/stationFiltersStore.ts b/src/store/stationFiltersStore.ts index d8f8af8..fbab940 100644 --- a/src/store/stationFiltersStore.ts +++ b/src/store/stationFiltersStore.ts @@ -16,6 +16,8 @@ const filterInitStates: Filter = { SPE: false, SUP: false, noSUP: false, + ASDEK: false, + noASDEK: false, ręczne: false, 'ręczne+SPK': false, 'ręczne+SCS': false,