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

stationboard: IRIS: always show cancelled trains with scheduled time

parent 87e16857

lib/DBInfoscreen/Controller/Stationboard.pm

+20 −8
Original line number Original line Diff line number Diff line
@@ -1862,16 +1862,28 @@ sub handle_result { 
			@results = sort { $a->datetime <=> $b->datetime } @results;

			@results = sort { $a->datetime <=> $b->datetime } @results;

		}

		}

		elsif ( $admode eq 'arr' ) {

		elsif ( $admode eq 'arr' ) {

			@results = sort {

			@results = map { $_->[1] }

				( $a->arrival // $a->departure )

			  sort { $a->[0] <=> $b->[0] }

				  <=> ( $b->arrival // $b->departure )

			  map {

			} @results;

				[

					$_->arrival_is_cancelled

					? ( $_->sched_arrival // $_->sched_departure )

					: ( $_->arrival // $_->departure ),

					$_

				]

			  } @results;

		}

		}

		else {

		else {

			@results = sort {

			@results = map { $_->[1] }

				( $a->departure // $a->arrival )

			  sort { $a->[0] <=> $b->[0] }

				  <=> ( $b->departure // $b->arrival )

			  map {

			} @results;

				[

					$_->departure_is_cancelled

					? ( $_->sched_departure // $_->sched_arrival )

					: ( $_->departure // $_->arrival ),

					$_

				]

			  } @results;

		}

		}

	}

	}

templates/app.html.ep

+7 −2
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ 
      </span>

      </span>

%   }

%   }

    <span class="time <%= $show_realtime ? get_rt_time_class($departure) : q{} %>">

    <span class="time <%= $show_realtime ? get_rt_time_class($departure) : q{} %>">

%     if ($departure->{delay} and not $departure->{is_cancelled}) {

%     if ($departure->{delay} and not $departure->{is_cancelled} and not $departure->{departure_is_cancelled}) {

%       if ($show_realtime and ($departure->{sched_arrival} or $departure->{sched_departure})) {

%       if ($show_realtime and ($departure->{sched_arrival} or $departure->{sched_departure})) {

%         if ($departure->{delay} > ($hide_low_delay ? 4 : 0)) {

%         if ($departure->{delay} > ($hide_low_delay ? 4 : 0)) {

            <span class="delaynorm" aria-hidden="true"><%= $departure->{sched_departure} // $departure->{sched_arrival} %> ⇒</span>

            <span class="delaynorm" aria-hidden="true"><%= $departure->{sched_departure} // $departure->{sched_arrival} %> ⇒</span>
@@ -142,7 +142,12 @@ 
%       }

%       }

%     }

%     }

%     else {

%     else {

%=      $departure->{time}

%       if ($departure->{is_cancelled} or $departure->{departure_is_cancelled}) {

%=        $departure->{sched_departure} // $departure->{sched_arrival} // $departure->{time}

%       }

%       else {

%=        $departure->{time}

%       }

%     }

%     }

    </span>

    </span>

%   if (($departure->{scheduled_platform} and $departure->{platform} and

%   if (($departure->{scheduled_platform} and $departure->{platform} and