From 3acc55c5288b0bd7375a7b97a67f5037ca79b78d Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@biblibre.com> Date: Wed, 2 Oct 2013 09:58:14 +0200 Subject: [PATCH] Bug 5336: Multiple QA fixes - add a message if the search returns no result - keep selected values if the search returns no result (for fund and order status) - remove plurals in order status - move the order status column in the search results table --- acqui/histsearch.pl | 3 + .../prog/en/modules/acqui/histsearch.tt | 67 ++++++++++++++------ 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl index e9e4009..4e152e9 100755 --- a/acqui/histsearch.pl +++ b/acqui/histsearch.pl @@ -149,7 +149,10 @@ $template->param( basketgroupname => $basketgroupname, from_placed_on => $from_date, to_placed_on => $to_date, + orderstatus => $orderstatus, + budget_id => $budget, bp_loop => $bp_loop, + search_done => $do_search, debug => $debug || $input->param('debug') || 0, uc(C4::Context->preference("marcflavour")) => 1 ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index fe6623b..54d19d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -51,12 +51,36 @@ <li> <label for="orderstatus">Order status: </label> <select name="orderstatus" id="orderstatus"> - <option value=""></option> - <option value="new">New orders</option> - <option value="ordered">Pending orders</option> - <option value="partial">Partially received orders</option> - <option value="complete">Received orders</option> - <option value="cancelled">Cancelled orders</option> + [% IF orderstatus == "" %] + <option value=""></option> + [% ELSE %] + <option value="" selected="selected"></option> + [% END %] + [% IF orderstatus == "new" %] + <option value="new" selected="selected">New</option> + [% ELSE %] + <option value="new">New</option> + [% END %] + [% IF orderstatus == "ordered" %] + <option value="ordered" selected="selected">Pending</option> + [% ELSE %] + <option value="ordered">Pending</option> + [% END %] + [% IF orderstatus == "partial" %] + <option value="partial" selected="selected">Partially received</option> + [% ELSE %] + <option value="partial">Partially received</option> + [% END %] + [% IF orderstatus == "complete" %] + <option value="complete" selected="selected">Received</option> + [% ELSE %] + <option value="complete">Received</option> + [% END %] + [% IF orderstatus == "cancelled" %] + <option value="cancelled" selected="selected">Cancelled</option> + [% ELSE %] + <option value="cancelled">Cancelled</option> + [% END %] </select> </li> <li> @@ -66,7 +90,11 @@ [% FOREACH bp_loo IN bp_loop %] <optgroup label="[% bp_loo.budget_period_description %]"> [% FOREACH h_loo IN bp_loo.hierarchy %] + [% IF h_loo.budget_id == budget_id %] + <option type="text" value="[% h_loo.budget_id %]" branchcode="[% h_loo.budget_branchcode %]" selected="selected"> + [% ELSE %] <option type="text" value="[% h_loo.budget_id %]" branchcode="[% h_loo.budget_branchcode %]"> + [% END %] [% h_loo.budget_display_name %] </option> [% END %] @@ -94,6 +122,7 @@ <thead> <tr> <th>Order line (parent)</th> + <th>Status</th> <th>Basket</th> <th>Basket group</th> <th>Invoice number</th> @@ -101,7 +130,6 @@ <th>Vendor</th> <th>Placed on</th> <th>Received on</th> - <th>Status</th> <th>Quantity received</th> <th>Pending order</th> <th>Unit cost</th> @@ -115,6 +143,15 @@ [% order.ordernumber %] [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %] </td> + <td> + [% SWITCH order.orderstatus %] + [% CASE 'new' %]New + [% CASE 'ordered' %]Pending + [% CASE 'partial' %]Partially received + [% CASE 'complete' %]Received + [% CASE 'cancelled' %]Cancelled + [% END %] + </td> <td>[% order.basketname %] (<a href="basket.pl?basketno=[% order.basketno %]">[% order.basketno %]</a>)</td> <td> [% IF ( order.basketgroupid ) %] @@ -140,15 +177,6 @@ [% order.datereceived | $KohaDates %] [% END %] </td> - <td> - [% SWITCH order.orderstatus %] - [% CASE 'new' %]New orders - [% CASE 'ordered' %]Pending orders - [% CASE 'partial' %]Partially received orders - [% CASE 'complete' %]Received orders - [% CASE 'cancelled' %]Cancelled orders - [% END %] - </td> <td>[% order.quantityreceived %]</td> <td>[% order.quantity %]</td> <td>[% order.ecost %]</td> @@ -156,8 +184,11 @@ </tr> [% END %] </tbody> - </table> - </div>[% ELSE %][% END %] + </table> + </div> + [% ELSIF search_done %] + There is no order for this search. + [% END %] </div> </div> -- 1.7.10.4