Commit 51e7e74c authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

support "arrival only, departure is cancelled"

parent ce13f859

index.pl

+12 −7
Original line number Diff line number Diff line
@@ -464,6 +464,9 @@ sub handle_request { 
			if ( $result->is_cancelled ) {

				$info = "Fahrt fällt aus: ${delaymsg}";

			}

			elsif ( $result->departure_is_cancelled ) {

				$info = "Zug endet hier: ${delaymsg}";

			}

			elsif ( $result->delay and $result->delay > 0 ) {

				if ( $template eq 'clean' ) {

					$info = $delaymsg;
@@ -765,6 +768,8 @@ sub handle_request { 
					scheduled_platform     => $result->sched_platform,

					info                   => $info,

					is_cancelled           => $result->is_cancelled,

					departure_is_cancelled => $result->departure_is_cancelled,

					arrival_is_cancelled   => $result->arrival_is_cancelled,

					messages               => {

						delay => [

							map { { timestamp => $_->[0], text => $_->[1] } }

templates/clean.html.ep

+6 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
%     $route_str .= $stop . ($via_cur < $via_max ? ' - ' : q{});

%   }

%   my $extraclasses = q{};

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

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

%     $extraclasses .= ' cancelled';

      <li class="cancelled">

%   }
@@ -79,7 +79,11 @@ 
      <div class="minfo">Fahrt fällt aus</div>

%   }

%   elsif (defined $departure->{delay} and $departure->{delay} > 0) {

      <div class="minfo">+<%= $departure->{delay} %></div>

      <div class="minfo">+<%= $departure->{delay} %>

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

        (endet hier)

%     }

      </div>

%   }

%   if (@{$departure->{replaced_by}}) {

%     for my $replacement (@{$departure->{replaced_by}}) {