Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

kohabug 2224 Third installment: Further corrections for NULL fields

Browse source 
This patch adds code to clean out any NULL fields in rows returned
since NULL fields do not truly meet the filter criteria

It also corrects a bad db field reference.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Chris Nighswonger 2008-07-25 10:37:51 -05:00 committed by Joshua Ferraro
parent a6c829e2bf
commit f6a3f83ca2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
View file

@ -156,8 +156,8 @@
</tr>
<tr>
<td>Received On</td>
<td><input type="radio" name="Line" value="aqorderbreakdown.datereceived" /></td>
<td><input type="radio" name="Column" value="aqorderbreakdown.datereceived" /></td>
<td><input type="radio" name="Line" value="aqorders.datereceived" /></td>
<td><input type="radio" name="Column" value="aqorders.datereceived" /></td>
<td> From <input type="text" size="10" id="fromRO" name="Filter" value="" />
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" />
<script type="text/javascript">

5
reports/acquisitions_stats.pl
View file

@ -620,10 +620,10 @@ sub calculate {
$strcalc .= " AND aqbasket.closedate <= '" . @$filters[1] . "'"
if ( @$filters[1] );
@$filters[2] =~ s/\*/%/g if ( @$filters[2] );
$strcalc .= " AND aqorderbreakdown.datereceived >= '" . @$filters[2] . "'"
$strcalc .= " AND aqorders.datereceived >= '" . @$filters[2] . "'"
if ( @$filters[2] );
@$filters[3] =~ s/\*/%/g if ( @$filters[3] );
$strcalc .= " AND aqorderbreakdown.datereceived <= '" . @$filters[3] . "'"
$strcalc .= " AND aqorders.datereceived <= '" . @$filters[3] . "'"
if ( @$filters[3] );
# @$filters[4] =~ s/\*/%/g if ( @$filters[4] );
# $strcalc .= " AND aqbasket.closedate >= '" . @$filters[4] . "'"
@ -655,6 +655,7 @@ sub calculate {
# warn "filling table";
my $emptycol;
while ( my ( $row, $col, $value ) = $dbcalc->fetchrow ) {
next if ($row eq undef || $col eq undef);
#warn "filling table $row / $col / $value ";
$emptycol = 1 if ( $col eq undef );
$col = "zzEMPTY" if ( $col eq undef );