EFA: show connections while checked in (831e851f) · Commits · derf / travelynx-deletion_scheduled-2

lib/Travelynx/Command/work.pm

+39 −2

Changes for lib/Travelynx/Command/work.pm: 39 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -285,9 +285,9 @@ sub run {
		)->wait;

		if ( $arr
		and $entry->{real_arr_ts}
		and $now->epoch - $entry->{real_arr_ts} > 900 )
		and $entry->{real_arr_ts} )
		{
		if ( $now->epoch - $entry->{real_arr_ts} > 900 ) {
		$self->app->checkout_p(
		station => $arr,
		force => 2,
		@@ -296,6 +296,43 @@ sub run {
		uid => $uid
		)->wait;
		}
		elsif ( $entry->{real_arr_ts} - $now->epoch < 900 ) {
		my @destinations
		= $self->app->journeys->get_connection_targets(
		uid => $uid,
		backend_id => $entry->{backend_id},
		eva => $arr,
		exclude => $dep,
		);
		$self->app->efa->get_connections_p(
		service => $entry->{backend_name},
		name => $arr,
		timestamp => $entry->{real_arr},
		destinations => \@destinations
		)->then(
		sub {
		my ($suggestions) = @_;
		$self->app->in_transit->update_data(
		uid => $uid,
		train_id => $train_id,
		data => {
		connection_suggestions_efa =>
		$suggestions
		},
		);
		return;
		}
		)->catch(
		sub {
		my ($err) = @_;
		$self->app->log->debug(
		"work($uid) @ EFA $entry->{backend_name}: get_departures_p($arr): $err"
		);
		return;
		}
		)->wait;
		}
		}
		};
		if ($@) {
		$errors += 1;

+69 −0

Changes for lib/Travelynx/Helper/EFA.pm: 69 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -48,6 +48,75 @@ sub get_departures_p {
		);
		}

		sub get_connections_p {
		my ( $self, %opt ) = @_;
		my $promise = Mojo::Promise->new;
		my @destinations = @{ $opt{destinations} };

		$self->get_departures_p(
		service => $opt{service},
		name => $opt{name},
		timestamp => $opt{timestamp},
		lookbehind => 0,
		lookahead => 60,
		)->then(
		sub {
		my ($status) = @_;
		my @suggestions;
		my %via_count;
		for my $dep ( $status->results ) {
		destination: for my $dest (@destinations) {
		for my $stop ( $dep->route_post ) {
		if ( $stop->full_name eq $dest->{name} ) {
		if ( not $dep->is_cancelled ) {
		$via_count{ $dep->stop_id_num } += 1;
		}
		if ( $via_count{ $dep->stop_id_num } > 2 ) {
		next destination;
		}
		my $dep_json = {
		id => $dep->id,
		ts => ( $dep->sched_datetime // $dep->datetime )
		->epoch,
		is_cancelled => $dep->is_cancelled,
		stop_id_num => $dep->stop_id_num,
		sched_hhmm =>
		$dep->sched_datetime->strftime('%H:%M'),
		rt_hhmm => $dep->datetime->strftime('%H:%M'),
		delay => $dep->delay,
		platform => $dep->platform,
		type => $dep->type,
		line => $dep->line,
		};
		push(
		@suggestions,
		[
		$dep_json, $dest,
		$stop->arr->strftime('%H:%M')
		]
		);
		next destination;
		}
		}
		}
		}
		@suggestions = map { $_->[0] }
		sort { $a->[1] <=> $b->[1] }
		map { [ $_, $_->[0]->{ts} ] } @suggestions;
		$promise->resolve( \@suggestions );
		return;
		}
		)->catch(
		sub {
		my ($err) = @_;
		$promise->reject(
		"get_departures_p($opt{service}, $opt{name}): $err");
		return;
		}
		)->wait;
		return $promise;
		}

		sub get_journey_p {
		my ( $self, %opt ) = @_;

+4 −0

Changes for lib/Travelynx/Model/Journeys.pm: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -2108,6 +2108,7 @@ sub get_connection_targets {
		my $min_count = $opt{min_count} // 3;
		my $backend_id = $opt{backend_id};
		my $dest_id = $opt{eva};
		my $exclude_id = $opt{exclude};

		$self->{log}->debug(
		"get_connection_targets(uid => $uid, backend_id => $backend_id, dest_id => $dest_id)"
		@@ -2163,6 +2164,9 @@ sub get_connection_targets {
		backend_id => $opt{backend_id},
		evas => [@destinations]
		);
		if ( defined $exclude_id ) {
		@destinations = grep { $_->{eva} != $exclude_id } @destinations;
		}
		return @destinations;
		}

+7 −0

Changes for templates/_checked_in.html.ep: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -221,6 +221,13 @@
		</ul>
		</p>
		% }
		% if (my @suggestions = @{$journey->{extra_data}{connection_suggestions_efa} // []}) {
		<span class="card-title" style="margin-top: 2ex;">Verbindungen</span>
		% if ($journey->{arrival_countdown} < 0) {
		<p>Fahrt auswählen zum Einchecken mit Zielwahl.</p>
		% }
		%= include '_connections_efa', efa => $journey->{backend_name}, suggestions => \@suggestions, checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_eva} : undef
		% }
		% if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} <= 0) {
		<p style="margin-top: 2ex;">
		%= L('status.delayed-auto-checkout')

0 → 100644

+56 −0

Changes for templates/_connections_efa.html.ep: 56 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<ul class="collection departures connections">
		% for my $res (@{$suggestions}) {
		% my ($dep, $dest, $via_arr) = @{$res};
		% my $row_class = '';
		% my $link_class = 'action-checkin';
		% if ($dep->{is_cancelled}) {
		% $row_class = 'cancelled';
		% $link_class = 'action-cancelled-from';
		% }
		% if ($checkin_from) {
		<li class="collection-item <%= $row_class %> <%= $link_class %>"
		data-efa="<%= $efa %>"
		data-station="<%= $dep->{stop_id_num} %>"
		data-train="<%= $dep->{id} %>"
		data-ts="<%= $dep->{ts} %>"
		data-dest="<%= $dest->{name} %>">
		% }
		% else {
		<li class="collection-item <%= $row_class %>">
		% }
		<a class="dep-time" href="#">
		% if ($dep->{is_cancelled}) {
		%= $dep->{sched_hhmm}
		% }
		% else {
		%= $dep->{rt_hhmm}
		% }
		% if ($via_arr) {
		→ <%= $via_arr %>
		% }
		% if ($dep->{delay}) {
		%= sprintf('(%+d)', $dep->{delay})
		% }
		</a>
		<span class="connect-platform-wrapper">
		% if ($dep->{platform}) {
		<span>
		% if (($dep->{type} // q{}) =~ m{ ast \| bus \| ruf }ix) {
		Steig
		% }
		% else {
		Gleis
		% }
		%= $dep->{platform}
		</span>
		% }
		<span class="dep-line <%= ($dep->{type} // q{}) =~ tr{a-zA-Z_-}{}cdr %>">
		%= $dep->{line}
		</span>
		</span>
		<span class="dep-dest">
		%= $dest->{name}
		</span>
		</li>
		% }
		</ul>