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

recent targets: add efa support

parent 37a6a515

lib/Travelynx/Model/Journeys.pm

+3 −2
Original line number Diff line number Diff line
@@ -875,8 +875,8 @@ sub get_latest_checkout_stations { 
			'arr_name',        'arr_eva',

			'arr_external_id', 'train_id',

			'backend_id',      'backend_name',

			'is_dbris',        'is_hafas',

			'is_motis'

			'is_dbris',        'is_efa',

			'is_hafas',        'is_motis'

		],

		{

			user_id   => $uid,
@@ -903,6 +903,7 @@ sub get_latest_checkout_stations { 
				external_id_or_eva => $row->{arr_external_id}

				  // $row->{arr_eva},

				dbris      => $row->{is_dbris} ? $row->{backend_name} : 0,

				efa        => $row->{is_efa}   ? $row->{backend_name} : 0,

				hafas      => $row->{is_hafas} ? $row->{backend_name} : 0,

				motis      => $row->{is_motis} ? $row->{backend_name} : 0,

				backend_id => $row->{backend_id},

public/static/js/geolocation.js

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ $(document).ready(function() { 
			const res = $(document.createElement('p'));

			$.each(stops, function(i, stop) {

				const parts = stop.split(';');

				const [ eva, name, dbris, motis, hafas ] = parts;

				const [ eva, name, dbris, efa, hafas, motis ] = parts;



				const node = $('<a class="tablerow" href="/s/' + eva + '?dbris=' + dbris + '&amp;motis=' + motis + '&amp;hafas=' + hafas + '"><span><i class="material-icons" aria-hidden="true">' + (dbris == '0' ? 'train' : 'directions') + '</i>' + name + '</span></a>');

				const node = $('<a class="tablerow" href="/s/' + eva + '?dbris=' + dbris + '&amp;efa=' + efa + '&amp;hafas=' + hafas + '&amp;motis=' + motis + '"><span><i class="material-icons" aria-hidden="true">' + (dbris == '0' ? 'train' : 'directions') + '</i>' + name + '</span></a>');

				node.click(function() {

					$('nav .preloader-wrapper').addClass('active');

				});

templates/landingpage.html.ep

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
						<div class="card-content">

							<span class="card-title">Hallo, <%= $user->{name} %>!</span>

							<p>Du bist gerade nicht eingecheckt.</p>

							<div class="geolocation" data-recent="<%= join('|', map { $_->{external_id_or_eva} . ';' . $_->{name} . ';' . $_->{dbris} . ';' . $_->{motis} . ';' . $_->{hafas} } @{stash('recent_targets') // []} ) %>" data-backend="<%= $user->{backend_id} %>">

							<div class="geolocation" data-recent="<%= join('|', map { $_->{external_id_or_eva} . ';' . $_->{name} . ';' . $_->{dbris} . ';' . $_->{efa} . ';' . $_->{hafas} . ';' . $_->{motis} } @{stash('recent_targets') // []} ) %>" data-backend="<%= $user->{backend_id} %>">

								<a class="btn waves-effect waves-light btn-flat request">Stationen in der Umgebung abfragen</a>

							</div>

							%= hidden_field backend_dbris => $user->{backend_dbris}