Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-03 05:18:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aktualizacja aplikacji i scenerii

Browse Source
This commit is contained in:
Spythere
2021-06-17 18:28:53 +02:00
parent fa493c5fa0
commit 5cba2994dc
8 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/icon-SPE.svg
+4
View File
@@ -0,0 +1,4 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="60" height="60" fill="#898989"/>
<path d="M19.992 25.492C19.92 25.612 19.84 25.704 19.752 25.768C19.672 25.824 19.572 25.852 19.452 25.852C19.316 25.852 19.156 25.784 18.972 25.648C18.788 25.512 18.556 25.364 18.276 25.204C18.004 25.036 17.672 24.884 17.28 24.748C16.896 24.612 16.428 24.544 15.876 24.544C15.356 24.544 14.896 24.616 14.496 24.76C14.104 24.896 13.772 25.084 13.5 25.324C13.236 25.564 13.036 25.848 12.9 26.176C12.764 26.496 12.696 26.844 12.696 27.22C12.696 27.7 12.812 28.1 13.044 28.42C13.284 28.732 13.596 29 13.98 29.224C14.372 29.448 14.812 29.644 15.3 29.812C15.796 29.972 16.3 30.14 16.812 30.316C17.332 30.492 17.836 30.692 18.324 30.916C18.82 31.132 19.26 31.408 19.644 31.744C20.036 32.08 20.348 32.492 20.58 32.98C20.82 33.468 20.94 34.068 20.94 34.78C20.94 35.532 20.812 36.24 20.556 36.904C20.3 37.56 19.924 38.132 19.428 38.62C18.94 39.108 18.336 39.492 17.616 39.772C16.904 40.052 16.092 40.192 15.18 40.192C14.06 40.192 13.044 39.992 12.132 39.592C11.22 39.184 10.44 38.636 9.792 37.948L10.464 36.844C10.528 36.756 10.604 36.684 10.692 36.628C10.788 36.564 10.892 36.532 11.004 36.532C11.108 36.532 11.224 36.576 11.352 36.664C11.488 36.744 11.64 36.848 11.808 36.976C11.976 37.104 12.168 37.244 12.384 37.396C12.6 37.548 12.844 37.688 13.116 37.816C13.396 37.944 13.712 38.052 14.064 38.14C14.416 38.22 14.812 38.26 15.252 38.26C15.804 38.26 16.296 38.184 16.728 38.032C17.16 37.88 17.524 37.668 17.82 37.396C18.124 37.116 18.356 36.784 18.516 36.4C18.676 36.016 18.756 35.588 18.756 35.116C18.756 34.596 18.636 34.172 18.396 33.844C18.164 33.508 17.856 33.228 17.472 33.004C17.088 32.78 16.648 32.592 16.152 32.44C15.656 32.28 15.152 32.12 14.64 31.96C14.128 31.792 13.624 31.6 13.128 31.384C12.632 31.168 12.192 30.888 11.808 30.544C11.424 30.2 11.112 29.772 10.872 29.26C10.64 28.74 10.524 28.1 10.524 27.34C10.524 26.732 10.64 26.144 10.872 25.576C11.112 25.008 11.456 24.504 11.904 24.064C12.36 23.624 12.916 23.272 13.572 23.008C14.236 22.744 14.996 22.612 15.852 22.612C16.812 22.612 17.684 22.764 18.468 23.068C19.26 23.372 19.956 23.812 20.556 24.388L19.992 25.492ZM29.3033 31.72C29.9673 31.72 30.5513 31.632 31.0553 31.456C31.5673 31.28 31.9953 31.036 32.3393 30.724C32.6913 30.404 32.9553 30.024 33.1313 29.584C33.3073 29.144 33.3953 28.66 33.3953 28.132C33.3953 27.036 33.0553 26.18 32.3753 25.564C31.7033 24.948 30.6793 24.64 29.3033 24.64H26.5433V31.72H29.3033ZM29.3033 22.804C30.3913 22.804 31.3353 22.932 32.1353 23.188C32.9433 23.436 33.6113 23.792 34.1393 24.256C34.6673 24.72 35.0593 25.28 35.3152 25.936C35.5793 26.592 35.7113 27.324 35.7113 28.132C35.7113 28.932 35.5713 29.664 35.2913 30.328C35.0113 30.992 34.5993 31.564 34.0553 32.044C33.5193 32.524 32.8513 32.9 32.0513 33.172C31.2593 33.436 30.3433 33.568 29.3033 33.568H26.5433V40H24.2273V22.804H29.3033ZM49.2493 38.104L49.2373 40H38.6413V22.804H49.2373V24.7H40.9693V30.412H47.6653V32.236H40.9693V38.104H49.2493Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

src/components/StationsView/StationTable.vue
+22 -9
View File
@@ -80,8 +80,10 @@
</td>
<td class="station_status">
<span class="status-badge" :class="station.statusID"
>{{ $t(`status.${station.statusID}`) }}
<span
class="status-badge"
:class="station.statusID"
>{{ $t(`status.${station.statusID}`) }}
{{
station.statusID == "online" ? station.statusTimeString : ""
}}
@@ -96,10 +98,9 @@
<span
v-if="station.online"
:style="calculateExpStyle(station.dispatcherExp)"
>{{
>{{
2 > station.dispatcherExp ? "L" : station.dispatcherExp
}}</span
>
}}</span>
</td>
<td class="station_tracks twoway">
@@ -181,7 +182,10 @@
/>
</td>
<td class="station_users" :class="{ inactive: !station.online }">
<td
class="station_users"
:class="{ inactive: !station.online }"
>
<span>
<span class="highlight">{{ station.currentUsers }}</span>
/
@@ -189,7 +193,10 @@
</span>
</td>
<td class="station_spawns" :class="{ inactive: !station.online }">
<td
class="station_spawns"
:class="{ inactive: !station.online }"
>
<span class="highlight">{{ station.spawns.length }}</span>
</td>
@@ -212,11 +219,17 @@
</table>
</div>
<div class="no-stations" v-if="stations.length == 0 && isDataLoaded">
<div
class="no-stations"
v-if="stations.length == 0 && isDataLoaded"
>
{{ $t("sceneries.no-stations") }}
</div>
<div class="no-stations" v-else-if="!isDataLoaded">
<div
class="no-stations"
v-else-if="!isDataLoaded"
>
{{ $t("app.loading") }}
</div>
</section>
src/components/TrainsView/TrainTable.vue
+18 -11
View File
@@ -188,6 +188,20 @@
@error="onImageError"
/>
</span>
<div class="driver-cars">
{{
train.cars.length == 0
? "EZT"
: `${train.cars.length} wagon${
train.cars.length % 10 >= 5
? "ów"
: train.cars.length == 1
? ""
: "y"
}`
}}
</div>
</span>
<span class="stats">
@@ -242,17 +256,6 @@
v-if="train.timetableData"
v-show="showedSchedule == train.timetableData.timetableId"
>
<!-- <div class="train_cars">
<span v-for="(car, i) in train.cars" :key="i">
<img
class="car-image"
:src="`https://rj.td2.info.pl/dist/img/thumbnails/${car}.png`"
alt="image-car"
@error="onImageError"
/>
</span>
</div> -->
<TrainSchedule
:followingStops="train.timetableData.followingStops"
:currentStationName="train.currentStationName"
@@ -506,6 +509,10 @@ img.train-image {
width: 100%;
text-align: center;
}
&-cars {
margin-top: 0.5em;
}
}
.stats {
src/data/stationData.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/lang/en.json
+1
View File
@@ -25,6 +25,7 @@
"SPK": "SPK",
"SCS": "SCS",
"SCS-SPK": "SCS/SPK",
"SPE": "SPE",
"ręczne": "manual",
"ręczne+SPK": "manual + SPK",
"ręczne+SCS": "manual + SCS",
src/lang/pl.json
+1
View File
@@ -25,6 +25,7 @@
"SPK": "SPK",
"SCS": "SCS",
"SCS-SPK": "SCS/SPK",
"SPE": "SPE",
"ręczne": "ręczne",
"ręczne+SPK": "ręczne + SPK",
"ręczne+SCS": "ręczne + SCS",
src/scripts/interfaces/Scenery.ts
+33 -33
View File
@@ -1,33 +1,33 @@
interface Scenery {
stationName: string;
stationURL: string;
stationLines: string;
stationProject: string;
reqLevel: string;
supportersOnly: string;
signalType: string;
controlType: string;
SBL: string;
twoWayBlock: string;
routesOneWayCatenary: number;
routesOneWayOther: number;
routesTwoWayCatenary: number;
routesToWayOther: number;
default: boolean;
nonPublic: boolean;
unavailable: boolean;
hasData: boolean;
stops: string[];
checkpoints: string[];
currentDispatcher: string;
currentDispatcherId: number;
currentDispatcherFrom: number;
dispatcherHistory: { dispatcherName: string; dispatcherId: number; dispatcherFrom: number; dispatcherTo: number }[];
}
export default Scenery;
interface Scenery {
stationName: string;
stationURL: string;
stationLines: string;
stationProject: string;
reqLevel: string;
supportersOnly: string;
signalType: string;
controlType: string;
SBL: string;
twoWayBlock: string;
routesOneWayCatenary: number;
routesOneWayOther: number;
routesTwoWayCatenary: number;
routesToWayOther: number;
default: boolean;
nonPublic: boolean;
unavailable: boolean;
hasData: boolean;
stops: string[];
checkpoints: string[];
currentDispatcher: string;
currentDispatcherId: number;
currentDispatcherFrom: number;
dispatcherHistory: { dispatcherName: string; dispatcherId: number; dispatcherFrom: number; dispatcherTo: number }[];
}
export default Scenery;