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

save all the wagon orders we can get

parent b0ddada5

lib/Travelynx.pm

+14 −11
Original line number Diff line number Diff line
@@ -2192,7 +2192,6 @@ sub startup { 


						if ($is_departure) {

							$data->{wagonorder_dep} = $wagonorder;

							$user_data->{wagons}    = [];

							if ( exists $user_data->{wagongroups} ) {

								$user_data->{wagongroups} = [];

							}
@@ -2203,11 +2202,12 @@ sub startup { 
								}

							  )

							{

								my @wagons;

								for

								  my $wagon ( @{ $group->{allFahrzeug} // [] } )

								{

									push(

										@{ $user_data->{wagons} },

										@wagons,

										{

											id => $wagon->{fahrzeugnummer},

											number =>
@@ -2216,15 +2216,18 @@ sub startup { 
										}

									);

								}

								if (    $group->{fahrzeuggruppebezeichnung}

									and $group->{fahrzeuggruppebezeichnung}

									=~ m{ ^ ICE }x )

								{

								push(

									@{ $user_data->{wagongroups} },

										$group->{fahrzeuggruppebezeichnung}

									);

									{

										name =>

										  $group->{fahrzeuggruppebezeichnung},

										from =>

										  $group->{startbetriebsstellename},

										to => $group->{zielbetriebsstellename},

										no => $group->{verkehrlichezugnummer},

										wagons => [@wagons],

									}

								);

							}

							$db->update(

								'in_transit',

templates/journey.html.ep

+19 −1
Original line number Diff line number Diff line
@@ -188,7 +188,25 @@ 
						% }

					</td>

				</tr>

				% if ($journey->{user_data} and $journey->{user_data}{wagons}) {

				% if ($journey->{user_data} and $journey->{user_data}{wagongroups} and not exists $journey->{user_data}{wagons}) {

				<tr>

					<th scope="row">Rollmaterial</th>

					<td class="wagons">

						% for my $wagongroup (@{$journey->{user_data}{wagongroups} // []}) {

							Wagenverbund <%= $wagongroup->{name} %> von <%= $wagongroup->{from} %> nach <%= $wagongroup->{to} %> als <%= $journey->{type} %> <%= $wagongroup->{no} %><br/>

							% for my $wagon (@{$wagongroup->{wagons}}) {

								<span><%= substr($wagon->{id}, 0, 2) %></span><span><%= substr($wagon->{id}, 2, 2) %></span><span><%= substr($wagon->{id}, 4, 1) %></span><span class="wagonclass"><%= substr($wagon->{id}, 5, 3) %></span><span class="wagonnum"><%= substr($wagon->{id}, 8, 3) %></span><span class="checksum"><%= substr($wagon->{id}, 11) %></span>

								%= $wagon->{type}

								% if ($wagon->{number}) {

									– Wagen <%= $wagon->{number} %>

								% }

								<br/>

							% }

						% }

					</td>

				</tr>

				% }

				% elsif ($journey->{user_data} and $journey->{user_data}{wagons}) {

				<tr>

					<th scope="row">Rollmaterial</th>

					<td class="wagons">