Bugzilla – Attachment 22908 Details for
Bug 5338
Add serials module to guided reports
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 5338: Serials Report
Bug-5338-Serials-Report.patch (text/plain), 9.67 KB, created by
Jonathan Druart
on 2013-11-13 14:38:09 UTC
(
hide
)
Description:
Bug 5338: Serials Report
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2013-11-13 14:38:09 UTC
Size:
9.67 KB
patch
obsolete
>From 35edce5077806ff00aa278ec1b6148b95bf4ead2 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Thu, 5 Apr 2012 15:44:32 +0200 >Subject: [PATCH] Bug 5338: Serials Report > >--- > C4/Reports/Guided.pm | 125 ++++++++++++-------- > koha-tmpl/intranet-tmpl/prog/en/columns.def | 6 + > .../en/modules/reports/guided_reports_start.tt | 2 +- > 3 files changed, 81 insertions(+), 52 deletions(-) > >diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm >index 22a23dd..8d5be09 100644 >--- a/C4/Reports/Guided.pm >+++ b/C4/Reports/Guided.pm >@@ -17,8 +17,7 @@ package C4::Reports::Guided; > # with Koha; if not, write to the Free Software Foundation, Inc., > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > >-use strict; >-#use warnings; FIXME - Bug 2505 this module needs a lot of repair to run clean under warnings >+use Modern::Perl; > use CGI; > use Carp; > >@@ -49,6 +48,7 @@ BEGIN { > GetParametersFromSQL > IsAuthorisedValueValid > ValidateSQLParameters >+ nb_rows update_sql > ); > } > >@@ -78,6 +78,7 @@ my @REPORT_AREA = ( > [PAT => "Patrons"], > [ACQ => "Acquisition"], > [ACC => "Accounts"], >+ [SER => "Serials"], > ); > my $AREA_NAME_SQL_SNIPPET > = "CASE report_area " . >@@ -93,6 +94,7 @@ my %table_areas = ( > PAT => ['borrowers'], > ACQ => [ 'aqorders', 'biblio', 'items' ], > ACC => [ 'borrowers', 'accountlines' ], >+ SER => [ 'biblio', 'biblioitems', 'serial', 'serialitems', 'subscription', 'subscriptionhistory', 'subscriptionroutinglist', 'aqbooksellers' ], > ); > my %keys = ( > CIRC => [ 'statistics.borrowernumber=borrowers.borrowernumber', >@@ -104,6 +106,7 @@ my %keys = ( > ACQ => [ 'aqorders.biblionumber=biblio.biblionumber', > 'biblio.biblionumber=items.biblionumber' ], > ACC => ['borrowers.borrowernumber=accountlines.borrowernumber'], >+ SER => [ 'biblio.biblionumber=biblioitems.biblionumber', 'biblioitems.biblionumber=serial.biblionumber', 'serial.serialid=serialitems.serialid', 'serial.subscriptionid=subscription.subscriptionid', 'serial.subscriptionid=subscriptionhistory.subscriptionid', 'serial.subscriptionid=subscriptionroutinglist.subscriptionid', 'subscription.aqbooksellerid=aqbooksellers.id'], > ); > > # have to do someting here to know if its dropdown, free text, date etc >@@ -120,6 +123,7 @@ my %criteria = ( > PAT => [ 'borrowers.branchcode', 'borrowers.categorycode' ], > ACQ => ['aqorders.datereceived|date'], > ACC => [ 'borrowers.branchcode', 'borrowers.categorycode' ], >+ SER => ['subscription.startdate|date', 'subscription.enddate|date', 'subscription.periodicity', 'subscription.callnumber', 'subscription.location', 'subscription.branchcode'], > ); > > # Adds itemtypes to criteria, according to the syspref >@@ -333,59 +337,64 @@ sub get_criteria { > foreach my $localcrit (@$crit) { > my ( $value, $type ) = split( /\|/, $localcrit ); > my ( $table, $column ) = split( /\./, $value ); >- if ($type eq 'textrange') { >- my %temp; >- $temp{'name'} = $value; >- $temp{'from'} = "from_" . $value; >- $temp{'to'} = "to_" . $value; >- $temp{'textrange'} = 1; >- $temp{'description'} = $column_defs->{$value}; >- push @criteria_array, \%temp; >- } >- elsif ($type eq 'date') { >- my %temp; >- $temp{'name'} = $value; >- $temp{'date'} = 1; >- $temp{'description'} = $column_defs->{$value}; >- push @criteria_array, \%temp; >- } >- elsif ($type eq 'daterange') { >- my %temp; >- $temp{'name'} = $value; >- $temp{'from'} = "from_" . $value; >- $temp{'to'} = "to_" . $value; >- $temp{'daterange'} = 1; >- $temp{'description'} = $column_defs->{$value}; >- push @criteria_array, \%temp; >- } >- else { >- my $query = >- "SELECT distinct($column) as availablevalues FROM $table"; >- my $sth = $dbh->prepare($query); >- $sth->execute(); >- my @values; >- # push the runtime choosing option >- my $list; >- $list='branches' if $column eq 'branchcode' or $column eq 'holdingbranch' or $column eq 'homebranch'; >- $list='categorycode' if $column eq 'categorycode'; >- $list='itemtype' if $column eq 'itype'; >- $list='ccode' if $column eq 'ccode'; >- # TODO : improve to let the librarian choose the description at runtime >- push @values, { availablevalues => "<<$column".($list?"|$list":'').">>" }; >- while ( my $row = $sth->fetchrow_hashref() ) { >- push @values, $row; >- if ($row->{'availablevalues'} eq '') { $row->{'default'} = 1 }; >+ for ( $type ) { >+ when ( 'textrange' ) { >+ my %temp; >+ $temp{'name'} = $value; >+ $temp{'from'} = "from_" . $value; >+ $temp{'to'} = "to_" . $value; >+ $temp{'textrange'} = 1; >+ $temp{'description'} = $column_defs->{$value}; >+ push @criteria_array, \%temp; > } >- $sth->finish(); >+ when ( 'date' ) { >+ my %temp; >+ $temp{'name'} = $value; >+ $temp{'date'} = 1; >+ $temp{'description'} = $column_defs->{$value}; >+ push @criteria_array, \%temp; >+ } >+ when ( 'daterange' ) { >+ my %temp; >+ $temp{'name'} = $value; >+ $temp{'from'} = "from_" . $value; >+ $temp{'to'} = "to_" . $value; >+ $temp{'daterange'} = 1; >+ $temp{'description'} = $column_defs->{$value}; >+ push @criteria_array, \%temp; >+ } >+ default { >+ my $query = >+ "SELECT distinct($column) as availablevalues FROM $table"; >+ my $sth = $dbh->prepare($query); >+ $sth->execute(); >+ my @values; >+ # push the runtime choosing option >+ my $list; >+ $list='branches' if $column eq 'branchcode' or $column eq 'holdingbranch' or $column eq 'homebranch'; >+ $list='categorycode' if $column eq 'categorycode'; >+ $list='itemtype' if $column eq 'itype'; >+ $list='ccode' if $column eq 'ccode'; >+ # TODO : improve to let the librarian choose the description at runtime >+ push @values, { >+ availablevalues => "<<$column" . ( $list ? "|$list" : '' ) . ">>", >+ display_value => "<<$column" . ( $list ? "|$list" : '' ) . ">>", >+ }; >+ while ( my $row = $sth->fetchrow_hashref() ) { >+ if ($row->{'availablevalues'} eq '') { $row->{'default'} = 1 } >+ else { $row->{display_value} = _get_display_value( $row->{'availablevalues'}, $column ); } >+ push @values, $row; >+ } >+ $sth->finish(); > >- my %temp; >- $temp{'name'} = $value; >- $temp{'description'} = $column_defs->{$value}; >- $temp{'values'} = \@values; >+ my %temp; >+ $temp{'name'} = $value; >+ $temp{'description'} = $column_defs->{$value}; >+ $temp{'values'} = \@values; > >- push @criteria_array, \%temp; >+ push @criteria_array, \%temp; >+ } > } >- > } > return ( \@criteria_array ); > } >@@ -1008,6 +1017,20 @@ sub ValidateSQLParameters { > return \@problematic_parameters; > } > >+sub _get_display_value { >+ my ( $original_value, $column ) = @_; >+ for ( $column ) { >+ when ("periodicity") { >+ my $dbh = C4::Context->dbh(); >+ my $query = "SELECT description FROM subscription_frequencies WHERE id = ?"; >+ my $sth = $dbh->prepare($query); >+ $sth->execute($original_value); >+ return $sth->fetchrow; >+ } >+ } >+ return $original_value; >+} >+ > 1; > __END__ > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def >index dc863e4..23a54d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/columns.def >+++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def >@@ -139,3 +139,9 @@ biblioitems.lccn LCCN > biblioitems.marcxml MARC blob > biblioitems.url URL > biblioitems.title Title >+subscription.startdate Start date >+subscription.enddate End date >+subscription.periodicity Periodicity >+subscription.callnumber Call number >+subscription.location Location >+subscription.branchcode Library >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 2ac91d6..a834242 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -557,7 +557,7 @@ canned reports and writing custom SQL reports.</p> > <td> > <select name="[% criteri.name %]_value"> > [% FOREACH value IN criteri.values %] >- <option value="[% value.availablevalues %]">[% IF ( value.default ) %]Default[% ELSE %][% value.availablevalues |html %][% END %]</option> >+ <option value="[% value.availablevalues %]">[% IF ( value.default ) %]Default[% ELSE %][% value.display_value |html %][% END %]</option> > [% END %] > </select> > </td> >-- >1.7.10.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=22908">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5338
:
11601
|
22908
|
23299
|
29271
|
35148
|
35149
|
35179
|
35180
|
35300
|
35301
|
36457
|
36458
|
36459
|
36621
|
36622
|
36623
|
36624
|
39302