[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha circ/reserve.pl koha-tmpl/intranet-tmpl/pr... [rel_3_0]
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha circ/reserve.pl koha-tmpl/intranet-tmpl/pr... [rel_3_0] |
|
Date: |
Mon, 08 Jan 2007 15:09:45 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 07/01/08 15:09:45
Modified files:
circ : reserve.pl
koha-tmpl/intranet-tmpl/prog/en/circ: reserve.tmpl
Log message:
-1- sync with dev_week.
-2- Fix wrong sql field borrowers.emailadress should be borrowers.email
-3- Biblio default view is depending on the syspref.
-4- Re indenting SQL.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.5&r2=1.3.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
Patches:
Index: circ/reserve.pl
===================================================================
RCS file: /sources/koha/koha/circ/reserve.pl,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -b -r1.3.2.5 -r1.3.2.6
--- circ/reserve.pl 18 Dec 2006 10:59:54 -0000 1.3.2.5
+++ circ/reserve.pl 8 Jan 2007 15:09:44 -0000 1.3.2.6
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: reserve.pl,v 1.3.2.5 2006/12/18 10:59:54 toins Exp $
+# $Id: reserve.pl,v 1.3.2.6 2007/01/08 15:09:44 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -28,8 +28,12 @@
use C4::Interface::CGI::Output;
my $input = new CGI;
-my $type = $input->param('type');
my $order = $input->param('order');
+my $startdate=$input->param('from');
+my $enddate=$input->param('to');
+
+warn "startdate=>".$startdate;
+warn "enddate=>".$enddate;
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
@@ -44,19 +48,6 @@
}
);
-# borrowernumber int(11)
-# reservedate date
-# biblionumber int(11)
-# constrainttype char(1)
-# branchcode varchar(4)
-# notificationdate date
-# reminderdate date
-# cancellationdate date
-# reservenotes text
-# priority smallint(6)
-# found char(1)
-# timestamp timestamp ON UPDATE CURRENT_TIMESTAMP
Oui CURRENT_TIMESTAMP Modifier Supprimer
Primaire Index Unique Texte entier
-# itemnumber int(11)
my $duedate;
my $borrowernumber;
my $itemnum;
@@ -69,6 +60,7 @@
my $biblionumber;
my $title;
my $author;
+
my @datearr = localtime( time() );
my $todaysdate =
( 1900 + $datearr[5] ) . '-'
@@ -76,16 +68,54 @@
. sprintf( "%0.2d", $datearr[3] );
my $dbh = C4::Context->dbh;
+my ($sqlorderby, $sqldatewhere) = ("","");
+
+$sqldatewhere .= " && reservedate >= " . $dbh->quote($startdate) if
($startdate) ;
+$sqldatewhere .= " && reservedate <= " . $dbh->quote($enddate) if ($enddate) ;
+
+warn "order=>".$order;
+
+if ($order eq "borrower") {
+ $sqlorderby = " order by borrower, reservedate";
+} elsif ($order eq "biblio") {
+ $sqlorderby = " order by biblio.title, priority,reservedate";
+} elsif ($order eq "priority") {
+ $sqlorderby = "order by priority DESC";
+} else {
+ $sqlorderby = " order by reservedate, borrower";
+}
my $strsth =
-"select reservedate,reserves.borrowernumber as borrowernumber,
concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber, borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
-$strsth =
-"select reservedate,reserves.borrowernumber as
borrowernumber,concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber , borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by borrower,reservedate "
- if ( $order eq "borrower" );
-$strsth =
-"select reservedate,reserves.borrowernumber as
borrowernumber,concat(firstname,' ',surname) as borrower, borrowers.phone,
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch,
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes,
notificationdate, reminderdate, priority, reserves.found, biblio.title,
biblio.author from reserves left join items on
items.itemnumber=reserves.itemnumber, borrowers,biblio where
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber &&
reserves.biblionumber=biblio.biblionumber order by biblio.title,
priority,reservedate "
- if ( $order eq "biblio" );
+"SELECT reservedate,
+ reserves.borrowernumber as borrowernumber,
+ concat(firstname,' ',surname) as borrower,
+ borrowers.phone,
+ borrowers.email,
+ reserves.biblionumber,
+ reserves.branchcode as branch,
+ items.holdingbranch,
+ items.itemcallnumber,
+ items.itemnumber,
+ notes,
+ notificationdate,
+ reminderdate,
+ priority,
+ reserves.found,
+ biblio.title,
+ biblio.author
+ FROM reserves
+ LEFT JOIN items ON items.itemnumber=reserves.itemnumber,
+ borrowers,biblio
+ WHERE isnull(cancellationdate)
+ && reserves.borrowernumber=borrowers.borrowernumber
+ && reserves.biblionumber=biblio.biblionumber
+ ";
+
+$strsth .= $sqlorderby;
+
my $sth = $dbh->prepare($strsth);
-warn "" . $strsth;
+
+warn $strsth;
+
$sth->execute();
my @reservedata;
@@ -112,20 +142,21 @@
notificationdate => $data->{notificationdate},
reminderdate => $data->{reminderdate}
}
-
);
-
}
$sth->finish;
$template->param(
todaysdate => format_date($todaysdate),
+ from => $startdate,
+ to => $enddate,
reserveloop => address@hidden,
intranetcolorstylesheet =>
C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
+ "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
);
output_html_with_http_headers $input, $cookie, $template->output;
Index: koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/Attic/reserve.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl 20 Nov 2006 10:26:49
-0000 1.1.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl 8 Jan 2007 15:09:45
-0000 1.1.2.6
@@ -1,20 +1,123 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Reserve
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-system.css">
+<!-- End of additions --><!-- Additions to enable Calendar system -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-<div id="mainbloc">
- <h1>Items Reserved as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
- <div>
+<h1>Items Reserved as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
+<div id="filters">
+<br />
+<form method="post" >
+<h4>Limit by Date Range:</h4>
+<p>
+<label for "from">
+ Start date:
+</label>
+<input type="text"
+ size="10"
+ id="from"
+ name="from"
+ value="<!-- TMPL_VAR NAME="from" -->" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif"
+ border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top"
/>
+<script language="JavaScript" type="text/javascript">
+function validate1(date) {
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var weekDay = date.getDay();
+ var dayMonth = month + '-' + day;
+ var dateString = year + '-' + month + '-' + day;
+ var dateTo = document.getElementById('to').value.split("-");
+ var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+ if (date > limitDate) {
+ return true;
+ } else {
+ return false;
+ }
+}
+Calendar.setup(
+ {
+ inputField : "from",
+ ifFormat : "%Y-%m-%d",
+ button : "openCalendarFrom",
+ disableFunc : validate1,
+ dateStatusFunc : validate1
+ }
+);
+</script>
+<label for "to" >
+ End date:
+</label>
+<input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->"
type="text" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif"
+ id="openCalendarTo"
+ style="cursor: pointer;"
+ valign="top" border="0" />
+<script type="text/javascript">
+ function validate2(date) {
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var weekDay = date.getDay();
+ var dayMonth = month + '-' + day;
+ var dateString = year + '-' + month + '-' + day;
+ var dateFrom = document.getElementById('from').value.split("-");
+ var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1),
dateFrom[2]);
+ if (limitDate > date) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ Calendar.setup(
+ {
+ inputField : "to",
+ ifFormat : "%Y-%m-%d",
+ button : "openCalendarTo",
+ disableFunc : validate2,
+ dateStatusFunc : validate2
+ }
+ );
+</script>
+(inclusive)
+<input type="submit" value="Go" class="submit">
+</p>
+</form>
+</div>
+
+<div class="searchresults">
<!-- TMPL_IF NAME="reserveloop" -->
<table>
<tr>
- <th class="circulation">Priority</th>
- <th class="circulation">Reserve Date <a
href="/cgi-bin/koha/circ/reserve.pl?order=date&type=intranet">Sort</a> </th>
- <th class="circulation">Patron <a
href="/cgi-bin/koha/circ/reserve.pl?order=borrower&type=intranet">Sort</a></th>
- <th class="circulation">Title <a
href="/cgi-bin/koha/circ/reserve.pl?order=biblio&type=intranet">Sort</a></th>
- <th class="circulation">Location</th>
- <th class="circulation">Notes</th>
+ <th >
+ Priority
+ <a
href="/cgi-bin/koha/circ/reserve.pl?order=priority">Sort</a>
+ </th>
+ <th >Reserve Date
+ <a
href="/cgi-bin/koha/circ/reserve.pl?order=date">Sort</a>
+ </th>
+ <th >Patron
+ <a
href="/cgi-bin/koha/circ/reserve.pl?order=borrower">Sort</a>
+ </th>
+ <th >Title
+ <a href="/cgi-bin/koha/circ/reserve.pl?order=biblio">Sort</a>
+ </th>
+ <th >
+ Location
+ </th>
+ <th >
+ Notes
+ </th>
</tr>
<!-- TMPL_LOOP NAME="reserveloop" -->
@@ -28,12 +131,26 @@
<td>
<p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a><br /><!-- TMPL_VAR
NAME="phone" --><br />
<!-- TMPL_IF NAME="email" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR
NAME="title" -->">
- <!-- TMPL_VAR NAME="email" --></a><!--/TMPL_IF-->
+<!-- TMPL_VAR NAME="email" --></a><!--/TMPL_IF-->
</p>
</td>
<td>
<p>
- <a
href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><br /><!-- TMPL_VAR
NAME="author" -->
+ <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+ <a
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+ <a
href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <a
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
</p>
</td>
<td><p><!-- TMPL_VAR NAME="holdingbranch" -->
<!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
@@ -45,6 +162,5 @@
<!-- TMPL_ELSE -->
<b>No items found.</b>
<!-- /TMPL_IF -->
- </div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha circ/reserve.pl koha-tmpl/intranet-tmpl/pr... [rel_3_0],
Antoine Farnault <=