Added NUMBER_ROLES to metadata.h for use in GUI source code.

formats/jsonparser.cpp

@@ -98,12 +98,16 @@ ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonOb
     values.insert(keyValuePair.first, keyValuePair.second);
   }
 
-  QListIterator<UserRoles> i(USER_FACING_ROLES);
+  for (auto iter = itemJsonObject.constBegin(), end = itemJsonObject.constEnd(); iter != end;
-  while (i.hasNext()) {
+       ++iter) {
-    const UserRoles role                  = i.next();
+    const QString roleName = iter.key();
-    std::pair<int, QVariant> keyValuePair = getKeyValuePair(itemJsonObject, role);
+    if (ROLE_NAMES.values().contains(roleName)) {
-    values.insert(keyValuePair.first, keyValuePair.second);
+      const int role                        = ROLE_NAMES.key(roleName.toLatin1());
+      std::pair<int, QVariant> keyValuePair = getKeyValuePair(itemJsonObject, role);
+      values.insert(keyValuePair.first, keyValuePair.second);
+    }
   }
+
   return values;
 }
 

model/metadata.h

@@ -25,9 +25,12 @@ enum UserRoles {
 
 static UserRoles DEFAULT_ROLE = NameRole;
 // TODO ?rename USER_FACING_ROLES -> MAIN_ROLES ?
-static QList<UserRoles> USER_FACING_ROLES = {NameRole, DescriptionRole, InfoRole,
+static QList<UserRoles> USER_FACING_ROLES = {NameRole,   DescriptionRole, InfoRole, TypeRole,
-                                             TypeRole, AmountRole,      FactorRole};
+                                             AmountRole, FactorRole,      IdRole};
-static QHash<int, QByteArray> ROLE_NAMES  = {
+
+static QList<UserRoles> READ_ONLY_ROLES = {IdRole};
+
+static QHash<int, QByteArray> ROLE_NAMES = {
     {NameRole, "name"},           {DescriptionRole, "description"},
     {InfoRole, "info"},           {TypeRole, "type"},
     {AmountRole, "amount"},       {FactorRole, "factor"},
@@ -37,6 +40,7 @@ static QHash<int, QByteArray> ROLE_NAMES  = {
 static QList<UserRoles> STRING_ROLES = {NameRole, DescriptionRole, InfoRole, IdRole};
 static QList<UserRoles> INT_ROLES    = {AmountRole};
 static QList<UserRoles> DOUBLE_ROLES = {FactorRole};
+static QList<UserRoles> NUMBER_ROLES = INT_ROLES + DOUBLE_ROLES;
 
 static const QList<UserRoles> TYPE_ROLES = {TypeRole};
 static const QList<QString> TYPES        = {"A", "B", "C", ""};
@@ -71,6 +75,9 @@ static UserRoles GET_ROLE_FOR_COLUMN(const int column) {
     case 5:
       return FactorRole;
       break;
+    case 6:
+      return IdRole;
+      break;
     default:
       qWarning() << QString("No role found for column %1! Returning 'NameRole'...").arg(column);
       return NameRole;

model/tablemodel.cpp

@@ -40,10 +40,19 @@ TableModel::TableModel(QUndoStack* undoStack, QObject* parent)
     , m_undoStack(undoStack) {}
 
 Qt::ItemFlags TableModel::flags(const QModelIndex& index) const {
+  Qt::ItemFlags result = QAbstractTableModel::flags(index);
   if (!index.isValid()) {
-    return QAbstractTableModel::flags(index);
+    return result;
   }
-  return Qt::ItemIsEditable | QAbstractTableModel::flags(index);
+
+  const int column        = index.column();
+  const int roleForColumn = GET_ROLE_FOR_COLUMN(column);
+  /// roles which aren't editable by the user
+  if (READ_ONLY_ROLES.contains(roleForColumn)) {
+    return result;
+  }
+
+  return result | Qt::ItemIsEditable;
 }
 
 QHash<int, QByteArray> TableModel::roleNames() const { return ROLE_NAMES; }
@@ -302,13 +311,6 @@ QMap<int, QVariant> TableModel::onlyChangedValues(const QModelIndex& index,
     const QVariant oldValue = index.data(role);
     // TODO check if role is a editable role?
     if (oldValue != newValue) {
-      bool emptyValueIsEqualToZero = isEmptyValueEqualToZero(role);
-      // REFACTOR the next if statement is too complex
-      if (emptyValueIsEqualToZero && oldValue == QVariant() && newValue == 0) {
-        qDebug() << "oldValue:" << oldValue << "& newValue:" << newValue
-                 << "mean the same. Ignoring...";
-        continue;
-      }
       qDebug() << "oldValue:" << oldValue << "!= newValue:" << newValue;
       result.insert(role, newValue);
     } else {
@@ -348,8 +350,6 @@ int TableModel::getAppropriateRoleForIndex(const QModelIndex& index, const int r
 }
 
 QModelIndex TableModel::searchItemIndex(const ModelItemValues givenItemValues) const {
-  // iterate over indexes to search item : see searchItem(...);
-  // for (const shared_ptr<ModelItem>& item : m_items) {
   for (int row = 0; row < rowCount(); ++row) {
     qDebug() << "Processing item at row" << row << "...";
     QModelIndex itemIndex = index(row, 0);