chore: added tn/pn filters for trains & timetables

src/components/JournalView/typings.ts

@@ -39,6 +39,8 @@ export namespace Journal {
     ALL_SPECIALS = 'all-specials',
     TWR = 'twr',
     SKR = 'skr',
+    PN = 'pn',
+    TN = 'tn',
     TWR_SKR = 'twr-skr'
   }
 

src/components/TrainsView/typings.ts

@@ -12,12 +12,14 @@ export const enum TrainFilterId {
   withComments = 'withComments',
 
   twr = 'twr',
-  skr = 'skr',
+  tn = 'tn',
+  pn = 'pn',
   common = 'common',
 
   passenger = 'passenger',
   freight = 'freight',
   other = 'other',
+
   noTimetable = 'noTimetable',
   withTimetable = 'withTimetable'
 }
@@ -40,7 +42,12 @@ export const trainFilters: TrainFilter[] = [
     isActive: true
   },
   {
-    id: TrainFilterId.skr,
+    id: TrainFilterId.tn,
+    section: TrainFilterSection.TRAIN_TYPE,
+    isActive: true
+  },
+  {
+    id: TrainFilterId.pn,
     section: TrainFilterSection.TRAIN_TYPE,
     isActive: true
   },

src/locales/en.json

@@ -197,11 +197,13 @@
 
     "filter-noComments": "NO COMMENTS",
     "filter-withComments": "COMMENTS",
-    "filter-twr": "HIGH RISK CARGO",
+    "filter-twr": "TWR",
-    "filter-skr": "EXCEEDED GAUGE",
+    "filter-skr": "SKR",
+    "filter-tn": "TN",
+    "filter-pn": "PN",
     "filter-twr-skr": "BOTH TYPES",
     "filter-all-specials": "ALL",
-    "filter-common": "NO WARNINGS",
+    "filter-common": "COMMON",
     "filter-passenger": "PASSENGER",
     "filter-freight": "FREIGHT",
     "filter-other": "OTHER",

src/locales/pl.json

@@ -195,8 +195,10 @@
 
     "filter-withComments": "UWAGI EKSPLOATACYJNE",
     "filter-noComments": "BEZ UWAG",
-    "filter-twr": "WYS. RYZYKA",
+    "filter-twr": "TWR",
-    "filter-skr": "SKRAJNIA",
+    "filter-skr": "SKR",
+    "filter-tn": "TN",
+    "filter-pn": "PN",
     "filter-twr-skr": "TWR/SKR",
     "filter-all-statuses": "WSZYSTKIE",
     "filter-common": "ZWYKŁE",

src/managers/trainFilterManager.ts

@@ -45,8 +45,11 @@ function filterTrainList(
         case TrainFilterId.twr:
           return !train.timetableData?.TWR;
 
-        case TrainFilterId.skr:
+        case TrainFilterId.pn:
-          return !train.timetableData?.SKR;
+          return !train.timetableData?.hasExtraDeliveries;
+
+        case TrainFilterId.tn:
+          return !train.timetableData?.hasDangerousCargo;
 
         case TrainFilterId.common:
           return train.timetableData?.SKR || train.timetableData?.TWR;

src/views/JournalTimetables.vue

@@ -105,7 +105,13 @@ export const journalTimetableFilters: Journal.TimetableFilter[] = [
     default: false
   },
   {
-    id: Journal.TimetableFilterId.TWR_SKR,
+    id: Journal.TimetableFilterId.TN,
+    filterSection: Journal.FilterSection.SPECIAL,
+    isActive: false,
+    default: false
+  },
+  {
+    id: Journal.TimetableFilterId.PN,
     filterSection: Journal.FilterSection.SPECIAL,
     isActive: false,
     default: false
@@ -136,6 +142,8 @@ interface TimetablesQueryParams {
 
   twr?: number;
   skr?: number;
+  pn?: number;
+  tn?: number;
 
   sortBy?: Journal.TimetableSorter['id'];
 }
@@ -391,21 +399,24 @@ export default defineComponent({
             case Journal.TimetableFilterId.ALL_SPECIALS:
               queryParams['twr'] = undefined;
               queryParams['skr'] = undefined;
+              queryParams['pn'] = undefined;
+              queryParams['tn'] = undefined;
               break;
 
             case Journal.TimetableFilterId.TWR:
               queryParams['twr'] = 1;
-              queryParams['skr'] = 0;
               break;
 
             case Journal.TimetableFilterId.SKR:
-              queryParams['twr'] = 0;
               queryParams['skr'] = 1;
               break;
 
-            case Journal.TimetableFilterId.TWR_SKR:
+            case Journal.TimetableFilterId.TN:
-              queryParams['twr'] = 1;
+              queryParams['tn'] = 1;
-              queryParams['skr'] = 1;
+              break;
+
+            case Journal.TimetableFilterId.PN:
+              queryParams['pn'] = 1;
               break;
 
             default: