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

add journey: do not hardcode backend

parent c5649b36

lib/Travelynx/Controller/Traveling.pm

+4 −2
Original line number Diff line number Diff line
@@ -2514,6 +2514,8 @@ sub edit_journey { 
sub add_journey_form {

	my ($self) = @_;



	$self->stash( backend_id => $self->current_user->{backend_id} );



	if ( $self->param('action') and $self->param('action') eq 'save' ) {

		my $parser = DateTime::Format::Strptime->new(

			pattern   => '%d.%m.%Y %H:%M',
@@ -2536,7 +2538,7 @@ sub add_journey_form { 
				with_autocomplete => 1,

				status            => 400,

				error             =>

'Zug muss als „Typ Nummer“ oder „Typ Linie Nummer“ eingegeben werden.'

'Fahrt muss als „Typ Nummer“ oder „Typ Linie Nummer“ eingegeben werden.'

			);

			return;

		}
@@ -2574,7 +2576,7 @@ sub add_journey_form { 


		$opt{db}         = $db;

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

		$opt{backend_id} = 1;

		$opt{backend_id} = $self->current_user->{backend_id};



		my ( $journey_id, $error ) = $self->journeys->add(%opt);

templates/add_journey.html.ep

+14 −2
Original line number Diff line number Diff line
@@ -34,9 +34,21 @@ 
				„ICE 100“, „S 1 31133“ oder „ABR RE11 26720“</li>

			<li>Wenn Nummer nicht bekannt oder vorhanden: einen beliebigen Integer eintragen, z.B. „S 5X 0“ oder „U 11 0“</li>	

			<li>Zeitangaben im Format DD.MM.YYYY HH:MM</li>

			<li>Das ausgewählte Backend bestimmt die verfügbaren Halte für Start, Ziel und Route. Siehe auch <a href="/static/stops.csv">stops.csv</a></li>

		</ul>

	</div>

</div>

<div class="row">

	<div class="col s12 center-align">

		% my $self_link = url_for('add_journey');

		% if (current_user->{backend_id}) {

			<a href="/account/select_backend?redirect_to=<%= $self_link %>" class="btn-small btn-flat"><i class="material-icons left" aria-hidden="true">directions</i><%= current_user->{backend_name} %></a>

		% }

		% else {

			<a href="/account/select_backend?redirect_to=<%= $self_link %>" class="btn-small btn-flat"><i class="material-icons left" aria-hidden="true">train</i>IRIS</a>

		% }

	</div>

</div>

%= form_for '/journey/add' => (method => 'POST') => begin

	%= csrf_field

	<div class="row">
@@ -54,7 +66,7 @@ 
	<div class="row">

		<div class="input-field col s12">

			%= text_field 'dep_station', id => 'dep_station', class => 'autocomplete validate', autocomplete => 'off', required => undef

			<label for="dep_station">Start (Name oder DS100)</label>

			<label for="dep_station">Start (Name oder ID)</label>

		</div>

		<div class="input-field col s12">

			%= text_field 'sched_departure', id => 'sched_departure', class => 'validate', required => undef, pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9] +[0-9][0-9]:[0-9][0-9]'
@@ -68,7 +80,7 @@ 
	<div class="row">

		<div class="input-field col s12">

			%= text_field 'arr_station', id => 'arr_station', class => 'autocomplete validate', autocomplete => 'off', required => undef

			<label for="arr_station">Ziel (Name oder DS100)</label>

			<label for="arr_station">Ziel (Name oder ID)</label>

		</div>

		<div class="input-field col s12">

			%= text_field 'sched_arrival', id => 'sched_arrival', class => 'validate', required => undef, pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9] +[0-9][0-9]:[0-9][0-9]'