ded/beerlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Models registry was added

Browse Source
This commit is contained in:
Denis V. Dedkov
2023-04-11 09:42:27 +02:00
parent 4a52926be9
commit 4ed4ecd429
17 changed files with 183 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
viewmodels/ordersviewmodel.cpp
View File

@@ -2,13 +2,15 @@
#include <QDateTime>
#include "models/basemodel.h"
OrdersViewModel::OrdersViewModel(QObject *parent)
: QAbstractListModel{parent}
{
connect(&m_ordersModel, &BaseModel::dataChanged, this, &OrdersViewModel::reload);
connect(&m_usersModel, &BaseModel::dataChanged, this, &OrdersViewModel::reload);
connect(&m_productsModel, &BaseModel::dataChanged, this, &OrdersViewModel::reload);
connect(&m_storesModel, &BaseModel::dataChanged, this, &OrdersViewModel::reload);
connect(m_ordersModel, &BaseModel::dataChanged, this, &OrdersViewModel::reload);
connect(m_usersModel, &BaseModel::dataChanged, this, &OrdersViewModel::reload);
connect(m_productsModel, &BaseModel::dataChanged, this, &OrdersViewModel::reload);
connect(m_storesModel, &BaseModel::dataChanged, this, &OrdersViewModel::reload);
reload();
}
@@ -45,18 +47,18 @@ void OrdersViewModel::reload()
m_model.clear();
for (const QVariant &vOrder : m_ordersModel.orders()) {
for (const QVariant &vOrder : m_ordersModel->items()) {
QVariantMap order = vOrder.toMap();
QDateTime orderTime = QDateTime::fromSecsSinceEpoch(order.value("ts", 0).toDouble());
order["date"] = orderTime.date();
order["time"] = orderTime.time();
order["userName"] = m_usersModel.itemProperty(order["userId"].toString(), "name").toString();
order["storeName"] = m_storesModel.itemProperty(order["storeId"].toString(), "name").toString();
order["userName"] = m_usersModel->itemProperty(order["userId"].toString(), "name").toString();
order["storeName"] = m_storesModel->itemProperty(order["storeId"].toString(), "name").toString();
QVariantList prodModel;
for (const QVariant &prod : order["products"].toList()) {
QVariantMap product = prod.toMap();
product["product"] = m_productsModel.itemProperty(product.value("productId").toString(), "name");
product["product"] = m_productsModel->itemProperty(product.value("productId").toString(), "name");
prodModel << product;
}
order["products"] = prodModel;
@@ -64,7 +66,7 @@ void OrdersViewModel::reload()
m_model << order;
}
std::sort(m_model.begin(), m_model.end(), [](const QVariant &l, const QVariant &r) {
std::sort(m_model.begin(), m_model.end(), [](const QVariant &l, const QVariant &r) -> bool {
return l.toMap().value("ts").toDouble() < r.toMap().value("ts").toDouble();
});

11
viewmodels/ordersviewmodel.h
View File

@@ -3,8 +3,7 @@
#include <QAbstractListModel>
#include "models/ordersmodel.h"
#include "models/usersmodel.h"
#include "services/modelsregister.h"
class OrdersViewModel : public QAbstractListModel
{
@@ -32,10 +31,10 @@ private:
void reload();
OrdersModel m_ordersModel;
UsersModel m_usersModel;
BaseModel m_productsModel = BaseModel("products", this);
BaseModel m_storesModel = BaseModel("stores", this);
BaseModel *m_ordersModel = ModelsRegister::model("orders");
BaseModel *m_usersModel = ModelsRegister::model("users");
BaseModel *m_productsModel = ModelsRegister::model("products");
BaseModel *m_storesModel = ModelsRegister::model("stores");
QVariantList m_model;
};

16
viewmodels/productsviewmodel.cpp
View File

@@ -1,17 +1,17 @@
#include "productsviewmodel.h"
#include "models/basemodel.h"
#include "services/settingsservice.h"
#include "models/ordersmodel.h"
ProductsViewModel::ProductsViewModel(QObject *parent)
: QObject{parent}
{
connect(&m_productsModel, &BaseModel::dataChanged, this, &ProductsViewModel::productsChanged);
connect(m_productsModel, &BaseModel::dataChanged, this, &ProductsViewModel::productsChanged);
}
QVariantList ProductsViewModel::products() const
{
return m_productsModel.items();
return m_productsModel->items();
}
QVariantList ProductsViewModel::order() const
@@ -19,7 +19,7 @@ QVariantList ProductsViewModel::order() const
QVariantList res;
for (auto it = m_order.constBegin(); it != m_order.constEnd(); ++it) {
QVariantMap product = m_productsModel.item(it.key());
QVariantMap product = m_productsModel->item(it.key());
product["count"] = it.value().toMap().value("quantity").toDouble();
res << product;
}
@@ -32,7 +32,7 @@ float ProductsViewModel::orderSum() const
float res = 0.0;
for (auto it = m_order.constBegin(); it != m_order.constEnd(); ++it) {
QVariantMap product = m_productsModel.item(it.key());
QVariantMap product = m_productsModel->item(it.key());
float price = product.value("price", 0.0).toFloat();
float quantity = it.value().toMap().value("quantity").toDouble();
res += quantity * price;
@@ -44,7 +44,7 @@ float ProductsViewModel::orderSum() const
void ProductsViewModel::setOrderValue(const QString &productId, float value)
{
if (value) {
float price = m_productsModel.itemProperty(productId, "price", 0.0).toFloat();
float price = m_productsModel->itemProperty(productId, "price", 0.0).toFloat();
m_order[productId] = QVariantMap {
{ "productId", productId },
{ "quantity", value},
@@ -59,8 +59,8 @@ void ProductsViewModel::setOrderValue(const QString &productId, float value)
void ProductsViewModel::submitOrder()
{
OrdersModel model;
model.submitOrder(QVariantMap {
BaseModel *ordersModel = ModelsRegister::model("orders");
ordersModel->addItem({
{ "userId", settings()->selectedUserId() },
{ "storeId", settings()->selectedStoreId() },
{ "products", m_order.values() },

5
viewmodels/productsviewmodel.h
View File

@@ -2,8 +2,9 @@
#define PRODUCTSVIEWMODEL_H
#include <QObject>
#include <QVariantMap>
#include "models/basemodel.h"
#include "services/modelsregister.h"
class SettingsService;
class ProductsViewModel : public QObject
@@ -31,7 +32,7 @@ signals:
private:
SettingsService *settings() const;
BaseModel m_productsModel = BaseModel("products", this);
BaseModel *m_productsModel = ModelsRegister::model("products");
QVariantMap m_order;
};

68
viewmodels/settingsviewmodel.cpp
View File

@@ -1,5 +1,10 @@
#include "settingsviewmodel.h"
#include "services/modelsregister.h"
#include "services/settingsservice.h"
#include "models/basemodel.h"
SettingsViewModel::SettingsViewModel(QObject *parent)
: QAbstractListModel{parent}
{
@@ -7,10 +12,16 @@ SettingsViewModel::SettingsViewModel(QObject *parent)
<< SettingItem { tr("Selected user id"), "selectedUserId", "choice", "users" }
<< SettingItem { tr("Selected store"), "selectedStoreId", "choice", "stores" };
m_models["users"] = new BaseModel("users", this);
m_models["stores"] = new BaseModel("stores", this);
}
QModelIndex selectedUserIdIndex = index(1);
QModelIndex selectedStoreIdIndex = index(2);
connect(settings(), &SettingsService::selectedUserIdChanged, this, [this, selectedUserIdIndex]() {
emit dataChanged(selectedUserIdIndex, selectedUserIdIndex);
});
connect(settings(), &SettingsService::selectedStoreIdChanged, this, [this, selectedStoreIdIndex]() {
emit dataChanged(selectedStoreIdIndex, selectedStoreIdIndex);
});
}
int SettingsViewModel::rowCount(const QModelIndex &) const
{
@@ -27,7 +38,8 @@ QVariant SettingsViewModel::data(const QModelIndex &index, int role) const
switch (role) {
case Roles::Title: return item.title;
case Roles::PropertyName: return item.propertyName;
case Roles::Subtitle: return subtitle(item.propertyName, item.modelName);
case Roles::Value: return settings()->property(item.propertyName.toLocal8Bit());
case Roles::ControlType: return item.controlType;
case Roles::Model: return model(item.modelName);
default:
@@ -41,17 +53,59 @@ QHash<int, QByteArray> SettingsViewModel::roleNames() const
{
return QHash<int, QByteArray> {
{ Roles::Title, "title" },
{ Roles::PropertyName, "name" },
{ Roles::Subtitle, "subtitle" },
{ Roles::Value, "value" },
{ Roles::ControlType, "control" },
{ Roles::Model, "choiceModel" }
};
}
bool SettingsViewModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (!index.isValid()) {
return false;
}
if (Roles::Value != role) {
return false;
}
SettingItem item = m_items.at(index.row());
bool res = settings()->setProperty(item.propertyName.toLocal8Bit(), value);
if (res) {
emit dataChanged(index, index);
}
return res;
}
Qt::ItemFlags SettingsViewModel::flags(const QModelIndex &index) const
{
return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
}
SettingsService *SettingsViewModel::settings() const
{
return SettingsService::instance();
}
QVariant SettingsViewModel::model(const QString &modelName) const
{
if (!m_models.contains(modelName)) {
BaseModel *model = modelName.isEmpty() ? nullptr : ModelsRegister::model(modelName);
if (!model) {
return {};
}
return m_models[modelName]->items();
return model->items();
}
QVariant SettingsViewModel::subtitle(const QString &propertyName, const QString &modelName) const
{
BaseModel *model = modelName.isEmpty() ? nullptr : ModelsRegister::model(modelName);
QVariant propertyValue = settings()->property(propertyName.toLocal8Bit());
if (model) {
return model->itemProperty(propertyValue.toString(), "name");
}
return propertyValue;
}

12
viewmodels/settingsviewmodel.h
View File

@@ -3,8 +3,7 @@
#include <QAbstractListModel>
#include "models/basemodel.h"
class SettingsService;
class SettingsViewModel : public QAbstractListModel
{
Q_OBJECT
@@ -16,10 +15,14 @@ public:
QVariant data(const QModelIndex &index, int role) const override;
QHash<int, QByteArray> roleNames() const override;
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
private:
enum Roles {
Title = Qt::UserRole + 1,
PropertyName,
Subtitle,
Value,
ControlType,
Model
};
@@ -38,10 +41,11 @@ private:
modelName(modelName) {}
};
SettingsService *settings() const;
QVariant model(const QString &modelName) const;
QVariant subtitle(const QString &propertyName, const QString &modelName) const;
QList<SettingItem> m_items;
QMap<QString, BaseModel *> m_models;
};
#endif // SETTINGSVIEWMODEL_H

9
viewmodels/storesviewmodel.cpp
View File

@@ -1,12 +1,13 @@
#include "storesviewmodel.h"
#include "models/basemodel.h"
#include "services/settingsservice.h"
StoresViewModel::StoresViewModel(QObject *parent)
: QObject{parent}
{
connect(&m_storesModel, &BaseModel::dataChanged, this, &StoresViewModel::storesChanged);
connect(&m_storesModel, &BaseModel::dataChanged, this, &StoresViewModel::selectedStoreNameChanged);
connect(m_storesModel, &BaseModel::dataChanged, this, &StoresViewModel::storesChanged);
connect(m_storesModel, &BaseModel::dataChanged, this, &StoresViewModel::selectedStoreNameChanged);
connect(settings(), &SettingsService::selectedStoreIdChanged, this, &StoresViewModel::selectedStoreChanged);
connect(settings(), &SettingsService::selectedStoreIdChanged, this, &StoresViewModel::selectedStoreNameChanged);
@@ -14,7 +15,7 @@ StoresViewModel::StoresViewModel(QObject *parent)
QVariantList StoresViewModel::stores() const
{
return m_storesModel.items();
return m_storesModel->items();
}
QString StoresViewModel::selectedStore() const
@@ -29,7 +30,7 @@ void StoresViewModel::setSelectedStore(const QString &newSelectedStore)
QString StoresViewModel::selectedStoreName() const
{
return m_storesModel.itemProperty(selectedStore(), "name").toString();
return m_storesModel->itemProperty(selectedStore(), "name").toString();
}
SettingsService *StoresViewModel::settings() const

4
viewmodels/storesviewmodel.h
View File

@@ -3,7 +3,7 @@
#include <QObject>
#include "models/basemodel.h"
#include "services/modelsregister.h"
class SettingsService;
class StoresViewModel : public QObject
@@ -30,7 +30,7 @@ signals:
private:
SettingsService *settings() const;
BaseModel m_storesModel = BaseModel("stores", this);
BaseModel *m_storesModel = ModelsRegister::model("stores");
};
#endif // STORESVIEWMODEL_H

9
viewmodels/usersviewmodel.cpp
View File

@@ -1,12 +1,13 @@
#include "usersviewmodel.h"
#include "models/basemodel.h"
#include "services/settingsservice.h"
UsersViewModel::UsersViewModel(QObject *parent)
: QObject{parent}
{
connect(&m_usersModel, &BaseModel::dataChanged, this, &UsersViewModel::usersChanged);
connect(&m_usersModel, &BaseModel::dataChanged, this, &UsersViewModel::selectedUserNameChanged);
connect(m_usersModel, &BaseModel::dataChanged, this, &UsersViewModel::usersChanged);
connect(m_usersModel, &BaseModel::dataChanged, this, &UsersViewModel::selectedUserNameChanged);
connect(settings(), &SettingsService::selectedUserIdChanged, this, &UsersViewModel::selectedUserChanged);
connect(settings(), &SettingsService::selectedUserIdChanged, this, &UsersViewModel::selectedUserNameChanged);
@@ -14,7 +15,7 @@ UsersViewModel::UsersViewModel(QObject *parent)
QVariantList UsersViewModel::users() const
{
return m_usersModel.users();
return m_usersModel->items();
}
QString UsersViewModel::selectedUser() const
@@ -29,7 +30,7 @@ void UsersViewModel::setSelectedUser(const QString &newSelectedUser)
QString UsersViewModel::selectedUserName() const
{
return m_usersModel.itemProperty(selectedUser(), "name").toString();
return m_usersModel->itemProperty(selectedUser(), "name").toString();
}
SettingsService *UsersViewModel::settings() const

4
viewmodels/usersviewmodel.h
View File

@@ -3,7 +3,7 @@
#include <QObject>
#include "models/usersmodel.h"
#include "services/modelsregister.h"
class SettingsService;
class UsersViewModel : public QObject
@@ -30,7 +30,7 @@ signals:
private:
SettingsService *settings() const;
UsersModel m_usersModel;
BaseModel *m_usersModel = ModelsRegister::model("users");
};
#endif // USERSVIEWMODEL_H