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

journey: show times of intermediate stops, if available

parent c8624786

lib/Travelynx/Model/Journeys.pm

+7 −0
Original line number Diff line number Diff line
@@ -626,6 +626,13 @@ sub get { 
			$ref->{checkout}      = epoch_to_dt( $ref->{checkout_ts} );

			$ref->{sched_arrival} = epoch_to_dt( $ref->{sched_arr_ts} );

			$ref->{rt_arrival}    = epoch_to_dt( $ref->{rt_arr_ts} );

			for my $stop ( @{ $ref->{route} } ) {

				for my $k (qw(rt_arr rt_dep sched_arr sched_dep)) {

					if ( $stop->[2]{$k} ) {

						$stop->[2]{$k} = epoch_to_dt( $stop->[2]{$k} );

					}

				}

			}

		}



		if ( $opt{verbose} ) {

templates/journey.html.ep

+23 −1
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ 
				<tr>

					<th scope="row">Route</th>

					<td>

						% my $before = 1;

						% my $within = 0;

						% my $at_startstop = 0;

						% for my $station (@{$journey->{route}}) {
@@ -220,8 +221,16 @@ 
							% else {

								% $at_startstop = 0;

							% }

							<span style="color: #808080;">

								% if ($before and $station->[2]{sched_dep}) {

									%= $station->[2]{sched_dep}->strftime('%H:%M')

								% }

								% elsif (not $before and $station->[2]{sched_arr}) {

									%= $station->[2]{sched_arr}->strftime('%H:%M')

								% }

							</span>

							% if ($at_startstop or $within) {

								<%= $station->[0] %>

								%= $station->[0]

							% }

							% else {

								<span style="color: #808080;"><%= $station->[0] %></span>
@@ -229,6 +238,19 @@ 
							% if ($journey->{edited} & 0x0010) {

								∗

							% }

							% if ($within or $at_startstop) {

								<span style="color: #808080;">

									% if ($before and $station->[2]{rt_dep} and $station->[2]{dep_delay}) {

										%= sprintf('%+d → %s', $station->[2]{dep_delay}, $station->[2]{rt_dep}->strftime('%H:%M'))

									% }

									% elsif (not $before and $station->[2]{rt_arr} and $station->[2]{arr_delay}) {

										%= sprintf('%+d → %s', $station->[2]{arr_delay}, $station->[2]{rt_arr}->strftime('%H:%M'))

									% }

								</span>

							% }

							% if ($station->[0] eq $journey->{from_name}) {

								% $before = 0;

							% }

							<br/>

						% }

					</td>