From c3f687d43938d3772f01882bc2261f4e5bdf0782 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 4 Jun 2023 01:45:58 +0200 Subject: [PATCH] =?UTF-8?q?hotfixy=20dziennik=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/JournalView/JournalOptions.vue | 2 +- src/constants/Journal/JournalTimetablesConsts.ts | 10 +++++----- src/locales/en.json | 2 +- src/locales/pl.json | 2 +- src/scripts/enums/JournalFilterType.ts | 2 +- src/scripts/types/JournalTimetablesTypes.ts | 8 +++++--- src/styles/filters_options.scss | 5 ----- src/views/JournalTimetables.vue | 7 +++---- src/views/SceneryView.vue | 2 +- 9 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/components/JournalView/JournalOptions.vue b/src/components/JournalView/JournalOptions.vue index 817354a..9fee8cc 100644 --- a/src/components/JournalView/JournalOptions.vue +++ b/src/components/JournalView/JournalOptions.vue @@ -100,10 +100,10 @@ import { DataStatus } from '../../scripts/enums/DataStatus'; import { DriverStatsAPIData } from '../../scripts/interfaces/api/DriverStatsAPIData'; import { URLs } from '../../scripts/utils/apiURLs'; import { useStore } from '../../store/store'; -import { JournalTimetableFilter } from '../../scripts/types/JournalTimetablesTypes'; import ActionButton from '../Global/ActionButton.vue'; import SelectBox from '../Global/SelectBox.vue'; import { JournalFilterSection } from '../../scripts/enums/JournalFilterType'; +import { JournalTimetableFilter } from '../../scripts/types/JournalTimetablesTypes'; export default defineComponent({ components: { SelectBox, ActionButton }, diff --git a/src/constants/Journal/JournalTimetablesConsts.ts b/src/constants/Journal/JournalTimetablesConsts.ts index 08a4a16..95eff87 100644 --- a/src/constants/Journal/JournalTimetablesConsts.ts +++ b/src/constants/Journal/JournalTimetablesConsts.ts @@ -1,28 +1,28 @@ -import { JournalFilterSection, JournalFilterType } from '../../scripts/enums/JournalFilterType'; +import { JournalFilterType } from '../../scripts/enums/JournalFilterType'; import { JournalTimetableFilter } from '../../scripts/types/JournalTimetablesTypes'; export const journalTimetableFilters: JournalTimetableFilter[] = [ { id: JournalFilterType.ALL, - filterSection: JournalFilterSection.TIMETABLE_STATUS, + filterSection: 'timetable-status', isActive: true, }, { id: JournalFilterType.ACTIVE, - filterSection: JournalFilterSection.TIMETABLE_STATUS, + filterSection: 'timetable-status', isActive: false, }, { id: JournalFilterType.FULFILLED, - filterSection: JournalFilterSection.TIMETABLE_STATUS, + filterSection: 'timetable-status', isActive: false, }, { id: JournalFilterType.ABANDONED, - filterSection: JournalFilterSection.TIMETABLE_STATUS, + filterSection: 'timetable-status', isActive: false, }, ]; diff --git a/src/locales/en.json b/src/locales/en.json index 819e7ee..8455ec8 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -106,7 +106,7 @@ "sort-mass": "mass", "sort-speed": "speed", "sort-length": "length", - "sort-routeDistance": "route distance", + "sort-distance": "route distance", "sort-timetable": "train no.", "sort-progress": "route progress", "sort-delay": "current delay", diff --git a/src/locales/pl.json b/src/locales/pl.json index b02c2d1..5b4423c 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -103,7 +103,7 @@ "search-timetables-date": "Data rozkładu jazdy (czas polski)", "search-dispatchers-date": "Data służby (czas polski)", - "sort-routeDistance": "kilometraż", + "sort-distance": "kilometraż", "sort-allStopsCount": "stacje", "sort-beginDate": "data", "sort-timetableId": "ID rozkładu", diff --git a/src/scripts/enums/JournalFilterType.ts b/src/scripts/enums/JournalFilterType.ts index 72a8512..f910b83 100644 --- a/src/scripts/enums/JournalFilterType.ts +++ b/src/scripts/enums/JournalFilterType.ts @@ -11,4 +11,4 @@ export enum JournalFilterSection { TIMETABLE_STATUS = 'timetable-status', TWR = 'twr', SKR = 'skr', -} +} \ No newline at end of file diff --git a/src/scripts/types/JournalTimetablesTypes.ts b/src/scripts/types/JournalTimetablesTypes.ts index 94007ab..0d6ddd7 100644 --- a/src/scripts/types/JournalTimetablesTypes.ts +++ b/src/scripts/types/JournalTimetablesTypes.ts @@ -1,4 +1,4 @@ -import { JournalFilterSection, JournalFilterType } from '../enums/JournalFilterType'; +import { JournalFilterType } from '../../scripts/enums/JournalFilterType'; export type JournalTimetableSearchKey = | 'search-driver' @@ -7,17 +7,19 @@ export type JournalTimetableSearchKey = | 'search-dispatcher' | 'search-issuedFrom'; +export type JournalTimetableSorterKey = 'timetableId' | 'beginDate' | 'distance' | 'total-stops'; + export type JournalTimetableSearchType = { [key in JournalTimetableSearchKey]: string; }; export interface JournalTimetableFilter { id: JournalFilterType; - filterSection: JournalFilterSection; + filterSection: string; isActive: boolean; } export interface JournalTimetableSorter { - id: 'timetableId' | 'beginDate' | 'routeDistance' | 'allStopsCount'; + id: JournalTimetableSorterKey; dir: 'asc' | 'desc'; } diff --git a/src/styles/filters_options.scss b/src/styles/filters_options.scss index a9dc50c..154de89 100644 --- a/src/styles/filters_options.scss +++ b/src/styles/filters_options.scss @@ -155,11 +155,6 @@ h1.option-title { max-width: 100%; } - .filter-option, - .sort-option { - margin: 0.25em 0.25em; - } - .options_filters, .options_sorters { justify-content: center; diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue index d6efb12..3648d43 100644 --- a/src/views/JournalTimetables.vue +++ b/src/views/JournalTimetables.vue @@ -7,7 +7,7 @@ @on-search-confirm="fetchHistoryData" @on-options-reset="resetOptions" @on-refresh-data="fetchHistoryData" - :sorter-option-ids="['timetableId', 'beginDate', 'routeDistance', 'allStopsCount']" + :sorter-option-ids="['timetableId', 'beginDate', 'distance', 'allStopsCount']" :filters="journalTimetableFilters" :currentOptionsActive="currentOptionsActive" :data-status="dataStatus" @@ -70,17 +70,16 @@ import JournalHeader from '../components/JournalView/JournalHeader.vue'; import JournalTimetablesList from '../components/JournalView/JournalTimetablesList.vue'; import Loading from '../components/Global/Loading.vue'; -import { JournalTimetableSorter } from '../scripts/types/JournalTimetablesTypes'; import { DataStatus } from '../scripts/enums/DataStatus'; import { TimetableHistory } from '../scripts/interfaces/api/TimetablesAPIData'; import { URLs } from '../scripts/utils/apiURLs'; import { useStore } from '../store/store'; -import { JournalTimetableSearchType } from '../scripts/types/JournalTimetablesTypes'; -import { journalTimetableFilters } from '../constants/Journal/JournalTimetablesConsts'; import { LocationQuery } from 'vue-router'; import { TimetablesQueryParams } from '../scripts/interfaces/api/TimetablesQueryParams'; import { JournalFilterType } from '../scripts/enums/JournalFilterType'; +import { JournalTimetableSearchType, JournalTimetableSorter } from '../scripts/types/JournalTimetablesTypes'; +import { journalTimetableFilters } from '../constants/Journal/JournalTimetablesConsts'; const TIMETABLES_API_URL = `${URLs.stacjownikAPI}/api/getTimetables`; diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue index cc84384..ea4833b 100644 --- a/src/views/SceneryView.vue +++ b/src/views/SceneryView.vue @@ -1,4 +1,4 @@ -