0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-09 05:57:14 +03:00

Group functions have been refactored. From now they can use script expression in value parameter

This commit is contained in:
Arin Alexander
2017-01-28 02:20:15 +03:00
parent 887710d728
commit afc8ad77b2
14 changed files with 333 additions and 172 deletions

View File

@@ -238,6 +238,29 @@ void DataSourceManager::setDefaultDatabasePath(const QString &defaultDatabasePat
{
m_defaultDatabasePath = defaultDatabasePath;
}
QString DataSourceManager::putGroupFunctionsExpressions(QString expression)
{
if (m_groupFunctionsExpressionsMap.contains(expression)){
return QString::number(m_groupFunctionsExpressionsMap.value(expression));
} else {
m_groupFunctionsExpressions.append(expression);
m_groupFunctionsExpressionsMap.insert(expression, m_groupFunctionsExpressions.size()-1);
return QString::number(m_groupFunctionsExpressions.size()-1);
}
}
void DataSourceManager::clearGroupFuntionsExpressions()
{
m_groupFunctionsExpressionsMap.clear();
m_groupFunctionsExpressions.clear();
}
QString DataSourceManager::getExpression(QString index)
{
return m_groupFunctionsExpressions.at(index.toInt());
}
bool DataSourceManager::designTime() const
{
return m_designTime;
@@ -702,6 +725,16 @@ bool DataSourceManager::initAndOpenDB(QSqlDatabase& db, ConnectionDesc& connecti
return connected;
}
ReportSettings *DataSourceManager::reportSettings() const
{
return m_reportSettings;
}
void DataSourceManager::setReportSettings(ReportSettings *reportSettings)
{
m_reportSettings = reportSettings;
}
bool DataSourceManager::connectConnection(ConnectionDesc *connectionDesc)
{