Bugzilla – Attachment 38369 Details for
Bug 13887
Add datatables to item specific holds table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 13887 - Add datatables to item specific holds table
PASSED-QA-Bug-13887---Add-datatables-to-item-speci.patch (text/plain), 8.82 KB, created by
Katrin Fischer
on 2015-04-22 20:32:36 UTC
(
hide
)
Description:
[PASSED QA] Bug 13887 - Add datatables to item specific holds table
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-04-22 20:32:36 UTC
Size:
8.82 KB
patch
obsolete
>From f702e138de76963f5a51240bf34e58ff41a6cba5 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@quecheelibrary.org> >Date: Sat, 21 Mar 2015 13:41:21 -0400 >Subject: [PATCH] [PASSED QA] Bug 13887 - Add datatables to item specific holds > table > >This patch adds datatables functionality to the item specific holds table > >To test: >1 - Apply patch >2 - Attempt to place an item specific hold for a patron >3 - Note that columns are now sortable and searchable >4 - Ensure that you can place both specific and next available holds as before > >Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/reserve/request.tt | 162 ++++++++++++--------- > 1 file changed, 90 insertions(+), 72 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 04023d3..8dbb623 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -42,6 +42,18 @@ $(document).ready(function() { > $(':radio', this).attr('checked', 'true') > } > }); >+ var my_table = $("#requestspecific").dataTable($.extend(true, {}, dataTablesDefaults, { >+ 'bPaginate': false, >+ 'bInfo': false, >+ "bAutoWidth": false, >+ })); >+ >+ //Override fieldset styling for dataTables search box >+ $("div.top.pager").css("margin-left","1em"); >+ $(".dataTables_filter label").css({ >+ "width":"auto", >+ "margin-right":"0em" >+ }); > > }); > >@@ -431,81 +443,86 @@ function checkMultiHold() { > > <table id="requestspecific"> > <caption>Place a hold on a specific item</caption> >- <tr> >- <th>Hold</th> >- [% IF ( item_level_itypes ) %] >- <th>Item type</th> >- [% END %] >- <th>Barcode</th> >- <th>Home library</th> >- <th>Last location</th> >- <th>Call no.</th> >- <th>Copy number</th> >- [% IF itemdata_enumchron %] >- <th>Vol no.</th> >- [% END %] >- <th>Information</th> >- </tr> >- [% FOREACH itemloo IN bibitemloo.itemloop %] >- [% UNLESS ( itemloo.hide ) %] >- <tr class="[% itemloo.backgroundcolor %]"> >- <td> >- [% IF ( itemloo.available ) %] >- <input type="radio" name="checkitem" value="[% itemloo.itemnumber %]" /> >- [% ELSIF ( itemloo.override ) %] >- <input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber %]" /> >- <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/error.png" alt="Requires override of hold policy" /> >- [% ELSE %] >- <input disabled="disabled" type="radio" name="checkitem" value="[% itemloo.itemnumber %]" /> >- <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" /> >- [% END %] >- </td> >- [% IF ( item_level_itypes ) %] >- <td> >+ <thead> >+ <tr> >+ <th>Hold</th> >+ [% IF ( item_level_itypes ) %] >+ <th>Item type</th> >+ [% END %] >+ <th>Barcode</th> >+ <th>Home library</th> >+ <th>Last location</th> >+ <th>Call no.</th> >+ <th>Copy number</th> >+ [% IF itemdata_enumchron %] >+ <th>Vol no.</th> >+ [% END %] >+ <th>Information</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH itemloo IN bibitemloo.itemloop %] >+ [% UNLESS ( itemloo.hide ) %] >+ <tr class="[% itemloo.backgroundcolor %]"> >+ <td> >+ [% IF ( itemloo.available ) %] >+ <input type="radio" name="checkitem" value="[% itemloo.itemnumber %]" /> >+ [% ELSIF ( itemloo.override ) %] >+ <input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber %]" /> >+ <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/error.png" alt="Requires override of hold policy" /> >+ [% ELSE %] >+ <input disabled="disabled" type="radio" name="checkitem" value="[% itemloo.itemnumber %]" /> >+ <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" /> >+ [% END %] >+ </td> >+ [% IF ( item_level_itypes ) %] >+ <td> > [% UNLESS ( noItemTypeImages ) %] > [% IF ( itemloo.imageurl ) %]<img src="[% itemloo.imageurl %]" alt="" /> <br /> [% END %] > [% END %] >- [% itemloo.itypename %] >- </td> >- [% END %] >+ [% itemloo.itypename %] >+ </td> >+ [% END %] > >- <td> >- [% itemloo.barcode %] >- </td> >- <td> >- [% itemloo.homebranchname %] >- </td> >- <td> >- [% itemloo.holdingbranchname %] >- </td> >- <td> >- [% itemloo.itemcallnumber %] >- </td> >- <td>[% IF ( itemloo.copynumber ) %][% itemloo.copynumber %][% ELSE %] [% END %]</td> >- [% IF itemdata_enumchron %] >- <td> >- [% itemloo.enumchron %] >- </td> >- [% END %] >- <td> >+ <td> >+ [% itemloo.barcode %] >+ </td> >+ <td> >+ [% itemloo.homebranchname %] >+ </td> >+ <td> >+ [% itemloo.holdingbranchname %] >+ </td> >+ <td> >+ [% itemloo.itemcallnumber %] >+ </td> >+ <td> >+ [% IF ( itemloo.copynumber ) %][% itemloo.copynumber %][% ELSE %] [% END %] >+ </td> >+ [% IF itemdata_enumchron %] >+ <td> >+ [% itemloo.enumchron %] >+ </td> >+ [% END %] >+ <td> > [% IF ( itemloo.onloan ) %] >- <span class="checkedout">Due [% itemloo.date_due %]</span> >- [% ELSE %] >- [% IF ( itemloo.transfertwhen ) %] >- In transit from [% itemloo.transfertfrom %], >- to [% itemloo.transfertto %], since [% itemloo.transfertwhen %] >- [% END %] >+ <span class="checkedout">Due [% itemloo.date_due %]</span> >+ [% ELSE %] >+ [% IF ( itemloo.transfertwhen ) %] >+ In transit from [% itemloo.transfertfrom %], >+ to [% itemloo.transfertto %], since [% itemloo.transfertwhen %] >+ [% END %] > [% END %] > >- [% IF ( itemloo.message ) %] >- Unavailable (lost or missing) >- [% END %] >+ [% IF ( itemloo.message ) %] >+ Unavailable (lost or missing) >+ [% END %] > >- [% IF ( itemloo.notforloan ) %] >- Not for loan ([% itemloo.notforloanvalue %]) >- [% END %] >+ [% IF ( itemloo.notforloan ) %] >+ Not for loan ([% itemloo.notforloanvalue %]) >+ [% END %] > >- [% IF ( itemloo.reservedate ) %] >+ [% IF ( itemloo.reservedate ) %] > [% IF ( itemloo.nocancel ) %] > Can't be cancelled when item is in transit > [% ELSE %] >@@ -515,13 +532,14 @@ function checkMultiHold() { > [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&CancelItemnumber=[% itemloo.itemnumber %]" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a> > > [% END %] >- [% ELSE %] >+ [% ELSE %] > Not on hold >- [% END %] >- </td> >- </tr> >- [% END %] <!--UNLESS item hide--> >- [% END %] <!-- itemloop --> >+ [% END %] >+ </td> >+ </tr> >+ [% END %] <!--UNLESS item hide--> >+ [% END %] <!-- itemloop --> >+ </tbody> > </table> > [% IF ( bibitemloo.hiddencount ) %] > <form> >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 13887
:
37081
|
37345
|
37385
|
37388
|
37411
|
38294
|
38295
|
38309
|
38310
|
38311
|
38312
|
38313
|
38321
|
38322
|
38323
| 38369 |
38370
|
38371
|
38372
|
38373
|
38374