From 47171500b7209d1f14078c13e37664d2de29a1cc Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 27 Jan 2020 20:22:46 +0100 Subject: fix bugs related to users without past journeys --- lib/Travelynx.pm | 20 +++++++++++++++----- templates/_public_status_card.html.ep | 7 ++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm index 7a72cc6..b7d9368 100755 --- a/lib/Travelynx.pm +++ b/lib/Travelynx.pm @@ -3208,8 +3208,12 @@ sub startup { uic => $status->{dep_eva}, longitude => undef, latitude => undef, - scheduledTime => $status->{sched_departure}->epoch || undef, - realTime => $status->{real_departure}->epoch || undef, + scheduledTime => $status->{sched_departure} + ? $status->{sched_departure}->epoch + : undef, + realTime => $status->{real_departure} + ? $status->{real_departure}->epoch + : undef, }, toStation => { ds100 => $status->{arr_ds100}, @@ -3217,8 +3221,12 @@ sub startup { uic => $status->{arr_eva}, longitude => undef, latitude => undef, - scheduledTime => $status->{sched_arrival}->epoch || undef, - realTime => $status->{real_arrival}->epoch || undef, + scheduledTime => $status->{sched_arrival} + ? $status->{sched_arrival}->epoch + : undef, + realTime => $status->{real_arrival} + ? $status->{real_arrival}->epoch + : undef, }, train => { type => $status->{train_type}, @@ -3226,7 +3234,9 @@ sub startup { no => $status->{train_no}, id => $status->{train_id}, }, - actionTime => $status->{timestamp}->epoch, + actionTime => $status->{timestamp} + ? $status->{timestamp}->epoch + : undef, intermediateStops => [], }; diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep index 04a8938..6979ad7 100644 --- a/templates/_public_status_card.html.ep +++ b/templates/_public_status_card.html.ep @@ -155,7 +155,12 @@ <%= $name %> ist gerade nicht eingecheckt

- Zuletzt gesehen in <%= $journey->{arr_name} %>. + % if ($journey->{arr_name}) { + Zuletzt gesehen in <%= $journey->{arr_name} %>. + % } + % else { + Noch keine Zugfahrten geloggt. + % }

-- cgit v1.2.3