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

Re-add train attributes

parent d0891186

lib/DBInfoscreen/Controller/Stationboard.pm

+1 −18
Original line number Diff line number Diff line
@@ -809,24 +809,7 @@ sub render_train { 
		}

	)->wait;



	# currently useless due to lack of Open Data

	if ( 0 and $self->param('detailed') ) {

		my $cycle_req = Mojo::Promise->new;

		push( @requests, $cycle_req );

		$self->wagonorder->has_cycle_p( $result->train_no )->then(

			sub {

				$departure->{has_cycle} = 1;

			}

		)->catch(

			sub {

				# nop

			}

		)->finally(

			sub {

				$cycle_req->resolve;

				return;

			}

		)->wait;

	if ( $self->param('detailed') ) {

		$departure->{composition}

		  = $self->app->train_details_db->{ $departure->{train_no} };

		my @cycle_from;

templates/_train_attr.html.ep

+6 −10
Original line number Diff line number Diff line 
% if ($attr->{series}) {

  <span>BR <%= $attr->{series} %>

%   if ($attr->{series2}) {

      + <%= $attr->{series2} %>

%   }

  </span>

% if ($attr->{vmax}) {

  <span><%= $attr->{vmax} %> km/h</span>

% }

% if ($attr->{length}) {

   <span>⇤ <%= $attr->{length} %>m ⇥</span>

% }

% if ($attr->{vmax}) {

  <span><%= $attr->{vmax} %> km/h</span>

% if ($attr->{weight}) {

   <span><%= $attr->{weight} %>t</span>

% }

% if ($attr->{brakingPercentage}) {

  <span>λ=<%= $attr->{brakingPercentage} %></span>

% }

% if ($attr->{station} and $with_station) {

  <span>ab <%= $attr->{station} %></span>

% if ($with_station and $attr->{range}[0]) {

  <span>ab <%= $attr->{range}[0] %></span>

% }

templates/_train_details.html.ep

+4 −4
Original line number Diff line number Diff line
@@ -324,12 +324,12 @@ 
      <div class="db-attr"><a href="https://lib.finalrewind.org/dbdb/db_umlauf/<%= $departure->{train_no} %>.svg">Umlaufplan</a>

        (ggf. fehlerhaft)</div>

%   }

%   if ($details->{commonAttr}) {

%     if ($details->{attrVariants} and (not $details->{commonAttr}{vmax} or not $details->{commonAttr}{brakingPercentage})) {

%   if ($details->{attributes}) {

%     if (@{$details->{attributes}} > 1) {

        <div class="db-attr">

          Attribute:

          <ul>

%           for my $attr (@{$details->{attrVariants} // [] }) {

%           for my $attr (@{$details->{attributes}}) {

              <li><%= include '_train_attr', attr => $attr, with_station => 1 %></li>

%           }

          </ul>
@@ -337,7 +337,7 @@ 
%     }

%     else {

        <div class="db-attr">

%=        include '_train_attr', attr => $details->{commonAttr}, with_station => 0

%=        include '_train_attr', attr => $details->{attributes}[0], with_station => 0

        </div>

%     }

%   }