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

recent targets: distinguish hafas/iris

parent 2ce2291e

lib/Travelynx/Model/Journeys.pm

+4 −3
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ sub get_latest_checkout_stations { 


	my $res = $db->select(

		'journeys_str',

		[ 'arr_name', 'arr_eva' ],

		[ 'arr_name', 'arr_eva', 'train_id' ],

		{

			user_id   => $uid,

			cancelled => 0
@@ -822,7 +822,8 @@ sub get_latest_checkout_stations { 
			@ret,

			{

				name  => $row->{arr_name},

				eva  => $row->{arr_eva}

				eva   => $row->{arr_eva},

				hafas => ( $row->{train_id} =~ m{[|]} ? 1 : 0 ),

			}

		);

	}

public/static/js/geolocation.js

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

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

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

				const node = $('<a class="tablerow" href="/s/' + parts[0] + '"><span>' + parts[1] + '</span></a>');

				const node = $('<a class="tablerow" href="/s/' + parts[0] + '?hafas=' + parts[2] + '"><span>' + parts[1] + '</span></a>');

				node.click(function() {

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

				});

templates/landingpage.html.ep

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

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

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

						<div class="geolocation" data-recent="<%= join('|', map { $_->{eva} . ';' . $_->{name} } @{stash('recent_targets') // []} ) %>">

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

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

						</div>

						%= form_for 'list_departures' => begin