Added type roles to the calculation if an item is equal to the given item values.

formats/csvparser.cpp

@@ -127,6 +127,10 @@ QVariant CsvParser::parseItemValue(const int role, const std::string& valueStrin
   if (STRING_ROLES.contains(role)) {
     /// string values
     result = QString::fromStdString(valueString);
+  } else if (TYPE_ROLES.contains(role)) {
+    /// type values
+    // TODO validate string is allowed
+    result = QString::fromStdString(valueString);
   } else if (INT_ROLES.contains(role)) {
     /// int values
 

formats/jsonparser.cpp

@@ -43,24 +43,7 @@ QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemVa
   QJsonObject rootObject;
   QJsonArray itemArray;
   for (const ModelItemValues& itemValues : itemValuesList) {
-    QJsonObject itemObject;
+    QJsonObject itemObject = itemValuesToJsonObject(itemValues);
-
-    QListIterator<UserRoles> i(USER_FACING_ROLES);
-    while (i.hasNext()) {
-      const UserRoles role   = i.next();
-      const QString roleName = ROLE_NAMES.value(role);
-      const QVariant value   = itemValues.value(role);
-      if (STRING_ROLES.contains(role)) {
-        itemObject.insert(roleName, value.toString());
-      } else if (INT_ROLES.contains(role)) {
-        itemObject.insert(roleName, value.toInt());
-      } else if (DOUBLE_ROLES.contains(role)) {
-        itemObject.insert(roleName, value.toDouble());
-      } else {
-        qCritical() << QString("Can't find data type for role %1!!!").arg(role);
-      }
-    }
-
     itemArray.append(itemObject);
   }
 
@@ -70,6 +53,27 @@ QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemVa
   return jsonDoc.toJson(QJsonDocument::Compact);
 }
 
+QJsonObject JsonParser::itemValuesToJsonObject(const ModelItemValues& itemValues) {
+  QJsonObject result;
+
+  // TODO add dates (entry, modification, end)
+  const UserRoles idRole   = IdRole;
+  const QJsonValue idValue = extractJsonValue(itemValues, idRole);
+  if (!idValue.isNull()) {
+    const QString idRoleName = ROLE_NAMES.value(idRole);
+    result.insert(idRoleName, idValue);
+  }
+
+  QListIterator<UserRoles> i(USER_FACING_ROLES);
+  while (i.hasNext()) {
+    const UserRoles role       = i.next();
+    const QJsonValue jsonValue = extractJsonValue(itemValues, role);
+    const QString roleName     = ROLE_NAMES.value(role);
+    result.insert(roleName, jsonValue);
+  }
+  return result;
+}
+
 JsonParser::JsonParser() {}
 
 QJsonArray JsonParser::extractItemArray(const QJsonDocument& doc, const QString& objectName) {
@@ -112,8 +116,28 @@ pair<int, QVariant> JsonParser::getKeyValuePair(const QJsonObject& itemJsonObjec
     result = jsonValue.toInt();
   } else if (DOUBLE_ROLES.contains(role)) {
     result = jsonValue.toDouble();
+  } else if (TYPE_ROLES.contains(role)) {
+    result = jsonValue.toString();
   } else {
     qCritical() << QString("Cant find data type of role %1!!!").arg(role);
   }
   return pair<int, QVariant>(role, result);
 }
+
+QJsonValue JsonParser::extractJsonValue(const ModelItemValues& itemValues, const int role) {
+  QJsonValue result;
+  const QString roleName = ROLE_NAMES.value(role);
+  const QVariant value   = itemValues.value(role);
+  if (STRING_ROLES.contains(role)) {
+    result = value.toString();
+  } else if (INT_ROLES.contains(role)) {
+    result = value.toInt();
+  } else if (DOUBLE_ROLES.contains(role)) {
+    result = value.toDouble();
+  } else if (TYPE_ROLES.contains(role)) {
+    result = value.toString();
+  } else {
+    qCritical() << QString("Can't find data type for role %1!!!").arg(role);
+  }
+  return result;
+}

formats/jsonparser.h

@@ -18,6 +18,7 @@ class JsonParser {
                                                  const QString& rootValueName = "");
   static QByteArray itemValuesListToJson(const QList<ModelItemValues>& itemValuesList,
                                          const QString& objectName = "");
+  static QJsonObject itemValuesToJsonObject(const ModelItemValues& itemValues);
 
  private:
   explicit JsonParser();
@@ -26,6 +27,8 @@ class JsonParser {
   static ModelItemValues jsonObjectToItemValues(const QJsonObject& itemJsonObject);
 
   static pair<int, QVariant> getKeyValuePair(const QJsonObject& itemJsonObject, const int role);
+
+  static QJsonValue extractJsonValue(const ModelItemValues& itemValues, const int role);
 };
 
 #endif  // JSONPARSER_H

model/generalsortfiltermodel.cpp

@@ -59,6 +59,12 @@ bool GeneralSortFilterModel::lessThan(const QModelIndex& source_left,
     const QString rightString = rightData.toString();
     return m_collator.compare(leftString, rightString) > 0;
   }
+  const bool isType = TYPE_ROLES.contains(role);
+  if (isType) {
+    const QString leftString  = leftData.toString();
+    const QString rightString = rightData.toString();
+    return m_collator.compare(leftString, rightString) > 0;
+  }
   const bool isInt = INT_ROLES.contains(role);
   if (isInt) {
     const int leftInt  = leftData.toInt();

model/metadata.h

@@ -13,6 +13,7 @@ enum UserRoles {
   NameRole = Qt::UserRole + 1,
   DescriptionRole,
   InfoRole,
+  TypeRole,
   AmountRole,
   FactorRole,
   /// Non user facing
@@ -24,16 +25,21 @@ enum UserRoles {
 
 static UserRoles DEFAULT_ROLE = NameRole;
 // TODO ?rename USER_FACING_ROLES -> MAIN_ROLES ?
-static QList<UserRoles> USER_FACING_ROLES = {NameRole, DescriptionRole, InfoRole, AmountRole,
+static QList<UserRoles> USER_FACING_ROLES = {NameRole, DescriptionRole, InfoRole,
-                                             FactorRole};
+                                             TypeRole, AmountRole,      FactorRole};
 static QHash<int, QByteArray> ROLE_NAMES  = {
-    {NameRole, "name"},     {DescriptionRole, "description"}, {InfoRole, "info"},
+    {NameRole, "name"},         {DescriptionRole, "description"},
-    {AmountRole, "amount"}, {FactorRole, "factor"},           {ToStringRole, "ToString"},
+    {InfoRole, "info"},         {TypeRole, "type"},
-    {IdRole, "id"}};
+    {AmountRole, "amount"},     {FactorRole, "factor"},
+    {ToStringRole, "ToString"}, {IdRole, "id"}};
+
 static QList<UserRoles> STRING_ROLES = {NameRole, DescriptionRole, InfoRole, IdRole};
 static QList<UserRoles> INT_ROLES    = {AmountRole};
 static QList<UserRoles> DOUBLE_ROLES = {FactorRole};
 
+static const QList<UserRoles> TYPE_ROLES = {TypeRole};
+static const QList<QString> TYPES        = {"A", "B", "C", ""};
+
 /// JSON keys
 static const QString ITEMS_KEY_STRING = "items";
 static const QString ITEM_KEY_STRING  = "item";
@@ -42,7 +48,7 @@ static const QString ITEM_KEY_STRING  = "item";
 static const QString ITEMS_FILE_NAME = ITEMS_KEY_STRING + ".json";
 
 /// functions
-static int GET_ROLE_FOR_COLUMN(const int column) {
+static UserRoles GET_ROLE_FOR_COLUMN(const int column) {
   switch (column) {
     case 0:
       return NameRole;
@@ -54,9 +60,12 @@ static int GET_ROLE_FOR_COLUMN(const int column) {
       return InfoRole;
       break;
     case 3:
-      return AmountRole;
+      return TypeRole;
       break;
     case 4:
+      return AmountRole;
+      break;
+    case 5:
       return FactorRole;
       break;
     default:
@@ -65,6 +74,9 @@ static int GET_ROLE_FOR_COLUMN(const int column) {
       break;
   }
 }
+
+static int GET_COLUMN_FOR_ROLE(const UserRoles role) { return USER_FACING_ROLES.indexOf(role); }
+
 static QList<QString> GET_HEADER_NAMES() {
   QList<QString> result;
   for (const UserRoles& role : USER_FACING_ROLES) {

model/modelitem.cpp

@@ -1,10 +1,11 @@
 #include "modelitem.h"
 
-#include "metadata.h"
-
 #include <QJsonObject>
 #include <QJsonValue>
 
+#include "../formats/jsonparser.h"
+#include "metadata.h"
+
 ModelItem::ModelItem(const ModelItemValues values)
     : m_values(values) {}
 
@@ -66,29 +67,6 @@ QString ModelItem::toString() const {
 }
 
 QJsonObject ModelItem::toJsonObject() const {
-  QJsonObject itemObject;
+  QJsonObject itemObject = JsonParser::itemValuesToJsonObject(m_values);
-  // TODO add UUID and dates (entry, modification, end)
-  const UserRoles idRole = IdRole;
-  QVariant idValue       = data(idRole);
-  if (!idValue.isNull()) {
-    const QString idRoleName = ROLE_NAMES.value(idRole);
-    itemObject.insert(idRoleName, idValue.toString());
-  }
-
-  QListIterator<UserRoles> i(USER_FACING_ROLES);
-  while (i.hasNext()) {
-    const UserRoles role   = i.next();
-    const QString roleName = ROLE_NAMES.value(role);
-    const QVariant value   = data(role);
-    if (STRING_ROLES.contains(role)) {
-      itemObject.insert(roleName, value.toString());
-    } else if (INT_ROLES.contains(role)) {
-      itemObject.insert(roleName, value.toInt());
-    } else if (DOUBLE_ROLES.contains(role)) {
-      itemObject.insert(roleName, value.toDouble());
-    } else {
-      qCritical() << QString("Cant find data type of role %1!!!").arg(role);
-    }
-  }
   return itemObject;
 }

model/tablemodel.cpp

@@ -78,19 +78,15 @@ QVariant TableModel::data(const QModelIndex& index, int role) const {
     case Qt::DisplayRole:
     case Qt::EditRole:
       return m_items.at(row)->data(roleForColumn);
-    case NameRole:
-    case DescriptionRole:
-    case InfoRole:
-    case AmountRole:
-    case FactorRole:
-    case IdRole:
-      return m_items.at(row)->data(role);
     case ToStringRole:
       return m_items.at(row)->toString();
     case ToJsonRole:
       return m_items.at(row)->toJsonObject();
+    case IdRole:
+      return m_items.at(row)->data(role);
+    default:
+      return m_items.at(row)->data(role);
   }
-
   return QVariant();
 }
 
@@ -373,6 +369,10 @@ bool TableModel::isItemEqualToItemValues(const QModelIndex& itemIndex,
         if (valueOfItem.toString() != givenValue.toString()) {
           return false;
         }
+      } else if (TYPE_ROLES.contains(role)) {
+        if (valueOfItem.toString() != givenValue.toString()) {
+          return false;
+        }
       } else if (INT_ROLES.contains(role)) {
         if (valueOfItem.toInt() != givenValue.toInt()) {
           return false;