diff options
Diffstat (limited to 'templates/_checked_in.html.ep')
-rw-r--r-- | templates/_checked_in.html.ep | 290 |
1 files changed, 190 insertions, 100 deletions
diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep index 76d11bc..7155208 100644 --- a/templates/_checked_in.html.ep +++ b/templates/_checked_in.html.ep @@ -1,8 +1,14 @@ +% my $user = current_user(); <div class="autorefresh"> <div class="card"> <div class="card-content"> - <i class="material-icons small right sync-failed-marker grey-text" style="display: none;">sync_problem</i> - <span class="card-title">Eingecheckt in <%= $journey->{train_type} %> <%= $journey->{train_no} %></span> + <i class="material-icons right sync-failed-marker grey-text" style="display: none;">sync_problem</i> + % if (not $journey->{arr_name}) { + <span class="card-title center-align">Ziel wählen</span> + % } + <span class="card-title center-align"> + %= include '_format_train', journey => $journey + </span> % if ($journey->{comment}) { <p><%= $journey->{comment} %></p> % } @@ -12,28 +18,21 @@ data-route="<%= journey_to_ajax_route($journey) %>" data-dest="<%= $journey->{arr_name} %>" > - % if ($journey->{boarding_countdown} > 120) { - Einfahrt in <%= sprintf('%.f', $journey->{boarding_countdown} / 60) %> Minuten<br/> - % } - % elsif ($journey->{boarding_countdown} > 60) { - Einfahrt in einer Minute<br/> + % if ($journey->{boarding_countdown} > 60) { + Einfahrt in <%= journeys->min_to_human(int($journey->{boarding_countdown} / 60)) %><br/> % } % elsif ($journey->{boarding_countdown} > 0) { - Zug fährt ein<br/> - % } - % if ($journey->{departure_countdown} > 120) { - Abfahrt in <%= sprintf('%.f', $journey->{departure_countdown} / 60) %> Minuten + Fährt ein<br/> % } - % elsif ($journey->{departure_countdown} > 60) { - Abfahrt in einer Minute + % if ($journey->{departure_countdown} > 60) { + Abfahrt in <%= journeys->min_to_human(int($journey->{departure_countdown} / 60)) %> % } % elsif ($journey->{departure_countdown} > 0) { Abfahrt in weniger als einer Minute % } % elsif (defined $journey->{arrival_countdown}) { % if ($journey->{arrival_countdown} > 60) { - Ankunft in <%= sprintf('%.f', $journey->{arrival_countdown} / 60) %> - Minute<%= sprintf('%.f', $journey->{arrival_countdown} / 60) == 1 ? '' : 'n' %> + Ankunft in <%= journeys->min_to_human(int($journey->{arrival_countdown} / 60)) %> % } % elsif ($journey->{arrival_countdown} > 0) { Ankunft in weniger als einer Minute @@ -77,12 +76,22 @@ % @wagons = reverse @wagons; % } % } - <a href="https://marudor.de/details/<%= $journey->{train_type} %>%20<%= $journey->{train_no} %>/<%= DateTime->now(time_zone => 'Europe/Berlin')->iso8601 %>?station=<%= $journey->{dep_eva} %>"> + <a href="https://dbf.finalrewind.org/_wr/<%= $journey->{train_no} %>/<%= $journey->{sched_departure}->strftime('%Y%m%d%H%M') %>?e=<%= $journey->{dep_direction} // q{} %>"> %= $direction + % my $gi; % for my $wagon (@wagons) { % if (not ($wagon->is_locomotive or $wagon->is_powercar)) { - %= $wagon->number || $wagon->type + % if (defined $gi and $gi != $wagon->group_index) { + • + % } + % if ($wagon->is_closed) { + X + % } + % else { + %= $wagon->number || ($wagon->type =~ m{AB} ? '½' : $wagon->type =~ m{A} ? '1.' : $wagon->type =~ m{B} ? '2.' : $wagon->type ) + % } % } + % $gi = $wagon->group_index; % } %= $direction </a> @@ -102,7 +111,12 @@ % } </div> <div style="float: right; text-align: right;"> - <b><%= $journey->{arr_name} %></b><br/> + % if ($user->{sb_template}) { + <b><a href="<%= resolve_sb_template($user->{sb_template}, name => $journey->{arr_name}, eva => $journey->{arr_eva}, tt => $journey->{train_type} // q{x}, tn => $journey->{train_no}, id => $journey->{train_id}) %>" class="unmarked"><%= $journey->{arr_name} %></a></b><br/> + % } + % else { + <b><%= $journey->{arr_name} %></b><br/> + % } % if ($journey->{real_arrival}->epoch) { <b><%= $journey->{real_arrival}->strftime('%H:%M') %></b> % if ($journey->{real_arrival}->epoch != $journey->{sched_arrival}->epoch) { @@ -118,19 +132,21 @@ % if ($station->[0] eq $journey->{arr_name}) { % last; % } - % if (($station->[1]{rt_arr_countdown} // 0) > 0) { - <%= $station->[0] %><br/><%= $station->[1]{rt_arr}->strftime('%H:%M') %> - % if ($station->[1]{sched_arr}->epoch != $station->[1]{rt_arr}->epoch) { - %= sprintf('(%+d)', ($station->[1]{rt_arr}->epoch - $station->[1]{sched_arr}->epoch ) / 60); + % if (($station->[2]{arr_countdown} // 0) > 0 and $station->[2]{arr}) { + <%= $station->[0] %><br/><%= $station->[2]{arr}->strftime('%H:%M') %> + % if ($station->[2]{arr_delay}) { + %= sprintf('(%+d)', $station->[2]{arr_delay} / 60); % } % last; % } - % if (($station->[1]{rt_dep_countdown} // 0) > 0) { + % if (($station->[2]{dep_countdown} // 0) > 0 and $station->[2]{dep}) { <%= $station->[0] %><br/> - <%= $station->[1]{rt_arr}->strftime('%H:%M') %> → - <%= $station->[1]{rt_dep}->strftime('%H:%M') %> - % if ($station->[1]{sched_dep}->epoch != $station->[1]{rt_dep}->epoch) { - %= sprintf('(%+d)', ($station->[1]{rt_dep}->epoch - $station->[1]{sched_dep}->epoch ) / 60); + % if ($station->[2]{arr}) { + <%= $station->[2]{arr}->strftime('%H:%M') %> → + % } + %= $station->[2]{dep}->strftime('%H:%M') + % if ($station->[2]{dep_delay}) { + %= sprintf('(%+d)', $station->[2]{dep_delay} / 60); % } % last; % } @@ -143,19 +159,19 @@ % if ($station->[0] eq $journey->{arr_name}) { % last; % } - % if (($station->[1]{rt_arr_countdown} // 0) > 0) { - <%= $station->[0] %><br/><%= $station->[1]{rt_arr}->strftime('%H:%M') %> - % if ($station->[1]{sched_arr}->epoch != $station->[1]{rt_arr}->epoch) { - %= sprintf('(%+d)', ($station->[1]{rt_arr}->epoch - $station->[1]{sched_arr}->epoch ) / 60); + % if (($station->[2]{arr_countdown} // 0) > 0 and $station->[2]{arr}) { + <%= $station->[0] %><br/><%= $station->[2]{arr}->strftime('%H:%M') %> + % if ($station->[2]{arr_delay}) { + %= sprintf('(%+d)', $station->[2]{arr_delay} / 60); % } % last; % } - % if (($station->[1]{rt_dep_countdown} // 0) > 0) { + % if (($station->[2]{dep_countdown} // 0) > 0 and $station->[2]{arr} and $station->[2]{dep}) { <%= $station->[0] %><br/> - <%= $station->[1]{rt_arr}->strftime('%H:%M') %> → - <%= $station->[1]{rt_dep}->strftime('%H:%M') %> - % if ($station->[1]{sched_dep}->epoch != $station->[1]{rt_dep}->epoch) { - %= sprintf('(%+d)', ($station->[1]{rt_dep}->epoch - $station->[1]{sched_dep}->epoch ) / 60); + <%= $station->[2]{arr}->strftime('%H:%M') %> → + <%= $station->[2]{dep}->strftime('%H:%M') %> + % if ($station->[2]{dep_delay}) { + %= sprintf('(%+d)', $station->[2]{dep_delay} / 60); % } % last; % } @@ -171,9 +187,12 @@ Bitte wähle ein neues Reiseziel. </p> % } - % if (@{$journey->{messages} // []} or @{$journey->{extra_data}{qos_msg} // []}) { + % if (@{$journey->{messages} // []} or @{$journey->{extra_data}{qos_msg} // []} or not $journey->{extra_data}{rt}) { <p style="margin-bottom: 2ex;"> <ul> + % if (not $journey->{extra_data}{rt}) { + <li><i class="material-icons tiny">gps_off</i> Keine Echtzeitdaten vorhanden + % } % for my $message (reverse @{$journey->{messages} // []}) { % if ($journey->{sched_departure}->epoch - $message->[0]->epoch < 1800) { <li> <i class="material-icons tiny">warning</i> <%= $message->[0]->strftime('%H:%M') %>: <%= $message->[1] %></li> @@ -187,51 +206,64 @@ </ul> </p> % } - % if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} < (20*60)) { - % if (my @connections = get_connecting_trains()) { - <span class="card-title" style="margin-top: 2ex;">Verbindungen</span> - % if ($journey->{arrival_countdown} < 0) { - <p>Zug auswählen zum Einchecken mit Zielwahl.</p> - % } - %= include '_connections', connections => \@connections, checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_ds100} : undef; + % if (@{stash('connections_iris') // [] } or @{stash('connections_hafas') // []}) { + <span class="card-title" style="margin-top: 2ex;">Verbindungen</span> + % if ($journey->{arrival_countdown} < 0) { + <p>Fahrt auswählen zum Einchecken mit Zielwahl.</p> + % } + % if (@{stash('connections_iris') // [] }) { + %= include '_connections', connections => stash('connections_iris'), checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_eva} : undef; + % } + % if (@{stash('connections_hafas') // [] }) { + %= include '_connections_hafas', connections => stash('connections_hafas'), checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_eva} : undef; % } % } % if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} <= 0) { <p style="margin-top: 2ex;"> - Der automatische Checkout erfolgt wegen gelegentlich veralteter - IRIS-Daten erst etwa zehn Minuten nach der Ankunft. + Der automatische Checkout erfolgt wegen teilweise langsamer + Echtzeitdatenupdates erst etwa zehn Minuten nach der Ankunft. </p> % } % elsif (not $journey->{arr_name}) { - <p>Ziel wählen:</p> - <table> - <tbody> - % for my $station (@{$journey->{route_after}}) { - <tr><td><a class="action-checkout" data-station="<%= $station->[0] %>"><%= $station->[0] %> - % if ($station->[2] and $station->[2] eq 'cancelled') { - <span style="float: right;">entfällt</span> - % } - % elsif ($station->[1]{rt_arr}) { - <span style="float: right;"><%= $station->[1]{rt_arr}->strftime('%H:%M') %></span> - % } - % elsif ($station->[2] and $station->[2] eq 'additional') { - <span style="float: right;">Zusatzhalt</span> - % } - </a></td></tr> - % } - </tbody> - </table> + <p> + % for my $station (@{$journey->{route_after}}) { + <a class="tablerow action-checkout" data-station="<%= $station->[1] // $station->[0] %>"> + <span><%= $station->[0] %></span> + <span> + % if ($station->[2]{load}{SECOND}) { + % my ($first, $second) = load_icon($station->[2]{load}); + <i class="material-icons tiny" aria-hidden="true"><%= $first %></i> <i class="material-icons tiny" aria-hidden="true"><%= $second %></i> + % } + % if ($station->[2]{isCancelled}) { + entfällt + % } + % elsif ($station->[2]{rt_arr} or $station->[2]{sched_arr}) { + %= ($station->[2]{rt_arr} || $station->[2]{sched_arr})->strftime('%H:%M') + % } + % elsif ($station->[2]{rt_dep} or $station->[2]{sched_dep}) { + (<%= ($station->[2]{rt_dep} || $station->[2]{sched_dep})->strftime('%H:%M') %>) + % } + % elsif ($station->[2]{isAdditional}) { + Zusatzhalt + % } + </span> + </a> + % } + </p> % } </div> <div class="card-action"> % if ($journey->{arr_name}) { - <a style="margin-right: 0;" href="/journey/comment"> - <i class="material-icons left" aria-hidden="true">comment</i> Kommentar + <a href="/journey/comment"> + <i class="material-icons">comment</i> + </a> + <a style="margin-right: 0;" href="/journey/visibility"> + <i class="material-icons"><%= visibility_icon($journey_visibility) %></i> </a> % } % else { <a class="action-undo blue-text" data-id="in_transit" data-checkints="<%= $journey->{timestamp}->epoch %>" style="margin-right: 0;"> - <i class="material-icons left" aria-hidden="true">undo</i> Checkin Rückgängig + <i class="material-icons left" aria-hidden="true">undo</i> Rückgängig </a> % } % if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} <= 0) { @@ -240,33 +272,48 @@ style="margin-right: 0;" data-station="<%= $journey->{arr_name}%>"> <i class="material-icons left">done</i> - Jetzt auschecken + Auschecken </a> % } % elsif ($journey->{arr_name}) { - % my $attrib = 'im'; + % my $attrib = 'in'; % if ($journey->{train_type} =~ m{ ^ (?: S | RB ) $ }x) { % $attrib = 'in der'; % } <a class="action-share blue-text right" style="margin-right: 0;" - % if (current_user()->{is_public} & 0x04 and $journey->{comment}) { + % my $arr_text = q{}; + % if ($journey->{real_arrival}->epoch and $journey_visibility eq 'private') { + % $arr_text = $journey->{real_arrival}->strftime(' – Ankunft gegen %H:%M Uhr'); + % } + % if ($user->{comments_visible} and $journey->{comment}) { data-text="<%= $journey->{comment} %> (@ <%= $journey->{train_type} %> <%= $journey->{train_no} %> → <%= $journey->{arr_name} %>) #travelynx" % } % else { - data-text="Ich bin gerade <%= $attrib %> <%= $journey->{train_type} %> <%= $journey->{train_no} %> nach <%= $journey->{arr_name} %> #travelynx" + data-text="Ich bin gerade <%= $attrib %> <%= $journey->{train_type} %> <%= $journey->{train_no} %> nach <%= $journey->{arr_name} . $arr_text %> #travelynx" + % } + % if ($journey_visibility eq 'public') { + data-url="<%= url_for('/status')->to_abs->scheme('https') %>/<%= $user->{name} %>/<%= $journey->{sched_departure}->epoch %>" % } - % if (current_user()->{is_public} & 0x02) { - data-url="<%= url_for('/status')->to_abs->scheme('https') %>/<%= current_user->{name} %>/<%= $journey->{sched_departure}->epoch %>" + % elsif ($journey_visibility eq 'travelynx' or $journey_visibility eq 'followers' or $journey_visibility eq 'unlisted') { + data-url="<%= url_for('/status')->to_abs->scheme('https') %>/<%= $user->{name} %>/<%= $journey->{sched_departure}->epoch %>?token=<%= $journey->{dep_eva} %>-<%= $journey->{timestamp}->epoch % 337 %>" % } > <i class="material-icons left" aria-hidden="true">share</i> Teilen </a> % } + % else { + <a class="right" href="/journey/visibility"> + <i class="material-icons left"><%= visibility_icon($journey_visibility) %></i> Sichtbarkeit + </a> + % } </div> </div> + % if (@{stash('timeline') // []}) { + %= include '_timeline_link', timeline => stash('timeline'), from_checkin => 1 + % } % if ($journey->{arr_name}) { - <div class="card" style="margin-top: 3em;"> + <div class="card" style="margin-top: <%= scalar @{stash('timeline') // []} ? '1.5rem' : '3em' %>;"> <div class="card-content"> <span class="card-title">Details</span> % if (@{$journey->{extra_data}{him_msg} // []}) { @@ -278,10 +325,30 @@ </ul> </p> % } + % if ($journey->{traewelling}{errored} and $journey->{traewelling_log_latest}) { + <p style="margin-bottom: 2ex;"> + <ul> + <li> <i class="material-icons tiny">warning</i> Träwelling: <%= $journey->{traewelling_log_latest} %></li> + </ul> + </p> + % } + % if ($journey->{traewelling_url}) { + <p style="margin-bottom: 2ex;"> + <ul> + <li> <i class="material-icons tiny">sync</i> Träwelling: <a href="<%= $journey->{traewelling_url} %>"><%= $journey->{traewelling_log_latest} %></a></li> + </ul> + </p> + % } </div> <div class="card-action"> - % my $url = 'https://marudor.de/details/' . $journey->{train_type} . ' ' . $journey->{train_no} . '/' . DateTime->now(time_zone => 'Europe/Berlin')->epoch . '000'; - <a style="margin-right: 0;" href="<%= $url %>" aria-label="Zuglauf"><i class="material-icons left">timeline</i> Zuglauf</a> + % my $url = 'https://bahn.expert/details/'; + % if ($journey->{train_id} =~ m{[|]}) { + % $url = $url . '/' . $journey->{sched_departure}->epoch . '000?jid=' . $journey->{train_id}; + % } + % else { + % $url = $url . $journey->{train_type} . ' ' . $journey->{train_no} . '/' . $journey->{sched_departure}->epoch . '000?station=' . $journey->{dep_eva}; + % } + <a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left" aria-hidden="true">timeline</i> Zuglauf</a> % if ($journey->{extra_data}{trip_id}) { <a class="right" style="margin-right: 0;" href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} %>/<%= $journey->{train_line} || 0 %>?from=<%= $journey->{dep_name} %>&to=<%= $journey->{arr_name} %>&dark=<%= (session('theme') and session('theme') eq 'dark') ? 1 : 0 %>"><i class="material-icons left" aria-hidden="true">map</i> Karte</a> % } @@ -291,31 +358,45 @@ <div class="card-content"> <i class="material-icons small right sync-failed-marker grey-text" style="display: none;">sync_problem</i> <span class="card-title">Ziel ändern?</span> - <table> - <tbody> - % for my $station (@{$journey->{route_after}}) { - % my $is_dest = ($journey->{arr_name} and $station->[0] eq $journey->{arr_name}); - <tr><td><a style="<%= $is_dest? 'font-weight: bold;' : '' %>" class="action-checkout" data-station="<%= $station->[0] %>"><%= $station->[0] %> - % if ($station->[2] and $station->[2] eq 'cancelled') { - <span style="float: right;">entfällt</span> - % } - % elsif ($station->[1]{rt_arr}) { - <span style="float: right;"><%= $station->[1]{rt_arr}->strftime('%H:%M') %></span> - % } - % elsif ($station->[2] and $station->[2] eq 'additional') { - <span style="float: right;">Zusatzhalt</span> - % } - </a></td></tr> + % if ($user->{sb_template}) { + <div class="targetlist"> + % } + % else { + <p> + % } + % for my $station (@{$journey->{route_after}}) { + % my $is_dest = ($journey->{arr_name} and $station->[0] eq $journey->{arr_name}); + <a class="action-checkout tablerow" style="<%= $is_dest? 'font-weight: bold;' : '' %>" data-station="<%= $station->[1] // $station->[0] %>"> + <span><%= $station->[0] %></span> + <span> + % if ($station->[2]{load}{SECOND}) { + % my ($first, $second) = load_icon($station->[2]{load}); + <i class="material-icons tiny" aria-hidden="true"><%= $first %></i> <i class="material-icons tiny" aria-hidden="true"><%= $second %></i> % } - </tbody> - </table> - <p> - Falls das Backend ausgefallen ist oder der Zug aus anderen - Gründen verloren ging: <a class="action-checkout" - data-force="1" data-station="<%= $journey->{arr_name} - %>">Ohne Echtzeitdaten in <%= $journey->{arr_name} %> - auschecken</a>. - </p> + % if ($station->[2]{isCancelled}) { + entfällt + % } + % elsif ($station->[2]{rt_arr} or $station->[2]{sched_arr}) { + %= ($station->[2]{rt_arr} || $station->[2]{sched_arr})->strftime('%H:%M') + % } + % elsif ($station->[2]{rt_dep} or $station->[2]{sched_dep}) { + (<%= ($station->[2]{rt_dep} || $station->[2]{sched_dep})->strftime('%H:%M') %>) + % } + % elsif ($station->[2]{isAdditional}) { + Zusatzhalt + % } + </span> + </a> + % if ($user->{sb_template}) { + <a class="nonflex" href="<%= resolve_sb_template($user->{sb_template}, name => $station->[0], eva => $station->[1], tt => $journey->{train_type} // q{x}, tn => $journey->{train_no}, id => $journey->{train_id}) %>"><i class="material-icons tiny">train</i></a> + % } + % } + % if ($user->{sb_template}) { + </div> + % } + % else { + </p> + % } </div> <div class="card-action"> <a class="action-undo blue-text" data-id="in_transit" data-checkints="<%= $journey->{timestamp}->epoch %>" style="margin-right: 0;"> @@ -323,5 +404,14 @@ </a> </div> </div> + <p> + Falls das Backend ausgefallen ist oder die Fahrt aus anderen + Gründen verloren ging: + </p> + <p class="center-align"> + <a class="action-checkout waves-light btn" + data-force="1" data-station="<%= $journey->{arr_name} + %>">Ohne Echtzeitdaten auschecken</a> + </p> % } </div> |