diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm index e09ca7d5f232cf3e2c65d45d1524504bacfa6889..e6659e2efdb71a1c1b5ff1ecdc5312f3baf3a58f 100755 --- a/lib/Travelynx/Model/Journeys.pm +++ b/lib/Travelynx/Model/Journeys.pm @@ -703,7 +703,7 @@ sub get_latest_checkout_station_id { return $res_h->{checkout_station_id}; } -sub get_years { +sub get_nav_years { my ( $self, %opt ) = @_; my $uid = $opt{uid}; @@ -723,6 +723,22 @@ sub get_years { return @ret; } +sub get_years { + my ( $self, %opt ) = @_; + + my @years = $self->get_nav_years(%opt); + + for my $year (@years) { + my $stats = $self->stats_cache->get( + uid => $opt{uid}, + year => $year, + month => 0, + ); + $year->[2] = $stats // {}; + } + return @years; +} + sub get_months_for_year { my ( $self, %opt ) = @_; @@ -748,7 +764,6 @@ sub get_months_for_year { for my $row ( $res->hashes->each ) { if ( $row->{year} == $year ) { - # TODO delegate query to the (not yet present) JourneyStats model my $stats = $self->stats_cache->get( db => $db, uid => $uid, diff --git a/templates/_history_years.html.ep b/templates/_history_years.html.ep index 686908f8ba7960e3670822000f3607353e6b052c..55917995c78fcfc560a4bde22a184c03a3276772 100644 --- a/templates/_history_years.html.ep +++ b/templates/_history_years.html.ep @@ -1,6 +1,6 @@