From d968233dd39879a994a6c1baa8d629cf9cc6926b Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Thu, 31 Mar 2022 11:34:38 +0200 Subject: [PATCH] Bug 30952: Reports Module --- .../en/modules/reports/acquisitions_stats.tt | 14 +++++++++++-- .../prog/en/modules/reports/bor_issues_top.tt | 14 +++++++++++-- .../prog/en/modules/reports/borrowers_out.tt | 9 ++++++++- .../en/modules/reports/borrowers_stats.tt | 14 +++++++++++-- .../en/modules/reports/cash_register_stats.tt | 14 +++++++++++-- .../prog/en/modules/reports/cat_issues_top.tt | 14 +++++++++++-- .../prog/en/modules/reports/catalogue_out.tt | 9 ++++++++- .../en/modules/reports/catalogue_stats.tt | 14 +++++++++++-- .../en/modules/reports/issues_avg_stats.tt | 9 ++++++++- .../prog/en/modules/reports/issues_stats.tt | 14 +++++++++++-- .../prog/en/modules/reports/itemslost.tt | 9 ++++++++- .../prog/en/modules/reports/itemtypes.tt | 9 ++++++++- .../en/modules/reports/orders_by_budget.tt | 9 ++++++++- .../prog/en/modules/reports/reports-home.tt | 9 ++++++++- .../prog/en/modules/reports/reserves_stats.tt | 14 +++++++++++-- .../prog/en/modules/reports/serials_stats.tt | 20 ++++++++++++++----- 16 files changed, 167 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt index aa41d41a16..54fcf4628e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -1,12 +1,14 @@ [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'circ-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( do_it ) %]Acquisitions statistics › Results[% ELSE %]Acquisitions statistics[% END %] › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt index af079b3e56..9ed12bf0cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt @@ -2,14 +2,16 @@ [% USE KohaDates %] [% USE ItemTypes %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'circ-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Patrons with the most checkouts › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt index f3dba0031d..2d7f93d58a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt @@ -6,7 +6,6 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt index 2017c62cf6..5e44b81fbf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt @@ -2,6 +2,9 @@ [% USE Koha %] [% USE Asset %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'circ-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( do_it ) %]Patrons statistics › Results[% ELSE %]Patrons statistics[% END %] › Reports › Koha @@ -13,8 +16,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt index 2e3bc98874..581a12f073 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -7,6 +7,9 @@ [% USE ItemTypes %] [% USE Registers %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'circ-search.inc' %] +[% END %] [% PROCESS 'accounts.inc' %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( do_it ) %]Cash register statistics › Results[% ELSE %]Cash register statistics[% END %] › Reports › Koha @@ -14,8 +17,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt index 4a1f29c7e8..81ed049467 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt @@ -1,13 +1,15 @@ [% USE Branches %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'prefs-admin-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Most-circulated items[% IF ( do_it ) %] › Results[% END %] › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt index 522f5cbcca..4a81d89767 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt @@ -8,7 +8,6 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt index 28ca91a789..05df192f2b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt @@ -1,13 +1,15 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] +[% formulaire = BLOCK %] + [% INCLUDE 'circ-search.inc' %] +[% END %] [% IF ( do_it ) %]Catalog statistics › Results[% ELSE %]Catalog statistics[% END %] › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt index 0cf4e3fdac..0cfef512ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt @@ -7,7 +7,6 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt index 46dc8ac727..03c63a3efa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -1,5 +1,8 @@ [% USE Branches %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'circ-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Circulation statistics[% IF ( do_it ) %] › Results[% END %] › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -9,8 +12,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt index 9ccc075100..b2fb5428ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt @@ -14,7 +14,6 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt index 57fe194b5b..a4dbea7b01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt @@ -12,7 +12,6 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt index 2b06ed6e72..742c2f0ee2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt @@ -9,7 +9,6 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt index 5c2de9cbf3..9bd9001473 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt @@ -6,7 +6,6 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'circ-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt index 181fb4e188..354cd96653 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt @@ -1,5 +1,8 @@ [% USE Branches %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'circ-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Holds statistics[% IF ( do_it ) %] › Results[% END %] › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -9,8 +12,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt index 0a0f60370c..64d138a581 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt @@ -3,6 +3,9 @@ [% USE KohaDates %] [% USE Branches %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'circ-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Serials subscriptions stats › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -12,8 +15,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
@@ -77,7 +87,7 @@ [% ELSE %]
-
+
  1. @@ -108,8 +118,8 @@
-
- Output +
+

Output

  1. -- 2.17.1