From 122fa4c82af978b3d074ae4bafb2b0f49a3e4592 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 5 Apr 2017 15:12:31 +0200 Subject: [PATCH] Bug 14399: Interface changes A part of the confusion around the inventory script may arise from the fact that the form offers several options that are only used under certain conditions. This patch hopefully rearranges a few options more logically and only offers options when appropriate. The barcode fieldset now also contains Compare barcodes and Do not check in checkboxes. These are meaningful when a barcode file is uploaded. The fieldset Item location filters (new name) contains fields that are always used. Same for tne only control left under Additional options, Export to CSV. The fieldset Optional filters depends on the status of the barcode file and the Compare checkbox. It is now shown or hidden depending on what you select: if you do not upload a file, it is shown; or if you upload a file and check Compare, it is shown. Otherwise we hide it, since the script will not look at these values. Under this fieldset last inventory date and Skip items on loan are added, since their behavior is the same as the various item statuses. Test plan: In this test plan we test both the script changes from the previous patch and the interface changes here. We follow the three main scenario's as mentioned in the previous patch. [1] First we prepare a few test items. Pick two biblios A, B and create five items say A1,A2,B1,B2,B3. Pick a not-existing callnumber range you want to test and move these five items there. Add barcodes too (say A1..B3). Edit one item A1 to a not-existing notforloan status (doing this on the mysql command line is fastest). Like: update items set notforloan = '9' where barcode='A1'; Now simulate that we did not add/edit these items today: update items set datelastseen='2017-01-01' where barcode in ('A1','A2','B1','B2','B3'); Note: We need this when comparing with last inventory date in the last scenario. Scenario 1 (no barcodes uploaded) [2] Enter the callnumber range on inventory form. Verify that "Set inventory date", Compare barcodes and "Do not check in" are disabled on the form. Check that you see the Optional filters box. Submit the form. Verify that you see all five items. Do the same. Check Export to CSV. Check result file contents. Scenario 2 (upload barcodes, do not compare) [3] Create a barcode file with the barcodes of A1, A2 and B1. Add another existing barcode outside the test callnumber range. After uploading this file, verify that "Set inventory date", Compare and "Do not check in" are enabled. The Optional filters should be hidden. Leave "Set inventory date" to today. Enter the callnumber range again. Submit the form. What do we expect? Four items should have been updated (alert). We should see barcode A1 with problem Unknown status. We should see also the barcode from the other range (Found in wrong place). Repeat this step with the same file. But now export to CSV. Verify that you see two barcodes with problems again in the csv file. Scenario 3 (upload barcodes, compare) [4] Create another barcode file with barcodes of B2 and one existing barcode outside the test callnumber range. After uploading this file, check the Compare checkbox. Verify now that the Optional filters box is displayed again. Leave "Set inventory date" to today. Enter the callnumber range again. Also set "Last inventory date" to today (important!). Submit the form. What do we expect now? Two items should be updated (see alert). We should see barcode B3 with problem Missing. We should also see the barcode from the other range (wrong place). Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall (cherry picked from commit 35b73aa3c6fb163f1389d30f0c175bec19696698) Signed-off-by: Katrin Fischer --- .../prog/en/modules/tools/inventory.tt | 80 +++++++++++++------ 1 file changed, 55 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt index a3bda5c659..642623eeef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -89,6 +89,35 @@ $(document).ready(function(){ $("#inventory_form").on("submit",function(){ return checkForm(); }); + + // #uploadbarcodes and #compareinv2barcd determine the behavior of + // the controls within the barcode fieldset and the optional filters + $("#uploadbarcodes").change(function() { + if( $("#uploadbarcodes").val() ) { + $("#setdate").prop('disabled',false); + $("#compareinv2barcd").prop('disabled',false); + $("#dont_checkin").prop('disabled',false); + if( $("#compareinv2barcd").attr('checked') ) { + $("fieldset#optionalfilters").show(); + } else { + $("fieldset#optionalfilters").hide(); + } + } else { + $("#setdate").prop('disabled',true); + $("#compareinv2barcd").prop('disabled',true); + $("#compareinv2barcd").attr('checked',false); + $("#dont_checkin").prop('disabled',true); + $("#dont_checkin").attr('checked',false); + $("fieldset#optionalfilters").show(); + } + }); + $("#compareinv2barcd").click(function() { + if( $("#compareinv2barcd").attr('checked') ) { + $("fieldset#optionalfilters").show(); + } else { + $("fieldset#optionalfilters").hide(); + } + }); }); //]]> @@ -125,16 +154,17 @@ $(document).ready(function(){
- Use a barcode file -
    + Use a barcode file +
      2. -
    2. -
      3. +
      4. +
      5. +
- Select items you want to check + Item location filters
  1. Home library @@ -165,11 +195,12 @@ $(document).ready(function(){
    3. - [% IF (statuses) %]
-
- Item statuses + +
+ Optional filters for inventory list or comparing barcodes +
[% FOREACH status IN statuses %] [% IF (status.values) %] @@ -195,33 +226,32 @@ $(document).ready(function(){ [% END %] [% END %]
-
-
-
    - [% END %] - -
  1. +
      +
    1. +
      + (Skip records marked as seen on or after this date.)
      2. -
    2. +
    3. + [% IF (ignoreissued) %] -
      4. + [% ELSE %] - + [% END %] + +
    +
+ +
+ Additional options +
    +
    2. -
  2. - - -
    3. -
  3. - - -
-- 2.39.5