Unverified Commit 49463c76 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

train details: show expected arrival time at first stop, if available

parent 8da6180b

lib/DBInfoscreen/Controller/Stationboard.pm

+13 −4
Original line number Diff line number Diff line
@@ -809,9 +809,16 @@ sub render_train { 
		}

	)->wait;



	if ( $self->param('detailed') ) {

	$departure->{composition}

	  = $self->app->train_details_db->{ $departure->{train_no} };

	if (    not $departure->{arrival}

		and $departure->{composition}{prepTime}

		and $departure->{composition}{prepAt} eq $station_name )

	{

		$departure->{prep_time}      = $departure->{composition}{prepTime};

		$departure->{arrival_hidden} = 1;

	}

	if ( $self->param('detailed') ) {

		my @cycle_from;

		my @cycle_to;

		for my $pred ( @{ $departure->{composition}{predecessors} // [] } ) {
@@ -834,7 +841,9 @@ sub render_train { 
				departure => $departure,

				linetype  => $linetype,

				icetype => $self->app->ice_type_map->{ $departure->{train_no} },

				details => $departure->{composition} // {},

				details => $self->param('detailed')

				? $departure->{composition} // {}

				: {},

				dt_now       => DateTime->now( time_zone => 'Europe/Berlin' ),

				station_name => $station_name,

				nav_link     =>

templates/_train_details.html.ep

+4 −1
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ 
%       else {

          An: <%= $departure->{arrival} %>

%       }

%     }

%     elsif ($departure->{prep_time}) {

        Ein: <%= $departure->{prep_time} %>

%     }

    </div>

    </div>
@@ -88,7 +91,7 @@ 
        <%= $left %>Gleis <%= $departure->{platform} // $departure->{scheduled_platform} %><%= $right %>

%     }

%   }

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

%   if ($departure->{arrival_hidden} and not $departure->{prep_time}) {

      <br/><span class="timehidden">Nur Einstieg</span>

%   }

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