paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-26 07:10:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

LazReport, allow second parameter of COUNT() to control if invisible records should be counted

Browse Source 
git-svn-id: trunk@51479 -
This commit is contained in:
jesus 2016-02-02 18:31:58 +00:00
parent 946f8970fb
commit 4d59e883db
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/lazreport/source/lr_class.pas
View File

@ -12515,16 +12515,26 @@ begin
DebugLn('CurBand=%s CurBand.View=%s AggrBand=%s',
[BandInfo(CurBand),dbgsName(CurBand.View),BandInfo(AggrBand)]);
{$ENDIF}
s1 := Trim(string(p2));
if s1 = '' then begin
if (dk=dkCount) and (p1+''<>'') then
s1 := p1
else
if dk <> dkCount then begin
// p1 = field
// p2 = data band
// p3 = InvisibleToo
s1 := trim(string(p2));
if s1='' then
s1 := CurBand.View.Name;
end;
if dk <> dkCount then
s2 := Trim(string(p3)) else
s2 := Trim(string(p3))
end
else begin
// p1 = data band
// p2 = InvisibleToo
s1 := Trim(string(p1));
s2 := Trim(string(p2));
if s2<>'1' then
s2 := '0';
end;
// s1 = data band
// s2 = '1' o '0' (1 means process invisible records too)
if (AggrBand.Typ in [btPageFooter, btMasterFooter, btDetailFooter,
btSubDetailFooter, btGroupFooter, btCrossFooter, btReportSummary]) and
((s2 = '1') or ((s2 <> '1') and CurBand.Visible)) then