Attachment #95441 for bug #12502

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




        exportColumns = dt_parameters["exportColumns"];
    }

    var export_format = {
        body: function ( data, row, column, node ) {
            var newnode = $(node);

            if ( newnode.find(".noExport").length > 0 ) {
                newnode = newnode.clone();
                newnode.find(".noExport").remove();
            }

            return newnode.text().replace( /\n/g, ' ' ).trim();
        }
    }

    var export_buttons = [
        {
            extend: 'excelHtml5',
            text: _("Excel"),
            exportOptions: {
                columns: exportColumns,
                format:  export_format
            },
        },
        {
            extend: 'csvHtml5',
            text: _("CSV"),
            exportOptions: {
                columns: exportColumns,
                format:  export_format
            },
        },
        {
            extend: 'copyHtml5',
            text: _("Copy"),
            exportOptions: {
                columns: exportColumns,
                format:  export_format
            },
        },
        {
            extend: 'print',
            text: _("Print"),
            exportOptions: {
                columns: exportColumns,
                format:  export_format
            },
        }
    ];




                [% IF ( lateorder.internalnote ) %]
                    <p class="ordernote">
                        <span id="internal-note-[% lateorder.ordernumber | html %]">[% lateorder.internalnote | html %]</span>
                        <a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber | html %]&type=internal" title="Edit internal note">
                            <i class="fa fa-pencil"></i> Edit internal note
                        </a>
                    </p>
                [% ELSE %]
                    <a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber | html %]&type=internal" title="Add internal note">
                        <i class="fa fa-plus"></i> Add internal note
                    </a>
                [% END %]

                [% IF ( lateorder.vendornote ) %]
                    <p class="ordernote">
                        <span id="vendor-note-[% lateorder.ordernumber | html %]">[% lateorder.vendornote | html %]</span>
                        <a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber | html %]&type=vendor" title="Edit vendor note">
                            <i class="fa fa-pencil"></i> Edit vendor note
                        </a>
                    </p>
                [% ELSE %]
                    <a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber | html %]&type=vendor" title="Add vendor note">
                        <i class="fa fa-plus"></i> Add vendor note
                    </a>
                [% END %]
- 

Return to bug 12502

Lines 27-59 function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc (-4 / +21 lines)
27	exportColumns = dt_parameters["exportColumns"];	27	exportColumns = dt_parameters["exportColumns"];
28	}	28	}
29		29
		30	var export_format = {
		31	body: function ( data, row, column, node ) {
		32	var newnode = $(node);
		33
		34	if ( newnode.find(".noExport").length > 0 ) {
		35	newnode = newnode.clone();
		36	newnode.find(".noExport").remove();
		37	}
		38
		39	return newnode.text().replace( /\n/g, ' ' ).trim();
		40	}
		41	}
		42
30	var export_buttons = [	43	var export_buttons = [
31	{	44	{
32	extend: 'excelHtml5',	45	extend: 'excelHtml5',
33	text: _("Excel"),	46	text: _("Excel"),
34	exportOptions: {	47	exportOptions: {
35	columns: exportColumns	48	columns: exportColumns,
		49	format: export_format
36	},	50	},
37	},	51	},
38	{	52	{
39	extend: 'csvHtml5',	53	extend: 'csvHtml5',
40	text: _("CSV"),	54	text: _("CSV"),
41	exportOptions: {	55	exportOptions: {
42	columns: exportColumns	56	columns: exportColumns,
		57	format: export_format
43	},	58	},
44	},	59	},
45	{	60	{
46	extend: 'copyHtml5',	61	extend: 'copyHtml5',
47	text: _("Copy"),	62	text: _("Copy"),
48	exportOptions: {	63	exportOptions: {
49	columns: exportColumns	64	columns: exportColumns,
		65	format: export_format
50	},	66	},
51	},	67	},
52	{	68	{
53	extend: 'print',	69	extend: 'print',
54	text: _("Print"),	70	text: _("Print"),
55	exportOptions: {	71	exportOptions: {
56	columns: exportColumns	72	columns: exportColumns,
		73	format: export_format
57	},	74	},
58	}	75	}
59	];	76	];

Lines 142-153 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-5 / +4 lines)
142	[% IF ( lateorder.internalnote ) %]	142	[% IF ( lateorder.internalnote ) %]
143	<p class="ordernote">	143	<p class="ordernote">
144	<span id="internal-note-[% lateorder.ordernumber \| html %]">[% lateorder.internalnote \| html %]</span>	144	<span id="internal-note-[% lateorder.ordernumber \| html %]">[% lateorder.internalnote \| html %]</span>
145	<a class="edit_note" data-ordernumber="[% lateorder.ordernumber \| html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber \| html %]&type=internal" title="Edit internal note">	145	<a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber \| html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber \| html %]&type=internal" title="Edit internal note">
146	<i class="fa fa-pencil"></i> Edit internal note	146	<i class="fa fa-pencil"></i> Edit internal note
147	</a>	147	</a>
148	</p>	148	</p>
149	[% ELSE %]	149	[% ELSE %]
150	<a class="edit_note" data-ordernumber="[% lateorder.ordernumber \| html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber \| html %]&type=internal" title="Add internal note">	150	<a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber \| html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber \| html %]&type=internal" title="Add internal note">
151	<i class="fa fa-plus"></i> Add internal note	151	<i class="fa fa-plus"></i> Add internal note
152	</a>	152	</a>
153	[% END %]	153	[% END %]
Lines 156-167 Link Here
156	[% IF ( lateorder.vendornote ) %]	156	[% IF ( lateorder.vendornote ) %]
157	<p class="ordernote">	157	<p class="ordernote">
158	<span id="vendor-note-[% lateorder.ordernumber \| html %]">[% lateorder.vendornote \| html %]</span>	158	<span id="vendor-note-[% lateorder.ordernumber \| html %]">[% lateorder.vendornote \| html %]</span>
159	<a class="edit_note" data-ordernumber="[% lateorder.ordernumber \| html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber \| html %]&type=vendor" title="Edit vendor note">	159	<a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber \| html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber \| html %]&type=vendor" title="Edit vendor note">
160	<i class="fa fa-pencil"></i> Edit vendor note	160	<i class="fa fa-pencil"></i> Edit vendor note
161	</a>	161	</a>
162	</p>	162	</p>
163	[% ELSE %]	163	[% ELSE %]
164	<a class="edit_note" data-ordernumber="[% lateorder.ordernumber \| html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber \| html %]&type=vendor" title="Add vendor note">	164	<a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber \| html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber \| html %]&type=vendor" title="Add vendor note">
165	<i class="fa fa-plus"></i> Add vendor note	165	<i class="fa fa-plus"></i> Add vendor note
166	</a>	166	</a>
167	[% END %]	167	[% END %]
168	-