rozbudowane filtry dziennika RJ

src/scripts/enums/JournalFilterType.ts

@@ -5,10 +5,10 @@ export const enum JournalFilterType {
   ALL = 'all',
   TWR = 'twr',
   SKR = 'skr',
+  TWR_SKR = 'twr-skr',
 }
 
 export enum JournalFilterSection {
   TIMETABLE_STATUS = 'timetable-status',
-  TWR = 'twr',
-  SKR = 'skr',
-}
+  TWRSKR = 'twrskr',
+}

src/scripts/interfaces/api/TimetablesQueryParams.ts

@@ -14,5 +14,8 @@ export interface TimetablesQueryParams {
   fulfilled?: number;
   terminated?: number;
 
+  twr?: number;
+  skr?: number;
+
   sortBy?: JournalTimetableSorter['id'];
 }

src/scripts/managers/trainFilterManager.ts

@@ -44,7 +44,7 @@ function filterTrainList(trainList: Train[], searchedTrain: string, searchedDriv
           return !train.timetableData?.SKR;
 
         case TrainFilterType.common:
-          return train.timetableData?.SKR ||  train.timetableData?.TWR;
+          return train.timetableData?.SKR || train.timetableData?.TWR;
 
         case TrainFilterType.passenger:
           return !/^[AMRE]\D{2}$/.test(train.timetableData?.category || '');
@@ -81,7 +81,7 @@ function sortTrainList(trainList: Train[], sorterActive: { id: string; dir: numb
         if (a.mass > b.mass) return sorterActive.dir;
         return -sorterActive.dir;
 
-      case 'distance':
+      case 'routeDistance':
         if ((a.timetableData?.routeDistance || -1) > (b.timetableData?.routeDistance || -1)) return sorterActive.dir;
 
         return -sorterActive.dir;

src/scripts/types/JournalTimetablesTypes.ts

@@ -13,7 +13,7 @@ export type JournalTimetableSearchType = {
   [key in JournalTimetableSearchKey]: string;
 };
 
-export interface JournalTimetableFilter {
+export interface JournalFilter {
   id: JournalFilterType;
   filterSection: string;
   isActive: boolean;