diff --git a/package-lock.json b/package-lock.json
index ad74a6c..8010dac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "stacjownik",
- "version": "1.19.0",
+ "version": "1.19.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "stacjownik",
- "version": "1.19.0",
+ "version": "1.19.1",
"dependencies": {
"core-js": "^3.32.2",
"dotenv": "^16.3.1",
diff --git a/package.json b/package.json
index 8efdaed..9198d0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "stacjownik",
- "version": "1.19.1",
+ "version": "1.19.2",
"private": true,
"scripts": {
"dev": "vite",
diff --git a/src/App.vue b/src/App.vue
index 6db40fa..756db8d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -74,7 +74,6 @@ export default defineComponent({
this.store.activeData.activeSceneries = [];
this.store.activeData.trains = [];
- this.store.activeData.connectedSocketCount = 0;
this.store.setStatuses();
});
diff --git a/src/components/SceneryView/SceneryDispatchersHistory.vue b/src/components/SceneryView/SceneryDispatchersHistory.vue
index b608838..586f7a9 100644
--- a/src/components/SceneryView/SceneryDispatchersHistory.vue
+++ b/src/components/SceneryView/SceneryDispatchersHistory.vue
@@ -33,6 +33,8 @@
>
{{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
+
+ ?
{{ historyItem.dispatcherRate }}
@@ -84,12 +86,10 @@ export default defineComponent({
components: { Loading },
props: {
station: {
- type: Object as PropType,
- required: true
+ type: Object as PropType
},
onlineScenery: {
- type: Object as PropType,
- required: false
+ type: Object as PropType
}
},
@@ -113,10 +113,17 @@ export default defineComponent({
countFrom = 0,
countLimit = 30
): Promise {
+ if (!this.station && !this.onlineScenery) {
+ this.dataStatus = Status.Data.Loaded;
+ return null;
+ }
+
try {
this.dataStatus = Status.Data.Loading;
- const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`;
+ const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${
+ this.station?.name || this.onlineScenery?.name
+ }&countFrom=${countFrom}&countLimit=${countLimit}`;
const historyAPIData: API.DispatcherHistory.Response = await (
await axios.get(requestString)
).data;
@@ -130,7 +137,9 @@ export default defineComponent({
}
},
navigateToHistory() {
- this.$router.push(`/journal/dispatchers?sceneryName=${this.station.name}`);
+ this.$router.push(
+ `/journal/dispatchers?sceneryName=${this.station?.name || this.onlineScenery?.name}`
+ );
}
}
});
diff --git a/src/components/SceneryView/SceneryHeader.vue b/src/components/SceneryView/SceneryHeader.vue
index 7c093e0..d3e86ba 100644
--- a/src/components/SceneryView/SceneryHeader.vue
+++ b/src/components/SceneryView/SceneryHeader.vue
@@ -1,11 +1,11 @@
|