Attachment #33169 for bug #13190

View | Details | Raw Unified | Return to bug 13190
Collapse All | Expand All

Lines 366-371 C<$itemnumbers> - a list of itemnumbers to export Link Here

(-)a/C4/Record.pm (-1 / +2 lines)
366		366
367	sub marc2csv {	367	sub marc2csv {
368	my ($biblios, $id, $itemnumbers) = @_;	368	my ($biblios, $id, $itemnumbers) = @_;
		369	$itemnumbers \|\|= [];
369	my $output;	370	my $output;
370	my $csv = Text::CSV::Encoded->new();	371	my $csv = Text::CSV::Encoded->new();
371		372
Lines 380-386 sub marc2csv { Link Here
380	eval $preprocess if ($preprocess);	381	eval $preprocess if ($preprocess);
381		382
382	my $firstpass = 1;	383	my $firstpass = 1;
383	if ( $itemnumbers ) {	384	if ( @$itemnumbers ) {
384	for my $itemnumber ( @$itemnumbers) {	385	for my $itemnumber ( @$itemnumbers) {
385	my $biblionumber = GetBiblionumberFromItemnumber $itemnumber;	386	my $biblionumber = GetBiblionumberFromItemnumber $itemnumber;
386	$output .= marcrecord2csv( $biblionumber, $id, $firstpass, $csv, $fieldprocessing, [$itemnumber] );	387	$output .= marcrecord2csv( $biblionumber, $id, $firstpass, $csv, $fieldprocessing, [$itemnumber] );

Lines 596-603 $template->param( Link Here

(-)a/circ/circulation.pl (-2 lines)
596	SpecifyDueDate => $duedatespec_allow,	596	SpecifyDueDate => $duedatespec_allow,
597	CircAutocompl => C4::Context->preference("CircAutocompl"),	597	CircAutocompl => C4::Context->preference("CircAutocompl"),
598	AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),	598	AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
599	export_remove_fields => C4::Context->preference("ExportRemoveFields"),
600	export_with_csv_profile => C4::Context->preference("ExportWithCsvProfile"),
601	canned_bor_notes_loop => $canned_notes,	599	canned_bor_notes_loop => $canned_notes,
602	debarments => GetDebarments({ borrowernumber => $borrowernumber }),	600	debarments => GetDebarments({ borrowernumber => $borrowernumber }),
603	todaysdate => dt_from_string()->set(hour => 23)->set(minute => 59),	601	todaysdate => dt_from_string()->set(hour => 23)->set(minute => 59),




        minute: 59
    });
    $("#export_submit").on("click",function(){
        var output_format = $("#output_format").val();
        export_checkouts(output_format);
        return false;
    });

    toggle_onsite_checkout();
    $("#onsite_checkout").click(function(){
        toggle_onsite_checkout();
    });
});

function export_checkouts(format) {

        $("#dont_export_item").val(1);
    }

    document.getElementById("output_format").value = format;
    document.issues.submit();
}





[% USE Koha %]
[% USE Branches %]
[% USE KohaDates %]
[% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %]
   [% SET exports_enabled = 1 %]
[% END %]
[% USE AuthorisedValues %]

[% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
[% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]

$(document).ready(function() {
    [% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
        // listen submit to trigger qslip on empty checkout
        $('#mainform').bind('submit',function() {
            if ($('#barcode').val() == '') {
                return printx_window( '[% CircAutoPrintQuickSlip %]' );
            }
        });
    [% END %]
});

// On-site checkout
function toggle_onsite_checkout(){
    if ( $("#onsite_checkout").attr('checked') ) {

    }
}

$(document).ready(function() {
    [% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
        // listen submit to trigger qslip on empty checkout
        $('#mainform').bind('submit',function() {
            if ($('#barcode').val() == '') {
                return printx_window( '[% CircAutoPrintQuickSlip %]' );
            }
        });
    [% END %]
    toggle_onsite_checkout();
    $("#onsite_checkout").click(function(){
        toggle_onsite_checkout();
    });
});

//]]>
</script>
</head>

            </p>
        </div>

        <form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post" class="checkboxed">
            <table id="issues-table">
                <thead>
                    <tr>
                        <th scope="col">&nbsp;</th>
                        <th scope="col">&nbsp;</th>
                        <th scope="col">Due date</th>
                        <th scope="col">Due date</th>
                        <th scope="col">Title</th>
                        <th scope="col">Item type</th>
                        <th scope="col">Checked out on</th>
                        <th scope="col">Checked out from</th>
                        <th scope="col">Call no</th>
                        <th scope="col">Charge</th>
                        <th scope="col">Price</th>
                        <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllRenewals">select all</a> | <a href="#" id="UncheckAllRenewals">none</a></p></th>
                        <th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllCheckins">select all</a> | <a href="#" id="UncheckAllCheckins">none</a></p></th>
                        <th scope="col">Export <p class="column-tool"><a href="#" id="CheckAllExports">select all</a> | <a href="#" id="UncheckAllExports">none</a></p></th>
                    </tr>
                </thead>
                [% INCLUDE 'checkouts-table-footer.inc' %]
            </table>

            <label for="issues-table-load-immediately">Always show checkouts immediately</label>
            <input id="issues-table-load-immediately" type="checkbox" />

            <fieldset id="issues-table-actions" class="action">
                [% IF ( CAN_user_circulate_override_renewals ) %]
                    [% IF ( AllowRenewalLimitOverride ) %]
                        <label for="override_limit">Override renewal limit:</label>
                        <input type="checkbox" name="override_limit" id="override_limit" value="1" />
                    [% END %]
                [% END %]
                <button class="btn" id="RenewCheckinChecked"><i class="icon-check"></i> Renew or return checked items</button>
                <button class="btn" id="RenewAll"><i class="icon-book"></i> Renew all</button>
            </fieldset>

            [% IF issuecount %]
                [% IF ( exports_enabled ) %]
                    <fieldset>
                        <label for="output_format"><b>Export checkouts using format:</b></label>
                        <select name="output_format" id="output_format">
                            <option value="iso2709_995">ISO2709 with items</option>
                            <option value="iso2709">ISO2709 without items</option>
                            [% IF Koha.Preference('ExportWithCsvProfile') %]
                                <option value="csv">CSV</option>
                            [% END %]
                        </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="output_format" name="output_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" />
                        <button class="btn btn-small" id="export_submit"><i class="icon-download-alt"></i> Export</button>
                    </fieldset>
                [% END %]
            [% END %]
        </form>

        </fieldset>
    [% ELSE %]
        <p>Patron has nothing checked out.</p>
    [% END %]

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-4 / +11 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
		3	[% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %]
		4	[% SET exports_enabled = 1 %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha &rsaquo; Patrons &rsaquo;	7	<title>Koha &rsaquo; Patrons &rsaquo;
5	[% IF ( unknowuser ) %]	8	[% IF ( unknowuser ) %]
Lines 17-22 Link Here
17	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>	20	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
18	[% INCLUDE 'timepicker.inc' %]	21	[% INCLUDE 'timepicker.inc' %]
19	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping.js"></script>	22	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping.js"></script>
		23	<script type="text/javascript" src="[% themelang %]/js/pages/circulation.js"></script>
20	<script type="text/javascript" src="[% themelang %]/js/checkouts.js"></script>	24	<script type="text/javascript" src="[% themelang %]/js/checkouts.js"></script>
21	<script type="text/javascript" src="[% themelang %]/js/holds.js"></script>	25	<script type="text/javascript" src="[% themelang %]/js/holds.js"></script>
22	<script type="text/JavaScript">	26	<script type="text/JavaScript">
Lines 34-39 var relatives_borrowernumbers = new Array(); Link Here
34	relatives_borrowernumbers.push("[% b %]");	38	relatives_borrowernumbers.push("[% b %]");
35	[% END %]	39	[% END %]
36		40
		41	var MSG_ADD_MESSAGE = _("Add a new message");
		42	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
		43
37	$(document).ready(function() {	44	$(document).ready(function() {
38	$('#finesholdsissues').tabs({	45	$('#finesholdsissues').tabs({
39	// Correct table sizing for tables hidden in tabs	46	// Correct table sizing for tables hidden in tabs
Lines 459-476 function validate1(date) { Link Here
459		466
460	[% IF ( exports_enabled ) %]	467	[% IF ( exports_enabled ) %]
461	<fieldset>	468	<fieldset>
462	<label for="export_formats"><b>Export checkouts using format:</b></label>	469	<label for="output_format"><b>Export checkouts using format:</b></label>
463	<select name="export_formats" id="export_formats">	470	<select name="output_format" id="output_format">
464	<option value="iso2709_995">ISO2709 with items</option>	471	<option value="iso2709_995">ISO2709 with items</option>
465	<option value="iso2709">ISO2709 without items</option>	472	<option value="iso2709">ISO2709 without items</option>
466	[% IF ( export_with_csv_profile ) %]	473	[% IF Koha.Preference('ExportWithCsvProfile') %]
467	<option value="csv">CSV</option>	474	<option value="csv">CSV</option>
468	[% END %]	475	[% END %]
469	</select>	476	</select>
470		477
471	<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" />	478	<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" />
472	<input type="hidden" name="op" value="export" />	479	<input type="hidden" name="op" value="export" />
473	<input type="hidden" id="export_format" name="format" value="iso2709" />	480	<input type="hidden" id="output_format" name="output_format" value="iso2709" />
474	<input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />	481	<input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
475	<input type="hidden" id="record_type" name="record_type" value="bibs" />	482	<input type="hidden" id="record_type" name="record_type" value="bibs" />
476	<button class="btn btn-small" id="export_submit"><i class="icon-download-alt"></i> Export</button>	483	<button class="btn btn-small" id="export_submit"><i class="icon-download-alt"></i> Export</button>

Lines 44-50 my $op = $query->param("op") \|\| ''; Link Here

(-)a/tools/export.pl (-2 / +1 lines)
44	my $filename = $query->param("filename") \|\| 'koha.mrc';	44	my $filename = $query->param("filename") \|\| 'koha.mrc';
45	my $dbh = C4::Context->dbh;	45	my $dbh = C4::Context->dbh;
46	my $marcflavour = C4::Context->preference("marcflavour");	46	my $marcflavour = C4::Context->preference("marcflavour");
47	my $format = $query->param("format") \|\| 'iso2709';	47	my $format = $query->param("format") \|\| $query->param("output_format") \|\| 'iso2709';
48		48
49	# Checks if the script is called from commandline	49	# Checks if the script is called from commandline
50	my $commandline = not defined $ENV{GATEWAY_INTERFACE};	50	my $commandline = not defined $ENV{GATEWAY_INTERFACE};
51	-

Return to bug 13190

Lines 41-55 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js (-8 / +3 lines)
41	minute: 59	41	minute: 59
42	});	42	});
43	$("#export_submit").on("click",function(){	43	$("#export_submit").on("click",function(){
44	var export_format = $("#export_formats").val();	44	var output_format = $("#output_format").val();
45	export_checkouts(export_format);	45	export_checkouts(output_format);
46	return false;	46	return false;
47	});	47	});
48
49	toggle_onsite_checkout();
50	$("#onsite_checkout").click(function(){
51	toggle_onsite_checkout();
52	});
53	});	48	});
54		49
55	function export_checkouts(format) {	50	function export_checkouts(format) {
Lines 74-80 function export_checkouts(format) { Link Here
74	$("#dont_export_item").val(1);	69	$("#dont_export_item").val(1);
75	}	70	}
76		71
77	document.getElementById("export_format").value = format;	72	document.getElementById("output_format").value = format;
78	document.issues.submit();	73	document.issues.submit();
79	}	74	}
80		75