Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-04 22:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

przyjazdy/odjazdy stacji pośrednich RJ w dzienniku

Browse Source
This commit is contained in:
Spythere
2023-06-21 18:26:16 +02:00
parent dbdc517b87
commit 8425cd4371
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/JournalView/JournalTimetablesList.vue
+18 -6
View File
@@ -45,7 +45,7 @@
<b <b
class="info-status" class="info-status"
:class="{ :class="{
fulfilled: timetable.fulfilled || timetable.currentDistance >= timetable.routeDistance * 0.9, fulfilled: timetable.fulfilled,
terminated: timetable.terminated && !timetable.fulfilled, terminated: timetable.terminated && !timetable.fulfilled,
active: !timetable.terminated, active: !timetable.terminated,
}" }"
@@ -53,7 +53,7 @@
{{ {{
!timetable.terminated !timetable.terminated
? $t('journal.timetable-active') ? $t('journal.timetable-active')
: timetable.fulfilled || timetable.currentDistance >= timetable.routeDistance * 0.9 : timetable.fulfilled
? $t('journal.timetable-fulfilled') ? $t('journal.timetable-fulfilled')
: `${$t('journal.timetable-abandoned')} ${localeTime(timetable.endDate, $i18n.locale)}` : `${$t('journal.timetable-abandoned')} ${localeTime(timetable.endDate, $i18n.locale)}`
}} }}
@@ -77,18 +77,30 @@
> >
<span v-if="i > 0"> <span v-if="i > 0">
&gt; &gt;
<span v-if="!item.showExtra.value && i == 1 && sceneryList.length > 2" <span v-if="!item.showExtra.value && i == 1 && sceneryList.length > 2">
>... (+{{ sceneryList.length - 2 }}) &gt;</span ... (+{{ sceneryList.length - 2 }}) &gt;
> </span>
</span> </span>
{{ scenery.name }} {{ scenery.name }}
<!-- Data odjazdu ze stacji początkowej --> <!-- Data odjazdu ze stacji początkowej -->
<span v-if="i == 0" v-html="scenery.beginDateHTML"></span> <span v-if="i == 0" v-html="scenery.beginDateHTML"></span>
<!-- Data przyjazdu do stacji końcowej --> <!-- Data przyjazdu do stacji końcowej -->
<span <span
v-if="i == sceneryList.length - 1 || (i == 1 && !item.showExtra.value)" v-else-if="i == sceneryList.length - 1 || (i == 1 && !item.showExtra.value)"
v-html="scenery.endDateHTML" v-html="scenery.endDateHTML"
></span> ></span>
<!-- Data przyjazdu i odjazdu ze stacji pośredniej -->
<span v-if="item.showExtra.value && i > 0 && i < sceneryList.length - 1">
<span v-if="timetable.checkpointArrivals && i < timetable.checkpointArrivals.length">
&lpar;p. {{ localeTime(timetable.checkpointArrivals[i], $i18n.locale)
}}<span v-if="timetable.checkpointDepartures && i < timetable.checkpointDepartures.length">
/ o. {{ localeTime(timetable.checkpointDepartures[i], $i18n.locale) }}</span
>&rpar;
</span>
</span>
</span> </span>
</div> </div>
src/scripts/interfaces/api/TimetablesAPIData.ts
+3
View File
@@ -49,6 +49,9 @@ export interface TimetableHistory {
currentSceneryHash?: string; currentSceneryHash?: string;
routeSceneries?: string; routeSceneries?: string;
checkpointArrivals?: string[];
checkpointDepartures?: string[];
} }
export interface SceneryTimetableHistory { export interface SceneryTimetableHistory {