Bugzilla – Attachment 10196 Details for
Bug 8098
DataTables in Acquisision module: parcel.tt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug : DataTables integration in acquisition module [1]
SIGNED-OFF-Bug--DataTables-integration-in-acquisit.patch (text/plain), 5.68 KB, created by
Katrin Fischer
on 2012-06-11 12:49:23 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug : DataTables integration in acquisition module [1]
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2012-06-11 12:49:23 UTC
Size:
5.68 KB
patch
obsolete
>From 943542936f552c9c065e77a1b380bf65fed7393a Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Thu, 7 Jun 2012 12:45:05 +0200 >Subject: [PATCH] [SIGNED-OFF] Bug : DataTables integration in acquisition > module [1] > >parcel.tt > >http://bugs.koha-community.org/show_bug.cgi?id=8098 >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Fixed bug number. >--- > koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 16 ++++++ > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 60 +++++++++++++------- > 2 files changed, 55 insertions(+), 21 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >index e0cc888..d435535 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js >@@ -382,3 +382,19 @@ $.fn.dataTableExt.oPagination.four_button = { > } > } > }; >+ >+$.fn.dataTableExt.oSort['num-html-asc'] = function(a,b) { >+ var x = a.replace( /<.*?>/g, "" ); >+ var y = b.replace( /<.*?>/g, "" ); >+ x = parseFloat( x ); >+ y = parseFloat( y ); >+ return ((x < y) ? -1 : ((x > y) ? 1 : 0)); >+}; >+ >+$.fn.dataTableExt.oSort['num-html-desc'] = function(a,b) { >+ var x = a.replace( /<.*?>/g, "" ); >+ var y = b.replace( /<.*?>/g, "" ); >+ x = parseFloat( x ); >+ y = parseFloat( y ); >+ return ((x < y) ? 1 : ((x > y) ? -1 : 0)); >+}; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index c3b169d..7b0f7ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -1,26 +1,52 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( date ) %] > Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title> >+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] >+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+[% INCLUDE 'datatables-strings.inc' %] >+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> > [% INCLUDE 'greybox.inc' %] > <script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script> >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > > var rowsToCollapse = 5; > >- $.tablesorter.addParser({ >- id: 'articles', >- is: function(s) {return false; }, >- format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); }, >- type: 'text' >- }); >- > $(document).ready(function(){ >- $("#pendingt").tablesorter({ >- headers: { 2: { sorter: 'articles' },3: { sorter: false },7:{sorter:false}} >- }); >+ var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, { >+ "aoColumnDefs": [ >+ { "aTargets": [ 3, 7, 8 ], "bSortable": false, "bSearchable": false }, >+ ], >+ "aoColumns": [ >+ { "sType": "num-html" }, >+ { "sType": "num-html" }, >+ null, >+ null, >+ null, >+ null, >+ null, >+ null, >+ null, >+ ], >+ "sPaginationType": "four_button" >+ } ) ); >+ var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, { >+ "aoColumnDefs": [ >+ { "aTargets": [ 3 ], "bSortable": false, "bSearchable": false }, >+ ], >+ "aoColumns": [ >+ { "sType": "num-html" }, >+ { "sType": "num-html" }, >+ null, >+ null, >+ null, >+ null, >+ null, >+ null, >+ ], >+ "sPaginationType": "four_button" >+ } ) ); > > rowCountPending = $("#pendingt tbody.filterclass tr").length; > rowCountReceived = $("#receivedt tbody.filterclass tr").length; >@@ -230,11 +256,7 @@ > </tfoot> > <tbody class="filterclass"> > [% FOREACH loop_order IN loop_orders %] >- [% UNLESS ( loop.odd ) %] >- <tr class="highlight"> >- [% ELSE %] > <tr> >- [% END %] > <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td> > <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td> > <td class="summaryfilterclass"> >@@ -324,8 +346,8 @@ > <th>Actual cost</th> > <th>TOTAL</th> > </tr> >- </thead> >-<tfoot> >+ </thead> >+ <tfoot> > <tr> > <td colspan="4" class="total">SUBTOTAL</td> > <td colspan="2"> </td> >@@ -362,11 +384,7 @@ > </tfoot> > <tbody class="filterclass"> > [% FOREACH loop_receive IN loop_received %] >- [% UNLESS ( loop.odd ) %] >- <tr class="highlight"> >- [% ELSE %] > <tr> >- [% END %] > <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td> > <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a> >-- >1.7.9.5
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 8098
:
9604
|
9969
| 10196