Bugzilla – Attachment 20474 Details for
Bug 7298
export late orders, with # of claims and claim dates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7298: CSV strings are translatables.
Bug-7298-CSV-strings-are-translatables.patch (text/plain), 4.50 KB, created by
Biblibre Sandboxes
on 2013-08-19 15:01:27 UTC
(
hide
)
Description:
Bug 7298: CSV strings are translatables.
Filename:
MIME Type:
Creator:
Biblibre Sandboxes
Created:
2013-08-19 15:01:27 UTC
Size:
4.50 KB
patch
obsolete
>From 82cf56a377f86838810d9af075c25ad0087d38dd Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 13 Aug 2013 16:21:33 +0200 >Subject: [PATCH] Bug 7298: CSV strings are translatables. > >Using a template file, the CSV headers become translatable. > >Signed-off-by: sonia <koha@univ-lyon3.fr> >--- > acqui/lateorders-export.pl | 71 ++++++++++---------- > .../prog/en/modules/acqui/csv/lateorders.tt | 8 ++ > 2 files changed, 44 insertions(+), 35 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt > >diff --git a/acqui/lateorders-export.pl b/acqui/lateorders-export.pl >index ef159c8..f363dab 100755 >--- a/acqui/lateorders-export.pl >+++ b/acqui/lateorders-export.pl >@@ -17,48 +17,49 @@ > > use Modern::Perl; > use CGI; >+ > use C4::Auth; >-use C4::Serials; > use C4::Acquisition; > use C4::Output; > use C4::Context; > >-use Text::CSV::Encoded; >-use open qw/ :std :utf8 /; >- >-my $csv = Text::CSV::Encoded->new ({ >- encoding => undef, >- quote_char => '"', >- escape_char => '"', >- sep_char => ',', >- binary => 1, >- }); >- >-my $query = new CGI; >-my @ordernumbers = $query->param('ordernumber'); >- >-print $query->header( >- -type => 'text/csv', >- -attachment => "lateorders.csv", >-); >- >-print "LATE ORDERS\n\n"; >-print "ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE\n"; >+my $input = new CGI; >+my ($template, $loggedinuser, $cookie) = get_template_and_user({ >+ template_name => "acqui/csv/lateorders.tt", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ flagsrequired => {acquisition => 'order_receive'}, >+}); >+my @ordernumbers = $input->param('ordernumber'); > >+my @orders; > for my $ordernumber ( @ordernumbers ) { > my $order = GetOrder $ordernumber; >- $csv->combine( >- $order->{orderdate} . " (" . $order->{latesince} . " days)", >- $order->{estimateddeliverydate}, >- $order->{supplier} . " (" . $order->{supplierid} . ") ", >- $order->{title} . ( $order->{author} ? " Author: $order->{author}" : "" ) . ( $order->{publisher} ? " Published by: $order->{publisher}" : "" ), >- $order->{unitpricesupplier} . "x" . $order->{quantity_to_receive} . " = " . $order->{subtotal} . " (" . $order->{budget} . ")", >- $order->{basketname} . " (" . $order->{basketno} . ")", >- $order->{claims_count}, >- $order->{claimed_date} >- ); >- my $string = $csv->string; >- print $string, "\n"; >+ push @orders, { >+ orderdate => $order->{orderdate}, >+ latesince => $order->{latesince}, >+ estimateddeliverydate => $order->{estimateddeliverydate}, >+ supplier => $order->{supplier}, >+ supplierid => $order->{supplierid}, >+ title => $order->{title}, >+ author => $order->{author}, >+ publisher => $order->{publisher}, >+ unitpricesupplier => $order->{unitpricesupplier}, >+ quantity_to_receive => $order->{quantity_to_receive}, >+ subtotal => $order->{subtotal}, >+ budget => $order->{budget}, >+ basketname => $order->{basketname}, >+ basketno => $order->{basketno}, >+ claims_count => $order->{claims_count}, >+ claimed_date => $order->{claimed_date}, >+ } >+ ; > } > >-print ",,Total Number Late, " . scalar @ordernumbers . "\n"; >+print $input->header( >+ -type => 'text/csv', >+ -attachment => 'lateorders.csv', >+); >+$template->param( orders => \@orders ); >+print $template->output; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt >new file mode 100644 >index 0000000..f66ce67 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt >@@ -0,0 +1,8 @@ >+[% USE KohaDates %] >+LATE ORDERS >+ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE >+ >+[% FOREACH o IN orders %]"[% o.orderdate %] ([% o.latesince %] days)","[% o.estimateddeliverydate | $KohaDates %]","[% o.supplier (o.supplierid) %]","[% o.title %] [% IF o.author %]Author: [% o.author %].[% END %][% IF o.publisher %]Published by: [% o.publisher %].[% END %]","[% o.unitpricesupplier %] x [% o.quantity_to_receive %] = [% o.subtotal %] ([% o.budget %])","[% o.basketname %] ([% o.basketno %])","[% o.claims_count %]","[% o.claimed_date %]" >+[% END %] >+ >+,,Total orders in late, [% orders.size %] >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7298
:
7809
|
7891
|
7946
|
8333
|
10426
|
11713
|
11717
|
11721
|
11722
|
12624
|
12817
|
12818
|
15027
|
15028
|
15037
|
15038
|
15039
|
15040
|
16688
|
16689
|
16690
|
16691
|
16692
|
16956
|
19819
|
20313
|
20314
|
20315
|
20471
|
20472
|
20473
|
20474
|
21339
|
21383
|
21384
|
21385
|
21386
|
21387
|
21398
|
21523
|
22617
|
22618
|
22619
|
22620
|
22621
|
22622