Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 35260: Revise structure of the batch checkout page

Browse source 
This patch makes some changes to the style and structure of the batch
checkout page in order to make it more usable.

To test, apply the patch and rebuild the staff interface CSS. Clear
your browser cache if necessary.

- Make sure the BatchCheckouts preference is enabled and that the
  BatchCheckoutsValidCategories has some categories selected.
- Locate a patron and open the batch checkout page.
- Test the process of checking out to the patron both by entering
  barcodes into the textarea and by uploading a file.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit b54da05c73)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Owen Leonard 2023-11-06 17:21:59 +00:00 committed by Fridolin Somers
parent 7011b3bc84
commit 002dfd6131
2 changed files with 65 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
View file

@ -2506,6 +2506,23 @@ td.bundle {
#circ_circulation_issue { #circ_circulation_issue {
position: relative; position: relative;
fieldset {
label {
display: block;
font-size: 105%;
font-weight: bold;
margin-bottom: 1rem;
max-width: 75%;
}
#onsite_checkout-select {
label {
display: inline;
margin: 0;
}
}
}
} }
#renew_as_unseen_label { #renew_as_unseen_label {
@ -3605,14 +3622,6 @@ input.renew {
} }
} }
.onsite_checkout-select {
label,
#circ_circulation_issue & {
font-size: inherit;
font-weight: normal;
}
}
.onsite_checkout { .onsite_checkout {
color: $warning-text-color; color: $warning-text-color;
} }

94
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
View file

@ -50,11 +50,12 @@
<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
[% END %] [% END %]
<main> <main>
<h1>Batch check out</h1> [% IF patron %]
[% INCLUDE 'members-toolbar.inc' %]
[% END %]
<h1>Batch check out</h1>
[% IF patron %]
[% INCLUDE 'members-toolbar.inc' %]
[% END %]
[% IF patron and not batch_allowed %] [% IF patron and not batch_allowed %]
<div class="dialog alert">You are not allowed to use batch checkout for this patron</div> <div class="dialog alert">You are not allowed to use batch checkout for this patron</div>
@ -83,47 +84,44 @@
</div> </div>
[% ELSIF patron and not checkout_infos %] [% ELSIF patron and not checkout_infos %]
<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl"> <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
<fieldset id="circ_circulation_issue"> <div id="circ_circulation_issue">
<label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label> <fieldset>
<fieldset class="rows"> <legend>Checking out to [% INCLUDE 'patron-title.inc' %]</legend>
<legend>Use a file</legend> <ol>
<ol> <li>
<li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li> <label for="barcodelist">Enter barcodes (one barcode per line): </label>
</ol> <textarea rows="10" cols="30" id="barcodelist" name="barcodelist"></textarea>
</fieldset> </li>
<fieldset class="rows"> <li>
<legend>Or list barcodes one by one</legend> <label for="uploadfile">Or use a file: </label>
<ol> <input type="file" id="uploadfile" name="uploadfile" />
<li> </li>
<label for="barcodelist">Barcode list (one barcode per line): </label> </ol>
<textarea rows="10" cols="30" id="barcodelist" name="barcodelist"></textarea> </fieldset>
</li>
</ol> [% IF Koha.Preference('SpecifyDueDate') || Koha.Preference('OnSiteCheckouts') %]
</fieldset> <fieldset>
[% IF Koha.Preference('SpecifyDueDate') || Koha.Preference('OnSiteCheckouts') %] <ol>
<fieldset class="rows"> [% IF Koha.Preference('SpecifyDueDate') %]
<ol> <li>
[% IF Koha.Preference('SpecifyDueDate') %] <label for="duedatespec">Specify due date: [% INCLUDE 'date-format.inc' %]</label>
<legend>Due date</legend> <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" class="flatpickr" data-flatpickr-enable-time="true"/>
<li> </li>
<label for="duedatespec">Hard due date: [% INCLUDE 'date-format.inc' %]</label> [% END %]
<input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" class="flatpickr" data-flatpickr-enable-time="true"/> [% IF Koha.Preference('OnSiteCheckouts') %]
</li> <li class="radio">
[% END %] <div id="onsite_checkout-select">
[% IF Koha.Preference('OnSiteCheckouts') %] <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting"/>
<li> <label for="onsite_checkout">On-site checkout</label>
<div id="onsite_checkout-select"> </div>
<label for="onsite_checkout">On-site checkout:</label> </li>
<input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting"/> [% END %]
</div> </ol>
</li> </fieldset>
[% END %] [% END %]
</ol>
</fieldset>
[% END %]
<input type="hidden" name="op" value="show" /> <input type="hidden" name="op" value="show" />
</fieldset> </div>
<fieldset class="action"> <fieldset class="action">
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /> <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
@ -135,11 +133,12 @@
[% ELSIF patron %] [% ELSIF patron %]
[% IF confirmation_needed && CAN_user_circulate_force_checkout %] [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
<h3>Batch checkout confirmation [% IF patron %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3> <h3>Batch checkout confirmation</h3>
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off"> <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
[% ELSE %] [% ELSE %]
<h3>Batch checkout information [% IF patron.borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] |[% batch | html %]|[% END %]</h3> <h3>Batch checkout results</h3>
[% END %] [% END %]
<div class="page-section">
<table id="checkout_infos"> <table id="checkout_infos">
<thead> <thead>
<tr> <tr>
@ -308,13 +307,16 @@
[% END %] [% END %]
[% IF checkout_info.issue.date_due %] [% IF checkout_info.issue.date_due %]
<li>Due on [% checkout_info.issue.date_due | $KohaDates as_due_date => 1 %]</li> <ul>
<li>Due on [% checkout_info.issue.date_due | $KohaDates as_due_date => 1 %]</li>
</ul>
[% END %] [% END %]
</td> </td>
</tr> </tr>
[% END %] [% END %]
</tbody> </tbody>
</table> </table>
</div>
[% IF confirmation_needed && CAN_user_circulate_force_checkout %] [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
<fieldset> <fieldset>