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

show carriage numbers (or classes) on traininfo page

parent b1ca67fd

lib/DBInfoscreen/Controller/Stationboard.pm

+1 −0
Original line number Diff line number Diff line
@@ -720,6 +720,7 @@ sub render_train { 
					my $wr

					  = Travel::Status::DE::DBWagenreihung->new(

						from_json => $wr_json );

					$departure->{wr}      = $wr;

					$departure->{wr_text} = join( q{ + },

						map { $_->{short} }

						grep { $_->{short} } $wr->train_descriptions );

sass/app.scss

+12 −1
Original line number Diff line number Diff line
@@ -523,13 +523,24 @@ div.app { 
			width: 100%;

			display: flex;

			justify-content: space-between;

			margin-bottom: 1em;

			margin-bottom: 0.5em;



			> div {

				width: 33%;

			}

		}



		.wagonorder-preview {

			font-size: 110%;

			width: 100%;

			text-align: center;

			margin-bottom: 1em;



			a {

				color: $fg;

			}

		}



		.departure {

			text-align: right;

		}

templates/_train_details.html.ep

+21 −0
Original line number Diff line number Diff line
@@ -113,6 +113,27 @@ 
    </div>

    </div>

    </div> <!-- dataline -->

%   if (my $wr = $departure->{wr}) {

      <div class="wagonorder-preview">

%     my @wagons = $wr->wagons;

%     my $direction = $wr->direction == 100 ? '→' : '←';

%     if ($departure->{direction}) {

%       $direction = $departure->{direction} eq 'l' ? '◀' : '▶';

%       if (($departure->{direction} eq 'l' ? 0 : 100) != $wr->direction) {

%         @wagons = reverse @wagons;

%       }

%     }

      <a href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>?e=<%= $departure->{direction} // '' %>">

      %= $direction

%     for my $wagon (@wagons) {

%       if (not ($wagon->is_locomotive or $wagon->is_powercar)) {

%=        $wagon->number || ($wagon->type =~ m{AB} ? '½' : $wagon->type =~ m{A} ? '1.' : $wagon->type =~ m{B} ? '2.' : '?' )

%       }

%     }

      %= $direction

      </a>

      </div>

%   }

    <div class="verbose">

%     if ($departure->{trip_id}) {

%       if (stash('station_name')) {