gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the feature to create reports with borrower's sex information(Men/Women) (bug #2671) 

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
Nahuel Angelinetti 2008-10-15 09:38:47 +02:00 committed by Henri-Damien LAURENT
parent eacdee3941
commit 96df48e786
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
View File

@ -208,7 +208,18 @@
</script>
</td>
</tr>
<tr>
<td>Sex</td>
<td><input type="radio" name="Line" value="sex" /></td>
<td><input type="radio" name="Column" value="sex" /></td>
<td>
<select id="sex" size="1" name="Filter">
<option value="" />
<option value="M">Men</option>
<option value="F">Women</option>
</select>
</td>
</tr>
<!-- TMPL_IF name="SORT1_LOOP" -->
<tr class="highlight">
<td>Sort1</td>

27
reports/borrowers_stats.pl
View File

@ -187,18 +187,20 @@ sub calculate {
$linefilter = @$filters[0] if ($line =~ /categorycode/ ) ;
$linefilter = @$filters[1] if ($line =~ /zipcode/ ) ;
$linefilter = @$filters[2] if ($line =~ /branchcode/ ) ;
$linefilter = @$filters[5] if ($line =~ /sort1/ ) ;
$linefilter = @$filters[6] if ($line =~ /sort2/ ) ;
$linefilter = @$filters[5] if ($line =~ /sex/);
$linefilter = @$filters[6] if ($line =~ /sort1/ ) ;
$linefilter = @$filters[7] if ($line =~ /sort2/ ) ;
#
my $colfilter = "";
$colfilter = @$filters[0] if ($column =~ /categorycode/);
$colfilter = @$filters[1] if ($column =~ /zipcode/);
$colfilter = @$filters[2] if ($column =~ /branchcode/);
$colfilter = @$filters[5] if ($column =~ /sort1/);
$colfilter = @$filters[6] if ($column =~ /sort2/);
$colfilter = @$filters[5] if ($column =~ /sex/);
$colfilter = @$filters[6] if ($column =~ /sort1/);
$colfilter = @$filters[7] if ($column =~ /sort2/);
my @loopfilter;
for (my $i=0;$i<=6;$i++) {
for (my $i=0;$i<=7;$i++) {
my %cell;
if ( @$filters[$i] ) {
$cell{filter} .= @$filters[$i];
@ -207,8 +209,9 @@ sub calculate {
$cell{crit} .="Branchcode" if ($i==2);
$cell{crit} .="Date of Birth" if ($i==3);
$cell{crit} .="Date of Birth" if ($i==4);
$cell{crit} .="Sort1" if ($i==5);
$cell{crit} .="Sort2" if ($i==6);
$cell{crit} .="Sex" if ($i==5);
$cell{crit} .="Sort1" if ($i==6);
$cell{crit} .="Sort2" if ($i==7);
push @loopfilter, \%cell;
}
}
@ -312,10 +315,12 @@ sub calculate {
$strcalc .= " AND dateofbirth > '" . @$filters[3] ."'" if ( @$filters[3] );
@$filters[4]=~ s/\*/%/g if (@$filters[4]);
$strcalc .= " AND dateofbirth < '" . @$filters[4] ."'" if ( @$filters[4] );
@$filters[5]=~ s/\*/%/g if (@$filters[5]);
$strcalc .= " AND sort1 like '" . @$filters[5] ."'" if ( @$filters[5] );
@$filters[6]=~ s/\*/%/g if (@$filters[6]);
$strcalc .= " AND sort2 like '" . @$filters[6] ."'" if ( @$filters[6] );
@$filters[5]=~ s/\*/%/g if (@$filters[5]);
$strcalc .= " AND sex like '" . @$filters[5] ."'" if ( @$filters[5] );
@$filters[6]=~ s/\*/%/g if (@$filters[6]);
$strcalc .= " AND sort1 like '" . @$filters[6] ."'" if ( @$filters[6] );
@$filters[7]=~ s/\*/%/g if (@$filters[7]);
$strcalc .= " AND sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
$strcalc .= " AND borrowernumber in (select distinct(borrowernumber) from old_issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'active');
$strcalc .= " AND borrowernumber not in (select distinct(borrowernumber) from old_issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'nonactive');
$strcalc .= " AND $status='1' " if ($status);