[Koha-patches] [PATCH] more XHTML corrections for new circ reports
Galen Charlton
galen.charlton at liblime.com
Tue Apr 1 19:01:10 CEST 2008
Note: I question the use of GROUP_CONCAT(... SEPARATOR '<br/>'),
because that puts knowledge of the output mechanism (currently HTML)
into the SQL query. However, I am not fixing this right now.
---
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 764899c..b369f22 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 '<br>') as l_accounttype,
- GROUP_CONCAT(description ORDER BY accountlines.date DESC SEPARATOR '<br>') as l_description,
- GROUP_CONCAT(round(amountoutstanding,2) ORDER BY accountlines.date DESC SEPARATOR '<br>') as l_amountoutstanding,
- GROUP_CONCAT(accountlines.date ORDER BY accountlines.date DESC SEPARATOR '<br>') as l_date,
- GROUP_CONCAT(accountlines.itemnumber ORDER BY accountlines.date DESC SEPARATOR '<br>') as l_itemnumber,
+ GROUP_CONCAT(accountlines.accounttype ORDER BY accountlines.date DESC SEPARATOR '<br/>') as l_accounttype,
+ GROUP_CONCAT(description ORDER BY accountlines.date DESC SEPARATOR '<br/>') as l_description,
+ GROUP_CONCAT(round(amountoutstanding,2) ORDER BY accountlines.date DESC SEPARATOR '<br/>') as l_amountoutstanding,
+ GROUP_CONCAT(accountlines.date ORDER BY accountlines.date DESC SEPARATOR '<br/>') as l_date,
+ GROUP_CONCAT(accountlines.itemnumber ORDER BY accountlines.date DESC SEPARATOR '<br/>') 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 f8ac860..0a6fa2f 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 '<br>') l_holdingbranch,
+ ORDER BY items.itemnumber SEPARATOR '<br/>') 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 '<br>') l_itype,
+ ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype,
GROUP_CONCAT(DISTINCT items.location
- ORDER BY items.itemnumber SEPARATOR '<br>') l_location,
+ ORDER BY items.itemnumber SEPARATOR '<br/>') l_location,
GROUP_CONCAT(DISTINCT items.itemcallnumber
- ORDER BY items.itemnumber SEPARATOR '<br>') l_itemcallnumber,
+ ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
items.itemnumber,
notes,
notificationdate,
diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl
index 60f01bb..b0dc55e 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 '<br>') as listcall,
+ ORDER BY items.itemnumber SEPARATOR '<br/>') as listcall,
GROUP_CONCAT(DISTINCT holdingbranch
- ORDER BY items.itemnumber SEPARATOR '<br>') as listbranch,
+ ORDER BY items.itemnumber SEPARATOR '<br/>') as listbranch,
GROUP_CONCAT(DISTINCT items.location
- ORDER BY items.itemnumber SEPARATOR '<br>') as l_location,
+ ORDER BY items.itemnumber SEPARATOR '<br/>') as l_location,
GROUP_CONCAT(DISTINCT items.itype
- ORDER BY items.itemnumber SEPARATOR '<br>') as l_itype,
+ ORDER BY items.itemnumber SEPARATOR '<br/>') 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 84f7a1e..458a0b0 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(
<!-- TMPL_LOOP NAME="reserveloop" -->
<tr>
<!-- TMPL_IF name="borrowernumber" -->
- <td><p><!-- TMPL_VAR NAME="pullcount" --></b></p></td>
+ <td><p><b><!-- TMPL_VAR NAME="pullcount" --></b></p></td>
<td><!-- TMPL_VAR NAME="count" --></td>
<td><!-- TMPL_VAR NAME="rcount" --></td>
<td>
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 b5fa1a1..dcc8a2c 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(
</tr>
<!-- TMPL_LOOP NAME="reserveloop" -->
+ <!-- TMPL_IF name="ratio_ge_one" -->
<tr>
- <!-- TMPL_IF name="ratio_ge_one" -->
<td>
<p><!-- TMPL_VAR NAME="reservecount" --></p>
</td>
@@ -169,8 +169,8 @@ Calendar.setup(
<td><p><!-- TMPL_VAR NAME="itype" --></p></td>
<td><p><!-- TMPL_VAR NAME="listcall" --></p></td>
<td><p><b>Order: <!-- TMPL_VAR NAME="ratiocalc" --></b></p></td>
- <!-- /TMPL_IF -->
</tr>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_ELSE -->
--
1.5.5.rc0.16.g02b00
More information about the Koha-patches
mailing list