Merge branch 'development'

src/components/JournalView/DailyStats.vue

@@ -143,7 +143,7 @@ async function fetchDailyTimetableStats() {
       distanceAvg,
       timetableAuthor: maxTimetable?.authorName || '',
       timetableDriver: maxTimetable?.driverName || '',
-      timetableId: maxTimetable?.timetableId || 0,
+      timetableId: maxTimetable?.id || 0,
       timetableRouteDistance: maxTimetable?.routeDistance || 0,
 
       mostActiveDispatchers,

src/components/SceneryView/SceneryTimetablesHistory.vue

@@ -11,8 +11,8 @@
         </div>
 
         <div>
-          <router-link :to="`/journal/timetables?timetableId=${historyItem.timetableId}`">
+          <router-link :to="`/journal/timetables?timetableId=${historyItem.id}`">
-            <span class="text--grayed"> #{{ historyItem.timetableId }} </span>
+            <span class="text--grayed"> #{{ historyItem.id }} </span>
             <b class="text--primary">&nbsp;{{ historyItem.trainCategoryCode }} {{ historyItem.trainNo }}</b>
             <div>{{ historyItem.driverName }}</div>
           </router-link>

src/scripts/managers/trainFilterManager.ts

@@ -24,7 +24,7 @@ function filterTrainList(trainList: Train[], searchedTrain: string, searchedDriv
         (train) => {
             const isFiltered = filters.every(f => {
                 if (f.isActive) return true;
-                
+
                 if (!train.timetableData) return filters.find(filter => filter.id == TrainFilterType.noTimetable)!.isActive;
 
                 switch (f.id) {

src/types/Journal/JournalTimetablesTypes.ts

@@ -13,6 +13,6 @@ export interface JournalTimetableFilter {
 }
 
 export interface JournalTimetableSorter {
-  id: 'timetableId' | 'beginDate' | 'distance' | 'total-stops';
+  id:  'beginDate' | 'distance' | 'total-stops';
   dir: -1 | 1;
 }

src/views/JournalTimetables.vue

@@ -6,7 +6,7 @@
       <JournalOptions
         @on-search-confirm="fetchHistoryData"
         @on-options-reset="resetOptions"
-        :sorter-option-ids="['timetableId', 'beginDate', 'distance', 'total-stops']"
+        :sorter-option-ids="[ 'beginDate', 'distance', 'total-stops']"
         :filters="journalTimetableFilters"
         :currentOptionsActive="currentOptionsActive"
         :data-status="dataStatus"
@@ -111,7 +111,7 @@ export default defineComponent({
   }),
 
   setup() {
-    const sorterActive: JournalTimetableSorter = reactive({ id: 'timetableId', dir: 1 });
+    const sorterActive: JournalTimetableSorter = reactive({ id: 'beginDate', dir: 1 });
     const journalFilterActive = ref(journalTimetableFilters[0]);
 
     const searchersValues = reactive({
@@ -147,7 +147,7 @@ export default defineComponent({
   watch: {
     currentQueryArray(q: string[]) {
       this.currentOptionsActive =
-        q.length > 2 || q.some((qv) => qv.startsWith('sortBy=') && qv.split('=')[1] != 'timetableId');
+        q.length > 2 || q.some((qv) => qv.startsWith('sortBy=') && qv.split('=')[1] != 'beginDate');
     },
   },
 
@@ -188,7 +188,7 @@ export default defineComponent({
       this.setSearchers('', '', '', '');
 
       this.journalFilterActive = this.journalTimetableFilters[0];
-      this.sorterActive.id = 'timetableId';
+      this.sorterActive.id = 'beginDate';
 
       this.fetchHistoryData();
     },