diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2019-06-24 18:02:45 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2019-06-24 18:02:45 +0200 |
| commit | 36121ccffc8dc65b27bcfbe1299fb6a7f9a5f77c (patch) | |
| tree | 67aaec51f26b3d34eb4810205ad452ad10cc99c1 | |
| parent | 6b9bf8e4861343dbc3f7a54436f5a6dcb2d08ec9 (diff) | |
show wagon order before departure1.8.0
| -rwxr-xr-x | lib/Travelynx.pm | 20 | ||||
| -rw-r--r-- | templates/_checked_in.html.ep | 10 | ||||
| -rw-r--r-- | templates/changelog.html.ep | 5 |
3 files changed, 35 insertions, 0 deletions
diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm index afeb880..df1d970 100755 --- a/lib/Travelynx.pm +++ b/lib/Travelynx.pm @@ -2264,6 +2264,7 @@ sub startup { for my $station (@route) { if ( $in_transit->{arr_name} + and @route_after and $station->[0] eq $in_transit->{arr_name} ) { $stop_before_dest = $route_after[-1][0]; @@ -2353,6 +2354,25 @@ sub startup { $ret->{departure_countdown} = $ret->{real_departure}->epoch - $now->epoch; + + if ( $ret->{departure_countdown} > 0 + and $in_transit->{data}{wagonorder_dep} ) + { + my $wr; + eval { + $wr + = Travel::Status::DE::DBWagenreihung->new( + from_json => $in_transit->{data}{wagonorder_dep} ); + }; + if ( $wr + and $wr->sections + and $wr->wagons + and defined $wr->direction ) + { + $ret->{wagonorder} = $wr; + } + } + if ( $in_transit->{real_arr_ts} ) { $ret->{arrival_countdown} = $ret->{real_arrival}->epoch - $now->epoch; diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep index 91cd37a..0f1dcb2 100644 --- a/templates/_checked_in.html.ep +++ b/templates/_checked_in.html.ep @@ -44,6 +44,16 @@ % if ($journey->{departure_countdown} > 0 and $journey->{dep_platform}) { <br/>von Gleis <%= $journey->{dep_platform} %> % } + % if (my $wr = $journey->{wagonorder}) { + <br/> + %= $wr->direction == 100 ? '→' : '←'; + % for my $wagon ($wr->wagons) { + % if (not ($wagon->is_locomotive or $wagon->is_powercar)) { + %= $wagon->number || $wagon->type + % } + % } + %= $wr->direction == 100 ? '→' : '←'; + % } </div> <div class="progress" style="height: 1ex;"> <div class="determinate" style="width: <%= sprintf('%.2f', 100 * ($journey->{journey_completion} // 0)); %>%;"></div> diff --git a/templates/changelog.html.ep b/templates/changelog.html.ep index ed0bff8..e511100 100644 --- a/templates/changelog.html.ep +++ b/templates/changelog.html.ep @@ -9,6 +9,11 @@ <i class="material-icons left">add</i> Angabe der Ausstiegsseite für einzelne Züge und Zielbahnhöfe. </p> + <p> + <i class="material-icons left">add</i> Angabe der Wagenreihung vor der + Abfahrt. Derzeit sind Wagenreihungen nur für Fernverkehrszüge + verfügbar. + </p> </div> </div> |