Bugzilla – Attachment 144387 Details for
Bug 32382
Fund input misaligned on invoice summary page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32382: Fix alignment on invoice summary page
Bug-32382-Fix-alignment-on-invoice-summary-page.patch (text/plain), 7.32 KB, created by
Lucas Gass (lukeg)
on 2022-12-02 00:26:12 UTC
(
hide
)
Description:
Bug 32382: Fix alignment on invoice summary page
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2022-12-02 00:26:12 UTC
Size:
7.32 KB
patch
obsolete
>From 6fea2d85dabb55259dc95c658483343e36fdc0ba Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Fri, 2 Dec 2022 00:18:59 +0000 >Subject: [PATCH] Bug 32382: Fix alignment on invoice summary page > >To test: > >1. Apply patch >2. Have some funds from budgets that are both active and inactive >3. Receive a basket and click 'Finish receiving' to get to the invoice page >4. Look at the Fund/Show inactive line and make sure it is aligned right >5. With some inactive funds click 'Show inactive' and make sure they appear in this dropdown >6. Click 'Add an adjustment'. Make sure the Fund/Show inactive line looks correct there as well/ >7. Make an adjustment and click 'Update adjustments' make sure the line also looks right in the table that appears. >8. Inside that table make sure you can click the 'Show inactive' checkbox and the inactive budgets appears. > >Note: Some of the HTML was ouside of the HTML body, so I moved it into the HTML body so it will be valid. >--- > .../prog/en/modules/acqui/invoice.tt | 90 +++++++++---------- > 1 file changed, 44 insertions(+), 46 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 534f07d4f26..62f2af7e2a4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -7,57 +7,14 @@ > [% USE AuthorisedValues %] > [% Asset.css("css/humanmsg.css") | $raw %] > >-<span style="display:none;" id="all_fund_dropdown"> >- [% FOREACH budget IN budgets %] >- [% IF ( budget.b_active ) %] >- <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]">[% budget.b_txt | html %]</option> >- [% ELSE %] >- <option value="[% budget.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat |html %]">[% budget.b_txt | html %] (inactive)</option> >- [% END %] >- [% END %] >-</span> > [% BLOCK fund_dropdown %] >- <span> > <label for="[% form_name | html %]">Fund: </label> > <select id="[% form_id | html %]" name="[% form_name | html %]" class="fund_dropdown" data-selected="[% selected | html %]"> > </select> >- <label for="showallfunds" style="float:none;width:auto;"> Show inactive:</label> >+ <label for="showallfunds"> Show inactive:</label> > <input type="checkbox" class="showallfunds" /> >- </span> > [% END %] > >-<div id="updateFund" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="updateReceivedFund" aria-hidden="true"> >- <div class="modal-dialog"> >- <div class="modal-content"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h3 id="updateReceivedFund">Update received fund</h3> >- </div> >- <div class="modal-body"> >- <p>Updating the fund may change available statistics for the order, please check values before submitting.</p> >- <fieldset class="rows"> >- <ol> >- <li>[% PROCESS fund_dropdown form_id => 'modify_budget_id' form_name => 'modify_budget_id' selected => "" %]</li> >- <li> >- <label for="sort1">Statistic 1: </label> >- <input type="text" name="sort1" /> >- </li> >- <li> >- <label for="sort2">Statistic 2: </label> >- <input type="text" name="sort2" /> >- </li> >- </ol> >- </fieldset> >- <a id="update_fund" class="btn btn-default">Update fund</a> >- </div> >- <div class="modal-footer"> >- <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >- </div> >- </div> >- </div> >-</div> >- >- > [% INCLUDE 'doc-head-open.inc' %] > <title>Invoice › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -206,7 +163,7 @@ > <th>Note</th> > <th>Fund</th> > <th>Encumber while invoice open</th> >- [% UNLESS readonly %]<th> </th>[% END %] >+ [% UNLESS readonly %]<th> </th>[% END %] > </tr> > [% total_adj = 0 %] > [% FOREACH adjustment IN adjustments %] >@@ -486,6 +443,47 @@ > </aside> > </div> <!-- /.row --> > >+<div id="updateFund" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="updateReceivedFund" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >+ <h3 id="updateReceivedFund">Update received fund</h3> >+ </div> >+ <div class="modal-body"> >+ <p>Updating the fund may change available statistics for the order, please check values before submitting.</p> >+ <fieldset class="rows"> >+ <ol> >+ <li>[% PROCESS fund_dropdown form_id => 'modify_budget_id' form_name => 'modify_budget_id' selected => "" %]</li> >+ <li> >+ <label for="sort1">Statistic 1: </label> >+ <input type="text" name="sort1" /> >+ </li> >+ <li> >+ <label for="sort2">Statistic 2: </label> >+ <input type="text" name="sort2" /> >+ </li> >+ </ol> >+ </fieldset> >+ <a id="update_fund" class="btn btn-default">Update fund</a> >+ </div> >+ <div class="modal-footer"> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> >+ </div> >+</div> >+ >+<span style="display:none;" id="all_fund_dropdown"> >+ [% FOREACH budget IN budgets %] >+ [% IF ( budget.b_active ) %] >+ <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]">[% budget.b_txt | html %]</option> >+ [% ELSE %] >+ <option value="[% budget.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat |html %]">[% budget.b_txt | html %] (inactive)</option> >+ [% END %] >+ [% END %] >+</span> >+ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] >@@ -552,7 +550,7 @@ > $('.b_inactive').remove(); > > $('.showallfunds').click(function() { >- var the_dropdown = $(this).parent('span').find('.fund_dropdown'); >+ var the_dropdown = $(this).siblings('.fund_dropdown'); > var selected = the_dropdown.val(); > if ($(this).is(":checked")) { > the_dropdown.html(disabledBudgetsCopy).val(selected); >-- >2.30.2
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 32382
:
144387
|
144727
|
144853
|
144854
|
145835
|
145836