From 698aae7e0f8ba86ea1a3562863c65915dde36028 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 25 Dec 2020 21:55:11 +0100 Subject: also show exit direction in wagon view --- lib/DBInfoscreen/Controller/Wagenreihung.pm | 20 ++++++++++++++++++++ templates/_train_details.html.ep | 2 +- templates/wagen.html.ep | 14 +++++++++++--- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/lib/DBInfoscreen/Controller/Wagenreihung.pm b/lib/DBInfoscreen/Controller/Wagenreihung.pm index daa2cda..c2d7f7e 100644 --- a/lib/DBInfoscreen/Controller/Wagenreihung.pm +++ b/lib/DBInfoscreen/Controller/Wagenreihung.pm @@ -82,6 +82,7 @@ sub wagenreihung { my ($self) = @_; my $train = $self->stash('train'); my $departure = $self->stash('departure'); + my $exit_side = $self->param('e'); $self->render_later; @@ -119,6 +120,7 @@ sub wagenreihung { my $wref = { d => $wr->direction, + e => $exit_side ? substr( $exit_side, 0, 1 ) : '', tt => $wr->train_type, tn => $train, s => $wr->station_name, @@ -193,6 +195,24 @@ sub wagen { } } + if ( defined $wref->{d} and $wref->{e} ) { + if ( $wref->{d} == 0 and $wref->{e} eq 'l' ) { + $wref->{e} = 'u'; + } + elsif ( $wref->{d} == 0 and $wref->{e} eq 'r' ) { + $wref->{e} = 'd'; + } + elsif ( $wref->{d} == 100 and $wref->{e} eq 'l' ) { + $wref->{e} = 'd'; + } + elsif ( $wref->{d} == 100 and $wref->{e} eq 'r' ) { + $wref->{e} = 'u'; + } + } + else { + $wref->{e} = ''; + } + $self->render( 'wagen', title => $title, diff --git a/templates/_train_details.html.ep b/templates/_train_details.html.ep index 138c877..77a61ba 100644 --- a/templates/_train_details.html.ep +++ b/templates/_train_details.html.ep @@ -113,7 +113,7 @@ Karte % } % if ($departure->{wr_link}) { - Wagenreihung + Wagenreihung % } % elsif ($icetype and $icetype->[2] and ($linetype eq 'fern' or $departure->{train_type} =~ m{NJ})) { diff --git a/templates/wagen.html.ep b/templates/wagen.html.ep index 68cf221..9cf4793 100644 --- a/templates/wagen.html.ep +++ b/templates/wagen.html.ep @@ -6,7 +6,7 @@ % } % if (defined $wref->{d}) {
- % if ($wref->{d} == 100) { + % if ($wref->{d} == 0) { arrow_back % } % else { @@ -14,12 +14,20 @@ % }
% } -
+ % if ($wref->{e} eq 'u') { +
arrow_upward
+
arrow_upward
+ % } +
+ % if ($wref->{e} eq 'd') { +
arrow_downward
+
arrow_downward
+ % } % if (defined $wref->{d}) {
- % if ($wref->{d} == 100) { + % if ($wref->{d} == 0) { arrow_back % } % else { -- cgit v1.2.3