diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2019-04-23 18:08:07 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2019-04-23 18:08:07 +0200 |
| commit | e168d9cd39c38b8e5a1994c8bf11376d26e9ea77 (patch) | |
| tree | dee321d330a8fc9c106c18863db179972c9abac6 /templates/_history_trains.html.ep | |
| parent | 812be4f0cbeb74db379a2c931ceb2c88bd9fabf7 (diff) | |
Use one row per journey instead of split checkin/checkout entries
Whether a user is in transit or not is now determined by an entry in the
in_transit table instead of a dangling checkin.
All completed journeys are stored in the "journeys" table.
This does most of the work needed for automatic checkout. However, note that
the corresponding worker process is not implemented yet.
Diffstat (limited to 'templates/_history_trains.html.ep')
| -rw-r--r-- | templates/_history_trains.html.ep | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/templates/_history_trains.html.ep b/templates/_history_trains.html.ep index def83d6..2328285 100644 --- a/templates/_history_trains.html.ep +++ b/templates/_history_trains.html.ep @@ -11,46 +11,44 @@ </thead> <tbody> % for my $travel (@{$journeys}) { - % if ($travel->{completed}) { - % my $detail_link = '/journey/' . current_user()->{id} . '-' . $travel->{ids}->[1]; - <tr> - <td><%= $travel->{sched_departure}->strftime('%d.%m.') %></td> - <td><a href="<%= $detail_link %>"><%= $travel->{type} %> <%= $travel->{line} // $travel->{no} %></a></td> - <td> - <a href="<%= $detail_link %>" class="unmarked"> - % if (param('cancelled')) { - %= $travel->{sched_departure}->strftime('%H:%M') + % my $detail_link = '/journey/' . $travel->{id}; + <tr> + <td><%= $travel->{sched_departure}->strftime('%d.%m.') %></td> + <td><a href="<%= $detail_link %>"><%= $travel->{type} %> <%= $travel->{line} // $travel->{no} %></a></td> + <td> + <a href="<%= $detail_link %>" class="unmarked"> + % if (param('cancelled')) { + %= $travel->{sched_departure}->strftime('%H:%M') + % } + % else { + <%= $travel->{rt_departure}->strftime('%H:%M') %> + % if ($travel->{sched_departure} != $travel->{rt_departure}) { + (<%= sprintf('%+d', ($travel->{rt_departure}->epoch - $travel->{sched_departure}->epoch) / 60) %>) % } - % else { - <%= $travel->{rt_departure}->strftime('%H:%M') %> - % if ($travel->{sched_departure} != $travel->{rt_departure}) { - (<%= sprintf('%+d', ($travel->{rt_departure}->epoch - $travel->{sched_departure}->epoch) / 60) %>) + % } + <br/> + <%= $travel->{from_name} %> + </a> + </td> + <td> + <a href="<%= $detail_link %>" class="unmarked"> + % if (param('cancelled') and $travel->{sched_arrival}->epoch != 0) { + %= $travel->{sched_arrival}->strftime('%H:%M') + % } + % else { + % if ($travel->{rt_arrival}->epoch == 0 and $travel->{sched_arrival}->epoch == 0) { + <i class="material-icons">timer_off</i> + % } else { + %= $travel->{rt_arrival}->strftime('%H:%M'); + % if ($travel->{sched_arrival} != $travel->{rt_arrival}) { + (<%= sprintf('%+d', ($travel->{rt_arrival}->epoch - $travel->{sched_arrival}->epoch) / 60) %>) % } % } - <br/> - <%= $travel->{from_name} %> - </a> - </td> - <td> - <a href="<%= $detail_link %>" class="unmarked"> - % if (param('cancelled') and $travel->{sched_arrival}->epoch != 0) { - %= $travel->{sched_arrival}->strftime('%H:%M') - % } - % else { - % if ($travel->{rt_arrival}->epoch == 0 and $travel->{sched_arrival}->epoch == 0) { - <i class="material-icons">timer_off</i> - % } else { - %= $travel->{rt_arrival}->strftime('%H:%M'); - % if ($travel->{sched_arrival} != $travel->{rt_arrival}) { - (<%= sprintf('%+d', ($travel->{rt_arrival}->epoch - $travel->{sched_arrival}->epoch) / 60) %>) - % } - % } - % } - <br/> - <%= $travel->{to_name} %> - </a></td> - </tr> - % } + % } + <br/> + <%= $travel->{to_name} %> + </a></td> + </tr> % } </tbody> </table> |