Commit 698aae7e authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

also show exit direction in wagon view

parent de9ea41c

lib/DBInfoscreen/Controller/Wagenreihung.pm

+20 −0
Original line number Diff line number Diff line
@@ -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,

templates/_train_details.html.ep

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
        <a class="smallbutton" href="/map/<%= $departure->{trip_id} %>/<%= $departure->{train_line} // 0 %>?from=<%= $station_name %>"><i class="material-icons" aria-hidden="true">map</i> Karte</a>

%     }

%     if ($departure->{wr_link}) {

        <a class="smallbutton" href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>"><i class="material-icons" aria-hidden="true">train</i> Wagenreihung

        <a class="smallbutton" href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>?e=<%= $departure->{direction} // '' %>"><i class="material-icons" aria-hidden="true">train</i> Wagenreihung

        </a>

%     }

%     elsif ($icetype and $icetype->[2] and ($linetype eq 'fern' or $departure->{train_type} =~ m{NJ})) {

templates/wagen.html.ep

+11 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
	% }

	% if (defined $wref->{d}) {

		<div style="text-align: center;">

			% if ($wref->{d} == 100) {

			% if ($wref->{d} == 0) {

				<i class="material-icons">arrow_back</i>

			% }

			% else {
@@ -14,12 +14,20 @@ 
			% }

		</div>

	% }

	<div>

	% if ($wref->{e} eq 'u') {

		<div style="float: left;"><i class="material-icons">arrow_upward</i></div>

		<div style="float: right;"><i class="material-icons">arrow_upward</i></div>

	% }

	<div style="clear: both;">

		<a href="<%= $wagon_file %>"><img src="<%= $wagon_file %>" style="width: 100%;"></a>

	</div>

	% if ($wref->{e} eq 'd') {

		<div style="float: left;"><i class="material-icons">arrow_downward</i></div>

		<div style="float: right;"><i class="material-icons">arrow_downward</i></div>

	% }

	% if (defined $wref->{d}) {

		<div style="text-align: center;">

			% if ($wref->{d} == 100) {

			% if ($wref->{d} == 0) {

				<i class="material-icons">arrow_back</i>

			% }

			% else {