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

Refactored JsonParser to not use roles (or their names) directly.

Browse Source
This commit is contained in:
Bent Witthold
2025-12-29 13:03:09 +01:00
parent 3610aa3841
commit acb8be5602
4 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
formats/jsonparser.cpp
View File

@ -23,20 +23,6 @@ QList<QHash<int, QVariant>> JsonParser::toItemValuesList(const QByteArray& jsonD
return result;
}
QHash<int, QVariant> JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonObject) {
QHash<int, QVariant> values;
// TODO iterate over "public & editable" roles (the ones that should occur in JSON file)
// & use a (static) function to retrieve it (i. e. getRoleValue(int role))
values[NameRole] = itemJsonObject[ROLE_NAMES.value(NameRole)].toString();
values[DescriptionRole] = itemJsonObject[ROLE_NAMES.value(DescriptionRole)].toString();
values[InfoRole] = itemJsonObject[ROLE_NAMES.value(InfoRole)].toString();
values[AmountRole] = itemJsonObject[ROLE_NAMES.value(AmountRole)].toInt();
values[FactorRole] = itemJsonObject[ROLE_NAMES.value(FactorRole)].toDouble();
return values;
}
JsonParser::JsonParser() {}
QJsonArray JsonParser::extractItemArray(const QByteArray& jsonData, const QString& objectName) {
@ -52,3 +38,28 @@ QJsonArray JsonParser::extractItemArray(const QByteArray& jsonData, const QStrin
return itemArray;
}
QHash<int, QVariant> JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonObject) {
QHash<int, QVariant> values;
for (auto iter = ROLE_NAMES.cbegin(), end = ROLE_NAMES.cend(); iter != end; ++iter) {
std::pair<int, QVariant> keyValuePair = getKeyValuePair(itemJsonObject, iter.key());
values.insert(keyValuePair.first, keyValuePair.second);
}
return values;
}
pair<int, QVariant> JsonParser::getKeyValuePair(const QJsonObject& itemJsonObject, const int role) {
QVariant result;
const QJsonValue jsonValue = itemJsonObject[ROLE_NAMES.value(role)];
if (STRING_ROLES.contains(role)) {
result = jsonValue.toString();
} else if (INT_ROLES.contains(role)) {
result = jsonValue.toInt();
} else if (DOUBLE_ROLES.contains(role)) {
result = jsonValue.toDouble();
} else {
qCritical() << QString("Cant find data type of role %1!!!").arg(role);
}
return pair<int, QVariant>(role, result.toString());
}

4
formats/jsonparser.h
View File

@ -8,6 +8,8 @@ class QString;
class QByteArray;
class QJsonArray;
using namespace std;
class JsonParser {
public:
static QList<QHash<int, QVariant>> toItemValuesList(const QByteArray& jsonData,
@ -18,6 +20,8 @@ class JsonParser {
static QJsonArray extractItemArray(const QByteArray& jsonData, const QString& objectName);
static QHash<int, QVariant> jsonObjectToItemValues(const QJsonObject& itemJsonObject);
static pair<int, QVariant> getKeyValuePair(const QJsonObject& itemJsonObject, const int role);
};
#endif // JSONPARSER_H

8
model/metadata.h
View File

@ -13,10 +13,9 @@ static QHash<int, QByteArray> ROLE_NAMES = {{NameRole, "Name"},
{InfoRole, "Info"},
{AmountRole, "Amount"},
{FactorRole, "Factor"}};
// TODO ? use a data structure containing the type information of each column
// ([QString, QString, QString, int, double], {{NameRole, QString},...})
// instead of INT_COLUMNS,...
static QList<QString> INT_COLUMNS = {"Amount", "Factor"};
static QList<UserRoles> STRING_ROLES = {NameRole, DescriptionRole, InfoRole};
static QList<UserRoles> INT_ROLES = {AmountRole};
static QList<UserRoles> DOUBLE_ROLES = {FactorRole};
/// JSON keys
static const QString ITEM_KEY_STRING = "items";
@ -24,6 +23,7 @@ static const QString ITEM_KEY_STRING = "items";
/// file naming
static const QString ITEM_FILE_NAME = ITEM_KEY_STRING + ".json";
/// functions
static int GET_ROLE_FOR_COLUMN(const int column) {
switch (column) {
case 0:

8
model/tablemodel.cpp
View File

@ -236,9 +236,11 @@ QMap<int, QVariant> TableModel::onlyChangedValues(const QModelIndex& index,
}
bool TableModel::isEmptyValueEqualToZero(const int role) const {
const QString roleName = ROLE_NAMES.value(role);
if (INT_COLUMNS.contains(roleName)) {
if (INT_ROLES.contains(role)) {
return true;
}
} else if (DOUBLE_ROLES.contains(role)) {
return true;
} else {
return false;
}
}