Lines 58-64
foreach my $key ( keys %$borrower ) {
Link Here
|
58 |
} |
58 |
} |
59 |
|
59 |
|
60 |
# Construct column names |
60 |
# Construct column names |
61 |
my $fields = C4::Context->preference('StatisticsFields') || 'location|itype|ccode'; |
61 |
my $fields = C4::Members::Statistics::get_fields(); |
62 |
our @statistic_column_names = split '\|', $fields; |
62 |
our @statistic_column_names = split '\|', $fields; |
63 |
our @value_column_names = ( 'count_precedent_state', 'count_total_issues_today', 'count_total_issues_returned_today' ); |
63 |
our @value_column_names = ( 'count_precedent_state', 'count_total_issues_today', 'count_total_issues_returned_today' ); |
64 |
our @column_names = ( @statistic_column_names, @value_column_names ); |
64 |
our @column_names = ( @statistic_column_names, @value_column_names ); |
Lines 70-75
my $total_issues_returned_today = GetTotalIssuesReturnedTodayByBorrower( $borrow
Link Here
|
70 |
my $r = merge ( |
70 |
my $r = merge ( |
71 |
@$precedent_state, @$total_issues_today, @$total_issues_returned_today |
71 |
@$precedent_state, @$total_issues_today, @$total_issues_returned_today |
72 |
); |
72 |
); |
|
|
73 |
|
73 |
add_actual_state( $r ); |
74 |
add_actual_state( $r ); |
74 |
my ( $total, $datas ) = build_array( $r ); |
75 |
my ( $total, $datas ) = build_array( $r ); |
75 |
|
76 |
|
Lines 194-200
sub merge {
Link Here
|
194 |
for my $ch ( @r ) { |
195 |
for my $ch ( @r ) { |
195 |
$exists = 1; |
196 |
$exists = 1; |
196 |
for my $cn ( @statistic_column_names ) { |
197 |
for my $cn ( @statistic_column_names ) { |
197 |
if ( not $ch->{$cn} eq $h->{$cn} ) { |
198 |
if ( $ch->{$cn} and not $ch->{$cn} eq $h->{$cn} ) { |
198 |
$exists = 0; |
199 |
$exists = 0; |
199 |
last; |
200 |
last; |
200 |
} |
201 |
} |
201 |
- |
|
|