Train picker

.env

@@ -0,0 +1,2 @@
+VITE_APP_API_URL=https://stacjownik-api-b9mrc.ondigitalocean.app/api
+VITE_APP_SWDR_URL=https://api.td2.info.pl:9640

package.json

@@ -9,6 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "axios": "^1.1.3",
     "pinia": "^2.0.14",
     "vue": "^3.2.37",
     "vue-i18n": "9",

src/components/OrderTrainPicker.vue

@@ -1,30 +1,141 @@
 <template>
-  <div class="order-train-picker"></div>
+  <div class="order-train-picker">
+    <div class="options">
+      <select name="dispatcher-select" id="dispatcher-select" v-model="selectedDispatcherName">
+        <option :value="null" disabled>Nick dyżurnego</option>
+        <option v-for="dispatcherName in dispatcherNameList" :value="dispatcherName">
+          {{ dispatcherName }}
+        </option>
+      </select>
+
+      <select
+        name="scenery-select"
+        id="scenery-select"
+        v-model="selectedSceneryName"
+        :disabled="sceneryNameList.length == 0"
+      >
+        <option :value="null" disabled>Sceneria</option>
+        <option :value="sceneryName" v-for="sceneryName in sceneryNameList">
+          {{ sceneryName }}
+        </option>
+      </select>
+    </div>
+
+    <div class="content">
+      Wybierz dyżurnego oraz scenerię, aby zobaczyć pociągi
+
+      <ul>
+        <li v-for="train in sceneryTrains">
+          {{ train.trainNo }}
+        </li>
+      </ul>
+    </div>
+  </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
+import axios from 'axios';
+import { ApiSWDR } from '../types/apiTypes';
+import { ISceneryData, ITrainData } from '../types/dataTypes';
 
 export default defineComponent({
   name: 'order-train-picker',
   data() {
     return {
-      sceneriesOnline: []
+      sceneriesOnline: [] as ISceneryData[],
-    }
+      trainsOnline: [] as ITrainData[],
+
+      selectedSceneryName: null as string | null,
+      selectedDispatcherName: null as string | null,
+    };
   },
 
   mounted() {
-   
+    this.fetchSceneriesOnline();
-    
+    this.fetchTrainsOnline();
+  },
+
+  watch: {
+    selectedDispatcherName() {
+      this.selectedSceneryName = this.sceneryNameList.length == 0 ? null : this.sceneryNameList[0];
+    },
+  },
+
+  computed: {
+    sceneriesOnlinePL1() {
+      return this.sceneriesOnline.filter((s) => s.region == 'eu' && s.isOnline);
+    },
+
+    dispatcherNameList() {
+      return [...new Set(this.sceneriesOnlinePL1.map((s) => s.dispatcherName))].sort((a, b) => (a < b ? -1 : 1));
+    },
+
+    sceneryNameList() {
+      return this.sceneriesOnlinePL1
+        .filter((s) => s.dispatcherName == this.selectedDispatcherName)
+        .map((s) => s.stationName)
+        .sort((a, b) => (a < b ? -1 : 1));
+    },
+
+    sceneryTrains() {
+      return this.trainsOnline.filter((t) => t.isOnline && t.station?.stationName == this.selectedSceneryName);
+    },
   },
 
   methods: {
-    fetchSceneriesOnline() {
+    async fetchSceneriesOnline() {
+      const data: ApiSWDR.IStationsOnline = await (
+        await axios.get(`${import.meta.env['VITE_APP_SWDR_URL']}/?method=getStationsOnline`)
+      ).data;
 
-    }
+      if (!data.success) return;
+
+      this.sceneriesOnline = data.message;
+    },
+
+    async fetchTrainsOnline() {
+      const data: ApiSWDR.ITrainsOnline = await (
+        await axios.get(`${import.meta.env['VITE_APP_SWDR_URL']}/?method=getTrainsOnline`)
+      ).data;
+
+      if (!data.success) return;
+
+      this.trainsOnline = data.message;
+    },
   },
 });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.order-train-picker {
+  padding: 1em 0;
+
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.options {
+  display: flex;
+  width: 100%;
+
+  padding: 0 2em;
+}
+
+.content {
+  margin-top: 1em;
+}
+
+select {
+  border: 2px solid white;
+  color: white;
+  font-size: 1em;
+  width: 100%;
+}
+
+option {
+  color: black;
+}
+</style>
 

src/types/apiTypes.ts

@@ -1,7 +1,53 @@
-export interface IStationsOnlineAPI {
+import { ISceneryData } from './dataTypes';
 
+export declare module ApiSWDR {
+  export interface IStationsOnline {
+    success: boolean;
+    respCode: number;
+    message: IStationsOnlineMessage[];
+  }
+
+  export interface IStationsOnlineMessage {
+    dispatcherId: number;
+    dispatcherName: string;
+    dispatcherIsSupporter: boolean;
+    stationName: string;
+    stationHash: string;
+    region: string;
+    maxUsers: number;
+    currentUsers: number;
+    spawn: number;
+    lastSeen: any;
+    dispatcherExp: number;
+    nameFromHeader: string;
+    spawnString: string;
+    networkConnectionString: string;
+    isOnline: number;
+    dispatcherRate: number;
+  }
+
+  export interface ITrainsOnline {
+    success: boolean;
+    respCode: number;
+    message: ITrainsOnlineMessage[];
+  }
+
+  export interface ITrainsOnlineMessage {
+    trainNo: number;
+    driverId: number;
+    driverName: string;
+    driverIsSupporter: boolean;
+    dataSignal: string;
+    dataSceneryConnection: string;
+    dataDistance: number;
+    dataCon: string;
+    dataSpeed: number;
+    dataMass: number;
+    dataLength: number;
+    region: string;
+    isOnline: number;
+    lastSeen: number;
+    station?: ISceneryData;
+  }
 }
 
-export interface IStationsOnlineAPIList {
-
-}

src/types/dataTypes.ts

@@ -0,0 +1,37 @@
+export interface ISceneryData {
+  dispatcherId: number;
+  dispatcherName: string;
+  dispatcherIsSupporter: boolean;
+  stationName: string;
+  stationHash: string;
+  region: string;
+  maxUsers: number;
+  currentUsers: number;
+  spawn: number;
+  lastSeen: any;
+  dispatcherExp: number;
+  nameFromHeader: string;
+  spawnString: string;
+  networkConnectionString: string;
+  isOnline: number;
+  dispatcherRate: number;
+}
+
+export interface ITrainData {
+  trainNo: number;
+  driverId: number;
+  driverName: string;
+  driverIsSupporter: boolean;
+  dataSignal: string;
+  dataSceneryConnection: string;
+  dataDistance: number;
+  dataCon: string;
+  dataSpeed: number;
+  dataMass: number;
+  dataLength: number;
+  region: string;
+  isOnline: number;
+  lastSeen: number;
+  station?: ISceneryData;
+}
+

yarn.lock

@@ -1357,11 +1357,25 @@ async@^3.2.3:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
   integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
 
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
+axios@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35"
+  integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-plugin-polyfill-corejs2@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
@@ -1507,6 +1521,13 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -1569,6 +1590,11 @@ define-properties@^1.1.3, define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
 ejs@^3.1.6:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
@@ -1815,6 +1841,20 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+follow-redirects@^1.15.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 fs-extra@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -2223,6 +2263,18 @@ micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
 minimatch@^3.0.4, minimatch@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -2345,6 +2397,11 @@ pretty-bytes@^6.0.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.0.0.tgz#928be2ad1f51a2e336add8ba764739f9776a8140"
   integrity sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"