From aaa2b650171a78b49558fa6ec999f2911113dfdf Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@biblibre.com> Date: Wed, 11 Sep 2013 10:01:34 +0200 Subject: [PATCH] Bug 10875: Add order from a staged file should not display inactive funds When adding an order from a staged file, a link "show all funds" is now added on the top of the page. All inactive funds are hidden by default. --- acqui/addorderiso2709.pl | 5 +++ .../prog/en/modules/acqui/addorderiso2709.tt | 40 +++++++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index c3b4b27..c8643b6 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -305,9 +305,14 @@ foreach my $r ( @{$budgets_hierarchy} ) { b_txt => $r->{budget_name}, b_sort1_authcat => $r->{'sort1_authcat'}, b_sort2_authcat => $r->{'sort2_authcat'}, + b_active => $r->{budget_period_active}, b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0, }; } + +@{$budget_loop} = + sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop}; + $template->param( budget_loop => $budget_loop,); my $CGIsort1; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index ec3279f..82803c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -27,6 +27,29 @@ "sPaginationType": "four_button" } ) ); + //keep a copy of all budgets before removing the inactives + disabledBudgetsCopy = $("select[name='all_budget_id']").html(); + $("select[name='all_budget_id'] .b_inactive").remove(); + $("select[name='budget_id'] .b_inactive").remove(); + + $("#showallbudgets").click(function() { + if ($(this).is(":checked")) { + $("select[name='budget_id']").html(disabledBudgetsCopy); //Puts back all the funds + } + else { + $("select[name='budget_id'] .b_inactive").remove(); + } + }); + + $("#all_showallbudgets").click(function() { + if ($(this).is(":checked")) { + $("select[name='all_budget_id']").html(disabledBudgetsCopy); //Puts back all the funds + } + else { + $("select[name='all_budget_id'] .b_inactive").remove(); + } + }); + $("select[name='budget_id']").change(function(){ var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat'); var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat'); @@ -149,6 +172,8 @@ <div id="records_to_import"> <span class="checkall"><a id="checkAll" href="#">Check All</a></span> <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span> + <label for="showallbudgets" style="float:none;width:auto;"> Show all funds:</label> + <input type="checkbox" id="showallbudgets" /> <input type="hidden" name="op" value="import_records"/> <input type="hidden" name="basketno" value="[% basketno %]" /> <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> @@ -201,12 +226,14 @@ <input type="hidden" size="20" name="budget_id" value="[% budget_id %]" />[% Budget_name %] [% ELSE %] <select id="fund_record_[% biblio.import_record_id %]" size="1" name="budget_id"> - <option value=""></option> + <option value="">Select a fund</option> [% FOREACH budget IN budget_loop %] [% IF ( budget.b_id == biblio.budget_id ) %] <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]" selected="selected">[% budget.b_txt %]</option> [% ELSE %] - <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option> + [% IF budget.b_active %]<option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option> + [% ELSE %]<option value="[% budget.b_id %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option> + [% END %] [% END %] [% END %] </select> @@ -284,14 +311,15 @@ <li> <label for="all_budget_id">Fund: </label> <select id="all_budget_id" size="1" name="all_budget_id"> + <option value="">Select a fund</option> [% FOREACH budget_loo IN budget_loop %] - [% IF ( budget_loo.b_sel ) %] - <option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]" selected="selected">[% budget_loo.b_txt %]</option> - [% ELSE %] - <option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option> + [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option> + [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option> [% END %] [% END %] </select> + <label for="all_showallbudgets" style="float:none;width:auto;"> Show all:</label> + <input type="checkbox" id="all_showallbudgets" /> </li> [% END %] </li> -- 1.7.10.4