refactor typów danych

src/components/JournalView/DailyStats.vue

@@ -1,7 +1,7 @@
 <template>
   <section class="daily-stats">
     <span :data-active="statsStatus">
-      <b v-if="statsStatus == DataStatus.Loading">
+      <b v-if="statsStatus == Status.Data.Loading">
         {{ $t('app.loading') }}
       </b>
 
@@ -32,24 +32,26 @@
           </i18n-t>
         </div>
 
-        <div v-if="stats.timetableId">
+        <div v-if="stats.maxTimetable">
           &bull;
           <i18n-t keypath="journal.timetable-stats-longest">
             <template #id>
-              <router-link :to="`/journal/timetables?timetableId=${stats.timetableId}`">
-                <b>{{ stats.timetableId }}</b>
+              <router-link :to="`/journal/timetables?timetableId=${stats.maxTimetable.id}`">
+                <b>{{ stats.maxTimetable.id }}</b>
               </router-link>
             </template>
             <template #author>
-              <router-link :to="`/journal/dispatchers?dispatcherName=${stats.timetableAuthor}`">
-                <b>{{ stats.timetableAuthor }}</b>
+              <router-link
+                :to="`/journal/dispatchers?dispatcherName=${stats.maxTimetable.authorName}`"
+              >
+                <b>{{ stats.maxTimetable.authorName }}</b>
               </router-link>
             </template>
             <template #driver>
-              <b class="text--primary">{{ stats.timetableDriver }}</b>
+              <b class="text--primary">{{ stats.maxTimetable.driverName }}</b>
             </template>
             <template #distance>
-              <b class="text--primary">{{ stats.timetableRouteDistance }} km</b>
+              <b class="text--primary">{{ stats.maxTimetable.routeDistance }} km</b>
             </template>
           </i18n-t>
         </div>
@@ -134,12 +136,10 @@
 import axios from 'axios';
 import { defineComponent } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import {
-  ITimetablesDailyStats,
-  ITimetablesDailyStatsResponse
-} from '../../scripts/interfaces/api/StatsAPIData';
+
 import { URLs } from '../../scripts/utils/apiURLs';
+import { API } from '../../typings/api';
+import { Status } from '../../typings/common';
 
 export default defineComponent({
   mixins: [dateMixin],
@@ -147,22 +147,11 @@ export default defineComponent({
 
   data() {
     return {
-      DataStatus,
-      statsStatus: DataStatus.Loading,
+      Status,
+      statsStatus: Status.Data.Loading,
       intervalId: -1,
 
-      stats: {
-        totalTimetables: 0,
-        distanceSum: 0,
-        distanceAvg: 0,
-        timetableAuthor: '',
-        timetableDriver: '',
-        timetableId: 0,
-        timetableRouteDistance: 0,
-        longestDuties: [],
-        mostActiveDrivers: [],
-        mostActiveDispatchers: []
-      } as ITimetablesDailyStats
+      stats: {} as API.DailyStats.Response
     };
   },
 
@@ -187,28 +176,30 @@ export default defineComponent({
   methods: {
     async fetchDailyTimetableStats() {
       try {
-        const res: ITimetablesDailyStatsResponse = await (
+        const res: API.DailyStats.Response = await (
           await axios.get(`${URLs.stacjownikAPI}/api/getDailyTimetableStats`)
         ).data;
 
-        this.stats = {
-          totalTimetables: res.totalTimetables,
-          distanceSum: res.distanceSum,
-          distanceAvg: res.distanceAvg,
-          timetableAuthor: res.maxTimetable?.authorName || '',
-          timetableDriver: res.maxTimetable?.driverName || '',
-          timetableId: res.maxTimetable?.id || 0,
-          timetableRouteDistance: res.maxTimetable?.routeDistance || 0,
+        // this.stats = {
+        //   totalTimetables: res.totalTimetables,
+        //   distanceSum: res.distanceSum,
+        //   distanceAvg: res.distanceAvg,
+        //   // timetableAuthor: res.maxTimetable?.authorName || '',
+        //   // timetableDriver: res.maxTimetable?.driverName || '',
+        //   // timetableId: res.maxTimetable?.id || 0,
+        //   // timetableRouteDistance: res.maxTimetable?.routeDistance || 0,
 
-          mostActiveDispatchers: res.mostActiveDispatchers,
-          mostActiveDrivers: res.mostActiveDrivers,
-          longestDuties: res.longestDuties
-        };
+        //   mostActiveDispatchers: res.mostActiveDispatchers,
+        //   mostActiveDrivers: res.mostActiveDrivers,
+        //   longestDuties: res.longestDuties
+        // };
 
-        this.statsStatus = DataStatus.Loaded;
+        this.stats = res;
+
+        this.statsStatus = Status.Data.Loaded;
       } catch (error) {
         console.error('Ups! Wystąpił błąd podczas pobierania statystyk rozkładów jazdy...');
-        this.statsStatus = DataStatus.Error;
+        this.statsStatus = Status.Data.Error;
       }
     },
 

src/components/JournalView/DispatcherStats.vue

@@ -52,11 +52,10 @@
 <script lang="ts">
 import axios from 'axios';
 import { defineComponent } from 'vue';
-import { DispatcherStatsAPIData } from '../../scripts/interfaces/api/DispatcherStatsAPIData';
-import { TimetableHistory } from '../../scripts/interfaces/api/TimetablesAPIData';
 import { URLs } from '../../scripts/utils/apiURLs';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
 import Loading from '../Global/Loading.vue';
+import { API } from '../../typings/api';
 
 export default defineComponent({
   components: { Loading },
@@ -73,7 +72,7 @@ export default defineComponent({
     return {
       cardVisible: false,
       lastDispatcherName: '',
-      timetables: [] as TimetableHistory[]
+      timetables: [] as API.TimetableHistory.Response
     };
   },
 
@@ -90,13 +89,13 @@ export default defineComponent({
         this.store.dispatcherStatsData = undefined;
       }
 
-      const statsData: DispatcherStatsAPIData = await (
+      const statsData: API.DispatcherStats.Response = await (
         await axios.get(
           `${URLs.stacjownikAPI}/api/getDispatcherInfo?name=${this.store.dispatcherStatsName}`
         )
       ).data;
 
-      const timetables: TimetableHistory[] = await (
+      const timetables: API.TimetableHistory.Response = await (
         await axios.get(
           `${URLs.stacjownikAPI}/api/getTimetables?authorName=${this.store.dispatcherStatsName}`
         )

src/components/JournalView/JournalDispatchersList.vue

@@ -6,9 +6,9 @@
           {{ $t('app.offline') }}
         </div>
 
-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
+        <Loading v-else-if="dataStatus == Status.Data.Loading" />
 
-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
+        <div v-else-if="dataStatus == Status.Data.Error" class="journal_warning error">
           {{ $t('app.error') }}
         </div>
 
@@ -114,13 +114,13 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
-import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
 import styleMixin from '../../mixins/styleMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { useStore } from '../../store/store';
+import { useStore } 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';
 
 export default defineComponent({
   components: { Loading, AddDataButton },
@@ -129,7 +129,7 @@ export default defineComponent({
 
   props: {
     dispatcherHistory: {
-      type: Array as PropType<DispatcherHistory[]>,
+      type: Array as PropType<API.DispatcherHistory.Response>,
       required: true
     },
     scrollNoMoreData: {
@@ -142,13 +142,13 @@ export default defineComponent({
       type: Function as PropType<() => void>
     },
     dataStatus: {
-      type: Number as PropType<DataStatus>
+      type: Number as PropType<Status.Data>
     }
   },
 
   data() {
     return {
-      DataStatus,
+      Status,
       store: useStore(),
       regions
     };
@@ -166,7 +166,7 @@ export default defineComponent({
 
           return acc;
         },
-        [] as (DispatcherHistory | string)[]
+        [] as (API.DispatcherHistory.Data | string)[]
       );
     }
   },

src/components/JournalView/JournalDriverStats.vue

@@ -43,10 +43,10 @@
       </div>
     </span>
 
-    <b v-else-if="store.driverStatsStatus == DataStatus.Loading">{{
+    <b v-else-if="store.driverStatsStatus == Status.Data.Loading">{{
       $t('journal.stats-loading')
     }}</b>
-    <b v-else-if="store.driverStatsStatus == DataStatus.Error">
+    <b v-else-if="store.driverStatsStatus == Status.Data.Error">
       {{ $t('journal.stats-error ') }}
     </b>
     <b v-else>{{ $t('journal.driver-stats-info') }}</b>
@@ -55,14 +55,14 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
+import { Status } from '../../typings/common';
 
 export default defineComponent({
   data() {
     return {
       store: useStore(),
-      DataStatus
+      Status: Status
     };
   }
 });

src/components/JournalView/JournalOptions.vue

@@ -113,12 +113,11 @@
 import axios from 'axios';
 import { defineComponent, inject, PropType } from 'vue';
 import keyMixin from '../../mixins/keyMixin';
-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 { JournalFilterSection } from '../../scripts/enums/JournalFilterType';
-import { JournalFilter } from '../../scripts/types/JournalTimetablesTypes';
+import { useStore } from '../../store/mainStore';
+import { Journal } from './typings';
+import { API } from '../../typings/api';
+import { Status } from '../../typings/common';
 
 export default defineComponent({
   emits: ['onSearchConfirm', 'onOptionsReset', 'onRefreshData'],
@@ -131,13 +130,13 @@ export default defineComponent({
     },
 
     filters: {
-      type: Array as PropType<JournalFilter[]>,
+      type: Array as PropType<Journal.TimetableFilter[]>,
       default: () => []
     },
 
     dataStatus: {
-      type: Number as PropType<DataStatus>,
-      default: DataStatus.Initialized
+      type: Number as PropType<Status.Data>,
+      default: -1
     },
 
     currentOptionsActive: {
@@ -154,7 +153,6 @@ export default defineComponent({
   data() {
     return {
       showOptions: false,
-      JournalFilterSection,
 
       driverSuggestions: [] as string[],
       dispatcherSuggestions: [] as string[],
@@ -162,7 +160,7 @@ export default defineComponent({
       searchTimeout: 0,
       store: useStore(),
 
-      DataStatus
+      JournalFilterSection: Journal.FilterSection
     };
   },
 
@@ -170,7 +168,7 @@ export default defineComponent({
     return {
       searchersValues: inject('searchersValues') as { [key: string]: string },
       sorterActive: inject('sorterActive') as { id: string | number; dir: number },
-      filterList: inject('filterList') as JournalFilter[] | undefined
+      filterList: inject('filterList') as Journal.TimetableFilter[] | undefined
     };
   },
 
@@ -212,23 +210,23 @@ export default defineComponent({
       this.store.driverStatsData = undefined;
 
       if (!this.store.driverStatsName) {
-        this.store.driverStatsStatus = DataStatus.Initialized;
+        this.store.driverStatsStatus = Status.Data.Initialized;
         return;
       }
 
       try {
-        this.store.driverStatsStatus = DataStatus.Loading;
+        this.store.driverStatsStatus = Status.Data.Loading;
 
-        const statsData: DriverStatsAPIData = await (
+        const statsData: API.DriverStats.Response = await (
           await axios.get(
             `${URLs.stacjownikAPI}/api/getDriverInfo?name=${this.store.driverStatsName}`
           )
         ).data;
 
         this.store.driverStatsData = statsData;
-        this.store.driverStatsStatus = DataStatus.Loaded;
+        this.store.driverStatsStatus = Status.Data.Loaded;
       } catch (error) {
-        this.store.driverStatsStatus = DataStatus.Error;
+        this.store.driverStatsStatus = Status.Data.Error;
         console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk maszynisty! :/');
       }
     },
@@ -270,7 +268,7 @@ export default defineComponent({
       this.$emit('onSearchConfirm');
     },
 
-    onFilterChange(filter: JournalFilter) {
+    onFilterChange(filter: Journal.TimetableFilter) {
       // this.journalFilterActive = filter;
       this.filterList
         ?.filter((f) => f.filterSection === filter.filterSection)

src/components/JournalView/JournalStats.vue

@@ -29,10 +29,10 @@
 
 <script setup lang="ts">
 import { computed, onMounted, reactive, Ref, ref, watch } from 'vue';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
 import JournalDailyStats from './DailyStats.vue';
 import JournalDriverStats from './JournalDriverStats.vue';
-import StorageManager from '../../scripts/managers/storageManager';
+import StorageManager from '../../managers/storageManager';
 
 // Types
 type TStatTab = 'daily' | 'driver';
@@ -60,7 +60,8 @@ let data = reactive({
 
 // Methods
 function onTabButtonClick(tab: TStatTab) {
-  if (lastClickedTab.value == tab || !lastClickedTab.value || !areStatsOpen.value) areStatsOpen.value = !areStatsOpen.value;
+  if (lastClickedTab.value == tab || !lastClickedTab.value || !areStatsOpen.value)
+    areStatsOpen.value = !areStatsOpen.value;
 
   if (tab == 'daily') {
     StorageManager.setBooleanValue('dailyStatsOpen', areStatsOpen.value);

src/components/JournalView/JournalTimetables/JournalTimetablesList.vue

@@ -6,9 +6,9 @@
           {{ $t('app.offline') }}
         </div>
 
-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
+        <Loading v-else-if="dataStatus == Status.Data.Loading" />
 
-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
+        <div v-else-if="dataStatus == Status.Data.Error" class="journal_warning error">
           {{ $t('app.error') }}
         </div>
 
@@ -38,20 +38,20 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import { DataStatus } from '../../../scripts/enums/DataStatus';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
-import { useStore } from '../../../store/store';
 
 import Loading from '../../Global/Loading.vue';
 import AddDataButton from '../../Global/AddDataButton.vue';
 import TimetableHistoryList from './TimetableHistoryList.vue';
+import { useStore } from '../../../store/mainStore';
+import { Status } from '../../../typings/common';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   components: { Loading, AddDataButton, TimetableHistoryList },
 
   props: {
     timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
+      type: Array as PropType<API.TimetableHistory.Response>,
       required: true
     },
     scrollNoMoreData: {
@@ -64,13 +64,13 @@ export default defineComponent({
       type: Function as PropType<() => void>
     },
     dataStatus: {
-      type: Number as PropType<DataStatus>
+      type: Number as PropType<Status.Data>
     }
   },
 
   data() {
     return {
-      DataStatus,
+      Status,
       store: useStore()
     };
   }

src/components/JournalView/JournalTimetables/TimetableExtra.vue

@@ -77,8 +77,8 @@
 
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import StockList from '../../Global/StockList.vue';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   components: { StockList },
@@ -88,7 +88,7 @@ export default defineComponent({
       required: true
     },
     timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
       required: true
     }
   },

src/components/JournalView/JournalTimetables/TimetableGeneral.vue

@@ -62,24 +62,24 @@
 
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 
 import dateMixin from '../../../mixins/dateMixin';
 import modalTrainMixin from '../../../mixins/modalTrainMixin';
 import styleMixin from '../../../mixins/styleMixin';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   mixins: [dateMixin, modalTrainMixin, styleMixin],
 
   props: {
     timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
       required: true
     }
   },
 
   methods: {
-    showTimetable(timetable: TimetableHistory, target: EventTarget | null) {
+    showTimetable(timetable: API.TimetableHistory.Data, target: EventTarget | null) {
       if (timetable?.terminated) return;
 
       this.selectModalTrain(timetable.driverName + timetable.trainNo.toString(), target);

src/components/JournalView/JournalTimetables/TimetableHistoryList.vue

@@ -38,17 +38,17 @@
 
 <script lang="ts">
 import { PropType, defineComponent, ref } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 
 import TimetableGeneral from './TimetableGeneral.vue';
 import TimetableStops from './TimetableStops.vue';
 import TimetableStatus from './TimetableStatus.vue';
 import TimetableExtra from './TimetableExtra.vue';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   props: {
     timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
+      type: Array as PropType<API.TimetableHistory.Response>,
       required: true
     }
   },

src/components/JournalView/JournalTimetables/TimetableStatus.vue

@@ -44,14 +44,14 @@
 
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import ProgressBar from '../../Global/ProgressBar.vue';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   components: { ProgressBar },
   props: {
     timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
       required: true
     }
   }

src/components/JournalView/JournalTimetables/TimetableStops.vue

@@ -24,8 +24,7 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../../mixins/dateMixin';
-
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   mixins: [dateMixin],
@@ -37,7 +36,7 @@ export default defineComponent({
     },
 
     timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
       required: true
     }
   },

src/components/JournalView/typings.ts

@@ -0,0 +1,49 @@
+export namespace Journal {
+  export type DispatcherSearcher = {
+    [key in 'search-dispatcher' | 'search-station' | 'search-date']: string;
+  };
+
+  export interface DispatcherSorter {
+    id: 'timestampFrom' | 'duration';
+    dir: -1 | 1;
+  }
+
+  export type TimetableSearchKey =
+    | 'search-driver'
+    | 'search-train'
+    | 'search-date'
+    | 'search-dispatcher'
+    | 'search-issuedFrom';
+
+  export type TimetableSearchType = {
+    [key in TimetableSearchKey]: string;
+  };
+
+  export const enum TimetableFilterId {
+    ACTIVE = 'active',
+    FULFILLED = 'fulfilled',
+    ABANDONED = 'abandoned',
+    ALL = 'all',
+    TWR = 'twr',
+    SKR = 'skr',
+    TWR_SKR = 'twr-skr'
+  }
+
+  export enum FilterSection {
+    TIMETABLE_STATUS = 'timetable-status',
+    TWRSKR = 'twrskr'
+  }
+
+  export interface TimetableFilter {
+    id: TimetableFilterId;
+    filterSection: string;
+    isActive: boolean;
+  }
+
+  export type TimetableSorterKey = 'timetableId' | 'beginDate' | 'distance' | 'total-stops';
+
+  export interface TimetableSorter {
+    id: TimetableSorterKey;
+    dir: 'asc' | 'desc';
+  }
+}