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

New functionality has been added to the report's variables

Browse Source
This commit is contained in:
Arin Alexander
2017-09-26 00:19:59 +03:00
parent 0ab92681b0
commit af589e31ba
11 changed files with 242 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/databrowser/lrdatabrowser.cpp
View File

@@ -237,7 +237,7 @@ void DataBrowser::updateVariablesTree()
}
}
foreach(QString variableName,m_report->dataManager()->namesOfUserVariables()){
foreach(QString variableName,m_report->dataManager()->userVariableNames()){
if (!m_report->dataManager()->variableNames().contains(variableName)){
QStringList values;
values<<variableName+" ["+m_report->dataManager()->variable(variableName).toString()+"]"

46
limereport/databrowser/lrvariabledialog.cpp
View File

@@ -30,8 +30,10 @@
#include "lrvariabledialog.h"
#include "ui_lrvariabledialog.h"
#include "lrglobal.h"
#include "lrvariablesholder.h"
#include <stdexcept>
#include <QMessageBox>
#include <QMetaEnum>
LRVariableDialog::LRVariableDialog(QWidget *parent) :
QDialog(parent),
@@ -42,8 +44,14 @@ LRVariableDialog::LRVariableDialog(QWidget *parent) :
m_oldVariableName("")
{
ui->setupUi(this);
ui->cbbType->setVisible(false);
ui->lblType->setVisible(false);
static int enumIndex = LimeReport::Enums::staticMetaObject.indexOfEnumerator("VariableDataType");
QMetaEnum enumerator = LimeReport::Enums::staticMetaObject.enumerator(enumIndex);
for (int i = 0; i<enumerator.keyCount(); ++i){
ui->cbbType->addItem(enumerator.key(i));
}
//ui->cbbType->setVisible(false);
//ui->lblType->setVisible(false);
}
LRVariableDialog::~LRVariableDialog()
@@ -66,28 +74,40 @@ void LRVariableDialog::setVariableName(const QString &value)
void LRVariableDialog::showEvent(QShowEvent *)
{
ui->leName->setText(m_variableName);
if (!m_variableName.isEmpty()&&m_variablesContainer&&m_variablesContainer->containsVariable(m_variableName)){
static int enumIndex = LimeReport::Enums::staticMetaObject.indexOfEnumerator("VariableDataType");
QMetaEnum enumerator = LimeReport::Enums::staticMetaObject.enumerator(enumIndex);
if (!m_variableName.isEmpty()&&m_variablesContainer&&m_variablesContainer->containsVariable(m_variableName)){
ui->leValue->setText(m_variablesContainer->variable(m_variableName).toString());
ui->cbbType->setCurrentText(enumerator.valueToKey(m_variablesContainer->variableDataType(m_variableName)));
ui->cbbMandatory->setChecked(m_variablesContainer->variableIsMandatory(m_variableName));
}
}
void LRVariableDialog::accept()
{
try{
if (m_variablesContainer&&!ui->leName->text().isEmpty()){
if (m_changeMode){
if (m_oldVariableName==ui->leName->text()){
m_variablesContainer->changeVariable(m_oldVariableName,value());
static int enumIndex = LimeReport::Enums::staticMetaObject.indexOfEnumerator("VariableDataType");
QMetaEnum enumerator = LimeReport::Enums::staticMetaObject.enumerator(enumIndex);
if (m_variablesContainer&&!ui->leName->text().isEmpty()){
if (m_changeMode){
if (m_oldVariableName==ui->leName->text()){
m_variablesContainer->changeVariable(m_oldVariableName,value());
} else {
m_variablesContainer->deleteVariable(m_oldVariableName);
m_variablesContainer->addVariable(ui->leName->text(),value(), LimeReport::VarDesc::Report);
}
} else {
m_variablesContainer->deleteVariable(m_oldVariableName);
m_variablesContainer->addVariable(ui->leName->text(),value(), LimeReport::VarDesc::Report);
}
} else {
m_variablesContainer->addVariable(ui->leName->text(),value(), LimeReport::VarDesc::Report);
m_variablesContainer->setVarableMandatory(ui->leName->text(),ui->cbbMandatory->isChecked());
m_variablesContainer->setVariableDataType(
ui->leName->text(),
LimeReport::VariableDataType(enumerator.keysToValue(ui->cbbType->currentText().toLatin1()))
);
emit signalVariableAccepted(ui->leName->text());
QDialog::accept();
}
emit signalVariableAccepted(ui->leName->text());
QDialog::accept();
}
} catch (LimeReport::ReportError &exception){
QMessageBox::critical(this,tr("Attention"),exception.what());
}

59
limereport/databrowser/lrvariabledialog.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>218</width>
<height>126</height>
<width>328</width>
<height>173</height>
</rect>
</property>
<property name="windowTitle">
@@ -18,35 +18,8 @@
<normaloff>:/databrowser/images/value</normaloff>:/databrowser/images/value</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item>
<layout class="QFormLayout" name="formLayout">
<property name="horizontalSpacing">
<number>7</number>
</property>
<property name="verticalSpacing">
<number>5</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="lblName">
<property name="text">
@@ -67,9 +40,6 @@
<item row="1" column="1">
<widget class="QLineEdit" name="leValue"/>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cbbType"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lblType">
<property name="text">
@@ -77,8 +47,31 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cbbType"/>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="cbbMandatory">
<property name="text">
<string>Mandatory</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">