Attachment 26532 Details for Bug 11946 – Bug 11946 - add table sorters to label and patron card batches

[patch] Bug 11946 - add table sorters to label and patron card batches

Bug-11946---add-table-sorters-to-label-and-patron-.patch (text/plain), 11.25 KB, created by Owen Leonard on 2014-03-24 13:02:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2014-03-24 13:02:40 UTC

Size: 11.25 KB

patch

obsolete

>From 02a1dc504fd34cc2f8d03915a2e2013c1b7f9274 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 21 Mar 2014 15:50:18 -0400
>Subject: [PATCH] Bug 11946 - add table sorters to label and patron card
> batches
>Content-Type: text/plain; charset="utf-8"
>
>When viewing batches of titles in the label creator module the table is
>not sortable. This patch adds table sorting.
>
>The patch also makes some corrections of invalid markup and moves
>informational/error messages to the top of the page rather than in a
>sidebar. This change lets the table and sorting controls expand into a
>wider space.
>
>To test, go to Tools -> Labels -> Manage label batches. View an existing
>batch or create a new batch and populate it with items. Table sorting
>controls should work correctly.
>---
> .../prog/en/modules/labels/label-edit-batch.tt     |  113 +++++++++++---------
> 1 file changed, 61 insertions(+), 52 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>index 54ff3bd..85bbb4e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>@@ -2,6 +2,8 @@
>     <title>Koha &rsaquo; Tools &rsaquo; Labels &rsaquo; Manage label batches</title>
>     [% INCLUDE 'doc-head-close.inc' %]
>     [% INCLUDE 'greybox.inc' %]
>+    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>+    [% INCLUDE 'datatables.inc' %]
>     <script type="text/javascript">
>     //<![CDATA[
>         function dofocus() {    // named function req'd for body onload event by some FF and IE7 security models
>@@ -121,6 +123,14 @@
>             };
> 
>          $(document).ready(function() {
>+            $("#batcht").dataTable($.extend(true, {}, dataTablesDefaults, {
>+                "aoColumnDefs": [
>+                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
>+                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }
>+                ],
>+                "aaSorting": [[ 1, "asc" ]],
>+                "sPaginationType": "four_button"
>+            }));
>             $("#additems").click(function(){
>                 Add();
>                 return false;
>@@ -171,18 +181,28 @@
>                             <a class="btn btn-small" id="exportitems" href="#">Export item(s)</a>
>                             <a class="btn btn-small" id="exportbatch" href="#">Export batch</a>[% END %]
>                     </div>
>-                    <div class="yui-g">
>-                        <div class="yui-u first" id="manage-label-batches">
>+
>+                        [% IF ( err ) %]
>+                            <div class="dialog alert">
>+                                <strong>WARNING:</strong> An error was encountered and [% errstr %] Please have your system administrator check the error log for details.
>+                            </div>
>+                        [% ELSIF ( duplicate_message ) %]
>+                            <div class="dialog message">
>+                                <strong>[% duplicate_count %] duplicate item(s) found</strong> and removed from batch [% batch_id %].
>+                            </div>
>+                        [% END %]
>+
>+                        <div id="manage-label-batches">
>                             <div class="hint">Current library: [% LoginBranchname %]</div>
>                             <form name="add_by_barcode" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
>                                 <div>
>                                     <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
>                                     <ol><li>
>-                                    <input type="hidden" name="op" value="add" \>
>-                                    <input type="hidden" name="batch_id" value="[% batch_id %]" \>
>+                                    <input type="hidden" name="op" value="add" />
>+                                    <input type="hidden" name="batch_id" value="[% batch_id %]" />
>                                     <label for="barcode">Add by barcode(s):
>-                                        <br \> <span class="hint">One barcode per line.</span>
>-                                        <br \> <span class="hint">Leave empty to add via item search.</span>
>+                                        <br /> <span class="hint">One barcode per line.</span>
>+                                        <br /> <span class="hint">Leave empty to add via item search.</span>
>                                     </label>
>                                     <textarea rows="5" id="barcode" name="barcode" tabindex="1" class="focus"></textarea>
>                                     </li></ol>
>@@ -192,39 +212,43 @@
>                                 [% IF ( table_loop ) %]
>                                 <form name="items" class="checkboxed">
>                                     <h2>Items in batch number [% batch_id %]</h2>
>-                                    <table>
>+                                    <table id="batcht">
>                                         [% FOREACH table_loo IN table_loop %]
>-                                        [% IF ( table_loo.header_fields ) %]
>-                                        <tr>
>-                                        [% FOREACH header_field IN table_loo.header_fields %]
>-                                            [% SWITCH header_field.field_label -%]
>-                                                [% CASE "Label Number" -%]
>-                                                    <th>Label number</th>
>-                                                [% CASE "Summary" -%]
>-                                                    <th>Summary</th>
>-                                                [% CASE "Item Type" %]
>-                                                    <th>Item type</th>
>-                                                [% CASE "Barcode" %]
>-                                                    <th>Barcode</th>
>-                                                [% CASE "Select" -%]
>-                                                    <th>Select</th>
>-                                                [% CASE %]
>-                                                    <th>[% header_field.field_label %]</th>
>-                                            [% END -%]
>-                                        [% END %]
>-                                        </tr>
>-                                        [% ELSE %]
>-                                        <tr>
>-                                        [% FOREACH text_field IN table_loo.text_fields %]
>-                                        [% IF ( text_field.select_field ) %]
>-                                            <td align="center"><input type="checkbox" name="action" value="[% text_field.field_value %]"></td>
>-                                        [% ELSE %]
>-                                            <td>[% text_field.field_value %]</td>
>-                                        [% END %]
>-                                        [% END %]
>-                                        </tr>
>-                                        [% END %]
>+                                            [% IF ( table_loo.header_fields ) %]
>+                                                <thead>
>+                                                    <tr>
>+                                                        [% FOREACH header_field IN table_loo.header_fields %]
>+                                                            [% SWITCH header_field.field_label -%]
>+                                                                [% CASE "Label Number" -%]
>+                                                                    <th>Label number</th>
>+                                                                [% CASE "Summary" -%]
>+                                                                    <th class="anti-the">Summary</th>
>+                                                                [% CASE "Item Type" %]
>+                                                                    <th>Item type</th>
>+                                                                [% CASE "Barcode" %]
>+                                                                    <th>Barcode</th>
>+                                                                [% CASE "Select" -%]
>+                                                                    <th>Select</th>
>+                                                                [% CASE %]
>+                                                                    <th>[% header_field.field_label %]</th>
>+                                                            [% END -%]
>+                                                        [% END %]
>+                                                    </tr>
>+                                                </thead>
>+                                                <tbody>
>+                                            [% ELSE %]
>+                                                    <tr>
>+                                                        [% FOREACH text_field IN table_loo.text_fields %]
>+                                                            [% IF ( text_field.select_field ) %]
>+                                                                <td><input type="checkbox" name="action" value="[% text_field.field_value %]"></td>
>+                                                            [% ELSE %]
>+                                                                <td>[% text_field.field_value %]</td>
>+                                                            [% END %]
>+                                                        [% END %]
>+                                                    </tr>
>+                                            [% END %]
>                                         [% END %]
>+                                        </tbody>
>                                     </table>
>                                 </form>
>                                 [% ELSE %]
>@@ -238,25 +262,10 @@
>                                 </fieldset>
>                                 [% END %]
>                             </div>
>-                            [% IF ( err ) %]
>-                            <div class="yui-u">
>-                                <div class="dialog alert">
>-                                    <strong>WARNING:</strong> An error was encountered and [% errstr %] Please have your system administrator check the error log for details.
>-                                </div>
>-                            </div>
>-                            [% ELSIF ( duplicate_message ) %]
>-                            <div class="yui-u">
>-                                <div class="dialog message">
>-                                    <strong>[% duplicate_count %] duplicate item(s) found</strong> and removed from batch [% batch_id %].
>-                                </div>
>-                            </div>
>-                            [% END %]
>                         </div>
>-                    </div>
>                 </div>
>                 <div class="yui-b">
>                     [% INCLUDE 'labels-menu.inc' %]
>                 </div>
>             </div>
>-        </div>
>     [% INCLUDE 'intranet-bottom.inc' %]
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 11946: 26373 | 26532 | 26564 | 26565 | 26701