From 82b57c7750840d3f83a35a92534cbc2f2ab7a0d8 Mon Sep 17 00:00:00 2001 From: David Cook Date: Mon, 14 May 2012 15:50:24 +1000 Subject: [PATCH] Bug 7839 [ENH]: Show subscription routing lists attached to borrower in Patron record. Content-Type: text/plain; charset="utf-8" --- C4/Serials.pm | 36 +++++- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 1 + .../prog/en/modules/members/routing-lists.tt | 80 ++++++++++++ members/routing-lists.pl | 133 ++++++++++++++++++++ 4 files changed, 249 insertions(+), 1 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt create mode 100755 members/routing-lists.pl diff --git a/C4/Serials.pm b/C4/Serials.pm index 58b6078..e316b94 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -53,7 +53,7 @@ BEGIN { &check_routing &updateClaim &removeMissingIssue &CountIssues HasItems - + &GetSubscriptionsFromBorrower ); } @@ -2175,6 +2175,40 @@ sub in_array { # used in next sub down return 0; } +=head2 GetSubscriptionsFromBorrower + +($count,@routinglist) = GetSubscriptionsFromBorrower($borrowernumber) + +this gets the info from subscriptionroutinglist for each $subscriptionid + +return : +a count of the serial subscription routing lists to which a patron belongs, +with the titles of those serial subscriptions as an array. Each element of the array +contains a hash_ref with subscriptionID and title of subscription. + +=cut + +sub GetSubscriptionsFromBorrower { + my ($borrowernumber) = @_; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare( + "SELECT subscription.subscriptionid, biblio.title + FROM subscription + JOIN biblio ON biblio.biblionumber = subscription.biblionumber + JOIN subscriptionroutinglist ON USING(subscriptionid) + WHERE subscriptionroutinglist.borrowernumber = ? ORDER BY title ASC + " + ); + $sth->execute($borrowernumber); + my @routinglist; + my $count = 0; + while ( my $line = $sth->fetchrow_hashref ) { + $count++; + push( @routinglist, $line ); + } + return ( $count, @routinglist ); +} + =head2 GetNextDate $resultdate = GetNextDate($planneddate,$subscription) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 7014c39..bf30ae3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -69,6 +69,7 @@ [% IF ( CAN_user_updatecharges ) %] [% IF ( finesview ) %]
  • [% ELSE %]
  • [% END %]Fines
  • [% END %] + [% IF ( routinglistview ) %]
  • [% ELSE %]
  • [% END %]Routing Lists
  • [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]
  • [% ELSE %]
  • [% END %]Circulation history
  • [% END %] [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]
  • [% ELSE %]
  • [% END %]Modification log
  • [% END %] [% IF ( EnhancedMessagingPreferences ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt new file mode 100644 index 0000000..8baa63f --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -0,0 +1,80 @@ +[% INCLUDE 'doc-head-open.inc' %] +Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %] +[% INCLUDE 'doc-head-close.inc' %] + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'patron-search.inc' %] + + + +
    +
    +
    +
    +[% INCLUDE 'circ-toolbar.inc' %] + + +

    Search Subscriptions:

    +
    [% IF ( routing ) %][% END %] +
    + + +

    +[% IF ( countSubscrip ) %] +[% countSubscrip %] Subscription Routing List(s) +[% ELSE %] +0 Subscription Routing Lists +[% END %] +

    + +
    +[% IF ( subscripLoop ) %] + + + + + + + + +[% FOREACH subscripLoop IN subscripLoop %] + + + + + [% END %] + +
    Subscription TitleRouting List
    + + [% subscripLoop.title %] + + + + + Edit Routing List + + + + +
    + + [% ELSE %] +

    Patron does not belong to any subscription routing lists.

    + + + [% END %] + +
    + + + + +
    +
    + +
    +[% INCLUDE 'circ-menu.inc' %] +
    +
    +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/members/routing-lists.pl b/members/routing-lists.pl new file mode 100755 index 0000000..bd3947d --- /dev/null +++ b/members/routing-lists.pl @@ -0,0 +1,133 @@ +#!/usr/bin/perl + +# Copyright 2000-2002 Katipo Communications +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# 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 +use CGI; +use C4::Output; +use C4::Auth qw/:DEFAULT get_session/; +use C4::Branch; # GetBranches +use C4::Members; +use C4::Context; +use C4::Serials; +use CGI::Session; + +my $query = new CGI; + +my $sessionID = $query->cookie("CGISESSID") ; +my $session = get_session($sessionID); + +# branch are now defined by the userenv +# but first we have to check if someone has tried to change them + +my $branch = $query->param('branch'); +if ($branch){ + # update our session so the userenv is updated + $session->param('branch', $branch); + $session->param('branchname', GetBranchName($branch)); +} + +my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( + { + template_name => 'members/routing-lists.tt', + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => { circulate => 'circulate_remaining_permissions' }, + } +); + +my $branches = GetBranches(); + +my $findborrower = $query->param('findborrower'); +$findborrower =~ s|,| |g; + +my $borrowernumber = $query->param('borrowernumber'); + +$branch = C4::Context->userenv->{'branch'}; + +# get the borrower information..... +my $borrower; +if ($borrowernumber) { + $borrower = GetMemberDetails( $borrowernumber, 0 ); +} + + +################################################################################## +# BUILD HTML +# I'm trying to show the title of subscriptions where the borrowernumber is attached via a routing list + +if ($borrowernumber) { +# new op dev + my $count; + my @borrowerSubscriptions; + ($count, @borrowerSubscriptions) = GetSubscriptionsFromBorrower($borrowernumber ); + my @subscripLoop; + + foreach my $num_res (@borrowerSubscriptions) { + my %getSubscrip; + $getSubscrip{subscriptionid} = $num_res->{'subscriptionid'}; + $getSubscrip{title} = $num_res->{'title'}; + $getSubscrip{borrowernumber} = $num_res->{'borrowernumber'}; + push( @subscripLoop, \%getSubscrip ); + } + + $template->param( + countSubscrip => scalar @subscripLoop, + subscripLoop => \@subscripLoop, + routinglistview => 1 + ); + + $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' ); +} + +################################################################################## + + +# Computes full borrower address +my (undef, $roadttype_hashref) = &GetRoadTypes(); +my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'}; + +$template->param( + + findborrower => $findborrower, + borrower => $borrower, + borrowernumber => $borrowernumber, + branch => $branch, + branchname => GetBranchName($borrower->{'branchcode'}), + firstname => $borrower->{'firstname'}, + surname => $borrower->{'surname'}, + categorycode => $borrower->{'categorycode'}, + categoryname => $borrower->{description}, + address => $address, + address2 => $borrower->{'address2'}, + email => $borrower->{'email'}, + emailpro => $borrower->{'emailpro'}, + borrowernotes => $borrower->{'borrowernotes'}, + city => $borrower->{'city'}, + zipcode => $borrower->{'zipcode'}, + country => $borrower->{'country'}, + phone => $borrower->{'phone'} || $borrower->{'mobile'}, + cardnumber => $borrower->{'cardnumber'}, +); + +my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'}); +$template->param( picture => 1 ) if $picture; + +output_html_with_http_headers $query, $cookie, $template->output; -- 1.7.7.4