diff --git a/package.json b/package.json index a52bd3d..1a322ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.12.1", + "version": "1.13.0", "private": true, "scripts": { "dev": "vite", diff --git a/src/assets/icon-historyczna.svg b/src/assets/icon-historyczna.svg index aed6e11..4bece83 100644 --- a/src/assets/icon-historyczna.svg +++ b/src/assets/icon-historyczna.svg @@ -1,18 +1,20 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icon-pragotron.svg b/src/assets/icon-pragotron.svg new file mode 100644 index 0000000..a592ce2 --- /dev/null +++ b/src/assets/icon-pragotron.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icon-tablice.ico b/src/assets/icon-tablice.ico new file mode 100644 index 0000000..f749c9b Binary files /dev/null and b/src/assets/icon-tablice.ico differ diff --git a/src/components/JournalView/JournalOptions.vue b/src/components/JournalView/JournalOptions.vue index a9766ed..ce8ca05 100644 --- a/src/components/JournalView/JournalOptions.vue +++ b/src/components/JournalView/JournalOptions.vue @@ -29,7 +29,7 @@

{{ $t('options.search-title') }}

- +
@@ -53,20 +54,38 @@
+
{{ timetable.route.replace('|', ' - ') }}
+
+
- - > + + + > + ... (+{{ sceneryList.length - 2 }}) > + {{ scenery.name }} - +
+
@@ -88,24 +107,29 @@
+
{{ $t('journal.dispatcher-name') }}  {{ timetable.authorName }} + + ({{ + (new Date(timetable.createdAt).getTime() - new Date(timetable.beginDate).getTime() < 0 + ? new Date(timetable.createdAt) + : new Date(timetable.beginDate) + ).toLocaleString($i18n.locale, { timeStyle: 'short', dateStyle: 'full' }) + }}) +
- -
+
@@ -144,6 +168,7 @@ import imageMixin from '../../mixins/imageMixin'; import modalTrainMixin from '../../mixins/modalTrainMixin'; import styleMixin from '../../mixins/styleMixin'; import { TimetableHistory } from '../../scripts/interfaces/api/TimetablesAPIData'; +import { TimetableStop } from '../../scripts/interfaces/api/TrainAPIData'; export default defineComponent({ props: { @@ -160,7 +185,7 @@ export default defineComponent({ return this.timetableHistory.map((timetable) => ({ timetable, sceneryList: this.getSceneryList(timetable), - showStock: ref(false), + showExtra: ref(false), })); }, }, @@ -190,12 +215,7 @@ export default defineComponent({ this.$i18n.locale )})`; - const abandonedDateHTML = ` (porz. ${this.localeTime( - timetable.fulfilled ? timetable.scheduledEndDate : timetable.endDate, - this.$i18n.locale - )})`; - - return { name, confirmed: i < timetable.confirmedStopsCount, beginDateHTML, endDateHTML, abandonedDateHTML }; + return { name, confirmed: i < timetable.confirmedStopsCount, beginDateHTML, endDateHTML }; }); }, @@ -221,6 +241,10 @@ export default defineComponent({ @import '../../styles/badge.scss'; @import '../../styles/JournalSection.scss'; +.journal_item { + cursor: pointer; +} + hr { margin: 0.25em 0; } diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue index 7717f47..d4179e0 100644 --- a/src/components/SceneryView/SceneryTimetable.vue +++ b/src/components/SceneryView/SceneryTimetable.vue @@ -2,17 +2,37 @@

- icon-timetable  + icon-timetable {{ $t('scenery.timetables') }} -   - {{ station.onlineInfo?.scheduledTrains?.length || '0' }} -  /  - - {{ station.onlineInfo?.scheduledTrains?.filter((train) => train.stopInfo.confirmed).length || '0' }} + + + {{ station.onlineInfo?.scheduledTrains?.length || '0' }} + / + + {{ station.onlineInfo?.scheduledTrains?.filter((train) => train.stopInfo.confirmed).length || '0' }} + + + + + + icon-pragotron + + + + icon-tablice +

-
+
{{ (i > 0 && '•') || '' }} @@ -168,7 +188,6 @@ import { useStore } from '../../store/store'; import imageMixin from '../../mixins/imageMixin'; import modalTrainMixin from '../../mixins/modalTrainMixin'; import ScheduledTrainStatus from './ScheduledTrainStatus.vue'; -import ScheduledTrain from '../../scripts/interfaces/ScheduledTrain'; export default defineComponent({ name: 'SceneryTimetable', @@ -281,24 +300,36 @@ export default defineComponent({ } .timetable-header { - display: flex; - align-items: center; - justify-content: center; - flex-direction: column; - position: sticky; top: 0; z-index: 99; background-color: #181818; + padding: 0.5em; + + img { + width: 25px; + vertical-align: middle; + } + h3 { display: flex; + justify-content: center; + flex-wrap: wrap; align-items: center; + + gap: 0.5em; font-size: 1.3em; } } +.header_links { + display: flex; + gap: 0.5em; + margin-left: 0.5em; +} + .timetable { &-count { margin-left: 0.5em; @@ -355,7 +386,8 @@ export default defineComponent({ flex-wrap: wrap; font-size: 1.1em; - padding: 0.75em 0; + + margin-top: 0.5em; button.checkpoint_item { color: #aaa; diff --git a/src/components/StationsView/FilterOption.vue b/src/components/StationsView/FilterOption.vue index ce66ff5..fe175fc 100644 --- a/src/components/StationsView/FilterOption.vue +++ b/src/components/StationsView/FilterOption.vue @@ -1,5 +1,11 @@ @@ -29,20 +35,51 @@ export default defineComponent({ filterStore: useStationFiltersStore(), }; }, + methods: { - handleChange() { + handleLeftClick() { this.option.value = !this.option.value; + this.filterStore.lastClickedFilterId = ''; this.filterStore.changeFilterValue({ name: this.option.name, value: !this.option.value, }); }, + + handleDbClick(e: Event) { + e.preventDefault(); + + + const lastClicked = this.filterStore.lastClickedFilterId == this.option.id; + console.log(this.filterStore.lastClickedFilterId); + this.filterStore.lastClickedFilterId = this.option.id; + this.option.value = true; + + this.filterStore.changeFilterValue({ + name: this.option.name, + value: !this.option.value, + }); + + this.filterStore.inputs.options + .filter((option) => { + return option.section == this.option.section && option.id != this.option.id; + }) + .forEach((option) => { + this.filterStore.changeFilterValue({ + name: option.name, + value: this.option.value, + }); + + option.value = !this.option.value; + }); + }, }, }); + diff --git a/src/components/StationsView/StationFilterCard.vue b/src/components/StationsView/StationFilterCard.vue index 65e397f..50b6a60 100644 --- a/src/components/StationsView/StationFilterCard.vue +++ b/src/components/StationsView/StationFilterCard.vue @@ -26,15 +26,28 @@
{{ $t('filters.title') }}
+

- +
+

+ {{ $t(`filters.sections.${section}`) }} + + +

+ +
+ +
+ +
+
+
{{ $t('filters.minimum-hours-title') }}
@@ -80,18 +93,25 @@
- -
-
- - - - -
-
+ +
+
+ + + + +
+
@@ -108,6 +128,7 @@ import { useStore } from '../../store/store'; import ActionButton from '../Global/ActionButton.vue'; import FilterOption from './FilterOption.vue'; +import { filterInitStates } from '../../store/constants/initFilterStates'; export default defineComponent({ components: { ActionButton, FilterOption }, @@ -181,15 +202,6 @@ export default defineComponent({ this.isVisible = !this.isVisible; }, - handleChange(change: { name: string; value: boolean }) { - this.filterStore.changeFilterValue({ - name: change.name, - value: !change.value, - }); - - if (this.saveOptions) StorageManager.setBooleanValue(change.name, change.value); - }, - handleInput(e: Event) { const target = e.target as HTMLInputElement; @@ -281,6 +293,14 @@ export default defineComponent({ } .card { + display: grid; + grid-template-rows: 1fr auto; + + &_info { + background-color: #111; + padding: 0.5em; + } + &_controls { display: flex; gap: 0.5em; @@ -292,13 +312,13 @@ export default defineComponent({ } &_content { + padding: 1em 0.5em; + display: flex; flex-direction: column; + gap: 1em; - - max-height: 90vh; - - padding: 1em; + overflow: auto; } &_title { @@ -309,18 +329,6 @@ export default defineComponent({ text-align: center; } - &_options { - display: grid; - grid-template-columns: repeat(4, minmax(0, 1fr)); - grid-template-rows: repeat(4, 1fr); - gap: 0.5em; - - @include smallScreen() { - grid-template-columns: repeat(auto-fit, minmax(8em, 1fr)); - grid-template-rows: auto; - } - } - &_regions { display: flex; justify-content: center; @@ -391,6 +399,9 @@ export default defineComponent({ } &_actions { + width: 100%; + padding: 0.5em; + .filter-option { max-width: 50%; margin: 0 auto; @@ -409,14 +420,42 @@ export default defineComponent({ padding: 0.5em; &[data-selected='true'] { - background-color: lightgreen; - color: black; + background-color: forestgreen; } } } } } +.card_options { + .option-section h3 { + display: flex; + align-items: center; + margin-bottom: 0.25em; + + gap: 0.5em; + + button { + padding: 0.15em; + color: coral; + } + } + + .section-inputs { + display: grid; + // flex-wrap: wrap; + grid-template-columns: repeat(3, minmax(0, 1fr)); + // grid-template-rows: repeat(3, 1fr); + gap: 0.5em; + margin: 1em 0; + + // @include smallScreen() { + // grid-template-columns: repeat(auto-fit, minmax(8em, 1fr)); + // grid-template-rows: auto; + // } + } +} + .slider { display: flex; align-items: center; diff --git a/src/components/TrainsView/TrainOptions.vue b/src/components/TrainsView/TrainOptions.vue index a3be8b1..a30693e 100644 --- a/src/components/TrainsView/TrainOptions.vue +++ b/src/components/TrainsView/TrainOptions.vue @@ -43,29 +43,34 @@

{{ $t('options.sort-title') }}

-
+ +
+ +

{{ $t('options.filter-title') }}

+ +
+
-

{{ $t('options.filter-title') }}

-
-
- -
- -
- - -
+
+
+
@@ -80,6 +85,7 @@ import keyMixin from '../../mixins/keyMixin'; import { TrainFilter } from '../../types/Trains/TrainOptionsTypes'; import ActionButton from '../Global/ActionButton.vue'; import SelectBox from '../Global/SelectBox.vue'; +import { TrainFilterSection } from '../../scripts/enums/TrainFilterType'; export default defineComponent({ components: { SelectBox, ActionButton }, @@ -101,6 +107,7 @@ export default defineComponent({ return { showOptions: false, lastSelectedFilter: null as TrainFilter | null, + TrainFilterSection, }; }, @@ -183,13 +190,24 @@ export default defineComponent({ margin: 0 auto; } -.filter-option { +.options_sorters { + display: flex; + grid-template-columns: repeat(3, 1fr); +} + +.options_filters > div { + display: flex; + width: 100%; + + gap: 0.5em; + button { - color: white; + width: 100%; + color: springgreen; font-weight: bold; - &[data-disabled='true'] { - color: #888; + &[data-inactive='true'] { + color: #aaa; } } } @@ -201,7 +219,7 @@ export default defineComponent({ margin-top: 1em; - button { + > * { width: 100%; } } diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue index 738e9ec..e927e42 100644 --- a/src/components/TrainsView/TrainTable.vue +++ b/src/components/TrainsView/TrainTable.vue @@ -12,10 +12,6 @@ {{ $t('trains.no-trains') }}
-
  • props.trains.findIndex(({ timetableData }) => timetableData && timetableData.routeDistance > 200) != -1 - ), }; }, - computed: { - trainNumbersWithTimeouts() { - return this.store.trainList.filter((train) => train.isTimeout).map((train) => train.trainNo); - }, - }, - activated() { const query = this.$route.query; if (query.trainNo && query.driverName) { @@ -159,7 +146,7 @@ img.train-image { .train { &-list { position: relative; - + @include smallScreen() { width: 100%; } diff --git a/src/constants/Trains/TrainOptionsConsts.ts b/src/constants/Trains/TrainOptionsConsts.ts index fff4f34..6f5dc14 100644 --- a/src/constants/Trains/TrainOptionsConsts.ts +++ b/src/constants/Trains/TrainOptionsConsts.ts @@ -1,33 +1,58 @@ -import { TrainFilterType } from '../../scripts/enums/TrainFilterType'; +import { TrainFilterSection, TrainFilterType } from '../../scripts/enums/TrainFilterType'; import { TrainFilter } from '../../types/Trains/TrainOptionsTypes'; export const trainFilters: TrainFilter[] = [ { id: TrainFilterType.twr, + section: TrainFilterSection.TRAIN_TYPE, isActive: true, }, { id: TrainFilterType.skr, + section: TrainFilterSection.TRAIN_TYPE, isActive: true, }, + { + id: TrainFilterType.common, + section: TrainFilterSection.TRAIN_TYPE, + isActive: true, + }, + { id: TrainFilterType.passenger, + section: TrainFilterSection.TIMETABLE_TYPE, isActive: true, }, { id: TrainFilterType.freight, + section: TrainFilterSection.TIMETABLE_TYPE, isActive: true, }, { id: TrainFilterType.other, + section: TrainFilterSection.TIMETABLE_TYPE, + isActive: true, + }, + + { + id: TrainFilterType.withComments, + section: TrainFilterSection.COMMENTS, isActive: true, }, { - id: TrainFilterType.comments, + id: TrainFilterType.noComments, + section: TrainFilterSection.COMMENTS, + isActive: true, + }, + + { + id: TrainFilterType.withTimetable, + section: TrainFilterSection.TIMETABLE, isActive: true, }, { id: TrainFilterType.noTimetable, + section: TrainFilterSection.TIMETABLE, isActive: true, }, ]; diff --git a/src/data/options.json b/src/data/options.json index 071fd8b..d532401 100644 --- a/src/data/options.json +++ b/src/data/options.json @@ -1,41 +1,38 @@ { + "optionSections": ["reality", "package-access", "access", "control", "addons", "blockades", "signals", "status"], + "options": [ - { - "id": "default", - "name": "default", - "iconName": "td2", - "section": "access", - "value": true, - "defaultValue": true - }, - { - "id": "not-default", - "name": "notDefault", - "iconName": "", - "section": "access", - "value": true, - "defaultValue": true - }, { "id": "real", "name": "real", - "iconName": "lock", - "section": "access", + "section": "reality", "value": true, "defaultValue": true }, { "id": "fictional", "name": "fictional", - "iconName": "user", - "section": "access", + "section": "reality", + "value": true, + "defaultValue": true + }, + { + "id": "default", + "name": "default", + "section": "package-access", + "value": true, + "defaultValue": true + }, + { + "id": "not-default", + "name": "notDefault", + "section": "package-access", "value": true, "defaultValue": true }, { "id": "non-public", "name": "nonPublic", - "iconName": "user", "section": "access", "value": true, "defaultValue": true @@ -43,7 +40,6 @@ { "id": "unavailable", "name": "unavailable", - "iconName": "user", "section": "access", "value": false, "defaultValue": false @@ -51,7 +47,6 @@ { "id": "abandoned", "name": "abandoned", - "iconName": "user", "section": "access", "value": false, "defaultValue": false @@ -59,7 +54,6 @@ { "id": "SPK", "name": "SPK", - "iconName": "SPK", "section": "control", "value": true, "defaultValue": true @@ -67,7 +61,6 @@ { "id": "SCS", "name": "SCS", - "iconName": "SCS", "section": "control", "value": true, "defaultValue": true @@ -75,15 +68,21 @@ { "id": "SPE", "name": "SPE", - "iconName": "SPE", + "section": "control", + "value": true, + "defaultValue": true + }, + + { + "id": "SPK-M", + "name": "mechaniczne+SPK", "section": "control", "value": true, "defaultValue": true }, { - "id": "manual", - "name": "ręczne", - "iconName": "ręczne", + "id": "SCS-M", + "name": "mechaniczne+SCS", "section": "control", "value": true, "defaultValue": true @@ -91,7 +90,27 @@ { "id": "mechanical", "name": "mechaniczne", - "iconName": "mechaniczne", + "section": "control", + "value": true, + "defaultValue": true + }, + { + "id": "SPK-R", + "name": "ręczne+SPK", + "section": "control", + "value": true, + "defaultValue": true + }, + { + "id": "SCS-R", + "name": "ręczne+SCS", + "section": "control", + "value": true, + "defaultValue": true + }, + { + "id": "manual", + "name": "ręczne", "section": "control", "value": true, "defaultValue": true @@ -99,23 +118,34 @@ { "id": "SUP", "name": "SUP", - "iconName": "SUP", - "section": "control", + "section": "addons", + "value": true, + "defaultValue": true + }, + { + "id": "noSUP", + "name": "noSUP", + "section": "addons", "value": true, "defaultValue": true }, { "id": "SBL", "name": "SBL", - "iconName": "SBL", - "section": "routes", + "section": "blockades", + "value": true, + "defaultValue": true + }, + { + "id": "PBL", + "name": "PBL", + "section": "blockades", "value": true, "defaultValue": true }, { "id": "modern", "name": "współczesna", - "iconName": "współczesna", "section": "signals", "value": true, "defaultValue": true @@ -123,7 +153,6 @@ { "id": "semaphores", "name": "kształtowa", - "iconName": "kształtowa", "section": "signals", "value": true, "defaultValue": true @@ -131,7 +160,6 @@ { "id": "mixed", "name": "mieszana", - "iconName": "mieszana", "section": "signals", "value": true, "defaultValue": true @@ -139,7 +167,6 @@ { "id": "historical", "name": "historyczna", - "iconName": "historyczna", "section": "signals", "value": true, "defaultValue": true @@ -148,7 +175,6 @@ { "id": "free", "name": "free", - "iconName": "", "section": "status", "value": false, @@ -157,7 +183,6 @@ { "id": "occupied", "name": "occupied", - "iconName": "", "section": "status", "value": true, @@ -166,7 +191,6 @@ { "id": "endingStatus", "name": "endingStatus", - "iconName": "", "section": "status", "value": true, @@ -175,7 +199,6 @@ { "id": "afkStatus", "name": "afkStatus", - "iconName": "", "section": "status", "value": true, @@ -184,7 +207,6 @@ { "id": "noSpaceStatus", "name": "noSpaceStatus", - "iconName": "", "section": "status", "value": true, @@ -193,7 +215,6 @@ { "id": "unavailableStatus", "name": "unavailableStatus", - "iconName": "", "section": "status", "value": true, @@ -254,7 +275,6 @@ { "id": "include-selected", "name": "include-selected", - "iconName": "", "section": "mode", "value": true, "defaultValue": true @@ -262,7 +282,6 @@ { "id": "save", "name": "save", - "iconName": "", "section": "mode", "value": true, "defaultValue": true diff --git a/src/locales/en.json b/src/locales/en.json index 26f5f84..34e4e54 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -35,7 +35,7 @@ "desc": { "control-type": "Control type: ", "signals-type": "Signals type: ", - "SBL": "This scenery has automatic line blockade system on following routes: ", + "SBL": "This scenery has automatic block signalling (ABS/SBL) system on following routes: ", "SUP": "Requires the SUP application (level crossing remote control simulator)", "TWB-all": "This scenery has two-way route blockade on all routes", "TWB-routes": "This scenery has two-way route blockade on following routes: ", @@ -94,7 +94,8 @@ "search-dispatcher": "Dispatcher name", "search-station": "Scenery name", "search-author": "Timetable author name", - "search-date": "Timetable date (CEST / GMT+2)", + "search-timetables-date": "Timetable date (CEST / GMT+2)", + "search-dispatchers-date": "Service date (CEST / GMT+2)", "sort-mass": "mass", "sort-speed": "speed", @@ -111,13 +112,16 @@ "sort-timestampFrom": "date", "sort-duration": "duration", - "filter-comments": "COMMENTS", - "filter-twr": "TWR", - "filter-skr": "SKR", + "filter-noComments": "NO COMMENTS", + "filter-withComments": "COMMENTS", + "filter-twr": "HIGH RISK CARGO", + "filter-skr": "EXCEEDED GAUGE", + "filter-common": "NO WARNINGS", "filter-passenger": "PASSENGER", "filter-freight": "FREIGHT", "filter-other": "OTHER", "filter-noTimetable": "NO TIMETABLE", + "filter-withTimetable": "TIMETABLE", "filter-reset": "RESET FILTERS", "filter-clear": "CLEAR FILTERS", @@ -128,14 +132,27 @@ "filter-active": "ACTIVE" }, "filters": { + "desc": " • Left mouse click: select / unselect chosen filter
    • Double left click: unselect all filters but chosen from a group
    • RESET: reset all filters from a group", + + "sections": { + "reality": "SCENERY REALITY", + "package-access": "IN-GAME AVAILABILITY", + "access": "GENERAL AVAILABILITY", + "control": "CONTROLS", + "signals": "SIGNALLING", + "addons": "ADDITIONAL PROGRAMS", + "blockades": "BLOCK SIGNALLING", + "status": "ONLINE STATUS" + }, + "endingStatus": "ENDS SOON", "afkStatus": "AFK", "noSpaceStatus": "NO SPACE", "unavailableStatus": "UNAVAILABLE", - "title": "STATION FILTER", - "default": "DEFAULT", - "not-default": "OTHER", + "title": "STATION FILTERS", + "default": "IN-GAME", + "not-default": "ADDITIONAL", "real": "REAL", "fictional": "FICTIONAL", "unavailable": "UNSUPPORTED", @@ -143,12 +160,22 @@ "abandoned": "ABANDONED", "SPK": "SPK", + "SPK-R": "SPK + MANUAL", + "SPK-M": "SPK + MECH.", "SCS": "SCS", + "SCS-R": "SCS + MANUAL", + "SCS-M": "SCS + MECH.", "SPE": "SPE", + "manual": "MANUAL", "mechanical": "MECHANICAL", - "SUP": "SUP", - "SBL": "SBL", + + "SUP": "SUP (RASP-UZK)", + "noSUP": "WITHOUT SUP", + + "SBL": "AUTOMATIC (SBL)", + "PBL": "SEMIAUTOMATIC (PBL)", + "modern": "MODERN", "semaphores": "SEMAPHORES", "mixed": "MIXED", @@ -169,7 +196,7 @@ "hour": "h", "no-limit": "NO LIMIT", "include-selected": "INCLUDE SELECTED", - "save": "SAVE FILTERS", + "save": "REMEMBER FILTERS", "reset": "RESET FILTERS", "close": "CLOSE FILTERS" }, @@ -187,7 +214,7 @@ "no-stations": "No stations to show here!", "scenery-search": "Search for scenery..." }, - "trains": { + "trains": { "no-trains": "No trains to show here!", "loading": "Loading train data...", "offline": "Offline ride", @@ -254,7 +281,7 @@ "minutes": "{minutes} mins", "hours": "{hours}h {minutes} mins", - "stock-info": "STOCK INFO", + "stock-info": "EXTRA INFO", "stock-length": "Length", "stock-mass": "Mass", "stock-max-speed": "Maximum registered speed", @@ -307,8 +334,8 @@ "two-way-routes": "Two way routes", "option-active-timetables": "Active timetables", - "option-timetables-history": "Scenery timetables history", - "option-dispatchers-history": "Scenery dispatchers history", + "option-timetables-history": "Timetables history", + "option-dispatchers-history": "Dispatchers history", "timetable-author-title": "Issued by", "timetable-author-unknown": "Author unknown", @@ -323,7 +350,10 @@ "req-level": "all dispatcher levels | dispatcher level {lvl} required | dispatcher level {lvl} required", "history-list-empty": "No recorded scenery history!", - "forum-topic": "Official {name} forum topic" + "forum-topic": "Official {name} forum topic", + + "pragotron-link": "Timetable pallet board (beta)", + "tablice-link": "Timetable summary board (by Thundo)" }, "availability": { "title": "Availability", diff --git a/src/locales/pl.json b/src/locales/pl.json index c3cd4cc..dc321d4 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -96,7 +96,8 @@ "search-dispatcher": "Nick dyżurnego", "search-station": "Nazwa scenerii", "search-author": "Nick autora rozkładu jazdy", - "search-date": "Data rozkładu jazdy (czas polski)", + "search-timetables-date": "Data rozkładu jazdy (czas polski)", + "search-dispatchers-date": "Data służby (czas polski)", "sort-distance": "kilometraż", "sort-total-stops": "stacje", @@ -105,7 +106,7 @@ "sort-timestampFrom": "data", "sort-duration": "czas dyżuru", "sort-id": "id rozkładu", - + "sort-mass": "masa", "sort-speed": "prędkość", "sort-length": "długość", @@ -114,13 +115,16 @@ "sort-delay": "opóźnienie", "sort-comments": "uwagi ekspl.", - "filter-comments": "UWAGI EKSPLOATACYJNE", - "filter-twr": "TWR", - "filter-skr": "PRZEKR. SKRAJNIA", + "filter-withComments": "UWAGI EKSPLOATACYJNE", + "filter-noComments": "BEZ UWAG", + "filter-twr": "WYS. RYZYKA", + "filter-skr": "SKRAJNIA", + "filter-common": "ZWYKŁE", "filter-passenger": "PASAŻERSKIE", "filter-freight": "TOWAROWE", "filter-other": "INNE", "filter-noTimetable": "BEZ RJ", + "filter-withTimetable": "ROZKŁAD JAZDY", "filter-reset": "ZRESETUJ FILTRY", "filter-clear": "WYŁĄCZ FILTRY", @@ -131,6 +135,19 @@ "filter-active": "AKTYWNE" }, "filters": { + "desc": " • Kliknięcie: zaznaczenie / odznaczenie filtru
    • Podwójne kliknięcie: odznaczenie reszty filtrów z grupy
    • RESET: zresetowanie filtrów z grupy", + + "sections": { + "reality": "FIKCYJNOŚĆ SCENERII", + "package-access": "DOSTĘPNOŚĆ W PACZCE", + "access": "DOSTĘPNOŚĆ OGÓLNA", + "control": "TYP STEROWANIA", + "signals": "TYP SYGNALIZACJI", + "addons": "DODATKOWE PROGRAMY", + "blockades": "BLOKADY LINIOWE", + "status": "STATUS ONLINE" + }, + "endingStatus": "KOŃCZY", "afkStatus": "Z/W", "noSpaceStatus": "BRAK MIEJSCA", @@ -146,18 +163,29 @@ "abandoned": "WYCOFANA", "SPK": "SPK", + "SPK-R": "SPK + RĘCZNE", + "SPK-M": "SPK + MECH.", "SCS": "SCS", + "SCS-R": "SCS + RĘCZNE", + "SCS-M": "SCS + MECH.", "SPE": "SPE", "manual": "RĘCZNE", - "SUP": "SUP", - "SBL": "SBL", + + "SUP": "SUP (RASP-UZK)", + "noSUP": "BEZ SUP", + + "SBL": "SAMOCZYNNA", + "PBL": "PÓŁSAMOCZYNNA", + "mechanical": "MECHANICZNE", "modern": "WSPÓŁCZESNA", "semaphores": "KSZTAŁTOWA", "mixed": "MIESZANA", "historical": "HISTORYCZNA", + "free": "WOLNA", "occupied": "ZAJĘTA", + "sliders": { "min-lvl": "MIN. WYMAGANY POZIOM DYŻURNEGO", "max-lvl": "MAKS. WYMAGANY POZIOM DYŻURNEGO", @@ -166,13 +194,14 @@ "routes-2t-cat": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)", "routes-2t-other": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)" }, + "authors-search": "Szukaj autora (uwzględnia inne filtry)", "minimum-hours-title": "POKAŻ TYLKO SCENERIE DOSTĘPNE MINIMUM DO:", "now": "TERAZ", "hour": " godz.", "no-limit": "BEZ LIMITU", "include-selected": "POKAŻ ZAZNACZONE", - "save": "ZAPISZ FILTRY", + "save": "ZAPAMIĘTAJ FILTRY", "reset": "RESETUJ FILTRY", "close": "ZAMKNIJ FILTRY" }, @@ -258,7 +287,7 @@ "timetable-fulfilled": "WYPEŁNIONY", "timetable-abandoned": "PORZUCONY", - "stock-info": "INFORMACJE O SKŁADZIE", + "stock-info": "DODATKOWE INFORMACJE", "stock-length": "Długość", "stock-mass": "Masa", "stock-max-speed": "Maks. zarejestrowana prędkość", @@ -303,7 +332,7 @@ "no-scenery": "Ups! Ta sceneria nie istnieje!", "return-btn": "Wróć na stronę główną", "history-btn": "Przejdź do widoku historii dyżurnych ruchu", - "info-btn": "Wróc do widoku scenerii", + "info-btn": "Wróć do widoku scenerii", "authors-title": "Autor scenerii | Autorzy scenerii", "lines-title": "Rzeczywiste linie", "project-title": "Projekt", @@ -311,8 +340,8 @@ "two-way-routes": "Szlaki dwutorowe", "option-active-timetables": "Aktywne rozkłady jazdy", - "option-timetables-history": "Historia rozkładów scenerii", - "option-dispatchers-history": "Historia dyżurów scenerii", + "option-timetables-history": "Historia rozkładów", + "option-dispatchers-history": "Historia dyżurów", "timetable-author-title": "Wydany przez", "timetable-author-unknown": "Autor nieznany", @@ -327,7 +356,10 @@ "req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego", "history-list-empty": "Brak historii dla tej scenerii!", - "forum-topic": "Oficjalny wątek scenerii {name}" + "forum-topic": "Oficjalny wątek scenerii {name}", + + "pragotron-link": "Paletowa tablica informacyjna (beta)", + "tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)" }, "availability": { "title": "Dostępność", diff --git a/src/main.ts b/src/main.ts index 0382cfc..b29c074 100644 --- a/src/main.ts +++ b/src/main.ts @@ -12,6 +12,7 @@ import { registerSW } from 'virtual:pwa-register'; const i18n = createI18n({ locale: 'pl', legacy: false, + warnHtmlMessage: false, fallbackLocale: 'pl', messages: { en: enLang, diff --git a/src/scripts/enums/TrainFilterType.ts b/src/scripts/enums/TrainFilterType.ts index 4ce8b04..efb2494 100644 --- a/src/scripts/enums/TrainFilterType.ts +++ b/src/scripts/enums/TrainFilterType.ts @@ -1,9 +1,21 @@ -export const enum TrainFilterType { - comments = "comments", - twr = "twr", - skr = "skr", - passenger = "passenger", - freight = "freight", - other = "other", - noTimetable = "noTimetable" +export enum TrainFilterSection { + TRAIN_TYPE = 'TRAIN_TYPE', + TIMETABLE_TYPE = 'TIMETABLE_TYPE', + COMMENTS = 'COMMENTS', + TIMETABLE = 'TIMETABLE', +} + +export const enum TrainFilterType { + noComments = 'noComments', + withComments = 'withComments', + + twr = 'twr', + skr = 'skr', + common = 'common', + + passenger = 'passenger', + freight = 'freight', + other = 'other', + noTimetable = 'noTimetable', + withTimetable = 'withTimetable', } diff --git a/src/scripts/interfaces/Filter.ts b/src/scripts/interfaces/Filter.ts index 0afc51c..441b69e 100644 --- a/src/scripts/interfaces/Filter.ts +++ b/src/scripts/interfaces/Filter.ts @@ -1,16 +1,22 @@ export default interface Filter { - [key: string]: (boolean | number | string), + [key: string]: boolean | number | string; default: boolean; notDefault: boolean; real: boolean; fictional: boolean; - "SPK": boolean; - "SCS": boolean; - "SPE": boolean; - "SUP": boolean; + SPK: boolean; + SCS: boolean; + SPE: boolean; + SUP: boolean; + noSUP: boolean; ręczne: boolean; + 'ręczne+SPK': boolean; + 'ręczne+SCS': boolean; mechaniczne: boolean; - "SBL": boolean; + 'mechaniczne+SPK': boolean; + 'mechaniczne+SCS': boolean; + SBL: boolean; + PBL: boolean; współczesna: boolean; kształtowa: boolean; historyczna: boolean; diff --git a/src/scripts/interfaces/api/TimetablesAPIData.ts b/src/scripts/interfaces/api/TimetablesAPIData.ts index da13061..2defce9 100644 --- a/src/scripts/interfaces/api/TimetablesAPIData.ts +++ b/src/scripts/interfaces/api/TimetablesAPIData.ts @@ -1,10 +1,12 @@ export interface TimetableHistory { id: number; - + createdAt: string; + updatedAt: string; + timetableId: number; trainNo: number; trainCategoryCode: string; - + driverId: number; driverName: string; driverLevel: number | null; @@ -33,6 +35,8 @@ export interface TimetableHistory { authorName?: string; authorId?: number; + stopsString?: string; + stockString?: string; stockMass?: number; stockLength?: number; diff --git a/src/scripts/interfaces/api/TrainAPIData.ts b/src/scripts/interfaces/api/TrainAPIData.ts index 3147114..8e2d97b 100644 --- a/src/scripts/interfaces/api/TrainAPIData.ts +++ b/src/scripts/interfaces/api/TrainAPIData.ts @@ -1,4 +1,44 @@ -export default interface TrainAPIData { +export interface TimetableStop { + stopName: string; + stopNameRAW: string; + stopType: string; + stopDistance: number; + pointId: number; + + mainStop: boolean; + + arrivalLine: string; + arrivalTimestamp: number; + arrivalRealTimestamp: number; + arrivalDelay: number; + + departureLine: string; + departureTimestamp: number; + departureRealTimestamp: number; + departureDelay: number; + + comments?: any; + + beginsHere: boolean; + terminatesHere: boolean; + confirmed: boolean; + stopped: boolean; + stopTime: number; +} + +export interface TrainTimetable { + timetableId: number; + category: string; + route: string; + + stopList: TimetableStop[]; + + TWR: boolean; + SKR: boolean; + sceneries: string[]; +} + +export interface TrainAPIData { trainNo: number; mass: number; @@ -24,41 +64,5 @@ export default interface TrainAPIData { region: string; isTimeout: boolean; - timetable?: { - timetableId: number; - category: string; - route: string; - - stopList: { - stopName: string; - stopNameRAW: string; - stopType: string; - stopDistance: number; - pointId: number; - - mainStop: boolean; - - arrivalLine: string; - arrivalTimestamp: number; - arrivalRealTimestamp: number; - arrivalDelay: number; - - departureLine: string; - departureTimestamp: number; - departureRealTimestamp: number; - departureDelay: number; - - comments?: any; - - beginsHere: boolean; - terminatesHere: boolean; - confirmed: boolean; - stopped: boolean; - stopTime: number; - }[]; - - TWR: boolean; - SKR: boolean; - sceneries: string[]; - }; + timetable?: TrainTimetable; } diff --git a/src/scripts/managers/trainFilterManager.ts b/src/scripts/managers/trainFilterManager.ts index 674ab58..05c10f9 100644 --- a/src/scripts/managers/trainFilterManager.ts +++ b/src/scripts/managers/trainFilterManager.ts @@ -24,26 +24,36 @@ function filterTrainList(trainList: Train[], searchedTrain: string, searchedDriv const isFiltered = filters.every((f) => { if (f.isActive) return true; - if (!train.timetableData) return filters.find((filter) => filter.id == TrainFilterType.noTimetable)!.isActive; - switch (f.id) { - case TrainFilterType.comments: - return !train.timetableData.followingStops.some((stop) => stop.comments); + case TrainFilterType.noTimetable: + return train.timetableData; + + case TrainFilterType.withTimetable: + return !train.timetableData; + + case TrainFilterType.withComments: + return !train.timetableData?.followingStops.some((stop) => stop.comments); + + case TrainFilterType.noComments: + return train.timetableData?.followingStops.some((stop) => stop.comments); case TrainFilterType.twr: - return !train.timetableData.TWR; + return !train.timetableData?.TWR; case TrainFilterType.skr: - return !train.timetableData.SKR; + return !train.timetableData?.SKR; + + case TrainFilterType.common: + return train.timetableData?.SKR || train.timetableData?.TWR; case TrainFilterType.passenger: - return !/^[AMRE]\D{2}$/.test(train.timetableData.category); + return !/^[AMRE]\D{2}$/.test(train.timetableData?.category || ''); case TrainFilterType.freight: - return !train.timetableData.category.startsWith('T'); + return !train.timetableData?.category.startsWith('T'); case TrainFilterType.other: - return !/^[PXZL]\D{2}$/.test(train.timetableData.category); + return !/^[PXZL]\D{2}$/.test(train.timetableData?.category || ''); default: return true; @@ -53,7 +63,7 @@ function filterTrainList(trainList: Train[], searchedTrain: string, searchedDriv return ( (searchedTrain.length > 0 ? train.trainNo.toString().startsWith(searchedTrain) : true) && (searchedDriver.length > 0 ? train.driverName.toLowerCase().startsWith(searchedDriver.toLowerCase()) : true) && - (!train.timetableData ? !train.online : true) && + (!train.timetableData ? train.online : train.timetableData) && isFiltered ); }); diff --git a/src/scripts/utils/apiURLs.ts b/src/scripts/utils/apiURLs.ts index 5c10567..fe47142 100644 --- a/src/scripts/utils/apiURLs.ts +++ b/src/scripts/utils/apiURLs.ts @@ -1,5 +1,7 @@ export const URLs = { stacjownikAPI: - import.meta.env.VITE_APP_API_DEV == 1 && !import.meta.env.PROD ? 'http://localhost:3000' : 'https://spythere.pl', + import.meta.env.VITE_APP_API_DEV == 1 && !import.meta.env.PROD + ? 'http://localhost:3000' + : 'https://spythere.pl', stacjownikAPIDev: 'localhost:3000', }; diff --git a/src/store/constants/initFilterStates.ts b/src/store/constants/initFilterStates.ts new file mode 100644 index 0000000..9e2aa83 --- /dev/null +++ b/src/store/constants/initFilterStates.ts @@ -0,0 +1,49 @@ +import Filter from "../../scripts/interfaces/Filter"; + +export const filterInitStates: Filter = { + default: false, + notDefault: false, + real: false, + fictional: false, + SPK: false, + SCS: false, + SPE: false, + SUP: false, + noSUP: false, + ręczne: false, + 'ręczne+SPK': false, + 'ręczne+SCS': false, + mechaniczne: false, + 'mechaniczne+SPK': false, + 'mechaniczne+SCS': false, + współczesna: false, + kształtowa: false, + historyczna: false, + mieszana: false, + SBL: false, + PBL: false, + minLevel: 0, + maxLevel: 20, + minOneWayCatenary: 0, + minOneWay: 0, + minTwoWayCatenary: 0, + minTwoWay: 0, + 'include-selected': false, + 'no-1track': false, + 'no-2track': false, + free: true, + occupied: false, + ending: false, + nonPublic: false, + unavailable: true, + abandoned: true, + afkStatus: false, + endingStatus: false, + noSpaceStatus: false, + unavailableStatus: false, + unsignedStatus: false, + + authors: '', + + onlineFromHours: 0, +}; diff --git a/src/store/stationFiltersStore.ts b/src/store/stationFiltersStore.ts index 8bd778c..ca48eb9 100644 --- a/src/store/stationFiltersStore.ts +++ b/src/store/stationFiltersStore.ts @@ -4,232 +4,8 @@ import Filter from '../scripts/interfaces/Filter'; import Station from '../scripts/interfaces/Station'; import StorageManager from '../scripts/managers/storageManager'; import { useStore } from './store'; - -const sortStations = (a: Station, b: Station, sorter: { index: number; dir: number }) => { - switch (sorter.index) { - case 0: - return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name); - - case 1: - if ((a.generalInfo?.reqLevel || 0) > (b.generalInfo?.reqLevel || 0)) return sorter.dir; - if ((a.generalInfo?.reqLevel || 0) < (b.generalInfo?.reqLevel || 0)) return -sorter.dir; - break; - - case 2: - if ((a.onlineInfo?.statusTimestamp || 0) > (b.onlineInfo?.statusTimestamp || 0)) return sorter.dir; - if ((a.onlineInfo?.statusTimestamp || 0) < (b.onlineInfo?.statusTimestamp || 0)) return -sorter.dir; - break; - - case 3: - if ((a.onlineInfo?.dispatcherName.toLowerCase() || '') > (b.onlineInfo?.dispatcherName.toLowerCase() || '')) - return sorter.dir; - if ((a.onlineInfo?.dispatcherName.toLowerCase() || '') < (b.onlineInfo?.dispatcherName.toLowerCase() || '')) - return -sorter.dir; - break; - - case 4: - if ((a.onlineInfo?.dispatcherExp || 0) > (b.onlineInfo?.dispatcherExp || 0)) return sorter.dir; - if ((a.onlineInfo?.dispatcherExp || 0) < (b.onlineInfo?.dispatcherExp || 0)) return -sorter.dir; - break; - - case 7: - if ((a.onlineInfo?.currentUsers || 0) > (b.onlineInfo?.currentUsers || 0)) return sorter.dir; - if ((a.onlineInfo?.currentUsers || 0) < (b.onlineInfo?.currentUsers || 0)) return -sorter.dir; - - if ((a.onlineInfo?.maxUsers || 0) > (b.onlineInfo?.maxUsers || 0)) return sorter.dir; - if ((a.onlineInfo?.maxUsers || 0) < (b.onlineInfo?.maxUsers || 0)) return -sorter.dir; - break; - - case 8: - if ((a.onlineInfo?.spawns.length || 0) > (b.onlineInfo?.spawns.length || 0)) return sorter.dir; - if ((a.onlineInfo?.spawns.length || 0) < (b.onlineInfo?.spawns.length || 0)) return -sorter.dir; - - break; - - case 9: - if ((a.onlineInfo?.scheduledTrains?.length || 0) > (b.onlineInfo?.scheduledTrains?.length || 0)) - return sorter.dir; - if ((a.onlineInfo?.scheduledTrains?.length || 0) < (b.onlineInfo?.scheduledTrains?.length || 0)) - return -sorter.dir; - - default: - break; - } - - return a.name.localeCompare(b.name); -}; - -const filterStations = (station: Station, filters: Filter, isOffline = false) => { - const returnMode = false; - - if ((station.generalInfo?.availability == 'nonPublic' || !station.generalInfo) && filters['nonPublic']) - return returnMode; - - if (station.onlineInfo?.statusID == 'ending' && filters['ending']) return returnMode; - - if ( - station.onlineInfo && - station.onlineInfo.statusTimestamp > 0 && - filters['onlineFromHours'] < 8 && - station.onlineInfo.statusTimestamp <= Date.now() + filters['onlineFromHours'] * 3600000 - ) - return returnMode; - - if (filters['onlineFromHours'] > 0 && station.onlineInfo && station.onlineInfo.statusTimestamp <= 0) - return returnMode; - if (filters['onlineFromHours'] == 8 && station.onlineInfo?.statusID != 'no-limit') return returnMode; - - if (station.onlineInfo?.statusID == 'ending' && filters['endingStatus']) return returnMode; - if ( - (station.onlineInfo?.statusID == 'not-signed' || station.onlineInfo?.statusID == 'unavailable') && - filters['unavailableStatus'] - ) - return returnMode; - if (station.onlineInfo?.statusID == 'brb' && filters['afkStatus']) return returnMode; - if (station.onlineInfo?.statusID == 'no-space' && filters['noSpaceStatus']) return returnMode; - - if (station.onlineInfo && filters['occupied']) return returnMode; - if (!station.onlineInfo && filters['free']) return returnMode; - if (station.generalInfo?.availability == 'unavailable' && filters['unavailable'] && !station.onlineInfo) - return returnMode; - - if (station.generalInfo) { - const routes = station.generalInfo.routes; - const availability = station.generalInfo.availability; - - if (filters['abandoned'] && availability == 'abandoned' && !station.onlineInfo) return returnMode; - - if (availability == 'default' && filters['default']) return returnMode; - if ( - availability != 'default' && - filters['notDefault'] && - !(availability == 'abandoned' || availability == 'unavailable') - ) - return returnMode; - - if (filters['real'] && station.generalInfo.lines != '') return returnMode; - if ( - filters['fictional'] && - station.generalInfo.lines == '' && - availability != 'abandoned' && - availability != 'unavailable' - ) - return returnMode; - - if ( - station.generalInfo.reqLevel + - (availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned' ? 1 : 0) < - filters['minLevel'] - ) - return returnMode; - if ( - station.generalInfo.reqLevel + - (availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned' ? 1 : 0) > - filters['maxLevel'] - ) - return returnMode; - - if ( - filters['no-1track'] && - (routes.oneWayCatenaryRouteNames.length != 0 || routes.oneWayNoCatenaryRouteNames.length != 0) - ) - return returnMode; - if ( - filters['no-2track'] && - (routes.twoWayCatenaryRouteNames.length != 0 || routes.twoWayNoCatenaryRouteNames.length != 0) - ) - return returnMode; - - if (routes.oneWayCatenaryRouteNames.length < filters['minOneWayCatenary']) return returnMode; - if (routes.oneWayNoCatenaryRouteNames.length < filters['minOneWay']) return returnMode; - - if (routes.twoWayCatenaryRouteNames.length < filters['minTwoWayCatenary']) return returnMode; - if (routes.twoWayNoCatenaryRouteNames.length < filters['minTwoWay']) return returnMode; - - if (filters[station.generalInfo.controlType]) return returnMode; - if (filters[station.generalInfo.signalType]) return returnMode; - - if ( - filters['SPK'] && - (station.generalInfo.controlType === 'SPK' || station.generalInfo.controlType.includes('+SPK')) - ) - return returnMode; - if ( - filters['SCS'] && - (station.generalInfo.controlType === 'SCS' || station.generalInfo.controlType.includes('+SCS')) - ) - return returnMode; - if ( - filters['SPE'] && - (station.generalInfo.controlType === 'SPE' || station.generalInfo.controlType.includes('+SPE')) - ) - return returnMode; - if (filters['SUP'] && station.generalInfo.SUP) return returnMode; - - if ( - filters['SCS'] && - filters['SPK'] && - (station.generalInfo.controlType.includes('SPK') || station.generalInfo.controlType.includes('SCS')) - ) - return returnMode; - - if (filters['mechaniczne'] && station.generalInfo.controlType.includes('mechaniczne')) return returnMode; - - if (filters['ręczne'] && station.generalInfo.controlType.includes('ręczne')) return returnMode; - - if (filters['SBL'] && routes.sblRouteNames.length > 0) return returnMode; - - if ( - filters['authors'].length > 3 && - !station.generalInfo.authors?.map((a) => a.toLocaleLowerCase()).includes(filters['authors'].toLocaleLowerCase()) - ) - return returnMode; - } - - return true; -}; - -const filterInitStates: Filter = { - default: false, - notDefault: false, - real: false, - fictional: false, - SPK: false, - SCS: false, - SPE: false, - SUP: false, - ręczne: false, - mechaniczne: false, - współczesna: false, - kształtowa: false, - historyczna: false, - mieszana: false, - SBL: false, - minLevel: 0, - maxLevel: 20, - minOneWayCatenary: 0, - minOneWay: 0, - minTwoWayCatenary: 0, - minTwoWay: 0, - 'include-selected': false, - 'no-1track': false, - 'no-2track': false, - free: true, - occupied: false, - ending: false, - nonPublic: false, - unavailable: true, - abandoned: true, - afkStatus: false, - endingStatus: false, - noSpaceStatus: false, - unavailableStatus: false, - unsignedStatus: false, - - authors: '', - - onlineFromHours: 0, -}; +import { filterInitStates } from './constants/initFilterStates'; +import { filterStations, sortStations } from './utils/filterUtils'; export const useStationFiltersStore = defineStore('stationFiltersStore', { state() { @@ -238,9 +14,16 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', { filters: { ...filterInitStates }, sorterActive: { index: 0, dir: 1 }, store: useStore(), + lastClickedFilterId: '', }; }, + getters: { + areFiltersAtDefault(state) { + return Object.keys(state.filters).every((f) => state.filters[f] === filterInitStates[f]); + }, + }, + actions: { getFilteredStationList(stationList: Station[], region: string): Station[] { return stationList @@ -251,7 +34,7 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', { return station; }) - .filter((station) => filterStations(station, this.filters, this.store.isOffline)) + .filter((station) => filterStations(station, this.filters)) .sort((a, b) => sortStations(a, b, this.sorterActive)); }, @@ -259,10 +42,10 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', { if (!StorageManager.isRegistered('options_saved')) return; this.inputs.options.forEach((option) => { - if (!StorageManager.isRegistered(option.id)) return; - const savedValue = StorageManager.getBooleanValue(option.id); + if (!StorageManager.isRegistered(option.name)) return; + const savedValue = StorageManager.getBooleanValue(option.name); - this.filters[option.id] = savedValue; + this.filters[option.name] = savedValue; option.value = !savedValue; }); @@ -295,6 +78,17 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', { }); }, + resetSectionOptions(section: string) { + this.inputs.options.forEach((option) => { + if (option.section != section) return; + + option.value = option.defaultValue; + this.filters[option.id] = !option.defaultValue; + + StorageManager.setBooleanValue(option.name, !option.defaultValue); + }); + }, + changeSorter(index: number) { if (index > 4 && index < 7) return; @@ -305,4 +99,3 @@ export const useStationFiltersStore = defineStore('stationFiltersStore', { }, }, }); - diff --git a/src/store/storeTypes.ts b/src/store/storeTypes.ts index 05be43d..f874743 100644 --- a/src/store/storeTypes.ts +++ b/src/store/storeTypes.ts @@ -1,7 +1,7 @@ import { Socket } from 'socket.io-client'; import { DataStatus } from '../scripts/enums/DataStatus'; import StationAPIData from '../scripts/interfaces/api/StationAPIData'; -import TrainAPIData from '../scripts/interfaces/api/TrainAPIData'; +import { TrainAPIData } from '../scripts/interfaces/api/TrainAPIData'; import Station from '../scripts/interfaces/Station'; import Train from '../scripts/interfaces/Train'; import { DispatcherStatsAPIData } from '../scripts/interfaces/api/DispatcherStatsAPIData'; @@ -70,9 +70,9 @@ export interface StationJSONData { SUP: boolean; routes: string; - + checkpoints: string | null; authors?: string; availability: Availability; -} \ No newline at end of file +} diff --git a/src/store/utils/filterUtils.ts b/src/store/utils/filterUtils.ts new file mode 100644 index 0000000..02a3c7b --- /dev/null +++ b/src/store/utils/filterUtils.ts @@ -0,0 +1,141 @@ +import Filter from '../../scripts/interfaces/Filter'; +import Station from '../../scripts/interfaces/Station'; + +export const sortStations = (a: Station, b: Station, sorter: { index: number; dir: number }) => { + switch (sorter.index) { + case 0: + return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name); + + case 1: + if ((a.generalInfo?.reqLevel || 0) > (b.generalInfo?.reqLevel || 0)) return sorter.dir; + if ((a.generalInfo?.reqLevel || 0) < (b.generalInfo?.reqLevel || 0)) return -sorter.dir; + break; + + case 2: + if ((a.onlineInfo?.statusTimestamp || 0) > (b.onlineInfo?.statusTimestamp || 0)) return sorter.dir; + if ((a.onlineInfo?.statusTimestamp || 0) < (b.onlineInfo?.statusTimestamp || 0)) return -sorter.dir; + break; + + case 3: + if ((a.onlineInfo?.dispatcherName.toLowerCase() || '') > (b.onlineInfo?.dispatcherName.toLowerCase() || '')) + return sorter.dir; + if ((a.onlineInfo?.dispatcherName.toLowerCase() || '') < (b.onlineInfo?.dispatcherName.toLowerCase() || '')) + return -sorter.dir; + break; + + case 4: + if ((a.onlineInfo?.dispatcherExp || 0) > (b.onlineInfo?.dispatcherExp || 0)) return sorter.dir; + if ((a.onlineInfo?.dispatcherExp || 0) < (b.onlineInfo?.dispatcherExp || 0)) return -sorter.dir; + break; + + case 7: + if ((a.onlineInfo?.currentUsers || 0) > (b.onlineInfo?.currentUsers || 0)) return sorter.dir; + if ((a.onlineInfo?.currentUsers || 0) < (b.onlineInfo?.currentUsers || 0)) return -sorter.dir; + + if ((a.onlineInfo?.maxUsers || 0) > (b.onlineInfo?.maxUsers || 0)) return sorter.dir; + if ((a.onlineInfo?.maxUsers || 0) < (b.onlineInfo?.maxUsers || 0)) return -sorter.dir; + break; + + case 8: + if ((a.onlineInfo?.spawns.length || 0) > (b.onlineInfo?.spawns.length || 0)) return sorter.dir; + if ((a.onlineInfo?.spawns.length || 0) < (b.onlineInfo?.spawns.length || 0)) return -sorter.dir; + + break; + + case 9: + if ((a.onlineInfo?.scheduledTrains?.length || 0) > (b.onlineInfo?.scheduledTrains?.length || 0)) + return sorter.dir; + if ((a.onlineInfo?.scheduledTrains?.length || 0) < (b.onlineInfo?.scheduledTrains?.length || 0)) + return -sorter.dir; + + default: + break; + } + + return a.name.localeCompare(b.name); +}; + +export const filterStations = (station: Station, filters: Filter) => { + if (!station.onlineInfo && filters['free']) return false; + + if (station.onlineInfo) { + const { statusID, statusTimestamp } = station.onlineInfo; + + const isEnding = statusID == 'ending' && filters['endingStatus']; + const isNotSigned = (statusID == 'not-signed' || statusID == 'unavailable') && filters['unavailableStatus']; + const isAFK = statusID == 'brb' && filters['afkStatus']; + const isNoSpace = statusID == 'no-space' && filters['noSpaceStatus']; + const isOccupied = station.onlineInfo && filters['occupied']; + + const isOnlineInBounds = + (filters['onlineFromHours'] < 8 && + statusTimestamp > 0 && + statusTimestamp <= Date.now() + filters['onlineFromHours'] * 3600000) || + (filters['onlineFromHours'] > 0 && statusTimestamp <= 0) || + (filters['onlineFromHours'] == 8 && statusID != 'no-limit'); + + if (isEnding || isOnlineInBounds || isNotSigned || isAFK || isNoSpace || isOccupied) return false; + } + + if ((station.generalInfo?.availability == 'nonPublic' || !station.generalInfo) && filters['nonPublic']) return false; + + if (station.generalInfo) { + const { routes, availability, controlType, lines, reqLevel, signalType, SUP, authors } = station.generalInfo; + + if (availability == 'unavailable' && filters['unavailable'] && !station.onlineInfo) return false; + if (availability == 'abandoned' && filters['abandoned'] && !station.onlineInfo) return false; + if (availability == 'default' && filters['default']) return false; + + if ( + availability != 'default' && + filters['notDefault'] && + !(availability == 'abandoned' || availability == 'unavailable') + ) + return false; + + if (filters['real'] && lines) return false; + if (filters['fictional'] && !lines) return false; + + const otherAvailability = + availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned'; + + if (reqLevel + (otherAvailability ? 1 : 0) < filters['minLevel']) return false; + + if (reqLevel + (otherAvailability ? 1 : 0) > filters['maxLevel']) return false; + + if ( + filters['no-1track'] && + (routes.oneWayCatenaryRouteNames.length != 0 || routes.oneWayNoCatenaryRouteNames.length != 0) + ) + return false; + + if ( + filters['no-2track'] && + (routes.twoWayCatenaryRouteNames.length != 0 || routes.twoWayNoCatenaryRouteNames.length != 0) + ) + return false; + + if (routes.oneWayCatenaryRouteNames.length < filters['minOneWayCatenary']) return false; + if (routes.oneWayNoCatenaryRouteNames.length < filters['minOneWay']) return false; + + if (routes.twoWayCatenaryRouteNames.length < filters['minTwoWayCatenary']) return false; + if (routes.twoWayNoCatenaryRouteNames.length < filters['minTwoWay']) return false; + + if (filters[controlType]) return false; + if (filters[signalType]) return false; + + if (filters['SUP'] && SUP) return false; + if (filters['noSUP'] && !SUP) return false; + + if (filters['SBL'] && routes.sblRouteNames.length > 0) return false; + if (filters['PBL'] && routes.sblRouteNames.length == 0) return false; + + if ( + filters['authors'].length > 3 && + !authors?.map((a) => a.toLocaleLowerCase()).includes(filters['authors'].toLocaleLowerCase()) + ) + return false; + } + + return true; +}; diff --git a/src/styles/card.scss b/src/styles/card.scss index 80ecd71..9739d44 100644 --- a/src/styles/card.scss +++ b/src/styles/card.scss @@ -21,17 +21,16 @@ transform: translate(-50%, -50%); - overflow-x: hidden; - background: #202020da; + overflow: hidden; + background: #202020e8; - box-shadow: 0 0 15px 5px #303030; + box-shadow: 0 0 15px 0 black; + border: 1px solid #202020e8; - width: 600px; + width: 95%; + max-width: 700px; - @include smallScreen { - width: 100%; - height: 80vh; - } + max-height: 95vh; &-exit { position: absolute; @@ -46,3 +45,9 @@ cursor: pointer; } } + +@include smallScreen { + .card { + max-height: 85vh; + } +} diff --git a/src/styles/filters_options.scss b/src/styles/filters_options.scss index 2daba67..dc28240 100644 --- a/src/styles/filters_options.scss +++ b/src/styles/filters_options.scss @@ -67,7 +67,7 @@ h1.option-title { box-shadow: 0 5px 10px 2px #0f0f0f; width: 97%; - max-width: 500px; + max-width: 550px; padding: 1em; z-index: 100; @@ -77,6 +77,7 @@ h1.option-title { display: flex; align-items: center; flex-wrap: wrap; + gap: 0.5em; padding: 0.25em 0.25em 0 0; } @@ -84,17 +85,18 @@ h1.option-title { .options_filters { display: flex; flex-wrap: wrap; + + gap: 0.5em; margin: 0.5em 0 0 0; } .sort-option, .filter-option { - margin: 0.25em 0.25em 0.25em 0; + padding: 0.25em 0.5em; } .sort-option[data-selected='true'] { color: $accentCol; - font-weight: bold; } .filter-option { diff --git a/src/styles/global.scss b/src/styles/global.scss index 5d8daa0..3e4efc6 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -202,10 +202,6 @@ button { pointer-events: none; opacity: 0.85; } - - &[data-inactive='true'] { - opacity: 0.55; - } } button.btn--filled { diff --git a/src/types/Trains/TrainOptionsTypes.ts b/src/types/Trains/TrainOptionsTypes.ts index b9db0a3..1c28fcb 100644 --- a/src/types/Trains/TrainOptionsTypes.ts +++ b/src/types/Trains/TrainOptionsTypes.ts @@ -1,6 +1,7 @@ -import { TrainFilterType } from "../../scripts/enums/TrainFilterType"; +import { TrainFilterSection, TrainFilterType } from '../../scripts/enums/TrainFilterType'; export interface TrainFilter { id: TrainFilterType; + section: TrainFilterSection; isActive: boolean; -} \ No newline at end of file +} diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue index 56b28eb..8c76336 100644 --- a/src/views/JournalDispatchers.vue +++ b/src/views/JournalDispatchers.vue @@ -10,6 +10,7 @@ :sorter-option-ids="['timestampFrom', 'duration']" :data-status="dataStatus" :current-options-active="currentOptionsActive" + optionsType="dispatchers" />
    diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue index 1f5e6ac..4b82da7 100644 --- a/src/views/JournalTimetables.vue +++ b/src/views/JournalTimetables.vue @@ -11,6 +11,7 @@ :filters="journalTimetableFilters" :currentOptionsActive="currentOptionsActive" :data-status="dataStatus" + optionsType="timetables" /> diff --git a/vite.config.ts b/vite.config.ts index d76787a..44c3e28 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -52,3 +52,4 @@ export default defineConfig({ }); +