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

Don't set missing model item values to default value from JSON object.

Browse Source
This commit is contained in:
Bent Witthold
2026-03-14 09:29:43 +01:00
parent 5b62f9461b
commit a9a4b39da1
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
formats/jsonparser.cpp
View File

@ -98,12 +98,16 @@ ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonOb
values.insert(keyValuePair.first, keyValuePair.second); 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();
if (ROLE_NAMES.values().contains(roleName)) {
const int role = ROLE_NAMES.key(roleName.toLatin1());
std::pair<int, QVariant> keyValuePair = getKeyValuePair(itemJsonObject, role); std::pair<int, QVariant> keyValuePair = getKeyValuePair(itemJsonObject, role);
values.insert(keyValuePair.first, keyValuePair.second); values.insert(keyValuePair.first, keyValuePair.second);
} }
}
return values; return values;
} }

7
model/tablemodel.cpp
View File

@ -302,13 +302,6 @@ QMap<int, QVariant> TableModel::onlyChangedValues(const QModelIndex& index,
const QVariant oldValue = index.data(role); const QVariant oldValue = index.data(role);
// TODO check if role is a editable role? // TODO check if role is a editable role?
if (oldValue != newValue) { 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; qDebug() << "oldValue:" << oldValue << "!= newValue:" << newValue;
result.insert(role, newValue); result.insert(role, newValue);
} else { } else {