bent/GenericQtClientCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added type role and column & refactored the JsonParser in the process.

Browse Source
This commit is contained in:
Bent Witthold
2026-03-01 10:59:34 +01:00
parent 1db5d9022a
commit becde8c794
5 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
formats/csvparser.cpp
View File

@ -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

53
formats/jsonparser.cpp
View File

@ -43,24 +43,7 @@ QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemVa
QJsonObject rootObject;
QJsonArray itemArray;
for (const ModelItemValues& itemValues : itemValuesList) {
QJsonObject itemObject;
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);
}
}
QJsonObject itemObject = itemValuesToJsonObject(itemValues);
itemArray.append(itemObject);
}
@ -70,6 +53,38 @@ 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 QString roleName = ROLE_NAMES.value(idRole);
const QVariant idValue = itemValues.value(idRole);
if (!idValue.isNull()) {
const QString idRoleName = ROLE_NAMES.value(idRole);
result.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 = itemValues.value(role);
if (STRING_ROLES.contains(role)) {
result.insert(roleName, value.toString());
} else if (INT_ROLES.contains(role)) {
result.insert(roleName, value.toInt());
} else if (DOUBLE_ROLES.contains(role)) {
result.insert(roleName, value.toDouble());
} else if (TYPE_ROLES.contains(role)) {
result.insert(roleName, value.toString());
} else {
qCritical() << QString("Can't find data type for role %1!!!").arg(role);
}
}
return result;
}
JsonParser::JsonParser() {}
QJsonArray JsonParser::extractItemArray(const QJsonDocument& doc, const QString& objectName) {
@ -112,6 +127,8 @@ 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);
}

1
formats/jsonparser.h
View File

@ -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
model/metadata.h
View File

@ -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,
FactorRole};
static QList<UserRoles> USER_FACING_ROLES = {NameRole, DescriptionRole, InfoRole,
TypeRole, AmountRole, FactorRole};
static QHash<int, QByteArray> ROLE_NAMES = {
{NameRole, "name"}, {DescriptionRole, "description"}, {InfoRole, "info"},
{AmountRole, "amount"}, {FactorRole, "factor"}, {ToStringRole, "ToString"},
{IdRole, "id"}};
{NameRole, "name"}, {DescriptionRole, "description"},
{InfoRole, "info"}, {TypeRole, "type"},
{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) {

30
model/modelitem.cpp
View File

@ -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;
// 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);
}
}
QJsonObject itemObject = JsonParser::itemValuesToJsonObject(m_values);
return itemObject;
}