From 085a2c4834d01d4f223a62482005e3e60250e259 Mon Sep 17 00:00:00 2001 From: Bouzid Fergani Date: Tue, 19 Jul 2016 14:56:41 -0400 Subject: [PATCH] Bug 6934: Make CSV header column translatable and add total amounts in csv file Signed-off-by: Hector Castro Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall --- .../reports/cash_register_stats.tt | 1 + .../reports/csv/cash_register_stats.tt | 14 +++++ reports/cash_register_stats.pl | 51 +++++-------------- 3 files changed, 29 insertions(+), 37 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/cash_register_stats.tt diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt new file mode 100644 index 0000000000..92f3400d73 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt @@ -0,0 +1 @@ +mfirstname[% sep %]cardnumber[% sep %]bfirstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]"itype" diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/cash_register_stats.tt new file mode 100644 index 0000000000..fc0b217ad6 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/cash_register_stats.tt @@ -0,0 +1,14 @@ +[% USE ItemTypes %] +[% INCLUDE csv_headers/reports/cash_register_stats.tt %] +[%- FOREACH row IN rows %] + [%- FOREACH field IN row; + field IF !loop.last; + ItemTypes.GetDescription(field) IF loop.last; + sep IF !loop.last; + END %] +[% END -%] +TOTAL +[%- FOREACH field IN total; + field; + sep IF !loop.last; +END %] diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl index 00561c32aa..40ee4890fd 100755 --- a/reports/cash_register_stats.pl +++ b/reports/cash_register_stats.pl @@ -137,7 +137,6 @@ if ($do_it) { total => $grantotal, ); } else{ - binmode STDOUT, ':encoding(UTF-8)'; my $q_errors; my $format = 'csv'; my $reportname = $input->param('basename'); @@ -145,27 +144,9 @@ if ($do_it) { #my $reportfilename = "$reportname.html" ; my $delimiter = C4::Context->preference('delimiter') || ','; my ( $content ); - if ( $format eq 'csv' ) { - my $csv = Text::CSV::Encoded->new({ encoding_out => 'UTF-8', sep_char => $delimiter}); - $csv or die "Text::CSV::Encoded->new({binary => 1}) FAILED: " . Text::CSV::Encoded->error_diag(); - my @headers = (); - push @headers, "mfirstname", - "cardnumber", - "bfirstname", - "branchname", - "date", - "accounttype", - "amount", - "title", - "barcode", - "itype"; - if ($csv->combine(@headers)) { - $content .= Encode::decode('UTF-8', $csv->string()) . "\n"; - } else { - push @$q_errors, { combine => 'HEADER ROW: ' . $csv->error_diag() } ; - } + my @rows; foreach my $row (@loopresult) { - my @rowValues = (); + my @rowValues; push @rowValues, $row->{mfirstname}, $row->{cardnumber}, $row->{bfirstname}, @@ -176,24 +157,20 @@ if ($do_it) { $row->{title}, $row->{barcode}, $row->{itype}; - if ($csv->combine(@rowValues)) { - $content .= Encode::decode('UTF-8',$csv->string()) . "\n"; - } else { - push @$q_errors, { combine => $csv->error_diag() } ; + push (@rows, \@rowValues) ; } - } - } + my @total; + for (1..6){push(@total,"")}; + push(@total, $grantotal); print $input->header( - -type => 'text/csv', - -attachment=> $reportfilename - ); - print $content; - - print $delimiter x 6; - print $grantotal."\n"; - foreach my $err (@$q_errors) { - print "# ERROR: " . (map {$_ . ": " . $err->{$_}} keys %$err) . "\n"; - } # here we print all the non-fatal errors at the end. Not super smooth, but better than nothing. + -type => 'text/csv', + -encoding => 'utf-8', + -attachment => $reportfilename, + -name => $reportfilename + ); + my $csvTemplate = C4::Templates::gettemplate('reports/csv/cash_register_stats.tt', 'intranet', $input); + $csvTemplate->param(sep => $delimiter, rows => \@rows, total => \@total ); + print $csvTemplate->output; exit(1); } -- 2.39.5