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

View: Normalize trip type / line number to avoid redundancy 

Closes #343
parent 7ce6e9e9

templates/_departures_dbris.html.ep

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
				<i class="material-icons" aria-label="Keine Echtzeitdaten vorhanden" style="font-size: 16px;">gps_off</i>

			% }

		</a>

		<span class="dep-line <%= $result->type // q{} %>">

		<span class="dep-line <%= ($result->type // q{}) =~ tr{a-zA-Z_-}{}cdr %> <%= $result->line =~ s{ ^ \D+ \K \d .* $ }{}rx %>">

			%= $result->line

		</span>

		<span class="dep-dest">

templates/_format_train.html.ep

+4 −1
Original line number Diff line number Diff line 
% if ($journey->{extra_data}{wagonorder_pride}) {

	🏳️‍🌈

% }

<span class="dep-line <%= ($journey->{train_type} // q{}) =~ tr{a-zA-Z_-}{}cdr %>">

<span class="dep-line <%= ($journey->{train_type} // q{}) =~ tr{a-zA-Z_-}{}cdr %> <%= ($journey->{train_line} // q{}) =~ s{ ^ \D+ \K \d .* $ }{}rx %>">

	% if (not $journey->{is_motis}) {

		<%= $journey->{train_type} %>

	% }

	% if ($journey->{train_type} and $journey->{train_line}) {

		% $journey->{train_line} =~ s{ ^ \Q$journey->{train_type}\E (?= \d ) }{}x;

	% }

	<%= $journey->{train_line}  // $journey->{train_no}%>

</span>

% if ($journey->{train_line}) {

templates/_history_trains.html.ep

+4 −1
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ 
			% }

			<li class="collection-item">

				<a href="<%= $detail_link %>">

					<span class="dep-line <%= ($travel->{type} // q{}) =~ tr{a-zA-Z_-}{}cdr %>">

					<span class="dep-line <%= ($travel->{type} // q{}) =~ tr{a-zA-Z_-}{}cdr %> <%= ($travel->{line} // q{}) =~ s{ ^ \D+ \K \d .* $ }{}rx %>">

						% if (length($travel->{type}) < 5 and not $travel->{is_motis}) {

							<%= $travel->{type} %>

						% }

						% if ($travel->{type} and $travel->{line}) {

							% $travel->{line} =~ s{ ^ \Q$travel->{type}\E (?= \d ) }{}x;

						% }

						<%= $travel->{line}  // $travel->{no}%>

					</span>

				</a>