Attachment 21507 Details for Bug 10725 – [PASSED QA] Bug 10725: Add filters on the pending orders table

[patch] [PASSED QA] Bug 10725: Add filters on the pending orders table

PASSED-QA-Bug-10725-Add-filters-on-the-pending-ord.patch (text/plain), 5.55 KB, created by Katrin Fischer on 2013-09-27 06:32:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2013-09-27 06:32:28 UTC

Size: 5.55 KB

patch

obsolete

>From 38c8925c4e99a4046e1a4b791962eccd75ab1a17 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Thu, 25 Apr 2013 16:57:07 +0200
>Subject: [PATCH] [PASSED QA] Bug 10725: Add filters on the pending orders
> table
>
>Since the parcel.pl script get *all* pending orders, there is no reason
>not to display all of them.
>
>Like that, DataTable manages pagination and sorting correctly (on all
>data).
>This patch adds filters on the table header (using columnFilter).
>
>Test plan:
>Try filters on the left of the screen and filters on the table header.
>
>Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Passes all tests and QA script.
>Searching and sorting the table works correctly.
>Larger result sets are a performance problem on this page,
>I have filed bug 10595 for that.
>---
> acqui/parcel.pl                                    |    2 +-
> .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   59 +++++++++++++++-----
> 2 files changed, 46 insertions(+), 15 deletions(-)
>
>diff --git a/acqui/parcel.pl b/acqui/parcel.pl
>index 028e957..4a43c38 100755
>--- a/acqui/parcel.pl
>+++ b/acqui/parcel.pl
>@@ -201,7 +201,7 @@ for my $item ( @parcelitems ) {
> push @book_foot_loop, map { $_ } values %foot;
> 
> my @loop_orders = ();
>-if(!defined $invoice->{closedate}) {
>+unless( defined $invoice->{closedate} ) {
>     my $pendingorders;
>     if($input->param('op') eq "search"){
>         my $search   = $input->param('summaryfilter') || '';
>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 250cc96..fef72dc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -4,6 +4,7 @@
> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
> [% INCLUDE 'doc-head-close.inc' %]
> [% INCLUDE 'datatables.inc' %]
>+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
> [% INCLUDE 'greybox.inc' %]
> <script type="text/javascript">
> //<![CDATA[
>@@ -15,7 +16,7 @@
>         var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, {
>             "bStateSave": true,
>             "iCookieDuration": 60*60*24*1000, // 1000 days
>-            "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
>+            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
>             "aoColumnDefs": [
>                 { "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
>             ],
>@@ -31,14 +32,31 @@
>                 null,
>                 null,
>             ],
>+            'bAutoWidth': false,
>             "sPaginationType": "four_button"
>-        } ) );
>+        } )
>+        ).columnFilter({
>+            sPlaceHolder: "head:after",
>+            aoColumns: [
>+                { type: "text" },
>+                { type: "text" },
>+                { type: "text" },
>+                null,
>+                { type: "text" },
>+                { type: "text" },
>+                { type: "text" },
>+                { type: "text" },
>+                null,
>+                null
>+            ]
>+        });
>       }
>+
>       if ( $("#receivedt").length ) {
>         var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
>             "bStateSave": true,
>             "iCookieDuration": 60*60*24*1000, // 1000 days
>-            "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
>+            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
>             "aoColumnDefs": [
>                 { "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },
>             ],
>@@ -175,12 +193,25 @@
> <p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
> </div>
> [% UNLESS (invoiceclosedate) %]
>-<div id="acqui_receive_search">
>+  <div id="acqui_receive_search">
>     <h3>Pending orders</h3>
> 
>- [% IF ( loop_orders ) %]<table id="pendingt">
>-    <thead>
>-        <tr>
>+    [% IF ( loop_orders ) %]
>+      <table id="pendingt">
>+        <thead>
>+          <tr>
>+            <th>Basket search</th>
>+            <th>Order line search</th>
>+            <th>Summary search</th>
>+            <th>&nbsp;</th>
>+            <th>Quantity search</th>
>+            <th>Unit cost search</th>
>+            <th>Order cost search</th>
>+            <th>Fund search</th>
>+            <th>&nbsp;</th>
>+            <th>&nbsp;</th>
>+          </tr>
>+          <tr>
>             <th>Basket</th>
>             <th>Order line</th>
>             <th>Summary</th>
>@@ -191,9 +222,9 @@
>             <th>Fund</th>
>             <th>&nbsp;</th>
>             <th>&nbsp;</th>
>-        </tr>
>-    </thead>
>-    <tbody class="filterclass">
>+          </tr>
>+        </thead>
>+        <tbody class="filterclass">
>         [% FOREACH loop_order IN loop_orders %]
>             <tr>
>                 <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
>@@ -250,11 +281,11 @@
>                         [% END %]
>                     </td>
>                 </tr>
>-            [% END %]
>+        [% END %]
>         </tbody>
>-        </table>
>-        [% ELSE %]There are no pending orders.[% END %]
>-    </div>
>+      </table>
>+    [% ELSE %]There are no pending orders.[% END %]
>+  </div>
> [% ELSE %]
>     <p>
>         Invoice is closed, so you can't receive orders anymore.
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 10725: 20327 | 21350 | 21507