Attachment #25174 for bug #11718

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

Lines 673-679 sub get_saved_reports { Link Here

(-)a/C4/Reports/Guided.pm (-1 lines)
673	$query .= " ORDER by date_created";	673	$query .= " ORDER by date_created";
674		674
675	my $result = $dbh->selectall_arrayref($query, {Slice => {}}, @args);	675	my $result = $dbh->selectall_arrayref($query, {Slice => {}}, @args);
676	$_->{date_created} = format_date($_->{date_created}) foreach @$result;
677		676
678	return $result;	677	return $result;
679	}	678	}




[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Reports &rsaquo; Guided reports wizard
[% IF ( saved1 ) %]&rsaquo; Saved Reports

</style>
[% IF ( saved1 ) %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'datatables-strings.inc' %]
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
[% END %]

<script type="text/javascript">
//<![CDATA[
[% IF (dateformat == 'metric' && saved1) %]
dt_add_type_uk_date();
[% END %]
var group_subgroups = {};
[% FOREACH group IN groups_with_subgroups %]
    var gid = "[% group.id %]"

$(document).ready(function(){

[% IF (saved1) %]
    [% IF (dateformat == "metric") %]
        dt_add_type_uk_date();
    [% END %]
    var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, {
        'bAutoWidth': false,
        'sDom': 't<"bottom pager"ilpf>',

        'iDisplayLength': 20,
        'aaSorting': [[ 1, "asc" ]],
        'aoColumnDefs': [
            { 'bSortable': false, 'bSearchable':false, 'aTargets': [0, -1, -2, -3] },
            { 'bSearchable': false, 'aTargets': [3, 4] },
            { "aTargets": [ 1, 2 ], "sType": "natural"  }
        ],
        "aoColumns": [
            null,null,null,null,null,null,null,null,{ "sType": "title-string" },null,[% IF (usecache) %]null,[% END %]null,null
        ],
        'oLanguage': {
            'sZeroRecords': _("No matching reports found")
        }

                        <td>[% savedreport.subgroupname %]</td>
                        <td>[% savedreport.notes %]</td>
                        <td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
                        <td><span title="[% savedreport.date_created %]">[% savedreport.date_created | $KohaDates %]</span></td>
                        [% IF (savedreport.public) %]
                        <td>Yes</td>
                        [% ELSE %]

Lines 2-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt (-4 / +2 lines)
2	<title>Koha &rsaquo; Reports &rsaquo; Catalog by item types</title>	2	<title>Koha &rsaquo; Reports &rsaquo; Catalog by item types</title>
3	[% INCLUDE 'doc-head-close.inc' %]	3	[% INCLUDE 'doc-head-close.inc' %]
4	[% IF ( do_it ) %]	4	[% IF ( do_it ) %]
5	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />	5	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
6	<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>	6	[% INCLUDE 'datatables.inc' %]
7	[% INCLUDE 'datatables-strings.inc' %]
8	<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
9	<script type="text/javascript">	7	<script type="text/javascript">
10	//<![CDATA[	8	//<![CDATA[
11	$(document).ready(function(){	9	$(document).ready(function(){




[% USE KohaDates %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Reports &rsaquo; Serials subscriptions stats</title>
[% INCLUDE 'doc-head-close.inc' %]
<style type="text/css">
	.sql {display: none;}
</style>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'datatables-strings.inc' %]
<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
<script type="text/javascript">
	//<![CDATA[
        [% IF (dateformat == 'metric') %]dt_add_type_uk_date();[% END %]
		$(document).ready(function() {
            $("#resulttable").dataTable($.extend(true, {}, dataTablesDefaults, {
                "sDom": 't',
                "bPaginate": false,
                "aoColumns": [
                    null,{ "sType": "anti-the" },null,null,null,{ "sType": "title-string" },{ "sType": "title-string" },null
                ],
            }));
    	});
	//]]>

		<tbody>
			<tr>
				[% FOREACH data IN datas %]
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid %]">[% data.name %]</a></td>
                    <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid %]">[% data.title |html %]</a></td>
					<td>[% data.subscriptionid %]</td>
                    <td>[% Branches.GetName( data.branchcode ) %]</td>
					<td>[% data.callnumber %]</td>
                    <td><span title="[% data.startdate %]">[% data.startdate | $KohaDates %]</span></td>
                    <td><span title="[% data.enddate %]">[% data.enddate | $KohaDates %]</span></td>
                    <td>
                        [% IF data.closed %]
                            Closed

					Vendor:
			    </label>
				<select name="bookseller" id="bookseller">
                    <option value="">Any vendor</option>
    				[% FOREACH bookseller IN booksellers %]
						<option value="[% bookseller.aqbooksellerid %]">[% bookseller.name %]</option>
					[% END %]

Lines 94-101 if($do_it){ Link Here

(-)a/reports/serials_stats.pl (-3 / +1 lines)
94	my @datas;	94	my @datas;
95		95
96	while(my $row = $sth->fetchrow_hashref){	96	while(my $row = $sth->fetchrow_hashref){
97	$row->{'enddate'} = format_date(GetExpirationDate($row->{'subscriptionid'}));	97	$row->{'enddate'} = GetExpirationDate($row->{'subscriptionid'});
98	$row->{'startdate'} = format_date($row->{'startdate'});
99	$row->{expired} = HasSubscriptionExpired($row->{subscriptionid});	98	$row->{expired} = HasSubscriptionExpired($row->{subscriptionid});
100	push @datas, $row if (	99	push @datas, $row if (
101	$expired	100	$expired
102	-

Return to bug 11718

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-11 / +7 lines)
		1	[% USE KohaDates %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Reports &rsaquo; Guided reports wizard	3	<title>Koha &rsaquo; Reports &rsaquo; Guided reports wizard
3	[% IF ( saved1 ) %]&rsaquo; Saved Reports	4	[% IF ( saved1 ) %]&rsaquo; Saved Reports
Lines 21-36 Link Here
21	</style>	22	</style>
22	[% IF ( saved1 ) %]	23	[% IF ( saved1 ) %]
23	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />	24	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
24	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>	25	[% INCLUDE 'datatables.inc' %]
25	[% INCLUDE 'datatables-strings.inc' %]
26	<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
27	[% END %]	26	[% END %]
28		27
29	<script type="text/javascript">	28	<script type="text/javascript">
30	//<![CDATA[	29	//<![CDATA[
31	[% IF (dateformat == 'metric' && saved1) %]
32	dt_add_type_uk_date();
33	[% END %]
34	var group_subgroups = {};	30	var group_subgroups = {};
35	[% FOREACH group IN groups_with_subgroups %]	31	[% FOREACH group IN groups_with_subgroups %]
36	var gid = "[% group.id %]"	32	var gid = "[% group.id %]"
Lines 61-69 function load_group_subgroups () { Link Here
61	$(document).ready(function(){	57	$(document).ready(function(){
62		58
63	[% IF (saved1) %]	59	[% IF (saved1) %]
64	[% IF (dateformat == "metric") %]
65	dt_add_type_uk_date();
66	[% END %]
67	var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, {	60	var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, {
68	'bAutoWidth': false,	61	'bAutoWidth': false,
69	'sDom': 't<"bottom pager"ilpf>',	62	'sDom': 't<"bottom pager"ilpf>',
Lines 72-81 $(document).ready(function(){ Link Here
72	'iDisplayLength': 20,	65	'iDisplayLength': 20,
73	'aaSorting': [[ 1, "asc" ]],	66	'aaSorting': [[ 1, "asc" ]],
74	'aoColumnDefs': [	67	'aoColumnDefs': [
75	{ 'bSortable': false, 'bSearchable':false, 'aTargets': [0, -1, -2, -3, -4] },	68	{ 'bSortable': false, 'bSearchable':false, 'aTargets': [0, -1, -2, -3] },
76	{ 'bSearchable': false, 'aTargets': [3, 4] },	69	{ 'bSearchable': false, 'aTargets': [3, 4] },
77	{ "aTargets": [ 1, 2 ], "sType": "natural" }	70	{ "aTargets": [ 1, 2 ], "sType": "natural" }
78	],	71	],
		72	"aoColumns": [
		73	null,null,null,null,null,null,null,null,{ "sType": "title-string" },null,[% IF (usecache) %]null,[% END %]null,null
		74	],
79	'oLanguage': {	75	'oLanguage': {
80	'sZeroRecords': _("No matching reports found")	76	'sZeroRecords': _("No matching reports found")
81	}	77	}
Lines 326-332 canned reports and writing custom SQL reports.</p> Link Here
326	<td>[% savedreport.subgroupname %]</td>	322	<td>[% savedreport.subgroupname %]</td>
327	<td>[% savedreport.notes %]</td>	323	<td>[% savedreport.notes %]</td>
328	<td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>	324	<td>[% savedreport.borrowersurname %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname %][% END %] ([% savedreport.borrowernumber %])</td>
329	<td>[% savedreport.date_created %]</td>	325	<td><span title="[% savedreport.date_created %]">[% savedreport.date_created \| $KohaDates %]</span></td>
330	[% IF (savedreport.public) %]	326	[% IF (savedreport.public) %]
331	<td>Yes</td>	327	<td>Yes</td>
332	[% ELSE %]	328	[% ELSE %]

Lines 1-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (-12 / +14 lines)
		1	[% USE KohaDates %]
		2	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Reports &rsaquo; Serials subscriptions stats</title>	4	<title>Koha &rsaquo; Reports &rsaquo; Serials subscriptions stats</title>
3	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
4	<style type="text/css">	6	<style type="text/css">
5	.sql {display: none;}	7	.sql {display: none;}
6	</style>	8	</style>
7	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />	9	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
8	<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>	10	[% INCLUDE 'datatables.inc' %]
9	[% INCLUDE 'datatables-strings.inc' %]
10	<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
11	<script type="text/javascript">	11	<script type="text/javascript">
12	//<![CDATA[	12	//<![CDATA[
13	[% IF (dateformat == 'metric') %]dt_add_type_uk_date();[% END %]
14	$(document).ready(function() {	13	$(document).ready(function() {
15	$("#resulttable").dataTable($.extend(true, {}, dataTablesDefaults, {	14	$("#resulttable").dataTable($.extend(true, {}, dataTablesDefaults, {
16	"sDom": 't',	15	"sDom": 't',
17	"bPaginate": false	16	"bPaginate": false,
		17	"aoColumns": [
		18	null,{ "sType": "anti-the" },null,null,null,{ "sType": "title-string" },{ "sType": "title-string" },null
		19	],
18	}));	20	}));
19	});	21	});
20	//]]>	22	//]]>
Lines 49-61 Link Here
49	<tbody>	51	<tbody>
50	<tr>	52	<tr>
51	[% FOREACH data IN datas %]	53	[% FOREACH data IN datas %]
52	<td>[% data.name %]</td>	54	<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid %]">[% data.name %]</a></td>
53	<td>[% data.title \|html %]</td>	55	<td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid %]">[% data.title \|html %]</a></td>
54	<td>[% data.subscriptionid %]</td>	56	<td>[% data.subscriptionid %]</td>
55	<td>[% data.branchcode %]</td>	57	<td>[% Branches.GetName( data.branchcode ) %]</td>
56	<td>[% data.callnumber %]</td>	58	<td>[% data.callnumber %]</td>
57	<td>[% data.startdate %]</td>	59	<td><span title="[% data.startdate %]">[% data.startdate \| $KohaDates %]</span></td>
58	<td>[% data.enddate %]</td>	60	<td><span title="[% data.enddate %]">[% data.enddate \| $KohaDates %]</span></td>
59	<td>	61	<td>
60	[% IF data.closed %]	62	[% IF data.closed %]
61	Closed	63	Closed
Lines 80-86 Link Here
80	Vendor:	82	Vendor:
81	</label>	83	</label>
82	<select name="bookseller" id="bookseller">	84	<select name="bookseller" id="bookseller">
83	<option value="">Any Vendor</option>	85	<option value="">Any vendor</option>
84	[% FOREACH bookseller IN booksellers %]	86	[% FOREACH bookseller IN booksellers %]
85	<option value="[% bookseller.aqbooksellerid %]">[% bookseller.name %]</option>	87	<option value="[% bookseller.aqbooksellerid %]">[% bookseller.name %]</option>
86	[% END %]	88	[% END %]