hotfixy dzienników

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 },

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,
   },
 ];

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",

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",

src/scripts/enums/JournalFilterType.ts

@@ -11,4 +11,4 @@ export enum JournalFilterSection {
   TIMETABLE_STATUS = 'timetable-status',
   TWR = 'twr',
   SKR = 'skr',
-}
+}

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';
 }

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;

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`;
 

src/views/SceneryView.vue

@@ -1,4 +1,4 @@
-<template>
+  <template>
   <div class="scenery-view">
     <div class="scenery-offline" v-if="!stationInfo && isComponentVisible && store.dataStatuses.sceneries == 2">
       <div>{{ $t('scenery.no-scenery') }}</div>