From 5b36f42c3baec41b6b8617fd170b3eec4b690e4f Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Thu, 17 Nov 2022 18:50:07 +0000 Subject: [PATCH] Bug 32198: Add page-section to stock rotation stages list (cat) This patch adds a .page-section container around relevant areas of the stock rotation management interface. Also changed: Removed a .dialog.message container which was not correct. To test, apply the patch and go to Cataloging -> Stock rotation. - If necessary, add a rota. - Click Manage -> Stages on your rota. - If neccesary, create one or more stages. - The display of stages should look correct. - From the list of rotas click Manage -> Items. - Click "Add items" and use a barcode file to add multiple items at once. - The page confirming your submission, with a list of items, should have a page-section. - Return to the view of items in the rota. The display of items should look correct. --- .../prog/en/modules/tools/stockrotation.tt | 141 +++++++++--------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt index 53433428a2..1db4229438 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt @@ -273,7 +273,7 @@ </div> <!-- /#addStageModal --> [% IF existing_stages.size > 0 %] - <div id="manage_stages"> + <div id="manage_stages" class="page-section"> <div id="manage_stages_help"> Stages can be re-ordered by using the <i class="drag_handle fa fa-lg fa-bars"></i>handle to drag and drop them to their new position </div> @@ -442,76 +442,78 @@ </div> <!-- /#addItemsModal --> [% IF sritems.count > 0 %] - <table id="stock_rotation_manage_items" class="items_table" role="grid"> - <thead> - <tr> - <th>Barcode</th> - <th>Title</th> - <th>Author</th> - <th>Call number</th> - <th class="NoSearch">In transit</th> - <th class="NoSort noExport">Stages & duration in days<br>(current stage highlighted)</th> - <th class="NoSort noExport"> </th> - </tr> - </thead> - <tbody> - [% FOREACH sritem IN sritems %] + <div class="page-section"> + <table id="stock_rotation_manage_items" class="items_table" role="grid"> + <thead> <tr> - <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% sritem.id | uri %]&biblionumber=[% sritem.item.biblio.id | uri %]#item[% sritem.id | uri %]">[% sritem.item.barcode | html %]</a></td> - <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% sritem.item.biblio.id | uri %]">[% sritem.item.biblio.title | html %]</a></td> - <td>[% sritem.item.biblio.author | html %]</td> - <td>[% sritem.item.itemcallnumber | html %]</td> - <td>[% sritem.item.get_transfer ? 'Yes' : 'No' | html %]</td> - <td> - [% FOREACH this_stage IN stages %] - [% IF this_stage.stage_id == sritem.stage.stage_id %] - <span class="stage highlight_stage"> + <th>Barcode</th> + <th>Title</th> + <th>Author</th> + <th>Call number</th> + <th class="NoSearch">In transit</th> + <th class="NoSort noExport">Stages & duration in days<br>(current stage highlighted)</th> + <th class="NoSort noExport"> </th> + </tr> + </thead> + <tbody> + [% FOREACH sritem IN sritems %] + <tr> + <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% sritem.id | uri %]&biblionumber=[% sritem.item.biblio.id | uri %]#item[% sritem.id | uri %]">[% sritem.item.barcode | html %]</a></td> + <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% sritem.item.biblio.id | uri %]">[% sritem.item.biblio.title | html %]</a></td> + <td>[% sritem.item.biblio.author | html %]</td> + <td>[% sritem.item.itemcallnumber | html %]</td> + <td>[% sritem.item.get_transfer ? 'Yes' : 'No' | html %]</td> + <td> + [% FOREACH this_stage IN stages %] + [% IF this_stage.stage_id == sritem.stage.stage_id %] + <span class="stage highlight_stage"> + [% ELSE %] + <span class="stage"> + [% END %] + [% Branches.GetName(this_stage.branchcode_id) | html %] ([% this_stage.duration | html %]) + </span> + » + [% END %] + [% IF stages.size > 0 %] + <span class="stage">[% rota.cyclical ? 'START' : 'END' | html %]</span> + [% END %] + </td> + <td class="actions"> + [% in_transit = sritem.item.get_transfer %] + [% IF !in_transit && stages.size > 1 %] + <a class="btn btn-default btn-xs" href="?op=move_to_next_stage&rota_id=[% rota.id | uri %]&item_id=[% sritem.id | uri %]&stage_id=[% sritem.stage.stage_id | uri %]"> [% ELSE %] - <span class="stage"> + <a class="btn btn-default btn-xs" disabled> [% END %] - [% Branches.GetName(this_stage.branchcode_id) | html %] ([% this_stage.duration | html %]) - </span> - » - [% END %] - [% IF stages.size > 0 %] - <span class="stage">[% rota.cyclical ? 'START' : 'END' | html %]</span> - [% END %] - </td> - <td class="actions"> - [% in_transit = sritem.item.get_transfer %] - [% IF !in_transit && stages.size > 1 %] - <a class="btn btn-default btn-xs" href="?op=move_to_next_stage&rota_id=[% rota.id | uri %]&item_id=[% sritem.id | uri %]&stage_id=[% sritem.stage.stage_id | uri %]"> - [% ELSE %] - <a class="btn btn-default btn-xs" disabled> - [% END %] - <i class="fa fa-arrow-right"></i> - Move to next stage - </a> - [% IF !in_transit %] - <a class="btn btn-default btn-xs" href="?op=toggle_in_demand&stage_id=[% sritem.stage.stage_id | uri %]&item_id=[% sritem.id | uri %]&rota_id=[% rota.id | uri %]"> - [% ELSE %] - <a class="btn btn-default btn-xs" disabled> - [% END %] - <i class="fa fa-fire"></i> - [% IF sritem.indemand %] - <span>Remove "In demand"</span> + <i class="fa fa-arrow-right"></i> + Move to next stage + </a> + [% IF !in_transit %] + <a class="btn btn-default btn-xs" href="?op=toggle_in_demand&stage_id=[% sritem.stage.stage_id | uri %]&item_id=[% sritem.id | uri %]&rota_id=[% rota.id | uri %]"> [% ELSE %] - <span>Add "In demand"</span> + <a class="btn btn-default btn-xs" disabled> [% END %] - </a> - [% IF !in_transit %] - <a class="btn btn-default btn-xs" href="?op=confirm_remove_from_rota&stage_id=[% sritem.stage.stage_id | uri %]&item_id=[% sritem.id | uri %]&rota_id=[% rota.id | uri %]"> - [% ELSE %] - <a class="btn btn-default btn-xs" disabled> - [% END %] - <i class="fa fa-trash"></i> - Remove from rota - </a> - </td> - </tr> - [% END %] - </tbody> - </table> + <i class="fa fa-fire"></i> + [% IF sritem.indemand %] + <span>Remove "In demand"</span> + [% ELSE %] + <span>Add "In demand"</span> + [% END %] + </a> + [% IF !in_transit %] + <a class="btn btn-default btn-xs" href="?op=confirm_remove_from_rota&stage_id=[% sritem.stage.stage_id | uri %]&item_id=[% sritem.id | uri %]&rota_id=[% rota.id | uri %]"> + [% ELSE %] + <a class="btn btn-default btn-xs" disabled> + [% END %] + <i class="fa fa-trash"></i> + Remove from rota + </a> + </td> + </tr> + [% END %] + </tbody> + </table> + </div> <!-- /.page-section --> [% ELSE %] <div class="dialog message"> @@ -525,11 +527,9 @@ [% ELSIF op == 'add_items_to_rota' %] - <div class="dialog message"> - <h1>Add items to rota report</h1> - </div> + <h1>Add items to rota report</h1> - <div> + <div class="page-section"> [% IF barcode_status.ok.size > 0 %] <h4>Items added to rota:</h4> <ul> @@ -563,6 +563,7 @@ </ul> [% END %] </div> + [% IF barcode_status.on_other.size > 0 %] <form id="add_rota_item_form" method="post" enctype="multipart/form-data"> <fieldset> -- 2.20.1