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

pass train suffix (which is sometimes line ID) on to InTransit->add 

Closes #217
parent 84d6e23c

lib/Travelynx.pm

+7 −5
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ sub startup { 


			my $station      = $opt{station};

			my $train_id     = $opt{train_id};

			my $train_suffix = $opt{train_suffix};

			my $ts           = $opt{ts};

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

			my $db           = $opt{db}  // $self->pg->db;
@@ -610,6 +611,7 @@ sub startup { 
							backend_id => $self->stations->get_backend_id(

								dbris => 'bahn.de'

							),

							train_suffix => $train_suffix,

						);

					};

					if ($@) {

lib/Travelynx/Controller/Traveling.pm

+6 −5
Original line number Diff line number Diff line
@@ -721,6 +721,7 @@ sub travel_action { 
					hafas        => $params->{hafas},

					station      => $params->{station},

					train_id     => $params->{train},

					train_suffix => $params->{suffix},

					ts           => $params->{ts},

				);

			}

lib/Travelynx/Model/InTransit.pm

+10 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ sub add { 
	my $db                 = $opt{db} // $self->{pg}->db;

	my $backend_id         = $opt{backend_id};

	my $train              = $opt{train};

	my $train_suffix       = $opt{train_suffix};

	my $journey            = $opt{journey};

	my $stop               = $opt{stop};

	my $checkin_station_id = $opt{departure_eva};
@@ -194,6 +195,14 @@ sub add { 
	}

	elsif ( $journey and $stop ) {



		my $line;

		if (    $train_suffix

			and $journey->number

			and $train_suffix ne $journey->number )

		{

			$line = $train_suffix;

		}



		# DBRIS

		my @route;

		for my $j_stop ( $journey->route ) {
@@ -231,6 +240,7 @@ sub add { 
				checkin_time => DateTime->now( time_zone => 'Europe/Berlin' ),

				dep_platform => $stop->platform,

				train_type   => $journey->type,

				train_line   => $line,

				train_no     => $journey->number,

				train_id     => $data->{trip_id},

				sched_departure => $stop->sched_dep,

public/static/js/travelynx-actions.js

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ function tvly_reg_handlers() { 
			hafas: link.data('hafas'),

			station: link.data('station'),

			train: link.data('train'),

			suffix: link.data('suffix'),

			dest: link.data('dest'),

			ts: link.data('ts'),

		};

templates/_departures_dbris.html.ep

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
		data-dbris="<%= $dbris %>"

		data-station="<%= $result->stop_eva %>"

		data-train="<%= $result->id %>"

		data-suffix="<%= $result->maybe_line_no %>"

		data-ts="<%= ($result->sched_dep // $result->dep)->epoch %>"

	>

		<a class="dep-time" href="#">