use stats-enabled list view for year list as well

This commit is contained in:
Daniel Friesel 2020-12-03 22:15:09 +01:00
parent 025b58126f
commit 2613fc0e58
3 changed files with 21 additions and 4 deletions

View file

@ -703,7 +703,7 @@ sub get_latest_checkout_station_id {
return $res_h->{checkout_station_id}; return $res_h->{checkout_station_id};
} }
sub get_years { sub get_nav_years {
my ( $self, %opt ) = @_; my ( $self, %opt ) = @_;
my $uid = $opt{uid}; my $uid = $opt{uid};
@ -723,6 +723,22 @@ sub get_years {
return @ret; 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 { sub get_months_for_year {
my ( $self, %opt ) = @_; my ( $self, %opt ) = @_;
@ -748,7 +764,6 @@ sub get_months_for_year {
for my $row ( $res->hashes->each ) { for my $row ( $res->hashes->each ) {
if ( $row->{year} == $year ) { if ( $row->{year} == $year ) {
# TODO delegate query to the (not yet present) JourneyStats model
my $stats = $self->stats_cache->get( my $stats = $self->stats_cache->get(
db => $db, db => $db,
uid => $uid, uid => $uid,

View file

@ -1,6 +1,6 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
% my @years = journeys->get_years(uid => current_user->{id}); % my @years = journeys->get_nav_years(uid => current_user->{id});
% if (@years) { % if (@years) {
<ul class="pagination"> <ul class="pagination">
% for my $year (@years) { % for my $year (@years) {

View file

@ -1,6 +1,8 @@
<h2>Fahrten</h2> <h2>Fahrten</h2>
%= include '_history_years', current => ''; Für Details ein Jahr auswählen.
%= include '_history_years_list';
<h2>Auswertungen</h2> <h2>Auswertungen</h2>
<div class="row"> <div class="row">