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

Bug 25892: Clarify the visual hierarchy of holds by branch and itemtype

Browse source 
This patch makes minor changes to the markup of the holds list to make
the page hierarchy clearer when holds are grouped by branch and
itemtype.

Test plan:

 - Enable the  AllowHoldItemTypeSelection system preference.
 - Locate a record in the catalog and place multiple holds:
   - Holds at different branches
   - Holds with different itemtypes selected
 - View the holds page with various values of the HoldsSplitQueue
   preference enabled:
   - nothing
   - pickup library
   - hold itemtype
   - pickup library & itemtype

   In each case verify that the interface works well.

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Signed-off-by: Emmi Takkinen <emmi.takkinen@outlook.com>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Owen Leonard 2020-06-29 14:31:24 +00:00 committed by Jonathan Druart
parent 6a6d0802e8
commit 581bd91319
1 changed files with 87 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

178
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
View file

@ -798,122 +798,118 @@
<input type = "hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% END %]
<fieldset class="rows">
<legend>Existing holds</legend>
<h2>Existing holds</h2>
[% FOREACH biblioloo IN biblioloop %]
[% IF ( biblioloo.reserveloop ) %]
[% IF ( multi_hold ) %]
<h3>
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">
[% biblioloo.title | html %]
</a>
</h3>
[% FOREACH biblioloo IN biblioloop %]
[% IF ( biblioloo.reserveloop ) %]
[% IF ( multi_hold ) %]
<h3>
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">
[% biblioloo.title | html %]
</a>
</h3>
[% END %]
[% IF Koha.Preference('HoldsSplitQueue') == 'branch' %]
[% SET branchcodes = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% branchcodes.push( h.branchcode ) %]
[% END %]
[% branchcodes = branchcodes.unique %]
[% IF Koha.Preference('HoldsSplitQueue') == 'branch' %]
[% SET branchcodes = [] %]
[% FOREACH b IN branchcodes.sort %]
[% SET holds_by_branch = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% branchcodes.push( h.branchcode ) %]
[% IF h.branchcode == b %]
[% holds_by_branch.push( h ) %]
[% END %]
[% END %]
[% branchcodes = branchcodes.unique %]
<fieldset>
<legend>[% Branches.GetName( b ) | html %]</legend>
[% INCLUDE holds_table.inc holds=holds_by_branch %]
</fieldset>
[% END # /FOREACh b %]
[% ELSIF Koha.Preference('HoldsSplitQueue') == 'itemtype' %]
[% SET itemtypes = [] %]
[% FOREACH b IN branchcodes.sort %]
[% FOREACH h IN biblioloo.reserveloop %]
[% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
[% itemtypes.push( hold_itemtype ) %]
[% END %]
[% itemtypes = itemtypes.unique %]
[% FOREACH i IN itemtypes.sort %]
[% SET holds_by_itemtype = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
[% IF hold_itemtype == i %]
[% holds_by_itemtype.push( h ) %]
[% END %]
[% END %]
<fieldset>
[% IF i %]
<legend>[% ItemTypes.GetDescription( i ) | html %]</legend>
[% ELSE %]
<legend>Any item type</legend>
[% END %]
[% INCLUDE holds_table.inc holds=holds_by_itemtype %]
</fieldset>
[% END # /FOREACH i %]
[% ELSIF Koha.Preference('HoldsSplitQueue') == 'branch_itemtype' %]
[% SET branchcodes = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% branchcodes.push( h.branchcode ) %]
[% END %]
[% branchcodes = branchcodes.unique %]
[% FOREACH b IN branchcodes.sort %]
<fieldset>
<legend>[% Branches.GetName( b ) | html %]</legend>
[% SET holds_by_branch = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% IF h.branchcode == b %]
[% holds_by_branch.push( h ) %]
[% END %]
[% END %]
<fieldset>
<legend>[% Branches.GetName( b ) | html %]</legend>
[% INCLUDE holds_table.inc holds=holds_by_branch %]
</fieldset>
[% END # /FOREACh b %]
[% ELSIF Koha.Preference('HoldsSplitQueue') == 'itemtype' %]
[% SET itemtypes = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
[% itemtypes.push( hold_itemtype ) %]
[% END %]
[% itemtypes = itemtypes.unique %]
[% FOREACH i IN itemtypes.sort %]
[% SET holds_by_itemtype = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% SET itemtypes = [] %]
[% FOREACH h IN holds_by_branch %]
[% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
[% IF hold_itemtype == i %]
[% holds_by_itemtype.push( h ) %]
[% END %]
[% itemtypes.push( hold_itemtype ) %]
[% END %]
[% itemtypes = itemtypes.unique %]
<fieldset>
[% FOREACH i IN itemtypes.sort %]
[% IF i %]
<legend>[% ItemTypes.GetDescription( i ) | html %]</legend>
<h3>[% ItemTypes.GetDescription( i ) | html %]</h3>
[% ELSE %]
<legend>Any item type</legend>
[% END %]
[% INCLUDE holds_table.inc holds=holds_by_itemtype %]
</fieldset>
[% END # /FOREACH i %]
[% ELSIF Koha.Preference('HoldsSplitQueue') == 'branch_itemtype' %]
[% SET branchcodes = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% branchcodes.push( h.branchcode ) %]
[% END %]
[% branchcodes = branchcodes.unique %]
[% FOREACH b IN branchcodes.sort %]
<fieldset class="contrast">
<legend>[% Branches.GetName( b ) | html %]</legend>
[% SET holds_by_branch = [] %]
[% FOREACH h IN biblioloo.reserveloop %]
[% IF h.branchcode == b %]
[% holds_by_branch.push( h ) %]
[% END %]
<h3>Any item type</h3>
[% END %]
[% SET itemtypes = [] %]
[% SET holds_by_itemtype = [] %]
[% FOREACH h IN holds_by_branch %]
[% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
[% itemtypes.push( hold_itemtype ) %]
[% IF hold_itemtype == i %]
[% holds_by_itemtype.push( h ) %]
[% END %]
[% END %]
[% itemtypes = itemtypes.unique %]
[% INCLUDE holds_table.inc holds=holds_by_itemtype %]
[% END %]
</fieldset>
[% END # /FOREACH b %]
[% ELSE %]
[% INCLUDE holds_table.inc holds=biblioloo.reserveloop %]
[% END # /IF HoldsSplitQueue %]
[% FOREACH i IN itemtypes.sort %]
<fieldset class="standard">
[% IF i %]
<legend>[% ItemTypes.GetDescription( i ) | html %]</legend>
[% ELSE %]
<legend>Any item type</legend>
[% END %]
[% END # /IF biblioloo.reserveloop %]
[% END # FOREACH biblioloo %]
[% SET holds_by_itemtype = [] %]
[% FOREACH h IN holds_by_branch %]
[% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
[% IF hold_itemtype == i %]
[% holds_by_itemtype.push( h ) %]
[% END %]
[% END %]
[% INCLUDE holds_table.inc holds=holds_by_itemtype %]
</fieldset>
[% END %]
</fieldset>
[% END # /FOREACH b %]
[% ELSE %]
[% INCLUDE holds_table.inc holds=biblioloo.reserveloop %]
[% END # /IF HoldsSplitQueue %]
[% END # /IF biblioloo.reserveloop %]
[% END # FOREACH biblioloo %]
<fieldset class="action">
<input type="submit" name="submit" value="Update hold(s)" />
</fieldset>
</fieldset> <!-- /.rows -->
<fieldset class="action">
<input type="submit" name="submit" value="Update hold(s)" />
</fieldset>
</form> <!-- /name=TTime -->
[% END # IF reserveloop %]
[% END # UNLESS patron %]