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

show load at next stop in timeline / status card, if available

parent 3ab10895

templates/_checked_in.html.ep

+2 −14
Original line number Diff line number Diff line
@@ -242,13 +242,7 @@ 
						<a class="tablerow action-checkout" data-station="<%= $station->[1] // $station->[0] %>">

							<span><%= $station->[0] %></span>

							<span>

							% if ($station->[2]{load}{SECOND}) {

								% my ($first, $second) = load_icon($station->[2]{load});

								% if ($first ne 'help_outline') {

									<i class="material-icons tiny" aria-hidden="true"><%= $first %></i>

								% }

								<i class="material-icons tiny" aria-hidden="true"><%= $second %></i>

							% }

							%= include '_show_load_icons', station => $station

							% if ($station->[2]{isCancelled}) {

								entfällt

							% }
@@ -389,13 +383,7 @@ 
					<a class="action-checkout tablerow" style="<%= $is_dest? 'font-weight: bold;' : '' %>" data-station="<%= $station->[1] // $station->[0] %>">

						<span><%= $station->[0] %></span>

						<span>

						% if ($station->[2]{load}{SECOND}) {

							% my ($first, $second) = load_icon($station->[2]{load});

							% if ($first ne 'help_outline') {

								<i class="material-icons tiny" aria-hidden="true"><%= $first %></i>

							% }

							<i class="material-icons tiny" aria-hidden="true"><%= $second %></i>

						% }

						%= include '_show_load_icons', station => $station

						% if ($station->[2]{isCancelled}) {

							entfällt

						% }

templates/_public_status_card.html.ep

+33 −10
Original line number Diff line number Diff line
@@ -95,20 +95,31 @@ 
							% last;

						% }

						% if (($station->[2]{arr_countdown} // 0) > 0 and $station->[2]{arr}) {

							<%= $station->[0] %><br/><%= $station->[2]{arr}->strftime('%H:%M') %>

							%= $station->[0]

							<br/>

							%= $station->[2]{arr}->strftime('%H:%M')

							% if ($station->[2]{arr_delay}) {

								%= sprintf('(%+d)', $station->[2]{arr_delay} / 60);

								%= sprintf('(%+d)', $station->[2]{arr_delay} / 60)

							% }

							% if ($station->[2]{load}{SECOND}) {

								<br/>

								%= include '_show_load_icons', station => $station

							% }

							% last;

						% }

						% if (($station->[2]{dep_countdown} // 0) > 0 and $station->[2]{dep}) {

							<%= $station->[0] %><br/>

							%= $station->[0]

							<br/>

							% if ($station->[2]{arr}) {

								<%= $station->[2]{arr}->strftime('%H:%M') %> →

							% }

							%= $station->[2]{dep}->strftime('%H:%M')

							% if ($station->[2]{dep_delay}) {

								%= sprintf('(%+d)', $station->[2]{dep_delay} / 60);

								%= sprintf('(%+d)', $station->[2]{dep_delay} / 60)

							% }

							% if ($station->[2]{load}{SECOND}) {

								<br/>

								%= include '_show_load_icons', station => $station

							% }

							% last;

						% }
@@ -123,19 +134,31 @@ 
						% }

						% if (($station->[2]{arr_countdown} // 0) > 0 and $station->[2]{arr}) {

							Nächster Halt:<br/>

							<%= $station->[0] %><br/><%= $station->[2]{arr}->strftime('%H:%M') %>

							%= $station->[0]

							<br/>

							%= $station->[2]{arr}->strftime('%H:%M')

							% if ($station->[2]{arr_delay}) {

								%= sprintf('(%+d)', $station->[2]{arr_delay} / 60);

								%= sprintf('(%+d)', $station->[2]{arr_delay} / 60)

							% }

							% if ($station->[2]{load}{SECOND}) {

								<br/>

								%= include '_show_load_icons', station => $station

							% }

							% last;

						% }

						% if (($station->[2]{dep_countdown} // 0) > 0 and $station->[2]{arr} and $station->[2]{dep}) {

							Aktueller Halt:<br/>

							<%= $station->[0] %><br/>

							<%= $station->[2]{arr}->strftime('%H:%M') %> →

							<%= $station->[2]{dep}->strftime('%H:%M') %>

							%= $station->[0]

							<br/>

							%= $station->[2]{arr}->strftime('%H:%M')

							→

							%= $station->[2]{dep}->strftime('%H:%M')

							% if ($station->[2]{dep_delay}) {

								%= sprintf('(%+d)', $station->[2]{dep_delay} / 60);

								%= sprintf('(%+d)', $station->[2]{dep_delay} / 60)

							% }

							% if ($station->[2]{load}{SECOND}) {

								<br/>

								%= include '_show_load_icons', station => $station

							% }

							% last;

						% }

templates/_show_load_icons.html.ep

0 → 100644
+7 −0
Original line number Diff line number Diff line 
% if ($station->[2]{load}{SECOND}) {

	% my ($first, $second) = load_icon($station->[2]{load});

	% if ($first ne 'help_outline') {

		<i class="material-icons tiny" aria-hidden="true"><%= $first %></i>

	% }

	<i class="material-icons tiny" aria-hidden="true"><%= $second %></i>

% }