filtry URL dziennika DR

src/views/JournalDispatchers.vue

@@ -140,8 +140,6 @@ export default defineComponent({
     },
 
     'mainStore.dispatcherStatsData'(stats) {
-      console.log('dispatcher stats', stats);
-
       this.statsButtons.find((sb) => sb.tab == Journal.StatsTab.DISPATCHER_STATS)!.disabled =
         stats === undefined;
     }
@@ -175,6 +173,7 @@ export default defineComponent({
         }
       });
     },
+
     handleScroll(e: Event) {
       const listElement = e.target as HTMLElement;
       const scrollTop = listElement.scrollTop;
@@ -187,19 +186,17 @@ export default defineComponent({
     },
 
     handleQueries(query: LocationQuery) {
-      // if (queryKeys.includes('sceneryName')) this.setSearchers('', `${query.sceneryName}`, '');
-      // if (queryKeys.includes('dispatcherName'))
-      //   this.setSearchers('', '', `${query.dispatcherName}`);
+      this.setOptions(query as any);
     },
 
-    setSearchers(searchers: { [key: string]: string }) {
+    setOptions(searchers: { [key: string]: string }) {
       this.searchersValues['search-date'] = searchers['search-date'] ?? '';
       this.searchersValues['search-station'] = searchers['search-station'] ?? '';
       this.searchersValues['search-dispatcher'] = searchers['search-dispatcher'] ?? '';
     },
 
     resetOptions() {
-      this.setSearchers({});
+      this.setOptions({});
       this.sorterActive.id = 'timestampFrom';
 
       this.fetchHistoryData();

src/views/JournalTimetables.vue

@@ -250,37 +250,9 @@ export default defineComponent({
 
   methods: {
     onSearchConfirm() {
-      this.handleRouteParams();
-
       this.fetchHistoryData();
     },
 
-    handleRouteParams() {
-      this.$router.push({
-        query: {
-          ...this.$route.query,
-          'sorter-active': this.sorterActive.id != 'timetableId' ? this.sorterActive.id : undefined,
-          ...Object.keys(this.searchersValues).reduce(
-            (acc, k) => {
-              const searchVal = this.searchersValues[k as Journal.TimetableSearchKey];
-
-              acc[k] = searchVal || undefined;
-
-              return acc;
-            },
-            {} as { [k: string]: string | undefined }
-          ),
-          ...this.filterList.reduce(
-            (acc, f) => {
-              if (f.isActive) acc[f.filterSection] = f.default ? undefined : f.id;
-              return acc;
-            },
-            {} as { [k: string]: string | undefined }
-          )
-        }
-      });
-    },
-
     handleScroll(e: Event) {
       const listElement = e.target as HTMLElement;
       const scrollTop = listElement.scrollTop;
@@ -316,15 +288,15 @@ export default defineComponent({
     resetOptions() {
       this.setOptions({});
 
-      this.sorterActive.id = 'timetableId';
+      // this.sorterActive.id = 'timetableId';
 
-      this.filterList.forEach(
-        (f) =>
-          (f.isActive =
-            this.initFilters.find((initFilter) => initFilter.id == f.id)?.isActive || false)
-      );
+      // this.filterList.forEach(
+      //   (f) =>
+      //     (f.isActive =
+      //       this.initFilters.find((initFilter) => initFilter.id == f.id)?.isActive || false)
+      // );
 
-      this.handleRouteParams();
+      // this.handleRouteParams();
       this.fetchHistoryData();
     },