From 150740f282b1ddbafd53799c281c7922d2d6ace1 Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Wed, 31 Jan 2024 17:36:13 +0100 Subject: [PATCH] history: show destination in first line, origin in second This way, consecutive history entries have matching origin/destination pairs, and both the outer list and the inner origin/destination pair are sorted by descending date. --- sass/src/common/local.scss | 4 ++-- templates/_history_trains.html.ep | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sass/src/common/local.scss b/sass/src/common/local.scss index 3dd422d..ca06708 100644 --- a/sass/src/common/local.scss +++ b/sass/src/common/local.scss @@ -122,14 +122,14 @@ ul.suggestions { font-weight: 600; } } - .destination::before { + .origin::before { content: ' '; display: block; border-left: 2px dotted $off-black; height: 1rem; position: absolute; margin-left: calc( 0.5rem - 1px ); - margin-top: -0.5rem; + margin-top: -0.75rem; } &.history-date-change { display: block; diff --git a/templates/_history_trains.html.ep b/templates/_history_trains.html.ep index be35a72..9af5490 100644 --- a/templates/_history_trains.html.ep +++ b/templates/_history_trains.html.ep @@ -21,20 +21,6 @@ - - radio_button_unchecked - % 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) %>) - % } - % } - <%= $travel->{from_name} %> - - place % if (param('cancelled') and $travel->{sched_arrival}->epoch != 0) { @@ -51,6 +37,20 @@ % } % } <%= $travel->{to_name} %> + + + radio_button_unchecked + % 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) %>) + % } + % } + <%= $travel->{from_name} %> + % }