[Koha-cvs] koha C4/Koha.pm C4/Search.pm C4/Circulation/Cir... [dev_week]
Kyle Hall
kyle.m.hall at gmail.com
Thu May 17 19:54:42 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Kyle Hall <kylemhall> 07/05/17 17:54:41
Modified files:
C4 : Koha.pm Search.pm
C4/Circulation : Circ2.pm
koha-tmpl/intranet-tmpl/ccfls/en/catalogue: detail.tmpl
moredetail.tmpl
Log message:
Added new Get Previous Issue function
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.4.2.14&r2=1.22.2.4.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.99.2.11.2.41&r2=1.99.2.11.2.42
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.87.2.14.2.30&r2=1.87.2.14.2.31
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.12&r2=1.1.2.1.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/catalogue/moredetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.4&r2=1.1.2.1.2.5
Patches:
Index: C4/Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.22.2.4.2.14
retrieving revision 1.22.2.4.2.15
diff -u -b -r1.22.2.4.2.14 -r1.22.2.4.2.15
--- C4/Koha.pm 23 Apr 2007 16:30:36 -0000 1.22.2.4.2.14
+++ C4/Koha.pm 17 May 2007 17:54:40 -0000 1.22.2.4.2.15
@@ -81,6 +81,7 @@
&displaySecondaryServers
&displayLanguages
+ getPreviousItemIssues
getItemnumberByBarcode
$DEBUG);
@@ -609,10 +610,8 @@
}
sub getbranch ($$) {
my($query, $branches) = @_; # get branch for this query from branches
- my $branch = $query->param('branch') || $query->cookie('branch');
- if ( ( ! $branch) && C4::Context->userenv() ) {
- $branch = C4::Context->userenv->{'branch'} ;
- }
+ my $branch = $query->param('branch');
+ ($branch) || ($branch = $query->cookie('branch'));
($branches->{$branch}) || ($branch=(keys %$branches)[0]);
return $branch;
}
@@ -762,6 +761,22 @@
# subfield => 'a',
# },
{
+ link_value => 'branch',
+ label_value => 'Libraries',
+# tags => ['959',],
+ tags => ['952',],
+# subfield => 'n',
+ subfield => 'b',
+ expanded => '1',
+ },
+ {
+ link_value => 'mt',
+ label_value => 'Item Type',
+ tags => ['942',],
+ subfield => 'c',
+ expanded => '1',
+ },
+ {
link_value => 'su-geo',
label_value => 'Places',
tags => ['651'],
@@ -785,15 +800,6 @@
tags => ['440','490',],
subfield => 'a',
},
- {
- link_value => 'branch',
- label_value => 'Branches',
-# tags => ['959',],
- tags => ['952',],
-# subfield => 'n',
- subfield => 'b',
- expanded => '1',
- },
];
return $facets;
}
@@ -984,74 +990,96 @@
my $outer_limit_types_loop = [
{ inner_limit_types_loop => [
- {label => "Books",
- id => "mc-books",
+ {label => "Fiction",
+ id => "mc-fiction",
name => "limit",
- value => "(mc-collection:AF or mc-collection:MYS or mc-collection:SCI or mc-collection:NF or mc-collection:YA or mc-collection:BIO or mc-collection:LP or mc-collection:LPNF)",
+ value => "(mc-collection:DF or mc-collection:FIC or mc-collection:PB or mc-collection:PBCC or mc-collection:PBCD or mc-collection:PBCW or mc-collection:PBSF or mc-collection:RF or mc-collection:SC or mc-collection:SF or mc-collection:W or mc-collection:YAF or mc-collection:JFIC)",
icon => "search-books.gif",
- title => "Books, Pamphlets, Technical reports, Manuscripts, Legal papers, Theses and dissertations",},
+ title => "General & Classic Fiction, Detective/Mysteries, Sci-Fi/Fantasy, Romance, and Westerns, both hardcover and paperback",},
- {label => "Movies",
- id => "mc-movies",
+ {label => "Non-Fiction",
+ id => "mc-nf",
name => "limit",
- value => "(mc-collection:DVD or mc-collection:AV or mc-collection:AVJ or mc-collection:AVJN or mc-collection:AVJNF or mc-collection:AVNF)",
- icon => "search-movies.gif",
- title => "Motion pictures, Videorecordings, Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings",},
+ value => "mc-collection:NF or mc-collection:JNF or mc-collection:YANF or mc-collection:O",
+ icon => "search-books.gif",
+ title => "Non-Fiction materials",},
- {label => "Music",
- id => "mc-music",
+ {label => "Children's",
+ id => "mc-childrens",
name => "limit",
- value => "(mc-collection:CDM)",
- icon => "search-music.gif",
- title => "Spoken, Books on CD and Cassette",},
+ value => "(mc-collection:EASY or mc-collection:BB or mc-collection:JUV or mc-collection:JREF or mc-collection:JMAG, or mc-collection:JFIC or mc-collection:JHS or mc-collection:JNF or mc-collection:JPB or mc-collection:JPT or mc-collection:JBCD or mc-collection:JCAS or mc-collection:JCAS or mc-collection:JCD or mc-collection:TOYS)",
+ icon => "search-kids.gif",
+ title => "Children's collection",},
+
+ {label => "Young Adult",
+ id => "mc-sofware-web",
+ name => "limit",
+ value => "(mc-collection:YA or mc-collection:YAF or mc-collection:YANF or mc-collection:YAPB or mc-collection:YMAG)",
+ icon => "YA.gif",
+ title => "Young Adult collection",},
],
},
{ inner_limit_types_loop => [
- {label => "Audio Books",
- id => "mc-audio-books",
+ {label => "Large Print",
+ id => "mc-large-print",
name => "limit",
- value => "(mc-collection:AB or mc-collection:AC or mc-collection:JAC or mc-collection:YAC)",
- icon => "search-audio-books.gif",
- title => "Spoken, Books on CD and Cassette",},
+ value => "(mc-collection:LP)",
+ icon => "search-large-print.gif ",
+ title => "Large Print",},
+
+ {label => "Reference",
+ id => "mc-reference",
+ name => "limit",
+ value => "mc-collection:REF or mc-collection:JREF",
+ icon => "search-reference.gif",
+ title => "Reference",},
- {label => "Local History Materials",
- id => "mc-local-history",
+ {label => "Homeschooling",
+ id => "mc-homeschooling",
name => "limit",
- value => "(mc-collection:LH)",
+ value => "(mc-collection:JPT or mc-collection:JHS)",
icon => "search-local-history.gif",
- title => "Local History Materials",},
+ title => "Resources for homeschooling",},
- {label => "Large Print",
- id => "mc-large-print",
+ {label => "Magazines",
+ id => "mc-mag",
name => "limit",
- value => "(mc-collection:LP or mc-collection:LPNF)",
- icon => "search-large-print.gif ",
- title => "Large Print",},
+ value => "mc-collection:MAG or mc-collection:JMAG or mc-collection:YMAG",
+ icon => "MAG.gif",
+ title => "Magazines",},
],
},
{ inner_limit_types_loop => [
- {label => "Kids",
- id => "mc-kids",
+ {label => "Movies",
+ id => "mc-movies",
name => "limit",
- value => "(mc-collection:EASY or mc-collection:JNF or mc-collection:JF or mc-collection:JREF or mc-collection:JB)",
- icon => "search-kids.gif",
- title => "Music",},
+ value => "(mc-collection:DVD or mc-collection:JDVD or mc-collection:VHS or mc-collection:JVHS or mc-collection:TWV)",
+ icon => "search-movies.gif",
+ title => "adult & children's DVDs and Videos",},
- {label => "Software/Internet",
- id => "mc-sofware-web",
+ {label => "Audio Books",
+ id => "mc-audio-books",
name => "limit",
- value => "(mc-collection:CDR)",
- icon => "search-software-web.gif",
- title => "Kits",},
+ value => "(mc-collection:JBCD or mc-collection:BB or mc-collection:JBOC or mc-collection:BCD or mc-collection:BOC)",
+ icon => "search-audio-books.gif",
+ title => "Audio Books on CD and Cassette",},
- {label => "Reference",
- id => "mc-reference",
+ {label => "Music",
+ id => "mc-music",
name => "limit",
- value => "mc-collection:REF",
- icon => "search-reference.gif",
- title => "Reference",},
+ value => "(mc-collection:CD or mc-collection:CAS or mc-collection:JCD or mc-collection:JCAS or mc-collection:REC)",
+ icon => "search-music.gif",
+ title => "Music on CD or cassette",},
+ {label => "Picture Books",
+ id => "mc-easy",
+ name => "limit",
+ value => "(mc-collection:EASY or mc-collection:JUV or mc-collection:BB)",
+ icon => "search-kids.gif",
+ title => "Children's picture books and easy readers",},
],
+
+
},
];
@@ -1061,7 +1089,7 @@
my $primary_servers_loop = [
{ inner_servers_loop => [
{label => C4::Context->preference('LibraryName')." Catalog", id=>"NPL", name=>"server", value=>"localhost:9900/biblios",checked=>"checked",icon => "npl-icon.gif",zed => "1"},
- {label => "OPLIN Databases", id=>"OPLIN", name=>"server", value=>"",checked=>"",icon => "oplin-icon.gif",zed => "1"},
+# {label => "OPLIN Databases", id=>"OPLIN", name=>"server", value=>"",checked=>"",icon => "oplin-icon.gif",zed => "1"},
],
},
];
@@ -1128,20 +1156,67 @@
return \%values;
}
-sub getItemnumberByBarcode {
- my ( $barcode ) = @_;
+## function GetEnrollments
+## Returns information about the clubs and services
+## the given borrower is enrolled in.
+## Input:
+## $borrowernumber: The borrowernumber of the borrower
+## Output:
+## $results: Reference to an array of associated arrays
+sub GetEnrollments {
+ my ( $borrowernumber ) = @_;
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare("SELECT itemnumber FROM items WHERE barcode = ?");
- $sth->execute( $barcode ) or return( 0 );
+ my $sth = $dbh->prepare("SELECT * FROM clubsAndServices, clubsAndServicesEnrollments
+ WHERE clubsAndServices.casId = clubsAndServicesEnrollments.casId
+ AND clubsAndServicesEnrollments.borrowernumber = ?");
+ $sth->execute( $borrowernumber ) or return 0;
- my $row = $sth->fetchrow_hashref;
+ my @results;
+ while ( my $row = $sth->fetchrow_hashref ) {
+ push( @results , $row );
+ }
+
+ $sth->finish;
+
+ return \@results;
+}
+
+sub getPreviousItemIssues {
+ my ( $itemnumber, $numberOfIssues ) = @_;
+
+ my $dbh = C4::Context->dbh;
+
+ my $sth = $dbh->prepare(
+"SELECT
+ borrowers.borrowernumber,
+ borrowers.surname,
+ borrowers.firstname,
+ issues.returndate,
+ issues.issue_date,
+ issues.date_due
+FROM borrowers, issues, items, biblio, biblioitems
+WHERE
+items.itemnumber = ? AND
+borrowers.borrowernumber = issues.borrowernumber AND
+issues.itemnumber = items.itemnumber AND
+items.biblionumber = biblio.biblionumber AND
+biblioitems.biblionumber = biblio.biblionumber
+ORDER BY issues.returndate"
+);
+
+ $sth->execute( $itemnumber ) or return( 0 );
+
+ my $i = 0;
+ my @previousIssues;
+ while ( my $row = $sth->fetchrow_hashref && $i < $numberOfIssues ) {
+ push( @previousIssues , $row );
+ }
- my $itemnumber = $$row{'itemnumber'};
$sth->finish;
- return( $itemnumber );
+ return \@previousIssues;
}
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.41
retrieving revision 1.99.2.11.2.42
diff -u -b -r1.99.2.11.2.41 -r1.99.2.11.2.42
--- C4/Search.pm 16 May 2007 00:04:14 -0000 1.99.2.11.2.41
+++ C4/Search.pm 17 May 2007 17:54:40 -0000 1.99.2.11.2.42
@@ -40,7 +40,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.11.2.41 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.42 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -1703,6 +1703,11 @@
$data->{"timestamp$i2"} = $data2->{'timestamp'};
$data->{"card$i2"} = $data2->{'cardnumber'};
$data->{"borrower$i2"} = $data2->{'borrowernumber'};
+ $data->{"date_due$i2"} = $data2->{'date_due'};
+ $data->{"returndate$i2"} = $data2->{"returndate"};
+ $data->{"issue_date$i2"} = $data2->{"issue_date"};
+ $data->{"surname$i2"} = $data2->{"surname"};
+ $data->{"firstname$i2"} = $data2->{"firstname"};
} # if
} # for
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Attic/Circ2.pm,v
retrieving revision 1.87.2.14.2.30
retrieving revision 1.87.2.14.2.31
diff -u -b -r1.87.2.14.2.30 -r1.87.2.14.2.31
--- C4/Circulation/Circ2.pm 16 May 2007 05:04:35 -0000 1.87.2.14.2.30
+++ C4/Circulation/Circ2.pm 17 May 2007 17:54:41 -0000 1.87.2.14.2.31
@@ -3,7 +3,7 @@
package C4::Circulation::Circ2;
-# $Id: Circ2.pm,v 1.87.2.14.2.30 2007/05/16 05:04:35 sushi Exp $
+# $Id: Circ2.pm,v 1.87.2.14.2.31 2007/05/17 17:54:41 kylemhall Exp $
#package to deal with Returns
#written 3/11/99 by olwen at katipo.co.nz
@@ -950,6 +950,54 @@
# transferbook($tobrcd,$barcode, 1);
warn "transferbook";
}
+<<<<<<< Circ2.pm
+ }
+ }
+ # Record in the database the fact that the book was issued.
+ my $sth=$dbh->prepare("insert into issues (borrowernumber, itemnumber, date_due, branchcode, issue_date ) values (?,?,?,?, CURRENT_DATE)");
+ my $loanlength = getLoanLength($borrower->{'categorycode'},$iteminformation->{'itemtype'},$calendar_branch);
+ my @datearr = localtime();
+ my $dateduef;
+
+ # if a hard set date-due is pasted, then use it!
+ if ($date) {
+ warn "--- hard-set due-date = $date";
+ $dateduef=$date;
+ }
+ # else, calc date-due using loan-length and holidays.
+ else {
+ $dateduef = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
+ my $calendar = C4::Calendar->new(branchcode => $calendar_branch);
+ my ($yeardue, $monthdue, $daydue) = split /-/, $dateduef;
+ ($daydue, $monthdue, $yeardue) = $calendar->addDate($daydue, $monthdue, $yeardue, $loanlength);
+ $dateduef = "$yeardue-".sprintf ("%0.2d", $monthdue)."-". sprintf("%0.2d",$daydue);
+ }
+
+# if ReturnBeforeExpiry ON the datedue can't be after borrower expirydate
+# if (C4::Context->preference('ReturnBeforeExpiry') && $dateduef gt $borrower->{expiry}) {
+# $dateduef=$borrower->{expiry};
+# }
+
+ $sth->execute($borrower->{'borrowernumber'}, $iteminformation->{'itemnumber'}, $dateduef, $env->{'branchcode'});
+ $sth->finish;
+ $iteminformation->{'issues'}++;
+ $sth=$dbh->prepare("update items set issues=? where itemnumber=?");
+ $sth->execute($iteminformation->{'issues'},$iteminformation->{'itemnumber'});
+ $sth->finish;
+ &itemseen($iteminformation->{'itemnumber'});
+ itemborrowed($iteminformation->{'itemnumber'});
+ # If it costs to borrow this book, charge it to the patron's account.
+ my ($charge,$itemtype)=calc_charges($env, $iteminformation->{'itemnumber'}, $borrower->{'borrowernumber'});
+ if ($charge > 0) {
+ createcharge($env, $dbh, $iteminformation->{'itemnumber'}, $borrower->{'borrowernumber'}, $charge);
+ $iteminformation->{'charge'}=$charge;
+ }
+ # Record the fact that this book was issued.
+ &UpdateStats($env,$env->{'branchcode'},'issue',$charge,'',$iteminformation->{'itemnumber'},$iteminformation->{'itemtype'},$borrower->{'borrowernumber'});
+# moo
+ }
+}
+=======
}
}
# Record in the database the fact that the book was issued.
@@ -996,6 +1044,7 @@
# moo
}
}
+>>>>>>> 1.87.2.14.2.30
=head2 getLoanLength
Index: koha-tmpl/intranet-tmpl/ccfls/en/catalogue/detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/catalogue/Attic/detail.tmpl,v
retrieving revision 1.1.2.1.2.12
retrieving revision 1.1.2.1.2.13
diff -u -b -r1.1.2.1.2.12 -r1.1.2.1.2.13
--- koha-tmpl/intranet-tmpl/ccfls/en/catalogue/detail.tmpl 4 Apr 2007 12:53:32 -0000 1.1.2.1.2.12
+++ koha-tmpl/intranet-tmpl/ccfls/en/catalogue/detail.tmpl 17 May 2007 17:54:41 -0000 1.1.2.1.2.13
@@ -87,7 +87,9 @@
</ul><br class="clear" /></div><!-- TMPL_IF NAME="CAN_user_editcatalogue" --><div class="tabitem">
<form action="acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit Record" /></form>
<form action="acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate Record" /></form>
+<!-- HIDE FOR CCFLS
<form action="acqui.simple/additem.pl" method="get" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form>
+-->
<!-- HIDE FOR CCFLS
<form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get">
Index: koha-tmpl/intranet-tmpl/ccfls/en/catalogue/moredetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/catalogue/Attic/moredetail.tmpl,v
retrieving revision 1.1.2.1.2.4
retrieving revision 1.1.2.1.2.5
diff -u -b -r1.1.2.1.2.4 -r1.1.2.1.2.5
--- koha-tmpl/intranet-tmpl/ccfls/en/catalogue/moredetail.tmpl 12 Jan 2007 14:30:22 -0000 1.1.2.1.2.4
+++ koha-tmpl/intranet-tmpl/ccfls/en/catalogue/moredetail.tmpl 17 May 2007 17:54:41 -0000 1.1.2.1.2.5
@@ -82,8 +82,34 @@
<tr><th>Last borrowed:</th><td> <!-- TMPL_VAR NAME="datelastborrowed" --></td></tr>
<!-- on issue bit -->
-<!-- TMPL_IF NAME="card0" --><tr><th>Last Borrower 1:</th><td> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card0" -->"><!-- TMPL_VAR NAME="card0" --></a></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="card1" --><tr><th>Last Borrower 2:</th><td> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card1" -->"><!-- TMPL_VAR NAME="card1" --></a></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="card0" -->
+ <tr>
+ <th>Last Borrower 1:</th>
+ <td>
+ <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card0" -->"><!-- TMPL_VAR NAME="surname0" -->, <!-- TMPL_VAR NAME="firstname0" --></a>
+ Due: <!-- TMPL_VAR NAME="date_due0" --> / Returned: <!-- TMPL_VAR NAME="returndate0" -->
+ </td>
+ </tr>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="card1" -->
+ <tr>
+ <th>Last Borrower 2:</th>
+ <td>
+ <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card1" -->"><!-- TMPL_VAR NAME="surname1" -->, <!-- TMPL_VAR NAME="firstname1" --></a>
+ Due: <!-- TMPL_VAR NAME="date_due1" --> / Returned: <!-- TMPL_VAR NAME="returndate1" -->
+ </td>
+ </tr>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="card2" -->
+ <tr>
+ <th>Last Borrower 3:</th>
+ <td>
+ <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card2" -->"><!-- TMPL_VAR NAME="surname2" -->, <!-- TMPL_VAR NAME="firstname2" --></a>
+ Due: <!-- TMPL_VAR NAME="date_due2" --> / Returned: <!-- TMPL_VAR NAME="returndate2" -->
+ </td>
+ </tr>
+<!-- /TMPL_IF -->
+
<!-- TMPL_IF NAME="replacementprice" --><tr><th>Replacement Price:</th><td> $<!-- TMPL_VAR NAME="replacementprice" --></td></tr><!-- /TMPL_IF -->
<tr><th>Damaged Status:</th>
@@ -111,7 +137,7 @@
<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
<select name="itemlost" >
<!-- TMPL_LOOP NAME="itemlostloop" -->
-<option value="<!-- TMPL_VAR NAME="authorised_value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="lib" --></option>
+<option value="<!-- TMPL_VAR NAME="authorised_value" -->"<!-- TMPL_IF NAME="selected" --> selected="status"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="lib" --></option>
<!-- /TMPL_LOOP -->
</select>
<input type="hidden" name="wthdrawn" value="<!-- TMPL_VAR NAME="wthdrawn" -->" />
More information about the Koha-cvs
mailing list