From 5c05ed609f3033fa97ec00089ed6885034ad9405 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sun, 23 Feb 2020 19:04:05 +0100
Subject: journey details: show route on map if available

---
 templates/journey.html.ep | 55 +++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

(limited to 'templates')

diff --git a/templates/journey.html.ep b/templates/journey.html.ep
index bd22edc..0979f49 100644
--- a/templates/journey.html.ep
+++ b/templates/journey.html.ep
@@ -166,6 +166,32 @@
 						</td>
 					</tr>
 				% }
+				% 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">
+						%= include '_wagons', wagongroups => $journey->{user_data}{wagongroups};
+					</td>
+				</tr>
+				% }
+				% elsif ($journey->{user_data} and $journey->{user_data}{wagons}) {
+				<tr>
+					<th scope="row">Rollmaterial</th>
+					<td class="wagons">
+						% for my $wagongroup (@{$journey->{user_data}{wagongroups} // []}) {
+							Wagenverbund <%= $wagongroup %><br/>
+						% }
+						% for my $wagon (@{$journey->{user_data}{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>
+				% }
 				<tr>
 					<th scope="row">Route</th>
 					<td>
@@ -194,35 +220,12 @@
 						% }
 					</td>
 				</tr>
-				% 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">
-						%= include '_wagons', wagongroups => $journey->{user_data}{wagongroups};
-					</td>
-				</tr>
-				% }
-				% elsif ($journey->{user_data} and $journey->{user_data}{wagons}) {
-				<tr>
-					<th scope="row">Rollmaterial</th>
-					<td class="wagons">
-						% for my $wagongroup (@{$journey->{user_data}{wagongroups} // []}) {
-							Wagenverbund <%= $wagongroup %><br/>
-						% }
-						% for my $wagon (@{$journey->{user_data}{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>
-				% }
 			</table>
 		</div>
 	</div>
+	% if (stash('polyline_groups')) {
+		%= include '_map', station_coordinates => stash('station_coordinates'), polyline_groups => stash('polyline_groups')
+	% }
 	% if (not stash('readonly')) {
 		<div class="row hide-on-small-only">
 			<div class="col s12 m6 l6 center-align">
-- 
cgit v1.2.3