Attachment #167856 for bug #36925

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




    let included_ids = params.included_ids || [];
    let settings = params.settings || {};
    let table_settings = params.table_settings;
    let hasFilters = params.hasFilters;

    var exportColumns = ":visible:not(.noExport)";
    if( settings.hasOwnProperty("exportColumns") ){

    ];

    let buttons = [];
    if(hasFilters){
        buttons.push(
            {
                fade: 100,
                className: "dt_button_clear_filter",
                titleAttr: __("Clear filter"),
                enabled: false,
                text: '<i class="fa fa-lg fa-remove"></i> <span class="dt-button-text">' + __("Clear filter") + '</span>',
                action: function ( e, dt, node, config ) {
                    dt.search( "" ).draw("page");
                    node.addClass("disabled");
                }
            }
        );
    }

    if( included_ids.length > 0 ){
        buttons.push(




                ),
                options: {
                    embed: this.embed,
                    dom: '<"top pager"<"table_entries"ilpB>>tr<"bottom pager"ip>',
                },
                url: () => this.tableURL(this.year, this.params),
                table_settings: this.report_type.includes("monthly")
                    ? this.monthly_usage_table_settings
                    : this.yearly_usage_table_settings,
                add_filters: false,
            },
            yearly_filter: null,
            params: this.params,

Lines 29-34 export default { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/KohaTable.vue (-1 / +1 lines)
29	let buttons = _dt_buttons({	29	let buttons = _dt_buttons({
30	included_ids,	30	included_ids,
31	table_settings: this.table_settings,	31	table_settings: this.table_settings,
		32	hasFilters: this.add_filters,
32	})	33	})
33	return {	34	return {
34	data: [],	35	data: [],
35	-

Return to bug 36925

Lines 665-670 function _dt_buttons(params){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-12 / +15 lines)
665	let included_ids = params.included_ids \|\| [];	665	let included_ids = params.included_ids \|\| [];
666	let settings = params.settings \|\| {};	666	let settings = params.settings \|\| {};
667	let table_settings = params.table_settings;	667	let table_settings = params.table_settings;
		668	let hasFilters = params.hasFilters;
668		669
669	var exportColumns = ":visible:not(.noExport)";	670	var exportColumns = ":visible:not(.noExport)";
670	if( settings.hasOwnProperty("exportColumns") ){	671	if( settings.hasOwnProperty("exportColumns") ){
Lines 721-739 function _dt_buttons(params){ Link Here
721	];	722	];
722		723
723	let buttons = [];	724	let buttons = [];
724	buttons.push(	725	if(hasFilters){
725	{	726	buttons.push(
726	fade: 100,	727	{
727	className: "dt_button_clear_filter",	728	fade: 100,
728	titleAttr: __("Clear filter"),	729	className: "dt_button_clear_filter",
729	enabled: false,	730	titleAttr: __("Clear filter"),
730	text: '<i class="fa fa-lg fa-remove"></i> <span class="dt-button-text">' + __("Clear filter") + '</span>',	731	enabled: false,
731	action: function ( e, dt, node, config ) {	732	text: '<i class="fa fa-lg fa-remove"></i> <span class="dt-button-text">' + __("Clear filter") + '</span>',
732	dt.search( "" ).draw("page");	733	action: function ( e, dt, node, config ) {
733	node.addClass("disabled");	734	dt.search( "" ).draw("page");
		735	node.addClass("disabled");
		736	}
734	}	737	}
735	}	738	);
736	);	739	}
737		740
738	if( included_ids.length > 0 ){	741	if( included_ids.length > 0 ){
739	buttons.push(	742	buttons.push(

Lines 96-108 export default { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportsViewer.vue (-2 / +2 lines)
96	),	96	),
97	options: {	97	options: {
98	embed: this.embed,	98	embed: this.embed,
99	dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',	99	dom: '<"top pager"<"table_entries"ilpB>>tr<"bottom pager"ip>',
100	},	100	},
101	url: () => this.tableURL(this.year, this.params),	101	url: () => this.tableURL(this.year, this.params),
102	table_settings: this.report_type.includes("monthly")	102	table_settings: this.report_type.includes("monthly")
103	? this.monthly_usage_table_settings	103	? this.monthly_usage_table_settings
104	: this.yearly_usage_table_settings,	104	: this.yearly_usage_table_settings,
105	add_filters: true,	105	add_filters: false,
106	},	106	},
107	yearly_filter: null,	107	yearly_filter: null,
108	params: this.params,	108	params: this.params,