From cb82ca95ec579b6ad05b24163673e68039f56520 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Wed, 12 Apr 2017 16:06:29 +0200
Subject: [PATCH] Bug 14399: Results form also needs a few interface changes

Currently, the value of compareinv2barcd is used to determine if the
Seen column, the Select/Clear all buttons and the Mark seen buttons are
displayed. But if we scanned barcodes, we already marked items as seen.
So we should only display these buttons when we did not upload barcodes.

Test plan:
[1] Upload a barcode file. Check that the result form does not show
    the buttons.
[2] Generate an inventory list, so do not upload a barcode file. Verify
    that you still see the buttons.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit af89df12e72ea51010039a2206bb942bcc4c4b50)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../intranet-tmpl/prog/en/modules/tools/inventory.tt      | 8 ++++----
 tools/inventory.pl                                        | 1 +
 2 files changed, 5 insertions(+), 4 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 642623eeef..eee528c68d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -269,14 +269,14 @@ $(document).ready(function(){
     <input type="hidden" name="branchcode" value="[% branchcode %]" />
     <input type="hidden" name="datelastseen" value="[% datelastseen %]" />
 
-    [% UNLESS compareinv2barcd %]
+    [% UNLESS uploadedbarcodesflag %]
       <div><a href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div>
     [% END %]
 
     <table id="inventoryt">
     <thead>
         <tr>
-            [% UNLESS compareinv2barcd %]<th>Seen</th>[% END %]
+            [% UNLESS uploadedbarcodesflag %]<th>Seen</th>[% END %]
             <th>Barcode</th>
             <th>Library</th>
             <th>Title</th>
@@ -291,7 +291,7 @@ $(document).ready(function(){
     <tbody>
     [% FOREACH result IN loop %]
         <tr>
-            [% UNLESS compareinv2barcd %]
+            [% UNLESS uploadedbarcodesflag %]
               <td>
                 <input type="checkbox" name="SEEN-[% result.itemnumber %]" value="1" />
               </td>
@@ -342,7 +342,7 @@ $(document).ready(function(){
     </tbody>
     </table>
     <div class="spacer"></div>
-    [% UNLESS compareinv2barcd %]
+    [% UNLESS uploadedbarcodesflag %]
       <div style="padding : .3em 0"><a href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div>
       <input type="submit" id="markseenandquit" value="Mark seen and quit" />
       <input type="submit" value="Mark seen and continue &gt;&gt;" id="markseenandcontinuebutton" />
diff --git a/tools/inventory.pl b/tools/inventory.pl
index 76a09252fa..1ee40a1014 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -123,6 +123,7 @@ $template->param(
     branch                   => $branch,
     datelastseen             => $datelastseen,
     compareinv2barcd         => $compareinv2barcd,
+    uploadedbarcodesflag     => $uploadbarcodes ? 1 : 0,
 );
 
 # Walk through uploaded barcodes, report errors, mark as seen, check in
-- 
2.39.5