Commit b12b5a82 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Show departures of all linked stations 

Not well-tested yet, deployment will have to wait a bit. Issue #15
parent b08b0fb9

lib/Travelynx.pm

+8 −6
Original line number Diff line number Diff line
@@ -218,10 +218,11 @@ sub startup { 


	$self->helper(

		'get_departures' => sub {

			my ( $self, $station, $lookbehind, $lookahead ) = @_;

			my ( $self, $station, $lookbehind, $lookahead, $with_related ) = @_;



			$lookbehind   //= 180;

			$lookahead    //= 30;

			$with_related //= 0;



			my @station_matches

			  = Travel::Status::DE::IRIS::Stations::get_station($station);
@@ -240,6 +241,7 @@ sub startup { 
						timeout => 10,

						agent   => 'travelynx/' . $self->app->config->{version},

					},

					with_related => $with_related,

				);

				return {

					results       => [ $status->results ],
@@ -348,7 +350,7 @@ sub startup { 
		'checkin' => sub {

			my ( $self, $station, $train_id ) = @_;



			my $status = $self->get_departures( $station, 140, 40 );

			my $status = $self->get_departures( $station, 140, 40, 0 );

			if ( $status->{errstr} ) {

				return ( undef, $status->{errstr} );

			}
@@ -532,7 +534,7 @@ sub startup { 
			my ( $self, $station, $force, $uid ) = @_;



			my $db     = $self->pg->db;

			my $status = $self->get_departures( $station, 120, 120 );

			my $status = $self->get_departures( $station, 120, 120, 0 );

			$uid //= $self->current_user->{id};

			my $user     = $self->get_user_status($uid);

			my $train_id = $user->{train_id};
@@ -2060,7 +2062,7 @@ sub startup { 
				return;

			}



			my $stationboard = $self->get_departures( $ds100, 0, 40 );

			my $stationboard = $self->get_departures( $ds100, 0, 40, 1 );

			if ( $stationboard->{errstr} ) {

				return;

			}

lib/Travelynx/Controller/Traveling.pm

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ sub station { 
	my $station = $self->stash('station');

	my $train   = $self->param('train');



	my $status = $self->get_departures( $station, 120, 30 );

	my $status = $self->get_departures( $station, 120, 30, 1 );



	if ( $status->{errstr} ) {

		$self->render(

templates/_connections.html.ep

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
		<tr>

			<td>

				% if ($checkin_from) {

					<a class="action-checkin" data-station="<%= $checkin_from %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $train->line %></a>

					<a class="action-checkin" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $train->line %></a>

				% }

				% else {

					%= $train->line
@@ -12,7 +12,7 @@ 
			</td>

			<td>

				% if ($checkin_from) {

					<a class="action-checkin" data-station="<%= $checkin_from %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $via %></a>

					<a class="action-checkin" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $via %></a>

				% }

				% else {

					%= $via
@@ -38,7 +38,7 @@ 
		<tr>

			<td class="<%= $td_class %>">

				% if ($checkin_from) {

					<a class="<%= $link_class %>" data-station="<%= $checkin_from %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $train->line %></a>

					<a class="<%= $link_class %>" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $train->line %></a>

				% }

				% else {

					%= $train->line
@@ -46,7 +46,7 @@ 
			</td>

			<td class="<%= $td_class %>">

				% if ($checkin_from) {

					<a class="<%= $link_class %>" data-station="<%= $checkin_from %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $via %></a>

					<a class="<%= $link_class %>" data-station="<%= $train->station_uic %>" data-train="<%= $train->train_id %>" data-dest="<%= $via %>"><%= $via %></a>

				% }

				% else {

					%= $via

templates/departures.html.ep

+2 −2
Original line number Diff line number Diff line
@@ -64,12 +64,12 @@ 
					% }

					<tr>

						<td>

							<a class="<%= $link_class %>" data-station="<%= $ds100 %>" data-train="<%= $result->train_id %>">

							<a class="<%= $link_class %>" data-station="<%= $result->station_uic %>" data-train="<%= $result->train_id %>">

								<%= $result->line %>

							</a>

						</td>

						<td class="<%= $td_class %>">

							<a class="<%= $link_class %>" data-station="<%= $ds100 %>" data-train="<%= $result->train_id %>">

							<a class="<%= $link_class %>" data-station="<%= $result->station_uic %>" data-train="<%= $result->train_id %>">

								<%= $result->destination %>

							</a>

						</td>