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();