Attachment 67549 Details for Bug 14399 – Bug 14399: [16.05.X] Results form also needs a few interface changes

[patch] Bug 14399: [16.05.X] Results form also needs a few interface changes

Bug-14399-1605X-Results-form-also-needs-a-few-inte.patch (text/plain), 3.33 KB, created by Marcel de Rooy on 2017-10-03 13:43:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2017-10-03 13:43:56 UTC

Size: 3.33 KB

patch

obsolete

>From de0d93c232380ad8fdd79eed27418666fa92d108 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: [16.05.X] Results form also needs a few interface
> changes
>Content-Type: text/plain; charset=utf-8
>
>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>
>---
> koha-tmpl/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 56958ac..1008528 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>@@ -272,14 +272,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">[Select all]</a> <a href="#" class="clearall">[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>
>@@ -294,7 +294,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>
>@@ -345,7 +345,7 @@ $(document).ready(function(){
>     </tbody>
>     </table>
>     <div class="spacer"></div>
>-    [% UNLESS compareinv2barcd %]
>+    [% UNLESS uploadedbarcodesflag %]
>       <div style="padding : .3em 0"><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[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 6e298da..fb4d319 100755
>--- a/tools/inventory.pl
>+++ b/tools/inventory.pl
>@@ -134,6 +134,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.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 14399: 61685 | 62096 | 62097 | 62098 | 62099 | 62139 | 62140 | 62733 | 62734 | 62735 | 62736 | 63465 | 63466 | 63467 | 63468 | 67546 | 67547 | 67548 | 67549