Attachment 15158 Details for Bug 9283 – Bug 9283 - Change structure of export checkouts form

[patch] Bug 9283 - Change structure of export checkouts form

Bug-9283---Change-structure-of-export-checkouts-fo.patch (text/plain), 4.26 KB, created by Marcel de Rooy on 2013-02-08 10:45:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2013-02-08 10:45:36 UTC

Size: 4.26 KB

patch

obsolete

>From a71fe7eeb1cfd0def95f34d26e394f66cc5d1cb6 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 13 Dec 2012 14:59:58 -0500
>Subject: [PATCH] Bug 9283 - Change structure of export checkouts form
>Content-Type: text/plain; charset="utf-8"
>
>This patch changes the structure of the export checkouts form
>so that it is a little more linear. This change moves generation of the
>export options from JavaScript to the markup, eliminating an instance
>of dependence on YUI menus.
>
>To test, enable checkout exports by specifying a value for
>ExportWithCsvProfile or  ExportRemoveFields. Load a patron with
>checkouts in circulation. Try the various checkout export options. Each
>should function correctly.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> .../prog/en/modules/circ/circulation.tt            |   40 ++++++++-----------
> 1 files changed, 17 insertions(+), 23 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index 9af072f..a57a9db 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -158,8 +158,6 @@ var allcheckboxes = $(".checkboxed");
>     $("input.radio").click(function(){
>         radioCheckBox($(this));
>     });
>-    $("#exportmenuc").empty();
>-    initExportButton();
> 
>     $("#newduedate").datetimepicker({
>         minDate: 1, // require that renewal date is after today
>@@ -171,25 +169,14 @@ var allcheckboxes = $(".checkboxed");
>         hour: 23,
>         minute: 59
>     });
>-
>+    $("#export_submit").click(function(){
>+        var export_format = $("#export_formats").val();
>+        export_checkouts(export_format);
>+        return false;
>+    })
>  });
> 
>-function initExportButton() {
>-    var exportmenu = [
>-        { text: _("ISO2709 with items"), onclick: {fn: function(){export_submit("iso2709_995")}} },
>-        { text: _("ISO2709 without items"), onclick: {fn: function(){export_submit("iso2709")}} },
>-        { text: _("CSV"), onclick: {fn: function(){export_submit("csv")}} },
>-    ];
>-    new YAHOO.widget.Button({
>-        type: "menu",
>-        label: _("Export checkouts"),
>-        name: "exportmenubutton",
>-        menu: exportmenu,
>-        container: "exportmenuc"
>-    });
>-}
>-
>-function export_submit(format) {
>+function export_checkouts(format) {
>     if ($("input:checkbox[name='biblionumbers'][checked]").length < 1){
>         alert(_("You must select a checkout to export"));
>         return;
>@@ -959,16 +946,23 @@ No patron matched <span class="ex">[% message %]</span>
>         [% END %]
>         <input type="submit" name="renew_checked" value="Renew or Return checked items" />
>         <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
>+    </fieldset>
>         [% IF export_remove_fields OR export_with_csv_profile %]
>-            <br/><br/>
>-            Don't export fields : <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" />
>-            <span id="exportmenuc">Export</span>
>+            <fieldset>
>+            <label for="export_formats"><b>Export checkouts using format:</b></label>
>+            <select name="export_formats" id="export_formats">
>+                <option value="iso2709_995">ISO2709 with items</option>
>+                <option value="iso2709">ISO2709 without items</option>
>+                <option value="csv">CSV</option>
>+            </select>
>+           <label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" />
>             <input type="hidden" name="op" value="export" />
>             <input type="hidden" id="export_format" name="format" value="iso2709" />
>             <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
>             <input type="hidden" id="record_type" name="record_type" value="bibs" />
>+            <input type="button" id="export_submit" value="Export" />
>+            </fieldset>
>         [% END %]
>-    </fieldset>
>     [% END %]
>     </form>
> [% ELSE %]
>-- 
>1.7.7.6

Actions: View | Diff | Splinter Review

Attachments on bug 9283: 14103 | 14104 | 14116 | 15158