Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 13234: On-site checkouts - OPAC

Browse source 
This patch introduces the code lost in bug 10860 for the OPAC side.

Test plan:
Go on opac-readingrecord.pl and verify the tabs work as expected and the
"show all items" and "show 50 items" links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Jonathan Druart 2014-11-12 11:52:46 +01:00 committed by Tomas Cohen Arazi
parent e2a169dc9d
commit f7d31f3916
2 changed files with 66 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
View file

@ -31,7 +31,7 @@
[% IF READING_RECORD.size == 0 %] [% IF READING_RECORD.size == 0 %]
You have never borrowed anything from this library. You have never borrowed anything from this library.
[% ELSE %] [% ELSE %]
<div id="opac-user-readingrec" class="statictabs"> <div id="opac-user-readingrec" class="statictabs2">
<div class="resultscontrol resort"> <div class="resultscontrol resort">
<form id="sortform" action="/cgi-bin/koha/opac-readingrecord.pl" method="get"> <form id="sortform" action="/cgi-bin/koha/opac-readingrecord.pl" method="get">
[% UNLESS ( limit ) %]<input type="hidden" name="limit" value="full" />[% END %] [% UNLESS ( limit ) %]<input type="hidden" name="limit" value="full" />[% END %]
@ -43,32 +43,43 @@
</form> </form>
</div> </div>
<ul> [% IF limit %]
[% IF ( showfulllink ) %] <a href="/cgi-bin/koha/opac-readingrecord.pl?limit=full[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show all items</a>
[% IF ( limit ) %] [% ELSE %]
<li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=full[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show all items</a></li><li class="active"><a href="#readingrec">Showing last 50 items</a></li> <a href="/cgi-bin/koha/opac-readingrecord.pl?limit=50[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Showing last 50 items</a>
[% ELSE %] [% END %]
<li class="active"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing all items</a></li><li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=50[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show last 50 items only</a></li>
[% END %]
[% ELSE %]
<li class="active"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing all items</a></li>
[% END %]
</ul>
<div class="tabs-container">
<table id="readingrec" class="table table-bordered table-striped">
<tr>
<th colspan="2">Title</th>
<th>Item type</th>
<th>Call no.</th>
<th>Date</th>
[% IF ( OPACMySummaryHTML ) %]
<th>Links</th>
[% END %]
</tr>
<div id="tabs" class="toptabs">
<ul>
<li><a href="#tabs-container" id="tab_all">All</a></li>
<li><a href="#tabs-container" id="tab_checkout">Checkouts</a></li>
<li><a href="#tabs-container" id="tab_onsite_checkout">On-site checkouts</a></li>
</ul>
<div id="tabs-container" style="overflow:hidden">
<table id="readingrec" class="table table-bordered table-striped">
<thead>
<tr>
<th style="display:none;">Type</th>
<th></th>
<th>Title</th>
<th>Item type</th>
<th>Call no.</th>
<th>Date</th>
[% IF ( OPACMySummaryHTML ) %]
<th>Links</th>
[% END %]
</tr>
</thead>
<tbody>
[% FOREACH issue IN READING_RECORD %] [% FOREACH issue IN READING_RECORD %]
[% IF loop.even %]<tr class="highlight">[% ELSE %]<tr>[% END %] <tr>
<td style="display:none;">
[% IF issue.onsite_checkout %]
onsite
[% ELSE %]
checkout
[% END %]
</td>
<td> <td>
[% IF OPACAmazonCoverImages %] [% IF OPACAmazonCoverImages %]
[% IF issue.normalized_isbn %] [% IF issue.normalized_isbn %]
@ -101,8 +112,8 @@
<img src="http://www.syndetics.com/index.aspx?isbn=[% issue.normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% issue.normalized_upc %]&amp;oclc=[% issue.normalized_oclc %]" alt="" class="item-thumbnail" /> <img src="http://www.syndetics.com/index.aspx?isbn=[% issue.normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% issue.normalized_upc %]&amp;oclc=[% issue.normalized_oclc %]" alt="" class="item-thumbnail" />
[% END %] [% END %]
[% END %] [% END %]
</td> </td>
<td> <td>
[% IF issue.BiblioDefaultViewmarc %] [% IF issue.BiblioDefaultViewmarc %]
<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a> <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
[% ELSIF issue.BiblioDefaultViewisbd %] [% ELSIF issue.BiblioDefaultViewisbd %]
@ -111,8 +122,8 @@
<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a> <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
[% END %] [% END %]
<span class="item-details">[% issue.author %]</span> <span class="item-details">[% issue.author %]</span>
</td> </td>
<td> <td>
[% UNLESS ( noItemTypeImages ) %] [% UNLESS ( noItemTypeImages ) %]
[% IF ( issue.imageurl ) %] [% IF ( issue.imageurl ) %]
<img src="[% issue.imageurl %]" alt="" /> <img src="[% issue.imageurl %]" alt="" />
@ -120,23 +131,24 @@
[% END %] [% END %]
<span class="tdlabel">Item type:</span> <span class="tdlabel">Item type:</span>
[% issue.description %]</td> [% issue.description %]</td>
<td> <td>
<span class="tdlabel">Call number:</span> <span class="tdlabel">Call number:</span>
[% issue.itemcallnumber %] [% issue.itemcallnumber %]
</td> </td>
<td> <td>
[% IF issue.returndate %] [% IF issue.returndate %]
<span class="tdlabel">Check-in date:</span> <span class="tdlabel">Check-in date:</span>
[% issue.returndate | $KohaDates %] [% issue.returndate | $KohaDates %]
[% ELSE %] [% ELSE %]
<em>(Checked out)</em> <em>(Checked out)</em>
[% END %] [% END %]
</td> </td>
[% IF OPACMySummaryHTML %] [% IF OPACMySummaryHTML %]
<td>[% issue.MySummaryHTML %]</td> <td>[% issue.MySummaryHTML %]</td>
[% END %]
</tr>
[% END %] [% END %]
</tr> </tbody>
[% END %]
</table> </table>
</div> <!-- / .tabs-container --> </div> <!-- / .tabs-container -->
</div> <!-- / .opac-user-readingrec --> </div> <!-- / .opac-user-readingrec -->
@ -149,6 +161,7 @@
[% INCLUDE 'opac-bottom.inc' %] [% INCLUDE 'opac-bottom.inc' %]
[% BLOCK jsinclude %] [% BLOCK jsinclude %]
[% INCLUDE 'datatables.inc' %]
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
$(document).ready(function(){ $(document).ready(function(){
@ -157,6 +170,22 @@
$('#order').change(function() { $('#order').change(function() {
$('#sortform').submit(); $('#sortform').submit();
}); });
var table = $("#readingrec").dataTable($.extend(true, {}, dataTablesDefaults, {
"sPaginationType": "four_button",
}));
var tabs = $("#tabs").tabs({
select: function(e, ui) {
var id = $(ui.tab).attr("id");
if ( id == "tab_checkout" ) {
table.fnFilter("checkout", 0);
} else if ( id == "tab_onsite_checkout" ) {
table.fnFilter("onsite", 0);
} else { // all
table.fnFilter('', 0);
}
}
});
}); });
//]]> //]]>
</script> </script>

1
opac/opac-readingrecord.pl
View file

@ -139,7 +139,6 @@ for(qw(AmazonCoverImages GoogleJackets)) { # BakerTaylorEnabled handled above
$template->param( $template->param(
READING_RECORD => $issues, READING_RECORD => $issues,
limit => $limit, limit => $limit,
showfulllink => 1,
readingrecview => 1, readingrecview => 1,
OPACMySummaryHTML => $opac_summary_html ? 1 : 0, OPACMySummaryHTML => $opac_summary_html ? 1 : 0,
); );