From 14ca48a90d7170e2ef63f41abe05afea40c9f701 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Fri, 10 Mar 2023 16:30:36 +0100
Subject: [PATCH] hotfix

---
 .../interfaces/api/TimetablesAPIData.ts       |  6 +-
 src/scripts/interfaces/api/TrainAPIData.ts    | 80 ++++++++++---------
 src/store/storeTypes.ts                       |  6 +-
 3 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/src/scripts/interfaces/api/TimetablesAPIData.ts b/src/scripts/interfaces/api/TimetablesAPIData.ts
index 42b0fc8..2defce9 100644
--- a/src/scripts/interfaces/api/TimetablesAPIData.ts
+++ b/src/scripts/interfaces/api/TimetablesAPIData.ts
@@ -2,11 +2,11 @@ export interface TimetableHistory {
   id: number;
   createdAt: string;
   updatedAt: string;
-  
+
   timetableId: number;
   trainNo: number;
   trainCategoryCode: string;
-  
+
   driverId: number;
   driverName: string;
   driverLevel: number | null;
@@ -35,6 +35,8 @@ export interface TimetableHistory {
   authorName?: string;
   authorId?: number;
 
+  stopsString?: string;
+
   stockString?: string;
   stockMass?: number;
   stockLength?: number;
diff --git a/src/scripts/interfaces/api/TrainAPIData.ts b/src/scripts/interfaces/api/TrainAPIData.ts
index 3147114..8e2d97b 100644
--- a/src/scripts/interfaces/api/TrainAPIData.ts
+++ b/src/scripts/interfaces/api/TrainAPIData.ts
@@ -1,4 +1,44 @@
-export default interface TrainAPIData {
+export interface TimetableStop {
+  stopName: string;
+  stopNameRAW: string;
+  stopType: string;
+  stopDistance: number;
+  pointId: number;
+
+  mainStop: boolean;
+
+  arrivalLine: string;
+  arrivalTimestamp: number;
+  arrivalRealTimestamp: number;
+  arrivalDelay: number;
+
+  departureLine: string;
+  departureTimestamp: number;
+  departureRealTimestamp: number;
+  departureDelay: number;
+
+  comments?: any;
+
+  beginsHere: boolean;
+  terminatesHere: boolean;
+  confirmed: boolean;
+  stopped: boolean;
+  stopTime: number;
+}
+
+export interface TrainTimetable {
+  timetableId: number;
+  category: string;
+  route: string;
+
+  stopList: TimetableStop[];
+
+  TWR: boolean;
+  SKR: boolean;
+  sceneries: string[];
+}
+
+export interface TrainAPIData {
   trainNo: number;
 
   mass: number;
@@ -24,41 +64,5 @@ export default interface TrainAPIData {
   region: string;
   isTimeout: boolean;
 
-  timetable?: {
-    timetableId: number;
-    category: string;
-    route: string;
-
-    stopList: {
-      stopName: string;
-      stopNameRAW: string;
-      stopType: string;
-      stopDistance: number;
-      pointId: number;
-
-      mainStop: boolean;
-
-      arrivalLine: string;
-      arrivalTimestamp: number;
-      arrivalRealTimestamp: number;
-      arrivalDelay: number;
-
-      departureLine: string;
-      departureTimestamp: number;
-      departureRealTimestamp: number;
-      departureDelay: number;
-
-      comments?: any;
-
-      beginsHere: boolean;
-      terminatesHere: boolean;
-      confirmed: boolean;
-      stopped: boolean;
-      stopTime: number;
-    }[];
-
-    TWR: boolean;
-    SKR: boolean;
-    sceneries: string[];
-  };
+  timetable?: TrainTimetable;
 }
diff --git a/src/store/storeTypes.ts b/src/store/storeTypes.ts
index 05be43d..f874743 100644
--- a/src/store/storeTypes.ts
+++ b/src/store/storeTypes.ts
@@ -1,7 +1,7 @@
 import { Socket } from 'socket.io-client';
 import { DataStatus } from '../scripts/enums/DataStatus';
 import StationAPIData from '../scripts/interfaces/api/StationAPIData';
-import TrainAPIData from '../scripts/interfaces/api/TrainAPIData';
+import { TrainAPIData } from '../scripts/interfaces/api/TrainAPIData';
 import Station from '../scripts/interfaces/Station';
 import Train from '../scripts/interfaces/Train';
 import { DispatcherStatsAPIData } from '../scripts/interfaces/api/DispatcherStatsAPIData';
@@ -70,9 +70,9 @@ export interface StationJSONData {
   SUP: boolean;
 
   routes: string;
-  
+
   checkpoints: string | null;
   authors?: string;
 
   availability: Availability;
-}
\ No newline at end of file
+}