From 1b0dd7eedebc91fa7178d0d4e0768ebc64b41fd2 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 3 Feb 2014 13:59:34 -0500
Subject: [PATCH] Bug 11671 - Restructure patron lists add form for improved
 usability
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Non-standard interface features have the potential to cause confusion.
This patch brings various aspects of the patron lists add page into
conformity with other staff client pages.

- Add "select all/clear all" links for the checkboxes
- Add a "remove selected" to the top of the table (see also Lists)
- Split functionality of add from from delete form
- Hide "Add patrons" button until at least one patron has been selected
- Remove non-standard trash can icon from table's checkbox column
- Exclude checkbox column from table sorting
- Add confirmation to deletion actions
- Improve breadcrumb specificity
- Add title-string sorting to date column to accommodate sorting for all
  date format types

To test, apply the patch and create a patron list.

1. Search for and select patrons for the list. Selecting a patron should
   trigger the display of an "Add patrons" button.
2. Click "Add patrons" and confirm that the add process completes
   correctly.
3. Search for and select a patron and also check the box next to an
   existing patron. Click "Add patrons" and confirm that no patron is
   removed.
4. Check that the "select all" and "clear all" links work correctly.
5. Select patrons on the list and click the "Remove selected" link. You
   should be prompted to confirm your choice.
   4.a. Click cancel and confirm that the deletion process aborts.
   4.b. Click OK and confirm that the deletion process completes.
6. Repeat step 4 with the "Remove selected patrons" at the bottom of the
   page.
7. Confirm that the page title and breadcrumbs correctly show the list
   name.
8. Switch between us and metric dateformat settings and confirm that
   table sorting by date is correct in both cases.

Followed test plan. Patch behaves as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no regressions found.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../prog/en/css/staff-global.css              |  2 +-
 .../prog/en/modules/patron_lists/list.tt      | 72 +++++++++++++++----
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 685ebef73e..4279ad93de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1435,7 +1435,7 @@ li.email {
      background-color : #E6F0F2;
 	font-size : 80%;
 	margin : 0 0 .5em -1px;
- padding : .1em 0 .4em 1em;
+    padding : .4em 0 .4em 1em;
      border-radius : 5px 5px 0 0;
    border : 1px solid #B9D8D9;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
index fa30be5412..b99748f366 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
@@ -1,6 +1,6 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Tools &rsaquo; Patron lists &rsaquo; New list</title>
+<title>Koha &rsaquo; Tools &rsaquo; Patron lists &rsaquo; [% list.name %] &rsaquo; Add patrons</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
@@ -11,7 +11,14 @@
 $(document).ready(function() {
     $('#patrons_to_add_fieldset').hide();
 
-    $('#patron-list-table').dataTable($.extend(true, {}, dataTablesDefaults));
+        $('#patron-list-table').dataTable($.extend(true, {}, dataTablesDefaults, {
+            "aoColumns": [
+                null,null,null,null,null,null,null,{ "sType": "title-string" },null
+            ],
+            "aoColumnDefs": [
+                { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
+            ]
+        } ));
 
     $( "#find_patron" ).autocomplete({
         source: "/cgi-bin/koha/circ/ysearch.pl",
@@ -34,6 +41,36 @@ $(document).ready(function() {
         var cardnumber = divid.replace("borrower_","");
         RemovePatron(cardnumber);
     });
+
+    var checkBoxes = $("input[type='checkbox']","#patron-list-table");
+
+    $("#CheckAll").click(function(e){
+        e.preventDefault();
+        checkBoxes.each(function(){
+            $(this).prop("checked",1);
+        });
+    });
+    $("#CheckNone").click(function(e){
+        e.preventDefault();
+        checkBoxes.each(function(){
+            $(this).prop("checked",0);
+        });
+    });
+
+    $("#remove_patrons").submit(function(){
+        var checkedItems = $("input:checked");
+        if ($(checkedItems).size() == 0) {
+            alert(_("You must select one or more patrons to remove"));
+            return false;
+        }
+        $(checkedItems).parents('tr').addClass("warn");
+        if( confirm(_("Are you sure you want to remove the selected patrons?")) ) {
+            return true;
+        } else {
+            $(checkedItems).parents('tr').removeClass("warn");
+            return false;
+        }
+    });
 });
 
 function AddPatron( name, cardnumber ) {
@@ -60,13 +97,13 @@ function RemovePatron( cardnumber ) {
 <body>
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="lists.pl">Patron lists</a> &rsaquo; Add patrons</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="lists.pl">Patron lists</a> &rsaquo; <a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% list.id %]">[% list.name %]</a> &rsaquo; Add patrons</div>
 
 <div class="yui-t7">
     <div class="yui-main">
         <h1>[% list.name %]</h1>
 
-        <form action="list.pl" method="post">
+        <form action="list.pl" id="add_patrons" method="post">
             <fieldset>
                 <legend>Add patrons</legend>
 
@@ -77,19 +114,31 @@ function RemovePatron( cardnumber ) {
                 <fieldset id="patrons_to_add_fieldset">
                     <legend>Patrons to be added</legend>
                     <div id="patrons_to_add"></div>
+
+                    <fieldset class="action">
+                        <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" />
+                        <input type="submit" value="Add patrons" />
+                        <a href="lists.pl" class="cancel">Cancel</a>
+                    </fieldset>
                 </fieldset>
 
             </fieldset>
+        </form>
+
+        <form action="list.pl" id="remove_patrons" method="post">
 
-            <p>
-                <input type="submit" class="btn" value="Update" />
-                <a href="lists.pl" class="cancel">Cancel</a>
-            </p>
+            <div id="searchheader">
+                <span class="checkall"><a id="CheckAll" href="#">Select all</a></span> |
+                <span class="clearall"><a id="CheckNone" href="#">Clear all</a></span> |
+                <div class="btn-group">
+                    <button class="btn btn-mini list-remove" type="submit"><i class="icon-remove-sign"></i> Remove selected</button>
+                </div>
+            </div>
 
             <table id="patron-list-table">
                 <thead>
                     <tr>
-                        <th><i title="Remove patron from list" class="icon-trash"></i></th>
+                        <th>&nbsp;</th>
                         <th>Card</th>
                         <th>Firstname</th>
                         <th>Surname</th>
@@ -121,7 +170,7 @@ function RemovePatron( cardnumber ) {
                             </td>
                             <td>[% p.borrowernumber.categorycode.description %] ([% p.borrowernumber.categorycode.categorycode %])</td>
                             <td>[% p.borrowernumber.branchcode.branchname %]</td>
-                            <td>[% p.borrowernumber.dateexpiry | $KohaDates %]</td>
+                            <td><span title="[% p.borrowernumber.dateexpiry %]">[% p.borrowernumber.dateexpiry | $KohaDates %]</span></td>
                             <td>[% p.borrowernumber.borrowernotes %]</td>
                         </tr>
                     [% END %]
@@ -129,8 +178,7 @@ function RemovePatron( cardnumber ) {
             </table>
 
             <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" />
-            <input type="submit" class="btn" value="Update" />
-            <a href="lists.pl" class="cancel">Cancel</a>
+            <input type="submit" value="Remove selected patrons" />
         </form>
     </div>
 </div>
-- 
2.39.5