mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00
Code 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

25
limereport/bands/lrgroupbands.cpp
View File

@@ -92,8 +92,9 @@ void GroupBandHeader::startGroup(DataSourceManager* dataManager)
QString lineVar = QLatin1String("line_")+objectName().toLower();
dataManager->setReportVariable(lineVar,1);
if ((dataManager->dataSource(parentBand()->datasourceName()))){
IDataSource* ds = dataManager->dataSource(parentBand()->datasourceName());
QString datasourceName = findDataSourceName(parentBand());
if (dataManager->containsDatasource(datasourceName)){
IDataSource* ds = dataManager->dataSource(datasourceName);
if (ds->columnIndexByName(m_groupFiledName)!=-1)
m_groupFieldValue=ds->data(m_groupFiledName);
}
@@ -104,17 +105,27 @@ QColor GroupBandHeader::bandColor() const
return QColor(Qt::darkBlue);
}
QString GroupBandHeader::findDataSourceName(BandDesignIntf* parentBand){
if (!parentBand) return "";
if (!parentBand->datasourceName().isEmpty())
return parentBand->datasourceName();
else
return findDataSourceName(parentBand->parentBand());
}
bool GroupBandHeader::isNeedToClose(DataSourceManager* dataManager)
{
//if (m_groupFieldValue.isNull()) return false;
if (!m_groupStarted) return false;
if (m_groupFiledName.isNull() || m_groupFiledName.isEmpty())
dataManager->putError("Group Field Not found");
if ((dataManager->dataSource(parentBand()->datasourceName()))){
IDataSource* ds = dataManager->dataSource(parentBand()->datasourceName());
dataManager->putError(tr("Group field not found"));
QString datasourceName = findDataSourceName(parentBand());
if (dataManager->containsDatasource(datasourceName)){
IDataSource* ds = dataManager->dataSource(datasourceName);
if (ds->data(m_groupFiledName).isNull() && m_groupFieldValue.isNull()) return false;
return ds->data(m_groupFiledName)!=m_groupFieldValue;
} else {
dataManager->putError(tr("Datasource \"%1\" not found !!!").arg(datasourceName));
}
return false;

1
limereport/bands/lrgroupbands.h
View File

@@ -64,6 +64,7 @@ private:
bool isStarted();
void closeGroup();
int index();
QString findDataSourceName(BandDesignIntf *parentBand);
private:
QVariant m_groupFieldValue;
QString m_groupFiledName;