Attachment #63571 for bug #17282

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

Lines 3001-3003 fieldset.rows + fieldset.action { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+4 lines)
3001	.yui-u .rows li p label.widelabel {	3001	.yui-u .rows li p label.widelabel {
3002	width: auto;	3002	width: auto;
3003	}	3003	}
		3004
		3005	div#makechart ol li {
		3006	list-style: none;
		3007	}

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc (-2 / +2 lines)
1	<div id="makechart">	1	<div id="makechart">
2	[% supposed_x = header_row.shift.cell %]	2	[% supposed_x = header_row.shift.cell %]
3		3
4	<fieldset class="rows">	4	<fieldset>
5	<legend>Draw a chart</legend>	5	<legend>Draw a chart</legend>
6	<ol>	6	<ol>
7	<li>	7	<li>
Lines 80-86 Link Here
80	</li>	80	</li>
81		81
82	<li>	82	<li>
83	<button id="draw-chart" class="btn">Draw</button>	83	<button id="draw-chart" class="btn btn-default">Draw</button>
84	</li>	84	</li>
85	</ol>	85	</ol>
86	</fieldset>	86	</fieldset>




        $('#download-chart').hide();
        var chart;

        $('#draw-chart').click(function() {
            var x_elements = $('select[name="x"]').val();
            var y_elements = [];
            var groups = [];
            var lines = [];
            var options = {};

            //var headers = [% header_row.json %];
            headers = [% header_row.json %];
            var results = [% results.json %]

            if ($('input[name="chart-exclude-last"]').prop('checked')) {
                results.splice(-1, 1);
            }

        [% UNLESS (errors) %]
            $('#draw-chart').click(function() {
            });
            $('select[name="group"]').each(function( index ) {
                groups.push( $(this).val() );
            });
            $('.column-line').each(function( index ) {
                if ($(this).prop('checked')) {
                    lines.push( $(this).attr('name') );
                }
            });

                var btn_text = $("#draw-chart").html();
                $("#draw-chart").html(_('Loading...'));

                var x_elements = $('select[name="x"]').val();
                var y_elements = [];
                var groups = [];
                var lines = [];
                var options = {};

                //var headers = [% header_row.json %];
                headers = [% header_row.json %];
                var results = [% results.json %]

                if ($('input[name="chart-exclude-last"]').prop('checked')) {
                    results.splice(-1, 1);
                }
            });

                $('select[name="y"]').each(function( index ) {
                    y_elements.push( $(this).val() );
                });
                $('select[name="group"]').each(function( index ) {
                    groups.push( $(this).val() );
                });
                $('.column-line').each(function( index ) {
                    if ($(this).prop('checked')) {
                        lines.push( $(this).attr('name') );
                    }
                });

                // Remove deleted columns from headers and results.
                var deleted_indexes = [];
                var kept_headers = [];
                $.each(headers, function(index, value) {
                    if (value.cell != x_elements && $.inArray(value.cell, y_elements) === -1) {
                        // This header is neither a x element nor in y elements. Don't need it.
                        deleted_indexes.push(index);
                    }
                    else {
                        kept_headers.push({cell: value.cell});
                    }
                });
                kept_results.push(line);
            });

                // Remove coresponding cells.
                var kept_results = [];
                $.each(results, function(index, value) {
                    var line = {};
                    line['cells'] = [];
                    $.each(value.cells, function(i, val) {
                        if ($.inArray(i, deleted_indexes) === -1) {
                            line['cells'].push({cell: val.cell});
                        }
                    });
                    kept_results.push(line);
                });

                options.type = $('select[name="chart-type"]').val();
                options.horizontal = $('input[name="column-horizontal"]').prop('checked');
                options.lines = lines;


                chart = create_chart(kept_headers, kept_results, x_elements, y_elements, groups, options);
                $('#chart').prepend('<div style="font-size: 1rem; text-align: center;">' + "[% name %]" + '</div>');
                $('#download-chart').show();
                $("#draw-chart").html(_(btn_text));
                $("html, body").animate({ scrollTop: $(document).height() }, "slow");
            });
        [% END %]
    });
</script>
<h1>[% name %]</h1>
- 

Return to bug 17282

Lines 900-967 canned reports and writing custom SQL reports.</p> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-54 / +62 lines)
900	$('#download-chart').hide();	900	$('#download-chart').hide();
901	var chart;	901	var chart;
902		902
903	$('#draw-chart').click(function() {
904	var x_elements = $('select[name="x"]').val();
905	var y_elements = [];
906	var groups = [];
907	var lines = [];
908	var options = {};
909
910	//var headers = [% header_row.json %];
911	headers = [% header_row.json %];
912	var results = [% results.json %]
913
914	if ($('input[name="chart-exclude-last"]').prop('checked')) {
915	results.splice(-1, 1);
916	}
917		903
918	$('select[name="y"]').each(function( index ) {	904	[% UNLESS (errors) %]
919	y_elements.push( $(this).val() );	905	$('#draw-chart').click(function() {
920	});
921	$('select[name="group"]').each(function( index ) {
922	groups.push( $(this).val() );
923	});
924	$('.column-line').each(function( index ) {
925	if ($(this).prop('checked')) {
926	lines.push( $(this).attr('name') );
927	}
928	});
929		906
930	// Remove deleted columns from headers and results.	907	var btn_text = $("#draw-chart").html();
931	var deleted_indexes = [];	908	$("#draw-chart").html(_('Loading...'));
932	var kept_headers = [];	909
933	$.each(headers, function(index, value) {	910	var x_elements = $('select[name="x"]').val();
934	if (value.cell != x_elements && $.inArray(value.cell, y_elements) === -1) {	911	var y_elements = [];
935	// This header is neither a x element nor in y elements. Don't need it.	912	var groups = [];
936	deleted_indexes.push(index);	913	var lines = [];
937	}	914	var options = {};
938	else {	915
939	kept_headers.push({cell: value.cell});	916	//var headers = [% header_row.json %];
		917	headers = [% header_row.json %];
		918	var results = [% results.json %]
		919
		920	if ($('input[name="chart-exclude-last"]').prop('checked')) {
		921	results.splice(-1, 1);
940	}	922	}
941	});
942		923
943	// Remove coresponding cells.	924	$('select[name="y"]').each(function( index ) {
944	var kept_results = [];	925	y_elements.push( $(this).val() );
945	$.each(results, function(index, value) {	926	});
946	var line = {};	927	$('select[name="group"]').each(function( index ) {
947	line['cells'] = [];	928	groups.push( $(this).val() );
948	$.each(value.cells, function(i, val) {	929	});
949	if ($.inArray(i, deleted_indexes) === -1) {	930	$('.column-line').each(function( index ) {
950	line['cells'].push({cell: val.cell});	931	if ($(this).prop('checked')) {
		932	lines.push( $(this).attr('name') );
		933	}
		934	});
		935
		936	// Remove deleted columns from headers and results.
		937	var deleted_indexes = [];
		938	var kept_headers = [];
		939	$.each(headers, function(index, value) {
		940	if (value.cell != x_elements && $.inArray(value.cell, y_elements) === -1) {
		941	// This header is neither a x element nor in y elements. Don't need it.
		942	deleted_indexes.push(index);
		943	}
		944	else {
		945	kept_headers.push({cell: value.cell});
951	}	946	}
952	});	947	});
953	kept_results.push(line);
954	});
955		948
956	options.type = $('select[name="chart-type"]').val();	949	// Remove coresponding cells.
957	options.horizontal = $('input[name="column-horizontal"]').prop('checked');	950	var kept_results = [];
958	options.lines = lines;	951	$.each(results, function(index, value) {
		952	var line = {};
		953	line['cells'] = [];
		954	$.each(value.cells, function(i, val) {
		955	if ($.inArray(i, deleted_indexes) === -1) {
		956	line['cells'].push({cell: val.cell});
		957	}
		958	});
		959	kept_results.push(line);
		960	});
959		961
		962	options.type = $('select[name="chart-type"]').val();
		963	options.horizontal = $('input[name="column-horizontal"]').prop('checked');
		964	options.lines = lines;
960		965
961	chart = create_chart(kept_headers, kept_results, x_elements, y_elements, groups, options);	966
962	$('#chart').prepend('<div style="font-size: 1rem; text-align: center;">' + "[% name %]" + '</div>');	967	chart = create_chart(kept_headers, kept_results, x_elements, y_elements, groups, options);
963	$('#download-chart').show();	968	$('#chart').prepend('<div style="font-size: 1rem; text-align: center;">' + "[% name %]" + '</div>');
964	});	969	$('#download-chart').show();
		970	$("#draw-chart").html(_(btn_text));
		971	$("html, body").animate({ scrollTop: $(document).height() }, "slow");
		972	});
		973	[% END %]
965	});	974	});
966	</script>	975	</script>
967	<h1>[% name %]</h1>	976	<h1>[% name %]</h1>
968	-