NewItemDialog uses dynamically generated control widgets for model data as well. Added a WidgetHelper class to consolidate identical source code for ItemDetailMapper and NewItemDialog.

dialogs/newitemdialog.cpp

@@ -1,11 +1,15 @@
 #include "newitemdialog.h"
 
+#include <QComboBox>
 #include <QGridLayout>
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QLabel>
 #include <QLineEdit>
 #include <QSpinBox>
+#include <QStringListModel>
+
+#include "../widgethelper.h"
 #include "formats/jsonparser.h"
 #include "model/metadata.h"
 
@@ -21,61 +25,84 @@ void NewItemDialog::createContent() {
 
   m_contentContainer = new QWidget(this);
 
-  // REFACTOR use a data structure for input widgets which can be iterated through
-  //        using a factory which iterates through the roles from metadata.h
-  //        and create the input widgets based on the data type of this role
-  m_nameLabel = new QLabel("&Name");
-  m_nameEdit  = new QLineEdit();
-  m_nameLabel->setBuddy(m_nameEdit);
+  m_layout = new QGridLayout();
 
-  m_descriptionLabel = new QLabel("&Description");
-  m_descriptionEdit  = new QLineEdit();
-  m_descriptionLabel->setBuddy(m_descriptionEdit);
+  for (int i = 0; i < USER_FACING_ROLES.size(); ++i) {
+    setupWidgetPairForColumn(i);
+  }
 
-  m_infoLabel = new QLabel("&Info");
-  m_infoEdit  = new QLineEdit();
-  m_infoLabel->setBuddy(m_infoEdit);
-
-  m_amountLabel = new QLabel("&Amount");
-  m_amountBox   = new QSpinBox();
-  m_amountBox->setMaximum(1000);
-  m_amountLabel->setBuddy(m_amountBox);
-
-  m_factorLabel = new QLabel("&Factor");
-  m_factorBox   = new QDoubleSpinBox();
-  m_factorBox->setMaximum(1000);
-  m_factorLabel->setBuddy(m_factorBox);
-
-  QGridLayout* layout = new QGridLayout();
-  layout->addWidget(m_nameLabel, 0, 0, 1, 1);
-  layout->addWidget(m_nameEdit, 0, 1, 1, 1);
-  layout->addWidget(m_descriptionLabel, 1, 0, 1, 1);
-  layout->addWidget(m_descriptionEdit, 1, 1, 1, 1);
-  layout->addWidget(m_infoLabel, 2, 0, 1, 1);
-  layout->addWidget(m_infoEdit, 2, 1, 1, 1);
-  layout->addWidget(m_amountLabel, 3, 0, 1, 1);
-  layout->addWidget(m_amountBox, 3, 1, 1, 1);
-  layout->addWidget(m_factorLabel, 4, 0, 1, 1);
-  layout->addWidget(m_factorBox, 4, 1, 1, 1);
-
-  m_contentContainer->setLayout(layout);
+  m_contentContainer->setLayout(m_layout);
 
   m_outerLayout->insertWidget(0, m_contentContainer);
 }
 
 void NewItemDialog::accept() {
+  addItemToModel();
+
+  resetContent();
+
+  AbstractDialog::accept();
+}
+
+void NewItemDialog::setupWidgetPairForColumn(const int column) {
+  // REFACTOR consolidate NewItemDialog::setupWidgetPairForColumn(...)
+  //          with ItemDetailMapper::setupWidgetPairForColumn(...)
+  const UserRoles role = GET_ROLE_FOR_COLUMN(column);
+
+  QWidget* control = WidgetHelper::createControlWidget(role, this);
+
+  const QString string = QString("&%1").arg(GET_HEADER_FOR_COLUMN(column));
+  QLabel* label        = new QLabel(string);
+  label->setBuddy(control);
+
+  m_layout->addWidget(label, column, 0);
+  m_layout->addWidget(control, column, 1);
+  m_controlWidgets.append(control);
+}
+
+void NewItemDialog::addItemToModel() {
   ModelItemValues itemValues;
-  // TODO (after refactoring data structure for input widgets) use iteration through the relevant
-  //    roles and their input widgets
-  itemValues.insert(NameRole, m_nameEdit->text());
-  itemValues.insert(DescriptionRole, m_descriptionEdit->text());
-  itemValues.insert(InfoRole, m_infoEdit->text());
-  itemValues.insert(AmountRole, m_amountBox->value());
-  itemValues.insert(FactorRole, m_factorBox->value());
+
+  for (int i = 0; i < m_controlWidgets.size(); ++i) {
+    const UserRoles role = GET_ROLE_FOR_COLUMN(i);
+    if (STRING_ROLES.contains(role)) {
+      QLineEdit* lineEdit = dynamic_cast<QLineEdit*>(m_controlWidgets[i]);
+      itemValues.insert(role, lineEdit->text());
+    } else if (TYPE_ROLES.contains(role)) {
+      QComboBox* comboBox = dynamic_cast<QComboBox*>(m_controlWidgets[i]);
+      itemValues.insert(role, comboBox->currentText());
+    } else if (INT_ROLES.contains(role)) {
+      QSpinBox* spinBox = dynamic_cast<QSpinBox*>(m_controlWidgets[i]);
+      itemValues.insert(role, spinBox->value());
+    } else if (DOUBLE_ROLES.contains(role)) {
+      QDoubleSpinBox* doubleSpinBox = dynamic_cast<QDoubleSpinBox*>(m_controlWidgets[i]);
+      itemValues.insert(role, doubleSpinBox->value());
+    } else {
+      qCritical() << "Could not reset content for control widget in column:" << i << "!";
+    }
+  }
 
   const QByteArray jsonDoc = JsonParser::itemValuesListToJson({itemValues}, ITEMS_KEY_STRING);
   emit addItems(jsonDoc);
-
-  // resetContent();
-  AbstractDialog::accept();
+}
+
+void NewItemDialog::resetContent() {
+  for (int i = 0; i < m_controlWidgets.size(); ++i) {
+    const UserRoles role = GET_ROLE_FOR_COLUMN(i);
+    if (STRING_ROLES.contains(role)) {
+      QLineEdit* lineEdit = dynamic_cast<QLineEdit*>(m_controlWidgets[i]);
+      lineEdit->clear();
+    } else if (TYPE_ROLES.contains(role)) {
+      QComboBox* comboBox = dynamic_cast<QComboBox*>(m_controlWidgets[i]);
+      comboBox->setCurrentText("");
+    } else if (INT_ROLES.contains(role)) {
+      QSpinBox* spinBox = dynamic_cast<QSpinBox*>(m_controlWidgets[i]);
+      spinBox->setValue(0);
+    } else if (DOUBLE_ROLES.contains(role)) {
+      QDoubleSpinBox* doubleSpinBox = dynamic_cast<QDoubleSpinBox*>(m_controlWidgets[i]);
+      doubleSpinBox->setValue(0.0);
+    } else {
+      qCritical() << "Could not reset content for control widget in column:" << i << "!";
+    }
+  }
 }

dialogs/newitemdialog.h

@@ -24,20 +24,13 @@ class NewItemDialog : public AbstractDialog {
   // void reject() override;
 
  private:
-  QLabel* m_nameLabel   = nullptr;
-  QLineEdit* m_nameEdit = nullptr;
+  QGridLayout* m_layout;
+  QList<QWidget*> m_controlWidgets;
 
-  QLabel* m_descriptionLabel   = nullptr;
-  QLineEdit* m_descriptionEdit = nullptr;
+  void setupWidgetPairForColumn(const int column);
 
-  QLabel* m_infoLabel   = nullptr;
-  QLineEdit* m_infoEdit = nullptr;
-
-  QLabel* m_amountLabel = nullptr;
-  QSpinBox* m_amountBox = nullptr;
-
-  QLabel* m_factorLabel       = nullptr;
-  QDoubleSpinBox* m_factorBox = nullptr;
+  void addItemToModel();
+  void resetContent();
 };
 
 #endif  // NEWITEMDIALOG_H