From 34a19ee1bf97edcc8a58fc83bc89ed2b43717670 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 27 Dec 2022 22:12:15 +0100 Subject: top trips: handle return trips --- lib/Travelynx/Model/Journeys.pm | 16 ++++++++++++++-- templates/year_in_review.html.ep | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm index 5721726..404567b 100755 --- a/lib/Travelynx/Model/Journeys.pm +++ b/lib/Travelynx/Model/Journeys.pm @@ -1342,8 +1342,20 @@ sub compute_review { my $single_trip_count = 0; for my $i ( 0 .. 3 ) { if ( $trips[$i] ) { - push( @{ $review{top_trips} }, - [ split( qr{[|]}, $trips[$i][0] ) ] ); + my ( $from, $to ) = split( qr{[|]}, $trips[$i][0] ); + my $found = 0; + for my $j ( 0 .. $i - 1 ) { + if ( $review{top_trip_count}[$j][0] eq $to + and $review{top_trip_count}[$j][2] eq $from ) + { + $review{top_trip_count}[$j][1] = '↔'; + $found = 1; + last; + } + } + if ( not $found ) { + push( @{ $review{top_trips} }, [ $from, '→', $to ] ); + } $top_trip_count += $trips[$i][1]; } } diff --git a/templates/year_in_review.html.ep b/templates/year_in_review.html.ep index 456fb37..aeecd76 100644 --- a/templates/year_in_review.html.ep +++ b/templates/year_in_review.html.ep @@ -149,7 +149,7 @@ <%= $review->{top_trip_percent_h} %> deiner Check-Ins konzentrierten sich auf diese Strecken:
% for my $i (0 .. $#{$review->{top_trips}}) { % my $trip = $review->{top_trips}[$i]; - <%= $trip->[0] %> → <%= $trip->[1] %>
+ <%= join(q{ }, @{$trip}) %>
% }

% } -- cgit v1.2.3