From 1e62fea429c10f9730b87c1478665cc3cf2c633d Mon Sep 17 00:00:00 2001 From: Owen Leonard 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. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../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 @@ [% IF existing_stages.size > 0 %] -
+
Stages can be re-ordered by using the handle to drag and drop them to their new position
@@ -442,76 +442,78 @@
[% IF sritems.count > 0 %] - - - - - - - - - - - - - - [% FOREACH sritem IN sritems %] +
+
BarcodeTitleAuthorCall numberIn transitStages & duration in days
(current stage highlighted)
 
+ - - - - - - + + + + + + + + + + [% FOREACH sritem IN sritems %] + + + + + + + + - - - [% END %] - -
[% sritem.item.barcode | html %][% sritem.item.biblio.title | html %][% sritem.item.biblio.author | html %][% sritem.item.itemcallnumber | html %][% sritem.item.get_transfer ? 'Yes' : 'No' | html %] - [% FOREACH this_stage IN stages %] - [% IF this_stage.stage_id == sritem.stage.stage_id %] - + BarcodeTitleAuthorCall numberIn transitStages & duration in days
(current stage highlighted)
 
[% sritem.item.barcode | html %][% sritem.item.biblio.title | html %][% sritem.item.biblio.author | html %][% sritem.item.itemcallnumber | html %][% sritem.item.get_transfer ? 'Yes' : 'No' | html %] + [% FOREACH this_stage IN stages %] + [% IF this_stage.stage_id == sritem.stage.stage_id %] + + [% ELSE %] + + [% END %] + [% Branches.GetName(this_stage.branchcode_id) | html %] ([% this_stage.duration | html %]) + + » + [% END %] + [% IF stages.size > 0 %] + [% rota.cyclical ? 'START' : 'END' | html %] + [% END %] + + [% in_transit = sritem.item.get_transfer %] + [% IF !in_transit && stages.size > 1 %] + [% ELSE %] - + [% END %] - [% Branches.GetName(this_stage.branchcode_id) | html %] ([% this_stage.duration | html %]) - - » - [% END %] - [% IF stages.size > 0 %] - [% rota.cyclical ? 'START' : 'END' | html %] - [% END %] - - [% in_transit = sritem.item.get_transfer %] - [% IF !in_transit && stages.size > 1 %] - - [% ELSE %] - - [% END %] - - Move to next stage - - [% IF !in_transit %] - - [% ELSE %] - - [% END %] - - [% IF sritem.indemand %] - Remove "In demand" + + Move to next stage + + [% IF !in_transit %] + [% ELSE %] - Add "In demand" + [% END %] - - [% IF !in_transit %] - - [% ELSE %] - - [% END %] - - Remove from rota - -
+ + [% IF sritem.indemand %] + Remove "In demand" + [% ELSE %] + Add "In demand" + [% END %] + + [% IF !in_transit %] + + [% ELSE %] + + [% END %] + + Remove from rota + + + + [% END %] + + +
[% ELSE %]
@@ -525,11 +527,9 @@ [% ELSIF op == 'add_items_to_rota' %] -
-

Add items to rota report

-
+

Add items to rota report

-
+
[% IF barcode_status.ok.size > 0 %]

Items added to rota:

    @@ -563,6 +563,7 @@
[% END %]
+ [% IF barcode_status.on_other.size > 0 %]
-- 2.39.5