poprawki requestów statystyk; organizacja kodu

src/App.vue

@@ -10,7 +10,7 @@
 
     <main class="app_main">
       <router-view v-slot="{ Component }">
-        <keep-alive exclude="JournalView,SceneryView">
+        <keep-alive exclude="SceneryView">
           <component :is="Component" :key="$route.name" />
         </keep-alive>
       </router-view>

src/components/JournalView/JournalDispatchers/JournalDispatcherStats.vue

@@ -61,8 +61,8 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useMainStore } from '../../store/mainStore';
-import dateMixin from '../../mixins/dateMixin';
+import dateMixin from '../../../mixins/dateMixin';
+import { useMainStore } from '../../../store/mainStore';
 
 export default defineComponent({
   name: 'journal-dispatcher-stats',
@@ -81,5 +81,5 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/JournalStats.scss';
+@import '../../../styles/JournalStats.scss';
 </style>

src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue

@@ -123,15 +123,15 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-import styleMixin from '../../mixins/styleMixin';
-import { useMainStore } from '../../store/mainStore';
-import Loading from '../Global/Loading.vue';
-import { regions } from '../../data/options.json';
-import AddDataButton from '../Global/AddDataButton.vue';
-import { API } from '../../typings/api';
-import { Status } from '../../typings/common';
-import donatorMixin from '../../mixins/donatorMixin';
+import { regions } from '../../../data/options.json';
+import { useMainStore } from '../../../store/mainStore';
+import { API } from '../../../typings/api';
+import { Status } from '../../../typings/common';
+import Loading from '../../Global/Loading.vue';
+import AddDataButton from '../../Global/AddDataButton.vue';
+import dateMixin from '../../../mixins/dateMixin';
+import donatorMixin from '../../../mixins/donatorMixin';
+import styleMixin from '../../../mixins/styleMixin';
 
 export default defineComponent({
   components: { Loading, AddDataButton },
@@ -200,11 +200,11 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/animations.scss';
-@import '../../styles/responsive.scss';
-@import '../../styles/badge.scss';
-@import '../../styles/variables.scss';
-@import '../../styles/JournalSection.scss';
+@import '../../../styles/animations.scss';
+@import '../../../styles/responsive.scss';
+@import '../../../styles/badge.scss';
+@import '../../../styles/variables.scss';
+@import '../../../styles/JournalSection.scss';
 
 table.scenery-history-table {
   --_bg-table: #111;

src/components/JournalView/JournalOptions.vue

@@ -248,7 +248,7 @@ export default defineComponent({
         } catch (error) {
           this[`${type}Suggestions`] = [];
         }
-      }, 450);
+      }, 250);
     },
 
     // Override keyMixin function

src/components/JournalView/JournalStats.vue

@@ -45,11 +45,8 @@ import { useMainStore } from '../../store/mainStore';
 import StorageManager from '../../managers/storageManager';
 import { Journal } from './typings';
 import JournalDailyStats from './JournalDailyStats.vue';
-import JournalDispatcherStats from './JournalDispatcherStats.vue';
-import JournalDriverStats from './JournalDriverStats.vue';
-import { Status } from '../../typings/common';
-import http from '../../http';
-import { API } from '../../typings/api';
+import JournalDispatcherStats from '../JournalView/JournalDispatchers/JournalDispatcherStats.vue';
+import JournalDriverStats from '../JournalView/JournalTimetables/JournalDriverStats.vue';
 
 export default defineComponent({
   components: { JournalDailyStats, JournalDriverStats, JournalDispatcherStats },
@@ -67,69 +64,11 @@ export default defineComponent({
     };
   },
 
-  watch: {
-    async 'mainStore.driverStatsName'(val) {
-      await this.fetchDriverStats();
-    },
-
-    async 'mainStore.dispatcherStatsName'() {
-      await this.fetchDispatcherStats();
-    }
-  },
-
   methods: {
     onTabButtonClick(tab: Journal.StatsTab) {
       this.currentStatsTab = tab == this.currentStatsTab ? null : tab;
 
       StorageManager.setStringValue('journalStatsTab', this.currentStatsTab ?? '');
-    },
-
-    async fetchDriverStats() {
-      if (!this.mainStore.driverStatsName) {
-        this.mainStore.driverStatsData = undefined;
-        this.mainStore.driverStatsStatus = Status.Data.Initialized;
-        return;
-      }
-
-      try {
-        this.mainStore.driverStatsStatus = Status.Data.Loading;
-
-        const statsData: API.DriverStats.Response = await (
-          await http.get(`api/getDriverInfo?name=${this.mainStore.driverStatsName}`)
-        ).data;
-
-        this.mainStore.driverStatsData = statsData;
-        this.mainStore.driverStatsStatus = Status.Data.Loaded;
-      } catch (error) {
-        this.mainStore.driverStatsData = undefined;
-        this.mainStore.driverStatsStatus = Status.Data.Error;
-        console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk maszynisty! :/');
-      }
-    },
-
-    async fetchDispatcherStats() {
-      if (!this.mainStore.dispatcherStatsName) {
-        this.mainStore.dispatcherStatsData = undefined;
-        return;
-      }
-
-      try {
-        const statsData: API.DispatcherStats.Response = await (
-          await http.get('api/getDispatcherStats', {
-            params: {
-              name: this.mainStore.dispatcherStatsName
-            }
-          })
-        ).data;
-
-        console.log(statsData);
-
-        this.mainStore.dispatcherStatsData = statsData;
-      } catch (error) {
-        this.mainStore.dispatcherStatsData = undefined;
-
-        console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk dyżurnego! :/');
-      }
     }
   }
 });

src/components/JournalView/JournalTimetables/JournalDriverStats.vue

@@ -52,8 +52,8 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useMainStore } from '../../store/mainStore';
-import { Status } from '../../typings/common';
+import { useMainStore } from '../../../store/mainStore';
+import { Status } from '../../../typings/common';
 
 export default defineComponent({
   name: 'journal-driver-stats',
@@ -68,5 +68,5 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/JournalStats.scss';
+@import '../../../styles/JournalStats.scss';
 </style>

src/router/index.ts

@@ -37,21 +37,12 @@ const routes: Array<RouteRecordRaw> = [
   {
     path: '/journal/timetables',
     name: 'JournalTimetables',
-    component: JournalTimetablesVue,
-    props: (route) => ({
-      trainNo: route.query.trainNo,
-      driverName: route.query.driverName,
-      timetableId: route.query.timetableId
-    })
+    component: JournalTimetablesVue
   },
   {
     path: '/journal/dispatchers',
     name: 'JournalDispatchers',
-    component: JournalDispatchersVue,
-    props: (route) => ({
-      sceneryName: route.query.sceneryName,
-      dispatcherName: route.query.dispatcherName
-    })
+    component: JournalDispatchersVue
   },
   {
     path: '/:catchAll(.*)',

src/store/mainStore.ts

@@ -9,6 +9,7 @@ import { Status } from '../typings/common';
 import Station from '../scripts/interfaces/Station';
 import { useApiStore } from './apiStore';
 import { API } from '../typings/api';
+import http from '../http';
 
 export const useMainStore = defineStore('store', {
   state: () =>
@@ -18,7 +19,6 @@ export const useMainStore = defineStore('store', {
       isOffline: false,
 
       dispatcherStatsName: '',
-      dispatcherStatsData: undefined,
       dispatcherStatsStatus: Status.Data.Initialized,
 
       driverStatsName: '',

src/views/JournalDispatchers.vue

@@ -44,8 +44,8 @@ import { Journal } from '../components/JournalView/typings';
 import { API } from '../typings/api';
 import { Status } from '../typings/common';
 
+import JournalDispatchersList from '../components/JournalView/JournalDispatchers/JournalDispatchersList.vue';
 import JournalOptions from '../components/JournalView/JournalOptions.vue';
-import JournalDispatchersList from '../components/JournalView/JournalDispatchersList.vue';
 import JournalHeader from '../components/JournalView/JournalHeader.vue';
 import JournalStats from '../components/JournalView/JournalStats.vue';
 
@@ -61,9 +61,9 @@ const statsButtons: Journal.StatsButton[] = [
 export default defineComponent({
   components: {
     JournalOptions,
-    JournalDispatchersList,
     JournalHeader,
-    JournalStats
+    JournalStats,
+    JournalDispatchersList
   },
   name: 'JournalDispatchers',
 
@@ -142,6 +142,10 @@ export default defineComponent({
     'mainStore.dispatcherStatsData'(stats) {
       this.statsButtons.find((sb) => sb.tab == Journal.StatsTab.DISPATCHER_STATS)!.disabled =
         stats === undefined;
+    },
+
+    async 'mainStore.dispatcherStatsName'() {
+      this.fetchDispatcherStats();
     }
   },
 
@@ -189,6 +193,29 @@ export default defineComponent({
       this.setOptions(query as any);
     },
 
+    async fetchDispatcherStats() {
+      if (!this.mainStore.dispatcherStatsName) {
+        this.mainStore.dispatcherStatsData = undefined;
+        return;
+      }
+
+      try {
+        const statsData: API.DispatcherStats.Response = await (
+          await http.get('api/getDispatcherStats', {
+            params: {
+              name: this.mainStore.dispatcherStatsName
+            }
+          })
+        ).data;
+
+        this.mainStore.dispatcherStatsData = statsData;
+      } catch (error) {
+        this.mainStore.dispatcherStatsData = undefined;
+
+        console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk dyżurnego! :/');
+      }
+    },
+
     setOptions(searchers: { [key: string]: string }) {
       this.searchersValues['search-date'] = searchers['search-date'] ?? '';
       this.searchersValues['search-station'] = searchers['search-station'] ?? '';
@@ -198,8 +225,6 @@ export default defineComponent({
     resetOptions() {
       this.setOptions({});
       this.sorterActive.id = 'timestampFrom';
-
-      this.fetchHistoryData();
     },
 
     async addHistoryData() {

src/views/JournalTimetables.vue

@@ -5,7 +5,6 @@
     <div class="journal_wrapper">
       <div class="journal_top-bar">
         <JournalOptions
-          @onSearchConfirm="onSearchConfirm"
           @onOptionsReset="resetOptions"
           @onRefreshData="fetchHistoryData"
           :sorter-option-ids="['timetableId', 'beginDate', 'routeDistance', 'allStopsCount']"
@@ -119,8 +118,12 @@ interface TimetablesQueryParams {
   timetableId?: string;
 
   authorName?: string;
-  timestampFrom?: number;
-  timestampTo?: number;
+  // timestampFrom?: number;
+  // timestampTo?: number;
+
+  dateFrom?: string;
+  dateTo?: string;
+
   issuedFrom?: string;
 
   countFrom?: number;
@@ -234,6 +237,10 @@ export default defineComponent({
     'mainStore.driverStatsData'(driverStats) {
       this.statsButtons.find((sb) => sb.tab == Journal.StatsTab.DRIVER_STATS)!.disabled =
         driverStats === undefined;
+    },
+
+    async 'mainStore.driverStatsName'() {
+      this.fetchDriverStats();
     }
   },
 
@@ -249,10 +256,6 @@ export default defineComponent({
   },
 
   methods: {
-    onSearchConfirm() {
-      this.fetchHistoryData();
-    },
-
     handleScroll(e: Event) {
       const listElement = e.target as HTMLElement;
       const scrollTop = listElement.scrollTop;
@@ -268,6 +271,29 @@ export default defineComponent({
       this.setOptions(query as any);
     },
 
+    async fetchDriverStats() {
+      if (!this.mainStore.driverStatsName) {
+        this.mainStore.driverStatsData = undefined;
+        this.mainStore.driverStatsStatus = Status.Data.Initialized;
+        return;
+      }
+
+      try {
+        this.mainStore.driverStatsStatus = Status.Data.Loading;
+
+        const statsData: API.DriverStats.Response = await (
+          await http.get(`api/getDriverInfo?name=${this.mainStore.driverStatsName}`)
+        ).data;
+
+        this.mainStore.driverStatsData = statsData;
+        this.mainStore.driverStatsStatus = Status.Data.Loaded;
+      } catch (error) {
+        this.mainStore.driverStatsData = undefined;
+        this.mainStore.driverStatsStatus = Status.Data.Error;
+        console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk maszynisty! :/');
+      }
+    },
+
     setOptions(options: { [key: string]: string }) {
       this.searchersValues['search-date'] = options['search-date'] ?? '';
       this.searchersValues['search-driver'] = options['search-driver'] ?? '';
@@ -287,17 +313,6 @@ export default defineComponent({
 
     resetOptions() {
       this.setOptions({});
-
-      // this.sorterActive.id = 'timetableId';
-
-      // this.filterList.forEach(
-      //   (f) =>
-      //     (f.isActive =
-      //       this.initFilters.find((initFilter) => initFilter.id == f.id)?.isActive || false)
-      // );
-
-      // this.handleRouteParams();
-      this.fetchHistoryData();
     },
 
     async addHistoryData() {
@@ -326,13 +341,19 @@ export default defineComponent({
       const driverName = this.searchersValues['search-driver'].trim() || undefined;
       const trainNo = this.searchersValues['search-train'].trim() || undefined;
       const authorName = this.searchersValues['search-dispatcher'].trim() || undefined;
-      const dateString = this.searchersValues['search-date'].trim() || undefined;
+      const dateFrom = this.searchersValues['search-date'].trim() || undefined;
       const issuedFrom = this.searchersValues['search-issuedFrom'].trim() || undefined;
 
-      const timestampFrom = dateString
-        ? Date.parse(new Date(dateString).toISOString()) - 120 * 60 * 1000
-        : undefined;
-      const timestampTo = timestampFrom ? timestampFrom + 86400000 : undefined;
+      let dateTo: string | undefined = undefined;
+
+      if (dateFrom) {
+        const d = new Date(dateFrom);
+        d.setDate(d.getDate() + 1);
+
+        dateTo = d.toISOString().split('T')[0];
+      }
+      // const timestampFrom = dateString ? Date.parse(new Date(dateString).toISOString()) : undefined;
+      // const timestampTo = timestampFrom ? timestampFrom + 86400000 : undefined;
 
       const queryParams: TimetablesQueryParams = {};
 
@@ -367,7 +388,7 @@ export default defineComponent({
 
             case Journal.TimetableFilterId.TWR:
               queryParams['twr'] = 1;
-              queryParams['skr'] = undefined;
+              queryParams['skr'] = 0;
               break;
 
             case Journal.TimetableFilterId.SKR:
@@ -391,8 +412,8 @@ export default defineComponent({
       queryParams['countLimit'] = undefined;
 
       queryParams['authorName'] = authorName;
-      queryParams['timestampFrom'] = timestampFrom;
-      queryParams['timestampTo'] = timestampTo;
+      queryParams['dateFrom'] = dateFrom;
+      queryParams['dateTo'] = dateTo;
       queryParams['issuedFrom'] = issuedFrom;
       queryParams['sortBy'] =
         this.sorterActive.id != 'timetableId' ? this.sorterActive.id : undefined;