From 20241fd68696d989e9ab6c68924abd63df9b20dc Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Tue, 1 Apr 2008 12:01:10 -0500 Subject: [PATCH] more XHTML corrections for new circ reports Note: I question the use of GROUP_CONCAT(... SEPARATOR '
'), because that puts knowledge of the output mechanism (currently HTML) into the SQL query. However, I am not fixing this right now. Signed-off-by: Joshua Ferraro --- circ/billing.pl | 10 +++++----- circ/pendingreserves.pl | 8 ++++---- circ/reserveratios.pl | 8 ++++---- .../prog/en/modules/circ/pendingreserves.tmpl | 2 +- .../prog/en/modules/circ/reserveratios.tmpl | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/circ/billing.pl b/circ/billing.pl index 764899cc86..b369f220dd 100755 --- a/circ/billing.pl +++ b/circ/billing.pl @@ -118,11 +118,11 @@ if ($order eq "patron") { } my $strsth = "SELECT - GROUP_CONCAT(accountlines.accounttype ORDER BY accountlines.date DESC SEPARATOR '
') as l_accounttype, - GROUP_CONCAT(description ORDER BY accountlines.date DESC SEPARATOR '
') as l_description, - GROUP_CONCAT(round(amountoutstanding,2) ORDER BY accountlines.date DESC SEPARATOR '
') as l_amountoutstanding, - GROUP_CONCAT(accountlines.date ORDER BY accountlines.date DESC SEPARATOR '
') as l_date, - GROUP_CONCAT(accountlines.itemnumber ORDER BY accountlines.date DESC SEPARATOR '
') as l_itemnumber, + GROUP_CONCAT(accountlines.accounttype ORDER BY accountlines.date DESC SEPARATOR '
') as l_accounttype, + GROUP_CONCAT(description ORDER BY accountlines.date DESC SEPARATOR '
') as l_description, + GROUP_CONCAT(round(amountoutstanding,2) ORDER BY accountlines.date DESC SEPARATOR '
') as l_amountoutstanding, + GROUP_CONCAT(accountlines.date ORDER BY accountlines.date DESC SEPARATOR '
') as l_date, + GROUP_CONCAT(accountlines.itemnumber ORDER BY accountlines.date DESC SEPARATOR '
') as l_itemnumber, count(*) as cnt, max(accountlines.date) as maxdate, round(sum(amountoutstanding),2) as sum_amount, diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index f8ac860edf..0a6fa2fa6d 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -116,7 +116,7 @@ my $strsth = "SELECT min(reservedate) as l_reservedate, reserves.borrowernumber as borrowernumber, GROUP_CONCAT(DISTINCT items.holdingbranch - ORDER BY items.itemnumber SEPARATOR '
') l_holdingbranch, + ORDER BY items.itemnumber SEPARATOR '
') l_holdingbranch, reserves.biblionumber, reserves.branchcode, GROUP_CONCAT(DISTINCT reserves.branchcode @@ -124,11 +124,11 @@ my $strsth = items.holdingbranch as branch, items.itemcallnumber, GROUP_CONCAT(DISTINCT items.itype - ORDER BY items.itemnumber SEPARATOR '
') l_itype, + ORDER BY items.itemnumber SEPARATOR '
') l_itype, GROUP_CONCAT(DISTINCT items.location - ORDER BY items.itemnumber SEPARATOR '
') l_location, + ORDER BY items.itemnumber SEPARATOR '
') l_location, GROUP_CONCAT(DISTINCT items.itemcallnumber - ORDER BY items.itemnumber SEPARATOR '
') l_itemcallnumber, + ORDER BY items.itemnumber SEPARATOR '
') l_itemcallnumber, items.itemnumber, notes, notificationdate, diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl index 60f01bb006..b0dc55ee2f 100755 --- a/circ/reserveratios.pl +++ b/circ/reserveratios.pl @@ -123,13 +123,13 @@ my $strsth = items.itemcallnumber, items.itemnumber, GROUP_CONCAT(DISTINCT items.itemcallnumber - ORDER BY items.itemnumber SEPARATOR '
') as listcall, + ORDER BY items.itemnumber SEPARATOR '
') as listcall, GROUP_CONCAT(DISTINCT holdingbranch - ORDER BY items.itemnumber SEPARATOR '
') as listbranch, + ORDER BY items.itemnumber SEPARATOR '
') as listbranch, GROUP_CONCAT(DISTINCT items.location - ORDER BY items.itemnumber SEPARATOR '
') as l_location, + ORDER BY items.itemnumber SEPARATOR '
') as l_location, GROUP_CONCAT(DISTINCT items.itype - ORDER BY items.itemnumber SEPARATOR '
') as l_itype, + ORDER BY items.itemnumber SEPARATOR '
') as l_itype, notes, reserves.found, biblio.title, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl index 84f7a1e655..458a0b0ded 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl @@ -143,7 +143,7 @@ Calendar.setup( -

+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl index b5fa1a1034..dcc8a2c68f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl @@ -135,8 +135,8 @@ Calendar.setup( + -

@@ -169,8 +169,8 @@ Calendar.setup(

Order:

- + -- 2.39.5