python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-09 05:57:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Nested group bands render has been fixed

Browse Source
This commit is contained in:
Arin Alexander
2016-09-28 02:24:55 +04:00
parent 7c4d3bf8da
commit fc271d6a3b
5 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
limereport/lrreportrender.cpp
View File

@@ -190,7 +190,7 @@ void ReportRender::renderPage(PageDesignIntf* patternPage)
m_reportFooterHeight = reportFooter->height();
initVariables();
initGroupFunctions();
initGroups();
clearPageMap();
resetPageNumber();
@@ -545,20 +545,22 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da
if (gb&&gb->isNeedToClose(m_datasources)){
if (band->childBands().count()>0){
dataSource->prior();
foreach (BandDesignIntf* subBand, parentBand->childrenByType(BandDesignIntf::GroupHeader)) {
if ( (subBand->bandIndex() > band->bandIndex()) &&
(subBand->childBands().count()>0)
){
renderBand(subBand->childBands().at(0));
foreach (BandDesignIntf* subBand, band->childrenByType(BandDesignIntf::GroupHeader)) {
foreach(BandDesignIntf* footer, subBand->childrenByType(BandDesignIntf::GroupFooter)){
renderBand(footer);
closeDataGroup(subBand);
}
}
renderBand(band->childBands().at(0),StartNewPageAsNeeded);
foreach (BandDesignIntf* footer, band->childrenByType(BandDesignIntf::GroupFooter)) {
renderBand(footer,StartNewPageAsNeeded);
}
dataSource->next();
}
closeDataGroup(band);
}
if (!gb->isStarted()){
if (band->reprintOnEachPage())
m_reprintableBands.append(band);
@@ -571,6 +573,8 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da
renderBand(band,StartNewPageAsNeeded);
}
}
renderGroupHeader(band, dataSource, firstTime);
}
}
@@ -588,11 +592,12 @@ void ReportRender::renderGroupFooter(BandDesignIntf *parentBand)
}
}
void ReportRender::initGroupFunctions()
void ReportRender::initGroups()
{
m_datasources->clearGroupFunction();
foreach(BandDesignIntf* band, m_patternPageItem->childBands()){
if (band->isFooter()) extractGroupsFunction(band);
if (band->isHeader()) dynamic_cast<IGroupBand*>(band)->closeGroup();
}
}