summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2017-05-26 19:34:05 +0200
committerDaniel Friesel <derf@finalrewind.org>2017-05-26 19:34:05 +0200
commit51e7e74cd55c5e51403c023edf04a31903a7c694 (patch)
tree6e625867d3f95f56420cfb44f12d4f9b399afbe6
parentce13f8594be9d0c2aa14a19f2bfe50357daab199 (diff)
support "arrival only, departure is cancelled"
-rw-r--r--index.pl19
-rw-r--r--templates/clean.html.ep8
2 files changed, 18 insertions, 9 deletions
diff --git a/index.pl b/index.pl
index 124b7fc..4981f93 100644
--- a/index.pl
+++ b/index.pl
@@ -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;
@@ -759,13 +762,15 @@ sub handle_request {
[ $result->sched_route_post ]
)
],
- destination => $result->destination,
- origin => $result->origin,
- platform => $result->platform,
- scheduled_platform => $result->sched_platform,
- info => $info,
- is_cancelled => $result->is_cancelled,
- messages => {
+ destination => $result->destination,
+ origin => $result->origin,
+ platform => $result->platform,
+ 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] } }
$result->delay_messages
diff --git a/templates/clean.html.ep b/templates/clean.html.ep
index 41dddc6..1c64c20 100644
--- a/templates/clean.html.ep
+++ b/templates/clean.html.ep
@@ -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}}) {