From 88e36a1c3078213a158028e240985d2c30b99d95 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 22:15:57 +0700 Subject: [PATCH 01/18] Admin panel edits --- sea_transport/adminpanel.cpp | 4 ++-- sea_transport/adminpanel.ui | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sea_transport/adminpanel.cpp b/sea_transport/adminpanel.cpp index d424284..868ed4e 100644 --- a/sea_transport/adminpanel.cpp +++ b/sea_transport/adminpanel.cpp @@ -1,6 +1,6 @@ #include "adminpanel.h" #include "ui_adminpanel.h" - +#include AdminPanel::AdminPanel(QWidget *parent) : QMainWindow(parent), ui(new Ui::AdminPanel) { ui->setupUi(this); @@ -24,7 +24,7 @@ AdminPanel::AdminPanel(QWidget *parent) : QMainWindow(parent), ui(new Ui::AdminP // ui->tv_vessels->setModel(); uvm = new UsersViewModel(this); - ui->tv_users->setModel(uvm); + ui->tv_users->setModel(this->uvm); // ui->tv_dp->setModel(); diff --git a/sea_transport/adminpanel.ui b/sea_transport/adminpanel.ui index 1542c03..3eaa710 100644 --- a/sea_transport/adminpanel.ui +++ b/sea_transport/adminpanel.ui @@ -25,7 +25,11 @@ - + + + true + + @@ -57,7 +61,11 @@ - + + + true + + @@ -89,7 +97,11 @@ - + + + true + + @@ -121,7 +133,11 @@ - + + + true + + From f58c53cadbd717b958108562a99677ef48e5ea7e Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 22:16:34 +0700 Subject: [PATCH 02/18] Vessel entity updates --- sea_transport/entities/vessel_entity.cpp | 12 +++++------- sea_transport/entities/vessel_entity.h | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sea_transport/entities/vessel_entity.cpp b/sea_transport/entities/vessel_entity.cpp index b4ccdc7..34f1b2b 100644 --- a/sea_transport/entities/vessel_entity.cpp +++ b/sea_transport/entities/vessel_entity.cpp @@ -3,7 +3,7 @@ entity_id vessel_entity::__global_id = 0; -vessel_entity::vessel_entity(const dpoint_entity &harbor, unsigned int capacity) : _harbor(harbor), _capacity(capacity) { +vessel_entity::vessel_entity(entity_id harbor_id, unsigned int capacity) : _harbor_id(harbor_id), _capacity(capacity) { this->_id = ++vessel_entity::__global_id; } @@ -11,8 +11,8 @@ entity_id vessel_entity::id() const { return this->_id; } -const dpoint_entity vessel_entity::harbor() const { - return this->_harbor; +entity_id vessel_entity::harbor() const { + return this->_harbor_id; } unsigned int vessel_entity::capacity() const { @@ -24,8 +24,7 @@ const QVector vessel_entity::cargo() { } void vessel_entity::serialize(QDataStream &output) { - output << this->_id; - this->_harbor.serialize(output); + output << this->_id << this->_harbor_id; output << this->_capacity << this->_cargo.size(); for (auto item : this->_cargo) { item.serialize(output); @@ -33,8 +32,7 @@ void vessel_entity::serialize(QDataStream &output) { } void vessel_entity::deserialize(QDataStream &input) { - input >> this->_id; - this->_harbor.deserialize(input); + input >> this->_id >> this->_harbor_id; int icnt; input >> this->_capacity >> icnt; this->_cargo.resize(icnt); diff --git a/sea_transport/entities/vessel_entity.h b/sea_transport/entities/vessel_entity.h index f381f37..e96ecfe 100644 --- a/sea_transport/entities/vessel_entity.h +++ b/sea_transport/entities/vessel_entity.h @@ -11,16 +11,16 @@ private: static entity_id __global_id; entity_id _id; - dpoint_entity _harbor; + entity_id _harbor_id; unsigned int _capacity; QVector _cargo; public: vessel_entity() = default; - vessel_entity(const dpoint_entity &harbor, unsigned int capacity); + vessel_entity(entity_id harbor_id, unsigned int capacity); entity_id id() const; - const dpoint_entity harbor() const; + entity_id harbor() const; unsigned int capacity() const; const QVector cargo(); From 09e67d4031f14406b6952bdfe581bd4ddf1ab801 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 22:17:04 +0700 Subject: [PATCH 03/18] Auth window update --- sea_transport/authwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sea_transport/authwindow.cpp b/sea_transport/authwindow.cpp index f8a13ff..271365f 100644 --- a/sea_transport/authwindow.cpp +++ b/sea_transport/authwindow.cpp @@ -34,6 +34,8 @@ void AuthWindow::on_auth_requested() { QMessageBox::information(this, "Info", "You are the first user of system. " "Your account type is administrator"); } + + apparatus::instance()->save(); } auto user = a->get_user(login, success); From 72a48428007f8188c2911ecd29b0f04a31fb6b4a Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 22:17:29 +0700 Subject: [PATCH 04/18] Systems update --- sea_transport/system/apparatus.cpp | 2 +- sea_transport/system/auth_system.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sea_transport/system/apparatus.cpp b/sea_transport/system/apparatus.cpp index 91c2ec3..9aa878d 100644 --- a/sea_transport/system/apparatus.cpp +++ b/sea_transport/system/apparatus.cpp @@ -59,7 +59,7 @@ void apparatus::load() { QDataStream stream(&f); // loading GIDs - entity_id vgid, sgid; + entity_id vgid, sgid = vgid = 0; stream >> vgid >> sgid; vessel_entity::preloadGlobalId(vgid); storage_entity::preloadGlobalId(sgid); diff --git a/sea_transport/system/auth_system.cpp b/sea_transport/system/auth_system.cpp index a6c53aa..6ac11b7 100644 --- a/sea_transport/system/auth_system.cpp +++ b/sea_transport/system/auth_system.cpp @@ -1,6 +1,5 @@ #include "apparatus.h" #include "auth_system.h" -#include const user_entity* auth_system::get_user(const QString &login, bool &success) { @@ -34,11 +33,7 @@ bool auth_system::register_user(const QString &login, const QString &password, U bool exists = false; this->get_user(login, exists); if (!exists) { - std::cout << apparatus::instance()->get_auth_subsystem()->users().length() << std::endl; this->_users.push_back(user_entity(login, password, role)); - std::cout << apparatus::instance()->get_auth_subsystem()->users().length() << std::endl; - apparatus::instance()->save(); - std::cout << apparatus::instance()->get_auth_subsystem()->users().length() << std::endl; return true; } From 9a4b71de36b9965883dbb9938aa7c07228db61e5 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 22:18:05 +0700 Subject: [PATCH 05/18] Updates and Vessels viewmodel --- sea_transport/sea_transport.pro | 6 ++++-- sea_transport/viewmodels/usersviewmodel.cpp | 9 +++++---- sea_transport/viewmodels/usersviewmodel.h | 8 ++++---- sea_transport/viewmodels/vesselsviewmodel.cpp | 6 ++++++ sea_transport/viewmodels/vesselsviewmodel.h | 13 +++++++++++++ st_test/tst_st_test.cpp | 4 ++-- 6 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 sea_transport/viewmodels/vesselsviewmodel.cpp create mode 100644 sea_transport/viewmodels/vesselsviewmodel.h diff --git a/sea_transport/sea_transport.pro b/sea_transport/sea_transport.pro index e5ceb58..be07897 100644 --- a/sea_transport/sea_transport.pro +++ b/sea_transport/sea_transport.pro @@ -25,7 +25,8 @@ SOURCES += \ system/object_system.cpp \ usereditdialog.cpp \ vesseleditdialog.cpp \ - viewmodels/usersviewmodel.cpp + viewmodels/usersviewmodel.cpp \ + viewmodels/vesselsviewmodel.cpp HEADERS += \ adminpanel.h \ @@ -45,7 +46,8 @@ HEADERS += \ system/object_system.h \ usereditdialog.h \ vesseleditdialog.h \ - viewmodels/usersviewmodel.h + viewmodels/usersviewmodel.h \ + viewmodels/vesselsviewmodel.h FORMS += \ adminpanel.ui \ diff --git a/sea_transport/viewmodels/usersviewmodel.cpp b/sea_transport/viewmodels/usersviewmodel.cpp index 93785f2..ae938c2 100644 --- a/sea_transport/viewmodels/usersviewmodel.cpp +++ b/sea_transport/viewmodels/usersviewmodel.cpp @@ -4,11 +4,11 @@ UsersViewModel::UsersViewModel(QObject *parent) : QAbstractTableModel(parent) { } -int UsersViewModel::rowCount(const QModelIndex & /*parent*/) const { - return apparatus::instance()->get_object_subsystem()->vessels().size(); +int UsersViewModel::rowCount(const QModelIndex &/*parent*/) const { + return apparatus::instance()->get_auth_subsystem()->users().length(); } -int UsersViewModel::columnCount(const QModelIndex & /*parent*/) const { +int UsersViewModel::columnCount(const QModelIndex &/*parent*/) const { return 3; } @@ -61,5 +61,6 @@ QVariant UsersViewModel::data(const QModelIndex &index, int role) const { } void UsersViewModel::update() { - this->resetInternalData(); + this->beginResetModel(); + this->endResetModel(); } diff --git a/sea_transport/viewmodels/usersviewmodel.h b/sea_transport/viewmodels/usersviewmodel.h index 411981b..2eda407 100644 --- a/sea_transport/viewmodels/usersviewmodel.h +++ b/sea_transport/viewmodels/usersviewmodel.h @@ -10,10 +10,10 @@ class UsersViewModel : public QAbstractTableModel Q_OBJECT public: UsersViewModel(QObject *parent = nullptr); - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const; + QVariant headerData(int section, Qt::Orientation orientation, int role) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; public slots: void update(); diff --git a/sea_transport/viewmodels/vesselsviewmodel.cpp b/sea_transport/viewmodels/vesselsviewmodel.cpp new file mode 100644 index 0000000..63d7454 --- /dev/null +++ b/sea_transport/viewmodels/vesselsviewmodel.cpp @@ -0,0 +1,6 @@ +#include "vesselsviewmodel.h" + +VesselsViewModel::VesselsViewModel() +{ + +} diff --git a/sea_transport/viewmodels/vesselsviewmodel.h b/sea_transport/viewmodels/vesselsviewmodel.h new file mode 100644 index 0000000..06cfd75 --- /dev/null +++ b/sea_transport/viewmodels/vesselsviewmodel.h @@ -0,0 +1,13 @@ +#ifndef VESSELSVIEWMODEL_H +#define VESSELSVIEWMODEL_H + +#include + +class VesselsViewModel : public QAbstractTableModel +{ + Q_OBJECT +public: + VesselsViewModel(); +}; + +#endif // VESSELSVIEWMODEL_H diff --git a/st_test/tst_st_test.cpp b/st_test/tst_st_test.cpp index 0e015bb..6cfc350 100644 --- a/st_test/tst_st_test.cpp +++ b/st_test/tst_st_test.cpp @@ -165,7 +165,7 @@ void st_test::vessel_entity_serialization_test() { stream.setDevice(&f); dpoint_entity test_harbor("test_harbor_for_vessel"); - ent1 = vessel_entity(test_harbor, 256); + ent1 = vessel_entity(test_harbor.id(), 256); ent1.serialize(stream); stream.setDevice(nullptr); @@ -181,7 +181,7 @@ void st_test::vessel_entity_serialization_test() { } QVERIFY2( - ent1.id() == ent2.id() && ent1.harbor().id() == ent2.harbor().id() && ent1.capacity() == ent2.capacity(), + ent1.id() == ent2.id() && ent1.harbor() == ent2.harbor() && ent1.capacity() == ent2.capacity(), "Delivery Point entity not serialized properly" ); } From fc9b61467c1e16b5a76f16659454083531cdd1b5 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 22:31:25 +0700 Subject: [PATCH 06/18] UsersVM small code style update --- sea_transport/viewmodels/usersviewmodel.cpp | 15 +++++++-------- sea_transport/viewmodels/usersviewmodel.h | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sea_transport/viewmodels/usersviewmodel.cpp b/sea_transport/viewmodels/usersviewmodel.cpp index ae938c2..72290fb 100644 --- a/sea_transport/viewmodels/usersviewmodel.cpp +++ b/sea_transport/viewmodels/usersviewmodel.cpp @@ -29,29 +29,29 @@ QVariant UsersViewModel::headerData(int section, Qt::Orientation orientation, in QVariant UsersViewModel::data(const QModelIndex &index, int role) const { if (role == Qt::DisplayRole) { auto item = apparatus::instance()->get_auth_subsystem()->users()[index.row()]; - int col = index.column(); + int col = index.column(); switch (col) { case 0: return QString::number(item.id()); case 1: return item.login(); case 2: - QString role = "unknown"; + QString _role = "unknown"; switch(item.role()) { case UserRole::ADMINISTRATOR: - role = "Administrator"; + _role = "Administrator"; break; case UserRole::DISPATCHER: - role = "Dispatcher"; + _role = "Dispatcher"; break; case UserRole::SKIPPER: - role = "Skipper"; + _role = "Skipper"; break; } - return role; + return _role; } return "UNKNOWN FIELD"; @@ -61,6 +61,5 @@ QVariant UsersViewModel::data(const QModelIndex &index, int role) const { } void UsersViewModel::update() { - this->beginResetModel(); - this->endResetModel(); + dataChanged(QModelIndex(), QModelIndex()); } diff --git a/sea_transport/viewmodels/usersviewmodel.h b/sea_transport/viewmodels/usersviewmodel.h index 2eda407..40e3813 100644 --- a/sea_transport/viewmodels/usersviewmodel.h +++ b/sea_transport/viewmodels/usersviewmodel.h @@ -5,9 +5,9 @@ #include -class UsersViewModel : public QAbstractTableModel -{ +class UsersViewModel : public QAbstractTableModel { Q_OBJECT + public: UsersViewModel(QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const; From 2f67449c72f6fd05302ad1c72013485b25ea4f1e Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 22:31:38 +0700 Subject: [PATCH 07/18] Implemented Vessels VM --- sea_transport/viewmodels/vesselsviewmodel.cpp | 63 ++++++++++++++++++- sea_transport/viewmodels/vesselsviewmodel.h | 15 ++++- 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/sea_transport/viewmodels/vesselsviewmodel.cpp b/sea_transport/viewmodels/vesselsviewmodel.cpp index 63d7454..accfe2b 100644 --- a/sea_transport/viewmodels/vesselsviewmodel.cpp +++ b/sea_transport/viewmodels/vesselsviewmodel.cpp @@ -1,6 +1,65 @@ #include "vesselsviewmodel.h" -VesselsViewModel::VesselsViewModel() -{ +VesselsViewModel::VesselsViewModel(QObject *parent) : QAbstractTableModel(parent) { } + +int VesselsViewModel::rowCount(const QModelIndex &/*parent*/) const { + return apparatus::instance()->get_object_subsystem()->vessels().length(); +} + +int VesselsViewModel::columnCount(const QModelIndex &/*parent*/) const { + return 5; +} + +QVariant VesselsViewModel::headerData(int section, Qt::Orientation orientation, int role) const { + if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { + switch (section) { + case 0: + return QString("VID"); + case 1: + return QString("Harbor"); + case 2: + return QString("Capacity"); + case 3: + return QString("Cargo count"); + case 4: + return QString("Cargo volume"); + } + } + return QVariant(); +} + +QVariant VesselsViewModel::data(const QModelIndex &index, int role) const { + if (role == Qt::DisplayRole) { + auto item = apparatus::instance()->get_object_subsystem()->vessels()[index.row()]; + bool s = false; + auto harbor = apparatus::instance()->get_object_subsystem()->get_dpoint(item.harbor(), s); + + int col = index.column(); + switch (col) { + case 0: + return QString::number(item.id()); + case 1: + return (s? harbor->title() : "##ERROR##"); + case 2: + return item.capacity(); + case 3: + return item.cargo().length(); + case 4: + int cvol = 0; + foreach (auto cargo, item.cargo()) { + cvol += cargo.volume(); + } + return cvol; + } + + return "UNKNOWN FIELD"; + } + + return QVariant(); +} + +void VesselsViewModel::update() { + dataChanged(QModelIndex(), QModelIndex()); +} diff --git a/sea_transport/viewmodels/vesselsviewmodel.h b/sea_transport/viewmodels/vesselsviewmodel.h index 06cfd75..b861fb9 100644 --- a/sea_transport/viewmodels/vesselsviewmodel.h +++ b/sea_transport/viewmodels/vesselsviewmodel.h @@ -1,13 +1,22 @@ #ifndef VESSELSVIEWMODEL_H #define VESSELSVIEWMODEL_H +#include "system/apparatus.h" + #include -class VesselsViewModel : public QAbstractTableModel -{ +class VesselsViewModel : public QAbstractTableModel { Q_OBJECT + public: - VesselsViewModel(); + VesselsViewModel(QObject *parent = nullptr); + int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const; + QVariant headerData(int section, Qt::Orientation orientation, int role) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + +public slots: + void update(); }; #endif // VESSELSVIEWMODEL_H From 6231e7efb00c660e0a1ce93c1a45643f08b95b97 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 22:40:40 +0700 Subject: [PATCH 08/18] Add and implemented Delivery Point VM --- sea_transport/sea_transport.pro | 2 + .../viewmodels/deliverypointsviewmodel.cpp | 59 +++++++++++++++++++ .../viewmodels/deliverypointsviewmodel.h | 22 +++++++ 3 files changed, 83 insertions(+) create mode 100644 sea_transport/viewmodels/deliverypointsviewmodel.cpp create mode 100644 sea_transport/viewmodels/deliverypointsviewmodel.h diff --git a/sea_transport/sea_transport.pro b/sea_transport/sea_transport.pro index be07897..bf9d0a6 100644 --- a/sea_transport/sea_transport.pro +++ b/sea_transport/sea_transport.pro @@ -25,6 +25,7 @@ SOURCES += \ system/object_system.cpp \ usereditdialog.cpp \ vesseleditdialog.cpp \ + viewmodels/deliverypointsviewmodel.cpp \ viewmodels/usersviewmodel.cpp \ viewmodels/vesselsviewmodel.cpp @@ -46,6 +47,7 @@ HEADERS += \ system/object_system.h \ usereditdialog.h \ vesseleditdialog.h \ + viewmodels/deliverypointsviewmodel.h \ viewmodels/usersviewmodel.h \ viewmodels/vesselsviewmodel.h diff --git a/sea_transport/viewmodels/deliverypointsviewmodel.cpp b/sea_transport/viewmodels/deliverypointsviewmodel.cpp new file mode 100644 index 0000000..5823d9c --- /dev/null +++ b/sea_transport/viewmodels/deliverypointsviewmodel.cpp @@ -0,0 +1,59 @@ +#include "deliverypointsviewmodel.h" + +DeliveryPointsViewModel::DeliveryPointsViewModel(QObject *parent) : QAbstractTableModel(parent) { + +} + +int DeliveryPointsViewModel::rowCount(const QModelIndex &/*parent*/) const { + return apparatus::instance()->get_object_subsystem()->dpoints().length(); +} + +int DeliveryPointsViewModel::columnCount(const QModelIndex &/*parent*/) const { + return 4; +} + +QVariant DeliveryPointsViewModel::headerData(int section, Qt::Orientation orientation, int role) const { + if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { + switch (section) { + case 0: + return QString("DPID"); + case 1: + return QString("Title"); + case 2: + return QString("Storages count"); + case 3: + return QString("Storages total volume"); + } + } + return QVariant(); +} + +QVariant DeliveryPointsViewModel::data(const QModelIndex &index, int role) const { + if (role == Qt::DisplayRole) { + auto item = apparatus::instance()->get_object_subsystem()->dpoints()[index.row()]; + + int col = index.column(); + switch (col) { + case 0: + return QString::number(item.id()); + case 1: + return item.title(); + case 2: + return item.storages().length(); + case 3: + int tvol = 0; + foreach (auto storage, item.storages()) { + tvol += storage.capacity(); + } + return tvol; + } + + return "UNKNOWN FIELD"; + } + + return QVariant(); +} + +void DeliveryPointsViewModel::update() { + dataChanged(QModelIndex(), QModelIndex()); +} diff --git a/sea_transport/viewmodels/deliverypointsviewmodel.h b/sea_transport/viewmodels/deliverypointsviewmodel.h new file mode 100644 index 0000000..bfbfb40 --- /dev/null +++ b/sea_transport/viewmodels/deliverypointsviewmodel.h @@ -0,0 +1,22 @@ +#ifndef DELIVERYPOINTSVIEWMODEL_H +#define DELIVERYPOINTSVIEWMODEL_H + +#include "system/apparatus.h" + +#include + +class DeliveryPointsViewModel : public QAbstractTableModel { + Q_OBJECT + +public: + DeliveryPointsViewModel(QObject *parent = nullptr); + int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const; + QVariant headerData(int section, Qt::Orientation orientation, int role) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + +public slots: + void update(); +}; + +#endif // DELIVERYPOINTSVIEWMODEL_H From 3adbef8c08b8996d405b99f12a4fcc1fa47327eb Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Tue, 22 Dec 2020 23:05:38 +0700 Subject: [PATCH 09/18] Redone Admin panel UI --- sea_transport/adminpanel.cpp | 21 +-- sea_transport/adminpanel.h | 7 +- sea_transport/adminpanel.ui | 338 +++++++++++++++++++---------------- 3 files changed, 190 insertions(+), 176 deletions(-) diff --git a/sea_transport/adminpanel.cpp b/sea_transport/adminpanel.cpp index 868ed4e..2418e16 100644 --- a/sea_transport/adminpanel.cpp +++ b/sea_transport/adminpanel.cpp @@ -14,24 +14,23 @@ AdminPanel::AdminPanel(QWidget *parent) : QMainWindow(parent), ui(new Ui::AdminP // connect(ui->pb_users_add, &QPushButton::clicked, this, &AdminPanel::on_user_add); // connect(ui->pb_users_remove, &QPushButton::clicked, this, &AdminPanel::on_user_remove); -// connect(ui->pb_users_add, &QPushButton::clicked, this, &AdminPanel::on_storage_add); -// connect(ui->pb_users_remove, &QPushButton::clicked, this, &AdminPanel::on_storage_remove); - // connect(ui->pb_dp_add, &QPushButton::clicked, this, &AdminPanel::on_delivery_point_add); // connect(ui->pb_dp_remove, &QPushButton::clicked, this, &AdminPanel::on_delivery_point_remove); -// ui->tv_vessels->setModel(); - uvm = new UsersViewModel(this); ui->tv_users->setModel(this->uvm); -// ui->tv_dp->setModel(); + vvm = new VesselsViewModel(this); + ui->tv_vessels->setModel(vvm); -// ui->tv_storages->setModel(); + dpvm = new DeliveryPointsViewModel(this); + ui->tv_dp->setModel(dpvm); uvm->update(); + vvm->update(); + dpvm->update(); } AdminPanel::~AdminPanel() { @@ -66,14 +65,6 @@ void AdminPanel::on_user_remove() { } -void AdminPanel::on_storage_add() { - -} - -void AdminPanel::on_storage_remove() { - -} - void AdminPanel::on_delivery_point_add() { } diff --git a/sea_transport/adminpanel.h b/sea_transport/adminpanel.h index a65ce20..8152158 100644 --- a/sea_transport/adminpanel.h +++ b/sea_transport/adminpanel.h @@ -4,6 +4,8 @@ #include #include "viewmodels/usersviewmodel.h" +#include "viewmodels/vesselsviewmodel.h" +#include "viewmodels/deliverypointsviewmodel.h" #include "entities/user_entity.h" @@ -18,6 +20,8 @@ class AdminPanel : public QMainWindow user_entity user; UsersViewModel *uvm; + VesselsViewModel *vvm; + DeliveryPointsViewModel *dpvm; public: explicit AdminPanel(QWidget *parent = nullptr); @@ -38,9 +42,6 @@ private: void on_user_add(); void on_user_remove(); - void on_storage_add(); - void on_storage_remove(); - void on_delivery_point_add(); void on_delivery_point_remove(); }; diff --git a/sea_transport/adminpanel.ui b/sea_transport/adminpanel.ui index 3eaa710..98e15da 100644 --- a/sea_transport/adminpanel.ui +++ b/sea_transport/adminpanel.ui @@ -6,169 +6,21 @@ 0 0 - 1200 - 600 + 1162 + 567 + + + 0 + 0 + + MainWindow - - - - - - - Vessels - - - - - - - true - - - - - - - - - Add - - - - - - - Remove - - - - - - - - - - - - - Users - - - - - - - true - - - - - - - - - Add - - - - - - - Remove - - - - - - - - - - - - - Delivery points - - - - - - - true - - - - - - - - - Add - - - - - - - Remove - - - - - - - - - - - - - Storages - - - - - - - true - - - - - - - - - Add - - - - - - - Remove - - - - - - - - - - - Hello, user %1 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + @@ -182,6 +34,176 @@ + + + + Hello, user %1 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + QTabWidget::Rounded + + + 2 + + + false + + + false + + + + Users + + + + + + true + + + + + + + Qt::Horizontal + + + + 953 + 20 + + + + + + + + + + Add + + + + + + + false + + + Remove + + + + + + + + + + Vessels + + + + + + + + Add + + + + + + + false + + + Remove + + + + + + + + + Qt::Horizontal + + + + 953 + 20 + + + + + + + + true + + + + + + + + Delivery points + + + + + + Qt::Horizontal + + + + 953 + 20 + + + + + + + + + + Add + + + + + + + false + + + Remove + + + + + + + + + true + + + + + + + @@ -189,7 +211,7 @@ 0 0 - 1200 + 1162 21 From e24554a0a0d8058bf0c6cbef84cd96ab32145653 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 01:03:13 +0700 Subject: [PATCH 10/18] User edit dialog completed --- sea_transport/adminpanel.cpp | 174 ++++++++++++++++++-- sea_transport/adminpanel.h | 12 +- sea_transport/adminpanel.ui | 59 +++++-- sea_transport/entities/user_entity.cpp | 8 + sea_transport/entities/user_entity.h | 2 + sea_transport/system/auth_system.cpp | 2 +- sea_transport/system/auth_system.h | 2 +- sea_transport/usereditdialog.cpp | 75 ++++++++- sea_transport/usereditdialog.h | 23 ++- sea_transport/usereditdialog.ui | 2 +- sea_transport/viewmodels/usersviewmodel.cpp | 3 +- 11 files changed, 315 insertions(+), 47 deletions(-) diff --git a/sea_transport/adminpanel.cpp b/sea_transport/adminpanel.cpp index 2418e16..1bda76f 100644 --- a/sea_transport/adminpanel.cpp +++ b/sea_transport/adminpanel.cpp @@ -1,21 +1,36 @@ #include "adminpanel.h" #include "ui_adminpanel.h" -#include + AdminPanel::AdminPanel(QWidget *parent) : QMainWindow(parent), ui(new Ui::AdminPanel) { ui->setupUi(this); -// connect(ui->pb_logout, &QPushButton::clicked, this, &AdminPanel::on_logout_requested); + connect(ui->pb_logout, &QPushButton::clicked, this, &AdminPanel::on_logout_requested); -// connect(ui->pb_vessels_add, &QPushButton::clicked, this, &AdminPanel::on_vessel_add); -// connect(ui->pb_vessels_remove, &QPushButton::clicked, this, &AdminPanel::on_vessel_remove); + connect(ui->pb_vessels_add, &QPushButton::clicked, this, [this](){ + this->on_vessel_add_edit(false); + }); + connect(ui->pb_vessels_edit, &QPushButton::clicked, this, [this](){ + this->on_vessel_add_edit(true); + }); + connect(ui->pb_vessels_remove, &QPushButton::clicked, this, &AdminPanel::on_vessel_remove); -// connect(ui->pb_users_add, &QPushButton::clicked, this, &AdminPanel::on_user_add); -// connect(ui->pb_users_remove, &QPushButton::clicked, this, &AdminPanel::on_user_remove); + connect(ui->pb_users_add, &QPushButton::clicked, this, [this](){ + this->on_user_add_edit(false); + }); + connect(ui->pb_users_edit, &QPushButton::clicked, this, [this](){ + this->on_user_add_edit(true); + }); + connect(ui->pb_users_remove, &QPushButton::clicked, this, &AdminPanel::on_user_remove); -// connect(ui->pb_dp_add, &QPushButton::clicked, this, &AdminPanel::on_delivery_point_add); -// connect(ui->pb_dp_remove, &QPushButton::clicked, this, &AdminPanel::on_delivery_point_remove); + connect(ui->pb_dp_add, &QPushButton::clicked, this, [this](){ + this->on_delivery_point_add_edit(false); + }); + connect(ui->pb_dp_edit, &QPushButton::clicked, this, [this](){ + this->on_delivery_point_add_edit(true); + }); + connect(ui->pb_dp_remove, &QPushButton::clicked, this, &AdminPanel::on_delivery_point_remove); uvm = new UsersViewModel(this); @@ -27,48 +42,175 @@ AdminPanel::AdminPanel(QWidget *parent) : QMainWindow(parent), ui(new Ui::AdminP dpvm = new DeliveryPointsViewModel(this); ui->tv_dp->setModel(dpvm); + connect(ui->tv_users->selectionModel(), &QItemSelectionModel::selectionChanged, [this](const QItemSelection &selected) { + ui->pb_users_remove->setEnabled(selected.length() > 0); + ui->pb_users_edit->setEnabled(selected.length() == 1); + }); - uvm->update(); - vvm->update(); - dpvm->update(); + connect(ui->tv_vessels->selectionModel(), &QItemSelectionModel::selectionChanged, [this](const QItemSelection &selected) { + ui->pb_vessels_remove->setEnabled(selected.length() > 0); + ui->pb_vessels_edit->setEnabled(selected.length() == 1); + }); + + connect(ui->tv_dp->selectionModel(), &QItemSelectionModel::selectionChanged, [this](const QItemSelection &selected) { + ui->pb_dp_remove->setEnabled(selected.length() > 0); + ui->pb_dp_edit->setEnabled(selected.length() == 1); + }); + + ui->tw_tabs->setCurrentIndex(0); } AdminPanel::~AdminPanel() { delete ui; delete uvm; + delete vvm; + delete dpvm; } AdminPanel& AdminPanel::set_user(const user_entity &user) { this->user = user; - ui->lab_user->setText(tr("Hello user %1").arg(user.login())); + ui->lab_user->setText(tr("Hello, **%1**").arg(user.login())); return *this; } void AdminPanel::on_logout_requested() { - + this->close(); } -void AdminPanel::on_vessel_add() { +void AdminPanel::on_vessel_add_edit(bool edit) { } void AdminPanel::on_vessel_remove() { + auto selected = ui->tv_vessels->selectionModel()->selectedRows(); + if (selected.length() == 0) { + return; + } + QMessageBox delConf(this); + delConf.setIcon(QMessageBox::Question); + delConf.setWindowTitle(tr("Deletion confirmation")); + delConf.setText(tr("Are you sure you want to delete these vessels?")); + delConf.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + delConf.setDefaultButton(QMessageBox::No); + if (delConf.exec() == QMessageBox::No) { + return; + } + + foreach (auto mIdx, selected) { + int idx = mIdx.row(); + qDebug() << idx << ' ' << mIdx.data() << '\n'; + } + + vvm->update(); } -void AdminPanel::on_user_add() { +void AdminPanel::on_user_add_edit(bool edit) { + auto selected = ui->tv_users->selectionModel()->selectedRows(); + if (edit && selected.length() != 1) { + return; + } + user_entity usr; + if (edit) { + int idx = selected[0].row(); + usr = apparatus::instance()->get_auth_subsystem()->users()[idx]; + if (usr.id() == this->user.id()) { + QMessageBox::critical(this, "Error", "You cannot edit yourself"); + return; + } + } + + UserEditDialog ued(this); + ued.setWindowTitle(edit? "Edit user" : "New user"); + ued.set_user(&usr, edit); + if (ued.exec() != UserEditDialog::Accepted) { + return; + } + + auto data = ued.user(); + if (edit) { + bool success; + auto user = apparatus::instance()->get_auth_subsystem()->get_user(usr.login(), success); + if (success) { + user->set_password(data->password); + user->set_role(data->role); + QMessageBox::information(this, "Info", "User edited successfully (note: you cannot change login)"); + } + else { + QMessageBox::critical(this, "Error", "Error while editing user"); + return; + } + } + else { + bool success = apparatus::instance()->get_auth_subsystem()->register_user(data->login, data->password, data->role); + if (success) { + QMessageBox::information(this, "Info", "User created successfully"); + } + else { + QMessageBox::critical(this, "Error", "Error while creating user"); + return; + } + } + + uvm->update(); } void AdminPanel::on_user_remove() { + auto selected = ui->tv_users->selectionModel()->selectedRows(); + if (selected.length() == 0) { + return; + } + QMessageBox delConf(this); + delConf.setIcon(QMessageBox::Question); + delConf.setWindowTitle(tr("Deletion confirmation")); + delConf.setText(tr("Are you sure you want to delete these users?")); + delConf.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + delConf.setDefaultButton(QMessageBox::No); + if (delConf.exec() == QMessageBox::No) { + return; + } + + auto _u = apparatus::instance()->get_auth_subsystem()->users(); + foreach (auto mIdx, selected) { + int idx = mIdx.row(); + auto ent = _u[idx]; + if (ent.id() == user.id()) { + QMessageBox::critical(this, "Error", "You cannot delete yourself!"); + break; + } + apparatus::instance()->get_auth_subsystem()->remove_user(ent.login()); + } + + uvm->update(); } -void AdminPanel::on_delivery_point_add() { +void AdminPanel::on_delivery_point_add_edit(bool edit) { } void AdminPanel::on_delivery_point_remove() { + auto selected = ui->tv_dp->selectionModel()->selectedRows(); + if (selected.length() == 0) { + return; + } + QMessageBox delConf(this); + delConf.setIcon(QMessageBox::Question); + delConf.setWindowTitle(tr("Deletion confirmation")); + delConf.setText(tr("Are you sure you want to delete these delivery points?")); + delConf.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + delConf.setDefaultButton(QMessageBox::No); + if (delConf.exec() == QMessageBox::No) { + return; + } + + foreach (auto mIdx, selected) { + int idx = mIdx.row(); + qDebug() << idx << ' ' << mIdx.data() << '\n'; + } + + dpvm->update(); } diff --git a/sea_transport/adminpanel.h b/sea_transport/adminpanel.h index 8152158..3489f39 100644 --- a/sea_transport/adminpanel.h +++ b/sea_transport/adminpanel.h @@ -2,6 +2,12 @@ #define ADMINPANEL_H #include +#include +#include + +#include "usereditdialog.h" +#include "vesseleditdialog.h" +#include "deliverypointeditdialog.h" #include "viewmodels/usersviewmodel.h" #include "viewmodels/vesselsviewmodel.h" @@ -36,13 +42,13 @@ private: void on_logout_requested(); - void on_vessel_add(); + void on_vessel_add_edit(bool edit); void on_vessel_remove(); - void on_user_add(); + void on_user_add_edit(bool edit); void on_user_remove(); - void on_delivery_point_add(); + void on_delivery_point_add_edit(bool edit); void on_delivery_point_remove(); }; diff --git a/sea_transport/adminpanel.ui b/sea_transport/adminpanel.ui index 98e15da..cc86acc 100644 --- a/sea_transport/adminpanel.ui +++ b/sea_transport/adminpanel.ui @@ -7,7 +7,7 @@ 0 0 1162 - 567 + 532 @@ -37,7 +37,10 @@ - Hello, user %1 + Hello, %1 + + + Qt::MarkdownText Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -65,6 +68,9 @@ + + QAbstractItemView::SelectRows + true @@ -92,6 +98,16 @@ + + + + false + + + Edit + + + @@ -120,6 +136,16 @@ + + + + false + + + Edit + + + @@ -147,6 +173,9 @@ + + QAbstractItemView::SelectRows + true @@ -154,7 +183,7 @@ - + Delivery points @@ -181,6 +210,16 @@ + + + + false + + + Edit + + + @@ -195,6 +234,9 @@ + + QAbstractItemView::SelectRows + true @@ -206,17 +248,6 @@ - - - - 0 - 0 - 1162 - 21 - - - - diff --git a/sea_transport/entities/user_entity.cpp b/sea_transport/entities/user_entity.cpp index 5cd56a7..a54471f 100644 --- a/sea_transport/entities/user_entity.cpp +++ b/sea_transport/entities/user_entity.cpp @@ -20,6 +20,14 @@ bool user_entity::verify_password(const QString &password) const { return (this->_pwd_hash == QCryptographicHash::hash(password.toLocal8Bit(), QCryptographicHash::Sha3_256)); } +void user_entity::set_password(const QString &new_password) { + this->_pwd_hash = QCryptographicHash::hash(new_password.toLocal8Bit(), QCryptographicHash::Sha3_256); +} + +void user_entity::set_role(UserRole new_role) { + this->_role = new_role; +} + void user_entity::serialize(QDataStream &output) { output << this->_id << this->_login << this->_role << this->_pwd_hash; } diff --git a/sea_transport/entities/user_entity.h b/sea_transport/entities/user_entity.h index 890279c..1bf4203 100644 --- a/sea_transport/entities/user_entity.h +++ b/sea_transport/entities/user_entity.h @@ -27,6 +27,8 @@ public: const QString login() const; UserRole role() const; bool verify_password(const QString &password) const; + void set_password(const QString &new_password); + void set_role(UserRole new_role); void serialize(QDataStream &output); void deserialize(QDataStream &input); diff --git a/sea_transport/system/auth_system.cpp b/sea_transport/system/auth_system.cpp index 6ac11b7..f10adc4 100644 --- a/sea_transport/system/auth_system.cpp +++ b/sea_transport/system/auth_system.cpp @@ -2,7 +2,7 @@ #include "auth_system.h" -const user_entity* auth_system::get_user(const QString &login, bool &success) { +user_entity* auth_system::get_user(const QString &login, bool &success) { user_entity *out = nullptr; success = false; diff --git a/sea_transport/system/auth_system.h b/sea_transport/system/auth_system.h index ecc42ae..21dd056 100644 --- a/sea_transport/system/auth_system.h +++ b/sea_transport/system/auth_system.h @@ -13,7 +13,7 @@ private: public: auth_system() = default; - const user_entity* get_user(const QString &login, bool &success); + user_entity* get_user(const QString &login, bool &success); bool remove_user(const QString &login); bool register_user(const QString &login, const QString &password, UserRole role); diff --git a/sea_transport/usereditdialog.cpp b/sea_transport/usereditdialog.cpp index a052c47..c0c2650 100644 --- a/sea_transport/usereditdialog.cpp +++ b/sea_transport/usereditdialog.cpp @@ -1,14 +1,77 @@ #include "usereditdialog.h" #include "ui_usereditdialog.h" -UserEditDialog::UserEditDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::UserEditDialog) -{ +UserEditDialog::UserEditDialog(QWidget *parent) : QDialog(parent), ui(new Ui::UserEditDialog) { ui->setupUi(this); + + connect(ui->btn_save, &QPushButton::clicked, this, &UserEditDialog::accept); + connect(ui->btn_discard, &QPushButton::clicked, this, &UserEditDialog::reject); } -UserEditDialog::~UserEditDialog() -{ +UserEditDialog::~UserEditDialog() { delete ui; } + +UserEditDialog::user_data* UserEditDialog::user() const { + return this->_user; +} + +void UserEditDialog::set_user(user_entity* user, bool edit) { + if (edit) { + this->_user = new UserEditDialog::user_data { + user->login(), "", user->role(), true + }; + + ui->et_login->setText(user->login()); + ui->et_password->setText("##########UNEDITED##########"); + ui->cb_role->setCurrentIndex((int)user->role()); + } + else { + this->_user = new UserEditDialog::user_data{}; + } + this->_user->edit = edit; +} + +void UserEditDialog::accept() { + UserRole role; + switch (ui->cb_role->currentIndex()) { + case 0: + role = UserRole::ADMINISTRATOR; + break; + case 1: + role = UserRole::DISPATCHER; + break; + case 2: + role = UserRole::SKIPPER; + break; + } + bool emptyTitle = ui->et_login->text().trimmed().isEmpty(); + bool emptyPassword = ui->et_password->text().trimmed().isEmpty(); + bool lowerank = this->_user->edit && this->_user->role < role; + if (emptyTitle || emptyPassword || lowerank) { + QMessageBox errDlg(this); + errDlg.setTextFormat(Qt::RichText); + errDlg.setWindowTitle(tr("Error")); + errDlg.setIcon(QMessageBox::Critical); + QString message = tr("Some errors happend, while saving your note:"); + if (emptyTitle) { + message.append("
- Title cannot be empty (all spaces - empty too)"); + } + if (emptyPassword) { + message.append("
- Password cannot be empty (all spaces - empty too)"); + } + if (lowerank) { + message.append("
- You cannot lower users rank"); + } + errDlg.setText(message); + errDlg.exec(); + return; + } + ; + + this->_user->login = ui->et_login->text().trimmed(); + this->_user->password = ui->et_password->text().trimmed(); + this->_user->role = role; + + QDialog::accept(); +} diff --git a/sea_transport/usereditdialog.h b/sea_transport/usereditdialog.h index 26a93e7..7fb13ca 100644 --- a/sea_transport/usereditdialog.h +++ b/sea_transport/usereditdialog.h @@ -2,21 +2,36 @@ #define USEREDITDIALOG_H #include +#include + +#include "entities/user_entity.h" + namespace Ui { class UserEditDialog; } -class UserEditDialog : public QDialog -{ +class UserEditDialog : public QDialog { Q_OBJECT + Ui::UserEditDialog *ui; + + struct user_data { + QString login; + QString password; + UserRole role; + bool edit; + } *_user; public: explicit UserEditDialog(QWidget *parent = nullptr); ~UserEditDialog(); -private: - Ui::UserEditDialog *ui; + UserEditDialog::user_data* user() const; + void set_user(user_entity* user, bool edit); + + +public slots: + void accept() Q_DECL_OVERRIDE; }; #endif // USEREDITDIALOG_H diff --git a/sea_transport/usereditdialog.ui b/sea_transport/usereditdialog.ui index 674bbb2..8ec17a4 100644 --- a/sea_transport/usereditdialog.ui +++ b/sea_transport/usereditdialog.ui @@ -68,7 +68,7 @@ - Captain + Skipper diff --git a/sea_transport/viewmodels/usersviewmodel.cpp b/sea_transport/viewmodels/usersviewmodel.cpp index 72290fb..9269d34 100644 --- a/sea_transport/viewmodels/usersviewmodel.cpp +++ b/sea_transport/viewmodels/usersviewmodel.cpp @@ -61,5 +61,6 @@ QVariant UsersViewModel::data(const QModelIndex &index, int role) const { } void UsersViewModel::update() { - dataChanged(QModelIndex(), QModelIndex()); + this->beginResetModel(); + this->endResetModel(); } From 4a3951938aeed3b6a5bc2e33f0e6bd546c0b42b3 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 01:23:36 +0700 Subject: [PATCH 11/18] Vessel interaction update --- sea_transport/entities/vessel_entity.cpp | 23 ++++++++++++++++++++++- sea_transport/entities/vessel_entity.h | 6 +++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/sea_transport/entities/vessel_entity.cpp b/sea_transport/entities/vessel_entity.cpp index 34f1b2b..e3bd829 100644 --- a/sea_transport/entities/vessel_entity.cpp +++ b/sea_transport/entities/vessel_entity.cpp @@ -3,7 +3,7 @@ entity_id vessel_entity::__global_id = 0; -vessel_entity::vessel_entity(entity_id harbor_id, unsigned int capacity) : _harbor_id(harbor_id), _capacity(capacity) { +vessel_entity::vessel_entity(entity_id skipper_id, entity_id harbor_id, unsigned int capacity) : _skipper_id(skipper_id), _harbor_id(harbor_id), _capacity(capacity) { this->_id = ++vessel_entity::__global_id; } @@ -23,6 +23,27 @@ const QVector vessel_entity::cargo() { return this->_cargo; } +void vessel_entity::add_cargo(cargo_entity object, bool &success) { + success = ((int)this->_capacity - (int)object.volume()) > 0; + if (success) { + this->_cargo.push_back(object); + this->_capacity -= object.volume(); + } +} + +void vessel_entity::withdraw_cargo(entity_id oid, bool &success) { + success = false; + auto vit = this->_cargo.begin(); + for (; vit != this->_cargo.end(); vit++) { + if ((*vit).id() == oid) { + this->_capacity += (*vit).volume(); + this->_cargo.erase(vit); + success = true; + break; + } + } +} + void vessel_entity::serialize(QDataStream &output) { output << this->_id << this->_harbor_id; output << this->_capacity << this->_cargo.size(); diff --git a/sea_transport/entities/vessel_entity.h b/sea_transport/entities/vessel_entity.h index e96ecfe..22a1c7c 100644 --- a/sea_transport/entities/vessel_entity.h +++ b/sea_transport/entities/vessel_entity.h @@ -11,19 +11,23 @@ private: static entity_id __global_id; entity_id _id; + entity_id _skipper_id; entity_id _harbor_id; unsigned int _capacity; QVector _cargo; public: vessel_entity() = default; - vessel_entity(entity_id harbor_id, unsigned int capacity); + vessel_entity(entity_id skipper_id, entity_id harbor_id, unsigned int capacity); entity_id id() const; entity_id harbor() const; unsigned int capacity() const; const QVector cargo(); + void add_cargo(cargo_entity object, bool &success); + void withdraw_cargo(entity_id oid, bool &success); + void serialize(QDataStream &output); void deserialize(QDataStream &input); static void preloadGlobalId(entity_id gid); From 05776f19f38f5a716550f92b633147af09a5467e Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 01:30:11 +0700 Subject: [PATCH 12/18] Entities update --- sea_transport/adminpanel.ui | 2 +- sea_transport/entities/dpoint_entity.cpp | 8 ++++++-- sea_transport/entities/dpoint_entity.h | 4 +++- sea_transport/entities/vessel_entity.cpp | 4 ++++ sea_transport/entities/vessel_entity.h | 1 + st_test/tst_st_test.cpp | 6 +++--- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sea_transport/adminpanel.ui b/sea_transport/adminpanel.ui index cc86acc..ac236f6 100644 --- a/sea_transport/adminpanel.ui +++ b/sea_transport/adminpanel.ui @@ -53,7 +53,7 @@ QTabWidget::Rounded - 2 + 0 false diff --git a/sea_transport/entities/dpoint_entity.cpp b/sea_transport/entities/dpoint_entity.cpp index abc256a..ed5b926 100644 --- a/sea_transport/entities/dpoint_entity.cpp +++ b/sea_transport/entities/dpoint_entity.cpp @@ -1,7 +1,7 @@ #include "dpoint_entity.h" -dpoint_entity::dpoint_entity(const QString &title) : _title(title) { - this->_id = 0; +dpoint_entity::dpoint_entity(entity_id dispatcher_id, const QString &title) : _dispatcher_id(dispatcher_id), _title(title) { + this->_id = dispatcher_id; auto hash = QCryptographicHash::hash(title.toLocal8Bit(), QCryptographicHash::Md5); for (auto bit : hash) { this->_id += bit; @@ -12,6 +12,10 @@ entity_id dpoint_entity::id() const { return this->_id; } +entity_id dpoint_entity::dispatcher() const { + return this->_dispatcher_id; +} + QString dpoint_entity::title() const { return this->_title; } diff --git a/sea_transport/entities/dpoint_entity.h b/sea_transport/entities/dpoint_entity.h index 037f8ff..90fb4a4 100644 --- a/sea_transport/entities/dpoint_entity.h +++ b/sea_transport/entities/dpoint_entity.h @@ -12,14 +12,16 @@ class dpoint_entity : public IEntity { private: entity_id _id; + entity_id _dispatcher_id; QString _title; QVector _storages; public: dpoint_entity() = default; - dpoint_entity(const QString &title); + dpoint_entity(entity_id dispatcher_id, const QString &title); entity_id id() const; + entity_id dispatcher() const; QString title() const; const QVector storages(); diff --git a/sea_transport/entities/vessel_entity.cpp b/sea_transport/entities/vessel_entity.cpp index e3bd829..45ce0a0 100644 --- a/sea_transport/entities/vessel_entity.cpp +++ b/sea_transport/entities/vessel_entity.cpp @@ -11,6 +11,10 @@ entity_id vessel_entity::id() const { return this->_id; } +entity_id vessel_entity::skipper() const { + return this->_skipper_id; +} + entity_id vessel_entity::harbor() const { return this->_harbor_id; } diff --git a/sea_transport/entities/vessel_entity.h b/sea_transport/entities/vessel_entity.h index 22a1c7c..9b72c90 100644 --- a/sea_transport/entities/vessel_entity.h +++ b/sea_transport/entities/vessel_entity.h @@ -21,6 +21,7 @@ public: vessel_entity(entity_id skipper_id, entity_id harbor_id, unsigned int capacity); entity_id id() const; + entity_id skipper() const; entity_id harbor() const; unsigned int capacity() const; const QVector cargo(); diff --git a/st_test/tst_st_test.cpp b/st_test/tst_st_test.cpp index 6cfc350..3c8ca78 100644 --- a/st_test/tst_st_test.cpp +++ b/st_test/tst_st_test.cpp @@ -164,8 +164,8 @@ void st_test::vessel_entity_serialization_test() { f.open(QIODevice::WriteOnly); stream.setDevice(&f); - dpoint_entity test_harbor("test_harbor_for_vessel"); - ent1 = vessel_entity(test_harbor.id(), 256); + dpoint_entity test_harbor(0, "test_harbor_for_vessel"); + ent1 = vessel_entity(0, test_harbor.id(), 256); ent1.serialize(stream); stream.setDevice(nullptr); @@ -265,7 +265,7 @@ void st_test::apparatus_check_auth_subsystem() { void st_test::apparatus_check_object_subsystem() { apparatus::init(); auto os = apparatus::instance()->get_object_subsystem(); - dpoint_entity p("test"); + dpoint_entity p(0, "test"); { bool test = os->add_dpoint(p); QVERIFY(test); From a6c080d36bcccc7e03b42c6067e8cd6b499fa467 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 03:17:06 +0700 Subject: [PATCH 13/18] Cargo edit dialog and VM --- sea_transport/cargoeditdialog.cpp | 24 ++++++--- sea_transport/cargoeditdialog.h | 15 ++++-- sea_transport/cargoeditdialog.ui | 33 +++++-------- sea_transport/viewmodels/cargoviewmodel.cpp | 54 +++++++++++++++++++++ sea_transport/viewmodels/cargoviewmodel.h | 24 +++++++++ 5 files changed, 118 insertions(+), 32 deletions(-) create mode 100644 sea_transport/viewmodels/cargoviewmodel.cpp create mode 100644 sea_transport/viewmodels/cargoviewmodel.h diff --git a/sea_transport/cargoeditdialog.cpp b/sea_transport/cargoeditdialog.cpp index b481bbf..67c9a1e 100644 --- a/sea_transport/cargoeditdialog.cpp +++ b/sea_transport/cargoeditdialog.cpp @@ -1,14 +1,26 @@ #include "cargoeditdialog.h" #include "ui_cargoeditdialog.h" -CargoEditDialog::CargoEditDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::CargoEditDialog) -{ +CargoEditDialog::CargoEditDialog(QWidget *parent) : QDialog(parent), ui(new Ui::CargoEditDialog) { ui->setupUi(this); } -CargoEditDialog::~CargoEditDialog() -{ +CargoEditDialog::~CargoEditDialog() { delete ui; } + +cargo_entity* CargoEditDialog::cargo() { + return this->_cargo; +} + +void CargoEditDialog::accept() { + bool emptyTitle = ui->et_title->text().trimmed().isEmpty(); + if (emptyTitle) { + QMessageBox::critical(this, "Error", "Title cannot be empty"); + return; + } + + this->_cargo = new cargo_entity(ui->et_title->text().trimmed(), ui->sb_volume->value()); + + QDialog::accept(); +} diff --git a/sea_transport/cargoeditdialog.h b/sea_transport/cargoeditdialog.h index 2da4b33..fcab6ea 100644 --- a/sea_transport/cargoeditdialog.h +++ b/sea_transport/cargoeditdialog.h @@ -2,21 +2,28 @@ #define CARGOEDITDIALOG_H #include +#include + +#include "entities/cargo_entity.h" namespace Ui { class CargoEditDialog; } -class CargoEditDialog : public QDialog -{ +class CargoEditDialog : public QDialog { Q_OBJECT + Ui::CargoEditDialog *ui; + + cargo_entity *_cargo; public: explicit CargoEditDialog(QWidget *parent = nullptr); ~CargoEditDialog(); -private: - Ui::CargoEditDialog *ui; + cargo_entity* cargo(); + +public slots: + void accept() Q_DECL_OVERRIDE; }; #endif // CARGOEDITDIALOG_H diff --git a/sea_transport/cargoeditdialog.ui b/sea_transport/cargoeditdialog.ui index a6b62e3..da14928 100644 --- a/sea_transport/cargoeditdialog.ui +++ b/sea_transport/cargoeditdialog.ui @@ -7,7 +7,7 @@ 0 0 318 - 279 + 127 @@ -19,12 +19,12 @@ - Cargo ID: + Title - + @@ -33,28 +33,17 @@ - Quantity: + Volume: - - - + + + 1 - - - - - - Destination: - - - - - - - Choose... + + 500 @@ -76,14 +65,14 @@ - + Discard - + Save diff --git a/sea_transport/viewmodels/cargoviewmodel.cpp b/sea_transport/viewmodels/cargoviewmodel.cpp new file mode 100644 index 0000000..ef6621a --- /dev/null +++ b/sea_transport/viewmodels/cargoviewmodel.cpp @@ -0,0 +1,54 @@ +#include "cargoviewmodel.h" + +CargoViewModel::CargoViewModel(QObject *parent) : QAbstractTableModel(parent) { + +} + +int CargoViewModel::rowCount(const QModelIndex &/*parent*/) const { + return this->_data.length(); +} + +int CargoViewModel::columnCount(const QModelIndex &/*parent*/) const { + return 3; +} + +QVariant CargoViewModel::headerData(int section, Qt::Orientation orientation, int role) const { + if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { + switch (section) { + case 0: + return QString("SID"); + case 1: + return QString("Title"); + case 2: + return QString("Volume"); + } + } + return QVariant(); +} + +QVariant CargoViewModel::data(const QModelIndex &index, int role) const { + if (role == Qt::DisplayRole) { + auto item = this->_data[index.row()]; + + int col = index.column(); + switch (col) { + case 0: + return QString::number(item.id()); + case 1: + return item.title(); + case 2: + return item.volume(); + } + + return "UNKNOWN FIELD"; + } + + return QVariant(); +} + +void CargoViewModel::set_data(const QVector &new_data) { + this->beginResetModel(); + this->_data.clear(); + this->_data += new_data; + this->endResetModel(); +} diff --git a/sea_transport/viewmodels/cargoviewmodel.h b/sea_transport/viewmodels/cargoviewmodel.h new file mode 100644 index 0000000..26db7b1 --- /dev/null +++ b/sea_transport/viewmodels/cargoviewmodel.h @@ -0,0 +1,24 @@ +#ifndef CARGOVIEWMODEL_H +#define CARGOVIEWMODEL_H + +#include +#include + +#include "entities/cargo_entity.h" + +class CargoViewModel : public QAbstractTableModel { + Q_OBJECT + + QVector _data; + +public: + CargoViewModel(QObject *parent); + int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const; + QVariant headerData(int section, Qt::Orientation orientation, int role) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + + void set_data(const QVector &new_data); +}; + +#endif // CARGOVIEWMODEL_H From 3e196f35746d55dbf6948749c061d7fd3629d766 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 04:26:18 +0700 Subject: [PATCH 14/18] Delivery point editor done --- sea_transport/adminpanel.cpp | 42 ++++++- sea_transport/adminpanel.h | 1 + sea_transport/cargoeditdialog.cpp | 3 + sea_transport/deliverypointeditdialog.cpp | 114 +++++++++++++++++- sea_transport/deliverypointeditdialog.h | 28 ++++- sea_transport/deliverypointeditdialog.ui | 24 +++- sea_transport/entities/dpoint_entity.cpp | 18 +++ sea_transport/entities/dpoint_entity.h | 4 + sea_transport/entities/storage_entity.cpp | 4 + sea_transport/entities/storage_entity.h | 1 + sea_transport/sea_transport.pro | 2 + sea_transport/storageeditdialog.cpp | 78 +++++++++++- sea_transport/storageeditdialog.h | 22 +++- sea_transport/storageeditdialog.ui | 51 +++++--- sea_transport/system/object_system.cpp | 4 +- sea_transport/system/object_system.h | 4 +- sea_transport/usereditdialog.cpp | 22 ++-- sea_transport/usereditdialog.h | 17 +-- .../viewmodels/deliverypointsviewmodel.cpp | 3 +- sea_transport/viewmodels/vesselsviewmodel.cpp | 3 +- sea_transport_project.pro.user | 6 +- st_test/tst_st_test.cpp | 2 +- 22 files changed, 379 insertions(+), 74 deletions(-) diff --git a/sea_transport/adminpanel.cpp b/sea_transport/adminpanel.cpp index 1bda76f..74a4e4a 100644 --- a/sea_transport/adminpanel.cpp +++ b/sea_transport/adminpanel.cpp @@ -78,7 +78,7 @@ void AdminPanel::on_logout_requested() { this->close(); } -void AdminPanel::on_vessel_add_edit(bool edit) { +void AdminPanel::on_vessel_add_edit(bool /*edit*/) { } @@ -129,7 +129,7 @@ void AdminPanel::on_user_add_edit(bool edit) { return; } - auto data = ued.user(); + auto data = ued.user_data(); if (edit) { bool success; auto user = apparatus::instance()->get_auth_subsystem()->get_user(usr.login(), success); @@ -188,7 +188,41 @@ void AdminPanel::on_user_remove() { } void AdminPanel::on_delivery_point_add_edit(bool edit) { + auto selected = ui->tv_dp->selectionModel()->selectedRows(); + if (edit && selected.length() != 1) { + return; + } + dpoint_entity dpoint; + if (edit) { + int idx = selected[0].row(); + dpoint = apparatus::instance()->get_object_subsystem()->dpoints()[idx]; + } + + DeliveryPointEditDialog dped(this); + dped.setWindowTitle(edit? "Edit delivery point" : "New delivery point"); + dped.set_dpoint(&dpoint, edit); + if (dped.exec() != UserEditDialog::Accepted) { + return; + } + + auto data = dped.dpoint(); + if (edit) { + bool success; + auto dp = apparatus::instance()->get_object_subsystem()->get_dpoint(dpoint.id(), success); + if (!success) { + QMessageBox::critical(this, "Error", "Error editing delivery point"); + return; + } + + dp->set_title(data->title()); + dp->set_storages(data->storages()); + } + else { + apparatus::instance()->get_object_subsystem()->add_dpoint(*data); + } + + dpvm->update(); } void AdminPanel::on_delivery_point_remove() { @@ -208,8 +242,8 @@ void AdminPanel::on_delivery_point_remove() { } foreach (auto mIdx, selected) { - int idx = mIdx.row(); - qDebug() << idx << ' ' << mIdx.data() << '\n'; + entity_id oid = mIdx.data().toULongLong(); + apparatus::instance()->get_object_subsystem()->remove_dpoint(oid); } dpvm->update(); diff --git a/sea_transport/adminpanel.h b/sea_transport/adminpanel.h index 3489f39..827c4b1 100644 --- a/sea_transport/adminpanel.h +++ b/sea_transport/adminpanel.h @@ -14,6 +14,7 @@ #include "viewmodels/deliverypointsviewmodel.h" #include "entities/user_entity.h" +#include "entities/dpoint_entity.h" namespace Ui { class AdminPanel; diff --git a/sea_transport/cargoeditdialog.cpp b/sea_transport/cargoeditdialog.cpp index 67c9a1e..a55ba79 100644 --- a/sea_transport/cargoeditdialog.cpp +++ b/sea_transport/cargoeditdialog.cpp @@ -3,6 +3,9 @@ CargoEditDialog::CargoEditDialog(QWidget *parent) : QDialog(parent), ui(new Ui::CargoEditDialog) { ui->setupUi(this); + + connect(ui->pb_save, &QPushButton::clicked, this, &CargoEditDialog::accept); + connect(ui->pb_discard, &QPushButton::clicked, this, &CargoEditDialog::reject); } CargoEditDialog::~CargoEditDialog() { diff --git a/sea_transport/deliverypointeditdialog.cpp b/sea_transport/deliverypointeditdialog.cpp index a010715..922a549 100644 --- a/sea_transport/deliverypointeditdialog.cpp +++ b/sea_transport/deliverypointeditdialog.cpp @@ -1,14 +1,116 @@ #include "deliverypointeditdialog.h" #include "ui_deliverypointeditdialog.h" -DeliveryPointEditDialog::DeliveryPointEditDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::DeliveryPointEditDialog) -{ + +DeliveryPointEditDialog::DeliveryPointEditDialog(QWidget *parent) : QDialog(parent), ui(new Ui::DeliveryPointEditDialog) { ui->setupUi(this); + + this->svm = new QStringListModel(this); + ui->lv_storages->setModel(this->svm); + + connect(ui->lv_storages->selectionModel(), &QItemSelectionModel::selectionChanged, [this](const QItemSelection &selected) { + ui->pb_storage_remove->setEnabled(selected.length() > 0); + ui->pb_storage_edit->setEnabled(selected.length() == 1); + }); + + connect(ui->pb_storage_remove, &QPushButton::clicked, [this]() { + auto sel = ui->lv_storages->selectionModel()->selectedRows(); + if (sel.length() == 0) { + return; + } + + foreach (auto mIdx, sel) { + auto cuid = mIdx.data().toString().toULongLong(); + auto st = this->_dp->storages(); + + for (int i = 0; i < st.length(); i++) { + if (st[i].id() == cuid) { + st.removeAt(i); + break; + } + } + + this->_dp->set_storages(st); + } + this->update_list(); + }); + + connect(ui->pb_storage_edit, &QPushButton::clicked, [this]() { + this->on_storage_edit_add(true); + }); + + connect(ui->pb_storage_add, &QPushButton::clicked, [this]() { + this->on_storage_edit_add(false); + }); + + connect(ui->pb_save, &QPushButton::clicked, this, &DeliveryPointEditDialog::accept); + connect(ui->pb_discard, &QPushButton::clicked, this, &DeliveryPointEditDialog::reject); } -DeliveryPointEditDialog::~DeliveryPointEditDialog() -{ +DeliveryPointEditDialog::~DeliveryPointEditDialog() { delete ui; } + +void DeliveryPointEditDialog::update_list() { + QStringList slist; + foreach (auto storage, this->_dp->storages()) { + slist << QString::number(storage.id()); + } + this->svm->setStringList(slist); +} + +dpoint_entity* DeliveryPointEditDialog::dpoint() const { + return this->_dp; +} + +void DeliveryPointEditDialog::on_storage_edit_add(bool edit) { + auto selected = ui->lv_storages->selectionModel()->selectedRows(); + if (edit && selected.length() != 1) { + return; + } + + storage_entity stor; + if (edit) { + int idx = selected[0].row(); + stor = this->_dp->storages()[idx]; + this->_dp->remove_storage(stor.id()); + } + + StorageEditDialog sed(this); + sed.setWindowTitle(edit? "Edit storage" : "New storage"); + sed.set_storage(&stor, edit); + if (sed.exec() != StorageEditDialog::Accepted) { + return; + } + + auto n_storage = sed.storage(); + if (edit) { + this->_dp->remove_storage(stor.id()); + } + this->_dp->add_storage(*n_storage); + + this->update_list(); +} + +void DeliveryPointEditDialog::set_dpoint(dpoint_entity* dpoint, bool edit) { + this->_dp = new dpoint_entity(*dpoint); + + if (edit) { + ui->et_title->setText(dpoint->title()); + this->update_list(); + } +} + +void DeliveryPointEditDialog::accept() { + bool emptyTitle = ui->et_title->text().trimmed().isEmpty(); + if (emptyTitle) {; + QString message = "Some errors happend, while saving your note:" + "
- Title cannot be empty (all spaces - empty too)"; + QMessageBox::critical(this, "Error", message); + return; + } + + this->_dp->set_title(ui->et_title->text().trimmed()); + + QDialog::accept(); +} diff --git a/sea_transport/deliverypointeditdialog.h b/sea_transport/deliverypointeditdialog.h index 6b044e2..3eeb00b 100644 --- a/sea_transport/deliverypointeditdialog.h +++ b/sea_transport/deliverypointeditdialog.h @@ -1,22 +1,42 @@ #ifndef DELIVERYPOINTEDITDIALOG_H #define DELIVERYPOINTEDITDIALOG_H +#include #include +#include +#include +#include +#include + +#include "entities/dpoint_entity.h" +#include "system/apparatus.h" +#include "storageeditdialog.h" + namespace Ui { class DeliveryPointEditDialog; } -class DeliveryPointEditDialog : public QDialog -{ +class DeliveryPointEditDialog : public QDialog { Q_OBJECT + Ui::DeliveryPointEditDialog *ui; + + QStringListModel *svm; + dpoint_entity *_dp; + + void update_list(); public: explicit DeliveryPointEditDialog(QWidget *parent = nullptr); ~DeliveryPointEditDialog(); -private: - Ui::DeliveryPointEditDialog *ui; + dpoint_entity* dpoint() const; + void set_dpoint(dpoint_entity* dpoint, bool edit); + +public slots: + void on_storage_edit_add(bool edit); + + void accept() Q_DECL_OVERRIDE; }; #endif // DELIVERYPOINTEDITDIALOG_H diff --git a/sea_transport/deliverypointeditdialog.ui b/sea_transport/deliverypointeditdialog.ui index 4a0ab3d..4797b21 100644 --- a/sea_transport/deliverypointeditdialog.ui +++ b/sea_transport/deliverypointeditdialog.ui @@ -44,19 +44,33 @@ - + + + QAbstractItemView::NoEditTriggers + + - + Add storage - + + + false + + + Edit storage + + + + + false @@ -83,14 +97,14 @@ - + Discard - + Save diff --git a/sea_transport/entities/dpoint_entity.cpp b/sea_transport/entities/dpoint_entity.cpp index ed5b926..01b164b 100644 --- a/sea_transport/entities/dpoint_entity.cpp +++ b/sea_transport/entities/dpoint_entity.cpp @@ -20,10 +20,28 @@ QString dpoint_entity::title() const { return this->_title; } +void dpoint_entity::set_title(const QString &new_title) { + this->_title = new_title; +} + const QVector dpoint_entity::storages() { return this->_storages; } +void dpoint_entity::set_storages(QVector storages) { + this->_storages = storages; +} + +void dpoint_entity::remove_storage(entity_id sid) { + std::remove_if(this->_storages.begin(), this->_storages.end(), [sid](storage_entity ent) { + return ent.id() == sid; + }); +} + +void dpoint_entity::add_storage(storage_entity ent) { + this->_storages.push_back(ent); +} + void dpoint_entity::serialize(QDataStream &output) { output << this->_id << this->_title << this->_storages.size(); for (auto &item : this->_storages) { diff --git a/sea_transport/entities/dpoint_entity.h b/sea_transport/entities/dpoint_entity.h index 90fb4a4..8c17537 100644 --- a/sea_transport/entities/dpoint_entity.h +++ b/sea_transport/entities/dpoint_entity.h @@ -23,7 +23,11 @@ public: entity_id id() const; entity_id dispatcher() const; QString title() const; + void set_title(const QString &new_title); const QVector storages(); + void set_storages(QVector storages); + void remove_storage(entity_id sid); + void add_storage(storage_entity ent); void serialize(QDataStream &output); void deserialize(QDataStream &input); diff --git a/sea_transport/entities/storage_entity.cpp b/sea_transport/entities/storage_entity.cpp index 5e55f4c..49a381d 100644 --- a/sea_transport/entities/storage_entity.cpp +++ b/sea_transport/entities/storage_entity.cpp @@ -16,6 +16,10 @@ unsigned int storage_entity::capacity() const { return this->_capacity; } +void storage_entity::set_capacity(unsigned int new_capacity) { + this->_capacity = new_capacity; +} + const QVector storage_entity::cargo() { return this->_cargo; } diff --git a/sea_transport/entities/storage_entity.h b/sea_transport/entities/storage_entity.h index 3b8abf5..68030a2 100644 --- a/sea_transport/entities/storage_entity.h +++ b/sea_transport/entities/storage_entity.h @@ -22,6 +22,7 @@ public: entity_id id() const; unsigned int capacity() const; + void set_capacity(unsigned int new_capacity); const QVector cargo(); void add_cargo(cargo_entity object, bool &success); diff --git a/sea_transport/sea_transport.pro b/sea_transport/sea_transport.pro index bf9d0a6..99e2c50 100644 --- a/sea_transport/sea_transport.pro +++ b/sea_transport/sea_transport.pro @@ -25,6 +25,7 @@ SOURCES += \ system/object_system.cpp \ usereditdialog.cpp \ vesseleditdialog.cpp \ + viewmodels/cargoviewmodel.cpp \ viewmodels/deliverypointsviewmodel.cpp \ viewmodels/usersviewmodel.cpp \ viewmodels/vesselsviewmodel.cpp @@ -47,6 +48,7 @@ HEADERS += \ system/object_system.h \ usereditdialog.h \ vesseleditdialog.h \ + viewmodels/cargoviewmodel.h \ viewmodels/deliverypointsviewmodel.h \ viewmodels/usersviewmodel.h \ viewmodels/vesselsviewmodel.h diff --git a/sea_transport/storageeditdialog.cpp b/sea_transport/storageeditdialog.cpp index bfb4dc4..8395ae9 100644 --- a/sea_transport/storageeditdialog.cpp +++ b/sea_transport/storageeditdialog.cpp @@ -1,14 +1,80 @@ #include "storageeditdialog.h" #include "ui_storageeditdialog.h" -StorageEditDialog::StorageEditDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::StorageEditDialog) -{ +StorageEditDialog::StorageEditDialog(QWidget *parent) : QDialog(parent), ui(new Ui::StorageEditDialog) { ui->setupUi(this); + + this->cvm = new CargoViewModel(this); + ui->lv_cargo->setModel(this->cvm); + + connect(ui->lv_cargo->selectionModel(), &QItemSelectionModel::selectionChanged, [this](const QItemSelection &selected) { + ui->pb_cargo_remove->setEnabled(selected.length() > 0); + }); + + connect(ui->pb_cargo_remove, &QPushButton::clicked, [this]() { + auto sel = ui->lv_cargo->selectionModel()->selectedRows(); + if (sel.length() == 0) { + return; + } + + foreach (auto mIdx, sel) { + auto cdata = mIdx.data().toInt(); + qDebug() << cdata << '\n'; + } + }); + + connect(ui->pb_cargo_add, &QPushButton::clicked, this, &StorageEditDialog::on_cargo_add); + + connect(ui->pb_save, &QPushButton::clicked, this, &StorageEditDialog::accept); + connect(ui->pb_discard, &QPushButton::clicked, this, &StorageEditDialog::reject); } -StorageEditDialog::~StorageEditDialog() -{ +StorageEditDialog::~StorageEditDialog() { delete ui; } + +storage_entity* StorageEditDialog::storage() { + return this->_storage; +} + +void StorageEditDialog::set_storage(storage_entity *ent, bool edit) { + this->_storage = new storage_entity(*ent); + + if (edit) { + ui->sb_capacity->setValue(ent->capacity()); + this->cvm->set_data(this->_storage->cargo()); + } +} + +void StorageEditDialog::on_cargo_add() { + CargoEditDialog ced(this); + ced.setWindowTitle("New cargo"); + if (ced.exec() != CargoEditDialog::Accepted) { + return; + } + + bool success; + this->_storage->add_cargo(*ced.cargo(), success); + if (success) { + this->cvm->set_data(this->_storage->cargo()); + QMessageBox::information(this, "Success", "Cargo successfully put into storage"); + } + else { + QMessageBox::critical(this, "Error", "Not enough space to put cargo"); + } +} + +void StorageEditDialog::accept() { + int cvs = 0; + foreach (auto c, this->_storage->cargo()) { + cvs += c.volume(); + } + if (cvs > ui->sb_capacity->value()) { + QMessageBox::critical(this, "Error", "Cargo volume bigger than capacity"); + return; + } + + this->_storage->set_capacity(ui->sb_capacity->value()); + + QDialog::accept(); +} diff --git a/sea_transport/storageeditdialog.h b/sea_transport/storageeditdialog.h index bf70a54..372833a 100644 --- a/sea_transport/storageeditdialog.h +++ b/sea_transport/storageeditdialog.h @@ -1,22 +1,36 @@ #ifndef STORAGEEDITDIALOG_H #define STORAGEEDITDIALOG_H +#include #include +#include + +#include "entities/storage_entity.h" +#include "viewmodels/cargoviewmodel.h" +#include "cargoeditdialog.h" + namespace Ui { class StorageEditDialog; } -class StorageEditDialog : public QDialog -{ +class StorageEditDialog : public QDialog { Q_OBJECT + Ui::StorageEditDialog *ui; + + CargoViewModel *cvm; + storage_entity *_storage; public: explicit StorageEditDialog(QWidget *parent = nullptr); ~StorageEditDialog(); -private: - Ui::StorageEditDialog *ui; + storage_entity* storage(); + void set_storage(storage_entity *ent, bool edit); + +public slots: + void on_cargo_add(); + void accept() Q_DECL_OVERRIDE; }; #endif // STORAGEEDITDIALOG_H diff --git a/sea_transport/storageeditdialog.ui b/sea_transport/storageeditdialog.ui index 95b17c4..ac1e467 100644 --- a/sea_transport/storageeditdialog.ui +++ b/sea_transport/storageeditdialog.ui @@ -7,7 +7,7 @@ 0 0 400 - 190 + 336 @@ -17,24 +17,45 @@ - - - Storage num.: - - - - - - - Capacity: - - + + + + 1 + + + 500 + + + + + + + + + + + + + + Add cargo + + + + + + + false + + + Remove cargo + + @@ -54,14 +75,14 @@ - + Discard - + Save diff --git a/sea_transport/system/object_system.cpp b/sea_transport/system/object_system.cpp index 6b6456c..5915b78 100644 --- a/sea_transport/system/object_system.cpp +++ b/sea_transport/system/object_system.cpp @@ -1,7 +1,7 @@ #include "object_system.h" -const dpoint_entity* object_system::get_dpoint(entity_id oid, bool &success) { +dpoint_entity* object_system::get_dpoint(entity_id oid, bool &success) { dpoint_entity *out = nullptr; success = false; @@ -39,7 +39,7 @@ bool object_system::add_dpoint(dpoint_entity dpoint) { return false; } -const vessel_entity* object_system::get_vessel(entity_id oid, bool &success) { +vessel_entity* object_system::get_vessel(entity_id oid, bool &success) { vessel_entity *out = nullptr; success = false; diff --git a/sea_transport/system/object_system.h b/sea_transport/system/object_system.h index 2239a42..7551201 100644 --- a/sea_transport/system/object_system.h +++ b/sea_transport/system/object_system.h @@ -16,11 +16,11 @@ private: public: object_system() = default; - const dpoint_entity* get_dpoint(entity_id oid, bool &success); + dpoint_entity* get_dpoint(entity_id oid, bool &success); bool remove_dpoint(entity_id oid); bool add_dpoint(dpoint_entity dpoint); - const vessel_entity* get_vessel(entity_id oid, bool &success); + vessel_entity* get_vessel(entity_id oid, bool &success); bool remove_vessel(entity_id oid); bool add_vessel(vessel_entity dpoint); diff --git a/sea_transport/usereditdialog.cpp b/sea_transport/usereditdialog.cpp index c0c2650..a84ba1b 100644 --- a/sea_transport/usereditdialog.cpp +++ b/sea_transport/usereditdialog.cpp @@ -1,6 +1,7 @@ #include "usereditdialog.h" #include "ui_usereditdialog.h" + UserEditDialog::UserEditDialog(QWidget *parent) : QDialog(parent), ui(new Ui::UserEditDialog) { ui->setupUi(this); @@ -12,24 +13,22 @@ UserEditDialog::~UserEditDialog() { delete ui; } -UserEditDialog::user_data* UserEditDialog::user() const { - return this->_user; +user_data_struct* UserEditDialog::user_data() const { + return this->_user_data; } void UserEditDialog::set_user(user_entity* user, bool edit) { if (edit) { - this->_user = new UserEditDialog::user_data { - user->login(), "", user->role(), true - }; + this->_user_data = new user_data_struct(); ui->et_login->setText(user->login()); ui->et_password->setText("##########UNEDITED##########"); ui->cb_role->setCurrentIndex((int)user->role()); } else { - this->_user = new UserEditDialog::user_data{}; + this->_user_data = new user_data_struct{}; } - this->_user->edit = edit; + this->_user_data->edit = edit; } void UserEditDialog::accept() { @@ -47,7 +46,7 @@ void UserEditDialog::accept() { } bool emptyTitle = ui->et_login->text().trimmed().isEmpty(); bool emptyPassword = ui->et_password->text().trimmed().isEmpty(); - bool lowerank = this->_user->edit && this->_user->role < role; + bool lowerank = this->_user_data->edit && this->_user_data->role < role; if (emptyTitle || emptyPassword || lowerank) { QMessageBox errDlg(this); errDlg.setTextFormat(Qt::RichText); @@ -67,11 +66,10 @@ void UserEditDialog::accept() { errDlg.exec(); return; } - ; - this->_user->login = ui->et_login->text().trimmed(); - this->_user->password = ui->et_password->text().trimmed(); - this->_user->role = role; + this->_user_data->login = ui->et_login->text().trimmed(); + this->_user_data->password = ui->et_password->text().trimmed(); + this->_user_data->role = role; QDialog::accept(); } diff --git a/sea_transport/usereditdialog.h b/sea_transport/usereditdialog.h index 7fb13ca..ada392e 100644 --- a/sea_transport/usereditdialog.h +++ b/sea_transport/usereditdialog.h @@ -11,25 +11,26 @@ namespace Ui { class UserEditDialog; } +struct user_data_struct { + QString login; + QString password; + UserRole role; + bool edit; +}; + class UserEditDialog : public QDialog { Q_OBJECT Ui::UserEditDialog *ui; - struct user_data { - QString login; - QString password; - UserRole role; - bool edit; - } *_user; + user_data_struct *_user_data; public: explicit UserEditDialog(QWidget *parent = nullptr); ~UserEditDialog(); - UserEditDialog::user_data* user() const; + user_data_struct* user_data() const; void set_user(user_entity* user, bool edit); - public slots: void accept() Q_DECL_OVERRIDE; }; diff --git a/sea_transport/viewmodels/deliverypointsviewmodel.cpp b/sea_transport/viewmodels/deliverypointsviewmodel.cpp index 5823d9c..487e768 100644 --- a/sea_transport/viewmodels/deliverypointsviewmodel.cpp +++ b/sea_transport/viewmodels/deliverypointsviewmodel.cpp @@ -55,5 +55,6 @@ QVariant DeliveryPointsViewModel::data(const QModelIndex &index, int role) const } void DeliveryPointsViewModel::update() { - dataChanged(QModelIndex(), QModelIndex()); + this->beginResetModel(); + this->endResetModel(); } diff --git a/sea_transport/viewmodels/vesselsviewmodel.cpp b/sea_transport/viewmodels/vesselsviewmodel.cpp index accfe2b..7d4f2ba 100644 --- a/sea_transport/viewmodels/vesselsviewmodel.cpp +++ b/sea_transport/viewmodels/vesselsviewmodel.cpp @@ -61,5 +61,6 @@ QVariant VesselsViewModel::data(const QModelIndex &index, int role) const { } void VesselsViewModel::update() { - dataChanged(QModelIndex(), QModelIndex()); + this->beginResetModel(); + this->endResetModel(); } diff --git a/sea_transport_project.pro.user b/sea_transport_project.pro.user index be69ce2..c77d533 100644 --- a/sea_transport_project.pro.user +++ b/sea_transport_project.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -169,7 +169,7 @@ true QtProjectManager.QMakeBuildStep - false + true @@ -221,7 +221,7 @@ true QtProjectManager.QMakeBuildStep - false + true diff --git a/st_test/tst_st_test.cpp b/st_test/tst_st_test.cpp index 3c8ca78..fca6bde 100644 --- a/st_test/tst_st_test.cpp +++ b/st_test/tst_st_test.cpp @@ -133,7 +133,7 @@ void st_test::dpoint_entity_serialization_test() { f.open(QIODevice::WriteOnly); stream.setDevice(&f); - ent1 = dpoint_entity("some_test_point"); + ent1 = dpoint_entity(0, "some_test_point"); ent1.serialize(stream); stream.setDevice(nullptr); From 9686b96d8a1a2a0daf470d39b5acc7f4b6bd6a5f Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 15:00:02 +0700 Subject: [PATCH 15/18] Minor system improvements --- sea_transport/adminpanel.cpp | 20 ++++-- sea_transport/cargoeditdialog.ui | 2 +- sea_transport/deliverypointeditdialog.cpp | 12 +--- sea_transport/deliverypointeditdialog.ui | 79 +++++++++++++---------- sea_transport/entities/cargo_entity.cpp | 1 + sea_transport/entities/cargo_entity.h | 1 + sea_transport/entities/dpoint_entity.cpp | 18 +++++- sea_transport/entities/dpoint_entity.h | 1 + sea_transport/entities/storage_entity.cpp | 2 +- sea_transport/entities/storage_entity.h | 4 +- sea_transport/entities/user_entity.cpp | 4 ++ sea_transport/entities/user_entity.h | 1 + sea_transport/entities/vessel_entity.cpp | 2 +- sea_transport/entities/vessel_entity.h | 2 + sea_transport/storageeditdialog.cpp | 8 ++- sea_transport/storageeditdialog.ui | 73 ++++++++++++++------- 16 files changed, 144 insertions(+), 86 deletions(-) diff --git a/sea_transport/adminpanel.cpp b/sea_transport/adminpanel.cpp index 74a4e4a..4ea9230 100644 --- a/sea_transport/adminpanel.cpp +++ b/sea_transport/adminpanel.cpp @@ -80,6 +80,8 @@ void AdminPanel::on_logout_requested() { void AdminPanel::on_vessel_add_edit(bool /*edit*/) { + + vvm->update(); } void AdminPanel::on_vessel_remove() { @@ -99,8 +101,8 @@ void AdminPanel::on_vessel_remove() { } foreach (auto mIdx, selected) { - int idx = mIdx.row(); - qDebug() << idx << ' ' << mIdx.data() << '\n'; + entity_id oid = mIdx.data().toULongLong(); + apparatus::instance()->get_object_subsystem()->remove_vessel(oid); } vvm->update(); @@ -210,7 +212,10 @@ void AdminPanel::on_delivery_point_add_edit(bool edit) { if (edit) { bool success; auto dp = apparatus::instance()->get_object_subsystem()->get_dpoint(dpoint.id(), success); - if (!success) { + if (success) { + QMessageBox::information(this, "Info", "Successfully edited delivery point"); + } + else { QMessageBox::critical(this, "Error", "Error editing delivery point"); return; } @@ -219,7 +224,14 @@ void AdminPanel::on_delivery_point_add_edit(bool edit) { dp->set_storages(data->storages()); } else { - apparatus::instance()->get_object_subsystem()->add_dpoint(*data); + bool success = apparatus::instance()->get_object_subsystem()->add_dpoint(*data); + if (success) { + QMessageBox::information(this, "Info", "Successfully created delivery point"); + } + else { + QMessageBox::critical(this, "Error", "Error creating delivery point"); + return; + } } dpvm->update(); diff --git a/sea_transport/cargoeditdialog.ui b/sea_transport/cargoeditdialog.ui index da14928..4b2f8bf 100644 --- a/sea_transport/cargoeditdialog.ui +++ b/sea_transport/cargoeditdialog.ui @@ -43,7 +43,7 @@ 1 - 500 + 500000 diff --git a/sea_transport/deliverypointeditdialog.cpp b/sea_transport/deliverypointeditdialog.cpp index 922a549..187d1c5 100644 --- a/sea_transport/deliverypointeditdialog.cpp +++ b/sea_transport/deliverypointeditdialog.cpp @@ -21,16 +21,7 @@ DeliveryPointEditDialog::DeliveryPointEditDialog(QWidget *parent) : QDialog(pare foreach (auto mIdx, sel) { auto cuid = mIdx.data().toString().toULongLong(); - auto st = this->_dp->storages(); - - for (int i = 0; i < st.length(); i++) { - if (st[i].id() == cuid) { - st.removeAt(i); - break; - } - } - - this->_dp->set_storages(st); + this->_dp->remove_storage(cuid); } this->update_list(); }); @@ -73,7 +64,6 @@ void DeliveryPointEditDialog::on_storage_edit_add(bool edit) { if (edit) { int idx = selected[0].row(); stor = this->_dp->storages()[idx]; - this->_dp->remove_storage(stor.id()); } StorageEditDialog sed(this); diff --git a/sea_transport/deliverypointeditdialog.ui b/sea_transport/deliverypointeditdialog.ui index 4797b21..c330679 100644 --- a/sea_transport/deliverypointeditdialog.ui +++ b/sea_transport/deliverypointeditdialog.ui @@ -13,7 +13,7 @@ Dialog - + @@ -44,43 +44,52 @@ - - - QAbstractItemView::NoEditTriggers + + + Storages IDs + + + + + QAbstractItemView::NoEditTriggers + + + + + + + + + Add storage + + + + + + + false + + + Edit storage + + + + + + + false + + + Remove storage + + + + + + - - - - - - Add storage - - - - - - - false - - - Edit storage - - - - - - - false - - - Remove storage - - - - - diff --git a/sea_transport/entities/cargo_entity.cpp b/sea_transport/entities/cargo_entity.cpp index 4104050..9835444 100644 --- a/sea_transport/entities/cargo_entity.cpp +++ b/sea_transport/entities/cargo_entity.cpp @@ -6,6 +6,7 @@ cargo_entity::cargo_entity(const QString &title, unsigned int volume) : _title(t for (auto bit : hash) { this->_id += bit; } + this->_id += QRandomGenerator().generate64(); } entity_id cargo_entity::id() const { diff --git a/sea_transport/entities/cargo_entity.h b/sea_transport/entities/cargo_entity.h index 8d84b3a..9b69169 100644 --- a/sea_transport/entities/cargo_entity.h +++ b/sea_transport/entities/cargo_entity.h @@ -4,6 +4,7 @@ #include "IEntity.h" #include +#include #include diff --git a/sea_transport/entities/dpoint_entity.cpp b/sea_transport/entities/dpoint_entity.cpp index 01b164b..04d2f32 100644 --- a/sea_transport/entities/dpoint_entity.cpp +++ b/sea_transport/entities/dpoint_entity.cpp @@ -6,6 +6,7 @@ dpoint_entity::dpoint_entity(entity_id dispatcher_id, const QString &title) : _d for (auto bit : hash) { this->_id += bit; } + this->_id += QRandomGenerator().generate64(); } entity_id dpoint_entity::id() const { @@ -33,9 +34,20 @@ void dpoint_entity::set_storages(QVector storages) { } void dpoint_entity::remove_storage(entity_id sid) { - std::remove_if(this->_storages.begin(), this->_storages.end(), [sid](storage_entity ent) { - return ent.id() == sid; - }); +// std::remove_if(this->_storages.begin(), this->_storages.end(), [sid](storage_entity ent) { +// return ent.id() == sid; +// }); + + QVector st(this->_storages); + + for (int i = 0; i < st.length(); i++) { + if (st[i].id() == sid) { + st.removeAt(i); + break; + } + } + + this->set_storages(st); } void dpoint_entity::add_storage(storage_entity ent) { diff --git a/sea_transport/entities/dpoint_entity.h b/sea_transport/entities/dpoint_entity.h index 8c17537..202e002 100644 --- a/sea_transport/entities/dpoint_entity.h +++ b/sea_transport/entities/dpoint_entity.h @@ -6,6 +6,7 @@ #include #include +#include #include diff --git a/sea_transport/entities/storage_entity.cpp b/sea_transport/entities/storage_entity.cpp index 49a381d..96909e6 100644 --- a/sea_transport/entities/storage_entity.cpp +++ b/sea_transport/entities/storage_entity.cpp @@ -4,7 +4,7 @@ entity_id storage_entity::__global_id = 0; storage_entity::storage_entity(unsigned int capacity) : _capacity(capacity) { - this->_id = ++storage_entity::__global_id; + this->_id = ++storage_entity::__global_id + QRandomGenerator().generate64(); } diff --git a/sea_transport/entities/storage_entity.h b/sea_transport/entities/storage_entity.h index 68030a2..4d502f2 100644 --- a/sea_transport/entities/storage_entity.h +++ b/sea_transport/entities/storage_entity.h @@ -5,7 +5,7 @@ #include "cargo_entity.h" #include -#include +#include class storage_entity : public IEntity { @@ -13,7 +13,7 @@ private: static entity_id __global_id; entity_id _id; - unsigned int _capacity; + unsigned int _capacity = 500000; QVector _cargo; public: diff --git a/sea_transport/entities/user_entity.cpp b/sea_transport/entities/user_entity.cpp index a54471f..a213906 100644 --- a/sea_transport/entities/user_entity.cpp +++ b/sea_transport/entities/user_entity.cpp @@ -2,6 +2,10 @@ user_entity::user_entity(const QString &login, const QString &password, UserRole role) : _login(login), _role(role) { this->_pwd_hash = QCryptographicHash::hash(password.toLocal8Bit(), QCryptographicHash::Sha3_256); + foreach (auto bit, this->_pwd_hash) { + this->_id += bit; + } + this->_id += QRandomGenerator().generate64(); } entity_id user_entity::id() const { diff --git a/sea_transport/entities/user_entity.h b/sea_transport/entities/user_entity.h index 1bf4203..7f875a7 100644 --- a/sea_transport/entities/user_entity.h +++ b/sea_transport/entities/user_entity.h @@ -4,6 +4,7 @@ #include "IEntity.h" #include +#include #include diff --git a/sea_transport/entities/vessel_entity.cpp b/sea_transport/entities/vessel_entity.cpp index 45ce0a0..4739ee4 100644 --- a/sea_transport/entities/vessel_entity.cpp +++ b/sea_transport/entities/vessel_entity.cpp @@ -4,7 +4,7 @@ entity_id vessel_entity::__global_id = 0; vessel_entity::vessel_entity(entity_id skipper_id, entity_id harbor_id, unsigned int capacity) : _skipper_id(skipper_id), _harbor_id(harbor_id), _capacity(capacity) { - this->_id = ++vessel_entity::__global_id; + this->_id = ++vessel_entity::__global_id + QRandomGenerator().generate64(); } entity_id vessel_entity::id() const { diff --git a/sea_transport/entities/vessel_entity.h b/sea_transport/entities/vessel_entity.h index 9b72c90..48c2bbc 100644 --- a/sea_transport/entities/vessel_entity.h +++ b/sea_transport/entities/vessel_entity.h @@ -5,6 +5,8 @@ #include "cargo_entity.h" #include "dpoint_entity.h" +#include + class vessel_entity : public IEntity { private: diff --git a/sea_transport/storageeditdialog.cpp b/sea_transport/storageeditdialog.cpp index 8395ae9..b8eaefb 100644 --- a/sea_transport/storageeditdialog.cpp +++ b/sea_transport/storageeditdialog.cpp @@ -5,14 +5,14 @@ StorageEditDialog::StorageEditDialog(QWidget *parent) : QDialog(parent), ui(new ui->setupUi(this); this->cvm = new CargoViewModel(this); - ui->lv_cargo->setModel(this->cvm); + ui->tv_cargo->setModel(this->cvm); - connect(ui->lv_cargo->selectionModel(), &QItemSelectionModel::selectionChanged, [this](const QItemSelection &selected) { + connect(ui->tv_cargo->selectionModel(), &QItemSelectionModel::selectionChanged, [this](const QItemSelection &selected) { ui->pb_cargo_remove->setEnabled(selected.length() > 0); }); connect(ui->pb_cargo_remove, &QPushButton::clicked, [this]() { - auto sel = ui->lv_cargo->selectionModel()->selectedRows(); + auto sel = ui->tv_cargo->selectionModel()->selectedRows(); if (sel.length() == 0) { return; } @@ -44,6 +44,8 @@ void StorageEditDialog::set_storage(storage_entity *ent, bool edit) { ui->sb_capacity->setValue(ent->capacity()); this->cvm->set_data(this->_storage->cargo()); } + + ui->lab_capacity_current->setText(QString::number(this->_storage->capacity())); } void StorageEditDialog::on_cargo_add() { diff --git a/sea_transport/storageeditdialog.ui b/sea_transport/storageeditdialog.ui index ac1e467..89c6b29 100644 --- a/sea_transport/storageeditdialog.ui +++ b/sea_transport/storageeditdialog.ui @@ -13,13 +13,13 @@ Dialog - + - Capacity: + Capacity (new): @@ -29,35 +29,58 @@ 1 - 500 + 500000 + + + + + + + Capacity (current): + + + + + + + 0 - - - - - - - - Add cargo - - - - - - - false - - - Remove cargo - - - - + + + Storage cargo + + + + + + + + + + + Add cargo + + + + + + + false + + + Remove cargo + + + + + + + From eb097588ba6c6fe1db59186afa4ce43ee373c952 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 18:43:41 +0700 Subject: [PATCH 16/18] Vessel edit dialog --- sea_transport/adminpanel.cpp | 43 ++- sea_transport/adminpanel.ui | 11 +- sea_transport/cargoeditdialog.ui | 12 + sea_transport/deliverypointeditdialog.ui | 12 + sea_transport/entities/cargo_entity.cpp | 5 + sea_transport/entities/cargo_entity.h | 6 +- sea_transport/entities/dpoint_entity.cpp | 22 +- sea_transport/entities/dpoint_entity.h | 5 +- sea_transport/entities/storage_entity.cpp | 7 +- sea_transport/entities/storage_entity.h | 4 +- sea_transport/entities/user_entity.cpp | 8 + sea_transport/entities/user_entity.h | 4 +- sea_transport/entities/vessel_entity.cpp | 43 ++- sea_transport/entities/vessel_entity.h | 16 +- sea_transport/storageeditdialog.cpp | 8 +- sea_transport/storageeditdialog.ui | 12 + sea_transport/usereditdialog.ui | 12 + sea_transport/vesseleditdialog.cpp | 267 +++++++++++++++++- sea_transport/vesseleditdialog.h | 27 +- sea_transport/vesseleditdialog.ui | 140 ++++++--- sea_transport/viewmodels/vesselsviewmodel.cpp | 22 +- 21 files changed, 589 insertions(+), 97 deletions(-) diff --git a/sea_transport/adminpanel.cpp b/sea_transport/adminpanel.cpp index 4ea9230..6095b12 100644 --- a/sea_transport/adminpanel.cpp +++ b/sea_transport/adminpanel.cpp @@ -78,10 +78,51 @@ void AdminPanel::on_logout_requested() { this->close(); } -void AdminPanel::on_vessel_add_edit(bool /*edit*/) { +void AdminPanel::on_vessel_add_edit(bool edit) { + auto selected = ui->tv_vessels->selectionModel()->selectedRows(); + if (edit && selected.length() != 1) { + return; + } + if (apparatus::instance()->get_object_subsystem()->dpoints().isEmpty()) { + QMessageBox::critical(this, "Error", "No harbors to assign. At least one required."); + return; + } + + int skippers = 0; + foreach (auto user, apparatus::instance()->get_auth_subsystem()->users()) { + skippers += user.role() == UserRole::SKIPPER; + } + if (skippers == 0) { + QMessageBox::critical(this, "Error", "No skippers to assign. At least one required."); + return; + } + + vessel_entity ves; + if (edit) { + int idx = selected[0].row(); + ves = apparatus::instance()->get_object_subsystem()->vessels()[idx]; + } + + VesselEditDialog ved(this); + ved.setWindowTitle(edit? "Edit vessel" : "New vessel"); + ved.set_vessel(&ves, edit); + if (ved.exec() != UserEditDialog::Accepted) { + return; + } + + auto data = ved.vessel(); + if (edit) { + apparatus::instance()->get_object_subsystem()->remove_vessel(ves.id()); + QMessageBox::information(this, "Info", "Vessel edited successfully"); + } + else { + QMessageBox::information(this, "Info", "Vessel created successfully"); + } + apparatus::instance()->get_object_subsystem()->add_vessel(*data); vvm->update(); + dpvm->update(); } void AdminPanel::on_vessel_remove() { diff --git a/sea_transport/adminpanel.ui b/sea_transport/adminpanel.ui index ac236f6..e472f2f 100644 --- a/sea_transport/adminpanel.ui +++ b/sea_transport/adminpanel.ui @@ -53,7 +53,7 @@ QTabWidget::Rounded - 0 + 2 false @@ -68,6 +68,9 @@ + + QAbstractItemView::SingleSelection + QAbstractItemView::SelectRows @@ -173,6 +176,9 @@ + + QAbstractItemView::SingleSelection + QAbstractItemView::SelectRows @@ -234,6 +240,9 @@ + + QAbstractItemView::SingleSelection + QAbstractItemView::SelectRows diff --git a/sea_transport/cargoeditdialog.ui b/sea_transport/cargoeditdialog.ui index 4b2f8bf..fd1b1f7 100644 --- a/sea_transport/cargoeditdialog.ui +++ b/sea_transport/cargoeditdialog.ui @@ -10,6 +10,18 @@ 127 + + + 318 + 127 + + + + + 318 + 127 + + Dialog diff --git a/sea_transport/deliverypointeditdialog.ui b/sea_transport/deliverypointeditdialog.ui index c330679..0d7c4ae 100644 --- a/sea_transport/deliverypointeditdialog.ui +++ b/sea_transport/deliverypointeditdialog.ui @@ -10,6 +10,18 @@ 386 + + + 394 + 386 + + + + + 394 + 386 + + Dialog diff --git a/sea_transport/entities/cargo_entity.cpp b/sea_transport/entities/cargo_entity.cpp index 9835444..a5d136c 100644 --- a/sea_transport/entities/cargo_entity.cpp +++ b/sea_transport/entities/cargo_entity.cpp @@ -1,5 +1,10 @@ #include "cargo_entity.h" + +cargo_entity::cargo_entity() { + this->_id += QRandomGenerator().generate64(); +} + cargo_entity::cargo_entity(const QString &title, unsigned int volume) : _title(title), _volume(volume) { this->_id = volume; auto hash = QCryptographicHash::hash(title.toLocal8Bit(), QCryptographicHash::Md5); diff --git a/sea_transport/entities/cargo_entity.h b/sea_transport/entities/cargo_entity.h index 9b69169..60d8c69 100644 --- a/sea_transport/entities/cargo_entity.h +++ b/sea_transport/entities/cargo_entity.h @@ -10,12 +10,12 @@ class cargo_entity : public IEntity { private: - entity_id _id; + entity_id _id = 0; QString _title; - unsigned int _volume; + unsigned int _volume = 50000; public: - cargo_entity() = default; + cargo_entity(); cargo_entity(const QString &title, unsigned int volume); entity_id id() const; diff --git a/sea_transport/entities/dpoint_entity.cpp b/sea_transport/entities/dpoint_entity.cpp index 04d2f32..55a682d 100644 --- a/sea_transport/entities/dpoint_entity.cpp +++ b/sea_transport/entities/dpoint_entity.cpp @@ -1,5 +1,10 @@ #include "dpoint_entity.h" + +dpoint_entity::dpoint_entity() { + this->_id += QRandomGenerator().generate64(); +} + dpoint_entity::dpoint_entity(entity_id dispatcher_id, const QString &title) : _dispatcher_id(dispatcher_id), _title(title) { this->_id = dispatcher_id; auto hash = QCryptographicHash::hash(title.toLocal8Bit(), QCryptographicHash::Md5); @@ -29,15 +34,24 @@ const QVector dpoint_entity::storages() { return this->_storages; } +storage_entity* dpoint_entity::get_storage(entity_id sid, bool &success) { + success = false; + for (int i = 0; i < this->_storages.length(); i++) { + if (this->_storages[i].id() != sid) { + continue; + } + success = true; + return &this->_storages[i]; + } + + return nullptr; +} + void dpoint_entity::set_storages(QVector storages) { this->_storages = storages; } void dpoint_entity::remove_storage(entity_id sid) { -// std::remove_if(this->_storages.begin(), this->_storages.end(), [sid](storage_entity ent) { -// return ent.id() == sid; -// }); - QVector st(this->_storages); for (int i = 0; i < st.length(); i++) { diff --git a/sea_transport/entities/dpoint_entity.h b/sea_transport/entities/dpoint_entity.h index 202e002..0a536ba 100644 --- a/sea_transport/entities/dpoint_entity.h +++ b/sea_transport/entities/dpoint_entity.h @@ -12,13 +12,13 @@ class dpoint_entity : public IEntity { private: - entity_id _id; + entity_id _id = 0; entity_id _dispatcher_id; QString _title; QVector _storages; public: - dpoint_entity() = default; + dpoint_entity(); dpoint_entity(entity_id dispatcher_id, const QString &title); entity_id id() const; @@ -26,6 +26,7 @@ public: QString title() const; void set_title(const QString &new_title); const QVector storages(); + storage_entity* get_storage(entity_id sid, bool &success); void set_storages(QVector storages); void remove_storage(entity_id sid); void add_storage(storage_entity ent); diff --git a/sea_transport/entities/storage_entity.cpp b/sea_transport/entities/storage_entity.cpp index 96909e6..49f5920 100644 --- a/sea_transport/entities/storage_entity.cpp +++ b/sea_transport/entities/storage_entity.cpp @@ -3,10 +3,13 @@ entity_id storage_entity::__global_id = 0; -storage_entity::storage_entity(unsigned int capacity) : _capacity(capacity) { +storage_entity::storage_entity() { this->_id = ++storage_entity::__global_id + QRandomGenerator().generate64(); } +storage_entity::storage_entity(unsigned int capacity) : _capacity(capacity) { + this->_id = ++storage_entity::__global_id + QRandomGenerator().generate64(); +} entity_id storage_entity::id() const { return this->_id; @@ -25,7 +28,7 @@ const QVector storage_entity::cargo() { } void storage_entity::add_cargo(cargo_entity object, bool &success) { - success = ((int)this->_capacity - (int)object.volume()) > 0; + success = ((int)this->_capacity - (int)object.volume()) >= 0; if (success) { this->_cargo.push_back(object); this->_capacity -= object.volume(); diff --git a/sea_transport/entities/storage_entity.h b/sea_transport/entities/storage_entity.h index 4d502f2..c09e2b5 100644 --- a/sea_transport/entities/storage_entity.h +++ b/sea_transport/entities/storage_entity.h @@ -12,12 +12,12 @@ class storage_entity : public IEntity { private: static entity_id __global_id; - entity_id _id; + entity_id _id = 0; unsigned int _capacity = 500000; QVector _cargo; public: - storage_entity() = default; + storage_entity(); storage_entity(unsigned int capacity); entity_id id() const; diff --git a/sea_transport/entities/user_entity.cpp b/sea_transport/entities/user_entity.cpp index a213906..9c628e6 100644 --- a/sea_transport/entities/user_entity.cpp +++ b/sea_transport/entities/user_entity.cpp @@ -1,10 +1,18 @@ #include "user_entity.h" + +user_entity::user_entity() { + this->_id += QRandomGenerator().generate64(); +} + user_entity::user_entity(const QString &login, const QString &password, UserRole role) : _login(login), _role(role) { this->_pwd_hash = QCryptographicHash::hash(password.toLocal8Bit(), QCryptographicHash::Sha3_256); foreach (auto bit, this->_pwd_hash) { this->_id += bit; } + foreach (auto bit, QCryptographicHash::hash(login.toLocal8Bit(), QCryptographicHash::Sha3_256)) { + this->_id += bit; + } this->_id += QRandomGenerator().generate64(); } diff --git a/sea_transport/entities/user_entity.h b/sea_transport/entities/user_entity.h index 7f875a7..6ab2de9 100644 --- a/sea_transport/entities/user_entity.h +++ b/sea_transport/entities/user_entity.h @@ -15,13 +15,13 @@ enum class UserRole { class user_entity : public IEntity { private: - entity_id _id; + entity_id _id = 0; QString _login; UserRole _role; QByteArray _pwd_hash; public: - user_entity() = default; + user_entity(); user_entity(const QString &login, const QString &password, UserRole role); entity_id id() const; diff --git a/sea_transport/entities/vessel_entity.cpp b/sea_transport/entities/vessel_entity.cpp index 4739ee4..383d116 100644 --- a/sea_transport/entities/vessel_entity.cpp +++ b/sea_transport/entities/vessel_entity.cpp @@ -3,38 +3,69 @@ entity_id vessel_entity::__global_id = 0; -vessel_entity::vessel_entity(entity_id skipper_id, entity_id harbor_id, unsigned int capacity) : _skipper_id(skipper_id), _harbor_id(harbor_id), _capacity(capacity) { +vessel_entity::vessel_entity() { this->_id = ++vessel_entity::__global_id + QRandomGenerator().generate64(); } +vessel_entity::vessel_entity(QString skipper, entity_id harbor_id, unsigned int capacity) : _skipper(skipper), _harbor_id(harbor_id), _capacity(capacity) { + this->_id = ++vessel_entity::__global_id + harbor_id + capacity + QRandomGenerator().generate64(); +} + entity_id vessel_entity::id() const { return this->_id; } -entity_id vessel_entity::skipper() const { - return this->_skipper_id; +QString vessel_entity::skipper() const { + return this->_skipper; +} + +void vessel_entity::set_skipper(const QString &new_skipper) { + this->_skipper = new_skipper; } entity_id vessel_entity::harbor() const { return this->_harbor_id; } +void vessel_entity::set_harbor(entity_id new_harbor) { + this->_harbor_id = new_harbor; +} + unsigned int vessel_entity::capacity() const { return this->_capacity; } +void vessel_entity::set_capacity(unsigned int new_capacity) { + this->_capacity = new_capacity; +} + const QVector vessel_entity::cargo() { return this->_cargo; } void vessel_entity::add_cargo(cargo_entity object, bool &success) { - success = ((int)this->_capacity - (int)object.volume()) > 0; + success = ((int)this->_capacity - (int)object.volume()) >= 0; if (success) { this->_cargo.push_back(object); this->_capacity -= object.volume(); } } +cargo_entity vessel_entity::get_cargo(entity_id oid, bool &found) { + cargo_entity ent; + found = false; + + auto vit = this->_cargo.begin(); + for (; vit != this->_cargo.end(); vit++) { + if ((*vit).id() == oid) { + ent = *vit; + found = true; + break; + } + } + return ent; +} + void vessel_entity::withdraw_cargo(entity_id oid, bool &success) { success = false; auto vit = this->_cargo.begin(); @@ -49,7 +80,7 @@ void vessel_entity::withdraw_cargo(entity_id oid, bool &success) { } void vessel_entity::serialize(QDataStream &output) { - output << this->_id << this->_harbor_id; + output << this->_id << this->_skipper << this->_harbor_id; output << this->_capacity << this->_cargo.size(); for (auto item : this->_cargo) { item.serialize(output); @@ -57,7 +88,7 @@ void vessel_entity::serialize(QDataStream &output) { } void vessel_entity::deserialize(QDataStream &input) { - input >> this->_id >> this->_harbor_id; + input >> this->_id >> this->_skipper >> this->_harbor_id; int icnt; input >> this->_capacity >> icnt; this->_cargo.resize(icnt); diff --git a/sea_transport/entities/vessel_entity.h b/sea_transport/entities/vessel_entity.h index 48c2bbc..a554a2b 100644 --- a/sea_transport/entities/vessel_entity.h +++ b/sea_transport/entities/vessel_entity.h @@ -12,23 +12,27 @@ class vessel_entity : public IEntity { private: static entity_id __global_id; - entity_id _id; - entity_id _skipper_id; + entity_id _id = 0; + QString _skipper; entity_id _harbor_id; - unsigned int _capacity; + unsigned int _capacity = 50000; QVector _cargo; public: - vessel_entity() = default; - vessel_entity(entity_id skipper_id, entity_id harbor_id, unsigned int capacity); + vessel_entity(); + vessel_entity(QString skipper, entity_id harbor_id, unsigned int capacity); entity_id id() const; - entity_id skipper() const; + QString skipper() const; + void set_skipper(const QString &new_skipper); entity_id harbor() const; + void set_harbor(entity_id new_harbor); unsigned int capacity() const; + void set_capacity(unsigned int new_capacity); const QVector cargo(); void add_cargo(cargo_entity object, bool &success); + cargo_entity get_cargo(entity_id oid, bool &found); void withdraw_cargo(entity_id oid, bool &success); void serialize(QDataStream &output); diff --git a/sea_transport/storageeditdialog.cpp b/sea_transport/storageeditdialog.cpp index b8eaefb..e7426c0 100644 --- a/sea_transport/storageeditdialog.cpp +++ b/sea_transport/storageeditdialog.cpp @@ -18,8 +18,12 @@ StorageEditDialog::StorageEditDialog(QWidget *parent) : QDialog(parent), ui(new } foreach (auto mIdx, sel) { - auto cdata = mIdx.data().toInt(); - qDebug() << cdata << '\n'; + auto oid = mIdx.data().toULongLong(); + bool success; + this->_storage->withdraw_cargo(oid, success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot remove some of this cargo!"); + } } }); diff --git a/sea_transport/storageeditdialog.ui b/sea_transport/storageeditdialog.ui index 89c6b29..08e60c2 100644 --- a/sea_transport/storageeditdialog.ui +++ b/sea_transport/storageeditdialog.ui @@ -10,6 +10,18 @@ 336 + + + 400 + 336 + + + + + 400 + 336 + + Dialog diff --git a/sea_transport/usereditdialog.ui b/sea_transport/usereditdialog.ui index 8ec17a4..e924ca5 100644 --- a/sea_transport/usereditdialog.ui +++ b/sea_transport/usereditdialog.ui @@ -10,6 +10,18 @@ 270 + + + 304 + 270 + + + + + 304 + 270 + + Dialog diff --git a/sea_transport/vesseleditdialog.cpp b/sea_transport/vesseleditdialog.cpp index dcc2e3b..a49384a 100644 --- a/sea_transport/vesseleditdialog.cpp +++ b/sea_transport/vesseleditdialog.cpp @@ -1,14 +1,269 @@ #include "vesseleditdialog.h" #include "ui_vesseleditdialog.h" -VesselEditDialog::VesselEditDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::VesselEditDialog) -{ +VesselEditDialog::VesselEditDialog(QWidget *parent) : QDialog(parent), ui(new Ui::VesselEditDialog) { ui->setupUi(this); + + this->cvm = new CargoViewModel(this); + ui->tv_cargo->setModel(this->cvm); + + connect(ui->tv_cargo->selectionModel(), &QItemSelectionModel::selectionChanged, [this](const QItemSelection &selected) { + ui->pb_cargo_remove->setEnabled(selected.length() > 0); + }); + + connect(ui->pb_cargo_remove, &QPushButton::clicked, [this]() { + auto sel = ui->tv_cargo->selectionModel()->selectedRows(); + if (sel.length() == 0) { + return; + } + + foreach (auto mIdx, sel) { + auto oid = mIdx.data().toULongLong(); + bool success; + this->_vessel->withdraw_cargo(oid, success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot remove some of this cargo!"); + } + } + }); + + foreach (auto port, apparatus::instance()->get_object_subsystem()->dpoints()) { + ui->cb_port->addItem(tr("%1 :%2").arg(port.title()).arg(port.id())); + } + + foreach (auto user, apparatus::instance()->get_auth_subsystem()->users()) { + if (user.role() != UserRole::SKIPPER) { + continue; + } + ui->cb_skippers->addItem(tr("%1 :%2").arg(user.login()).arg(user.id())); + } + + connect(ui->pb_cargo_add, &QPushButton::clicked, this, &VesselEditDialog::on_cargo_add); + + connect(ui->pb_withdraw_from_harbor, &QPushButton::clicked, this, &VesselEditDialog::on_withdraw_from_harbor); + connect(ui->pb_withdraw_from_vessel, &QPushButton::clicked, this, &VesselEditDialog::on_withdraw_from_vessel); + + connect(ui->pb_save, &QPushButton::clicked, this, &VesselEditDialog::accept); + connect(ui->pb_discard, &QPushButton::clicked, this, &VesselEditDialog::reject); } -VesselEditDialog::~VesselEditDialog() -{ +VesselEditDialog::~VesselEditDialog() { delete ui; } + +void VesselEditDialog::select_proper_skipper() { + int i = 0; + foreach (auto user, apparatus::instance()->get_auth_subsystem()->users()) { + if (user.role() != UserRole::SKIPPER || user.login() != this->_vessel->skipper()) { + i += 1; + continue; + } + ui->cb_port->setCurrentIndex(i); + return; + } + + QMessageBox::critical(this, "Error", "Cannot find this vessel's skipper."); +} + +void VesselEditDialog::select_proper_port() { + int i = 0; + foreach (auto port, apparatus::instance()->get_object_subsystem()->dpoints()) { + if (port.id() != this->_vessel->harbor()) { + i += 1; + continue; + } + ui->cb_port->setCurrentIndex(i); + return; + } + + QMessageBox::critical(this, "Error", "Cannot find this vessel's harbor."); +} + +vessel_entity* VesselEditDialog::vessel() { + return this->_vessel; +} + +void VesselEditDialog::set_vessel(vessel_entity *ves, bool edit) { + this->_vessel = new vessel_entity(*ves); + + if (edit) { + this->select_proper_skipper(); + this->select_proper_port(); + ui->sb_capacity->setValue(this->_vessel->capacity()); + this->cvm->set_data(this->_vessel->cargo()); + ui->pb_withdraw_from_harbor->setEnabled(true); + ui->pb_withdraw_from_vessel->setEnabled(true); + } + ui->lab_capacity_current->setText(QString::number(this->_vessel->capacity())); +} + +void VesselEditDialog::on_cargo_add() { + CargoEditDialog ced(this); + ced.setWindowTitle("New cargo"); + if (ced.exec() != CargoEditDialog::Accepted) { + return; + } + + bool success; + this->_vessel->add_cargo(*ced.cargo(), success); + if (success) { + this->cvm->set_data(this->_vessel->cargo()); + QMessageBox::information(this, "Success", "Cargo successfully put into storage"); + } + else { + QMessageBox::critical(this, "Error", "Not enough space to put cargo"); + } +} + +void VesselEditDialog::on_withdraw_from_harbor() { + QMessageBox::information(this, "Note", "Please note, old storage will be used.\n" + "Also, movement cannot be undone by discarding vessel edit dialog"); + + bool success; + auto dpoint = apparatus::instance()->get_object_subsystem()->get_dpoint(this->_vessel->harbor(), success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot find associated harbor in DB"); + return; + } + if (dpoint->storages().isEmpty()) { + QMessageBox::information(this, "Note", "Vessel has no storages"); + return; + } + + QStringList harbor_storage; + foreach (auto storage, dpoint->storages()) { + harbor_storage << QString::number(storage.id()); + } + bool ok; + QString storage_id_str = QInputDialog::getItem(this, "Select storage", "Storages in harbor:", harbor_storage, 0, false, &ok); + if (!ok || storage_id_str.isEmpty()) { + QMessageBox::information(this, "Aborted", "Operation aborted by user."); + return; + } + + entity_id sid = storage_id_str.toULongLong(); + auto storage = dpoint->get_storage(sid, success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot find associated storage in harbor"); + return; + } + if (storage->cargo().isEmpty()) { + QMessageBox::information(this, "Note", "Storage has no cargo"); + return; + } + + QStringList storage_cargo; + foreach (auto storage, storage->cargo()) { + storage_cargo << tr("%1 :%2").arg(storage.title()).arg(storage.id()); + } + QString cargo_id_str = QInputDialog::getItem(this, "Select cargo", "Cargo in storage:", storage_cargo, 0, false, &ok); + if (!ok || cargo_id_str.isEmpty()) { + QMessageBox::information(this, "Aborted", "Operation aborted by user."); + return; + } + + entity_id cid = cargo_id_str.split(":")[1].toULongLong(); + auto cargo = storage->get_cargo(cid, success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot find cargo in storage"); + return; + } + + this->_vessel->add_cargo(cargo, success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot add cargo to vessel"); + return; + } + storage->withdraw_cargo(cid, success); + if (!success) { + throw std::runtime_error("Cannot withdraw from storage"); + } + + QMessageBox::information(this, "Info", "Successfully withdrawed cargo from harbor"); + cvm->set_data(this->_vessel->cargo()); +} + +void VesselEditDialog::on_withdraw_from_vessel() { + if (this->_vessel->cargo().isEmpty()) { + QMessageBox::information(this, "Note", "Vessel has no cargo"); + return; + } + + QMessageBox::information(this, "Note", "Please note, old storage will be used.\n" + "Also, movement cannot be undone by discarding vessel edit dialog"); + + bool success; + auto dpoint = apparatus::instance()->get_object_subsystem()->get_dpoint(this->_vessel->harbor(), success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot find associated harbor in DB"); + return; + } + + QStringList vessel_cargo; + foreach (auto storage, this->_vessel->cargo()) { + vessel_cargo << tr("%1 :%2").arg(storage.title()).arg(storage.id()); + } + bool ok; + QString cargo_id_str = QInputDialog::getItem(this, "Select cargo", "Cargo in storage:", vessel_cargo, 0, false, &ok); + if (!ok || cargo_id_str.isEmpty()) { + QMessageBox::information(this, "Aborted", "Operation aborted by user."); + return; + } + + entity_id cid = cargo_id_str.split(":")[1].toULongLong(); + auto cargo = this->_vessel->get_cargo(cid, success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot find cargo in vessel"); + return; + } + + QStringList harbor_storage; + foreach (auto storage, dpoint->storages()) { + harbor_storage << QString::number(storage.id()); + } + QString storage_id_str = QInputDialog::getItem(this, "Select storage", "Storages in harbor:", harbor_storage, 0, false, &ok); + if (!ok || storage_id_str.isEmpty()) { + QMessageBox::information(this, "Aborted", "Operation aborted by user."); + return; + } + entity_id sid = storage_id_str.toULongLong(); + auto storage = dpoint->get_storage(sid, success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot find associated storage in harbor"); + return; + } + + storage->add_cargo(cargo, success); + if (!success) { + QMessageBox::critical(this, "Error", "Cannot add cargo to storage"); + return; + } + this->_vessel->withdraw_cargo(cid, success); + if (!success) { + throw std::runtime_error("Cannot withdraw from vessel"); + } + + QMessageBox::information(this, "Info", "Successfully withdrawed cargo from vessel"); + cvm->set_data(this->_vessel->cargo()); +} + +void VesselEditDialog::accept() { + int cvs = 0; + foreach (auto c, this->_vessel->cargo()) { + cvs += c.volume(); + } + if (cvs > ui->sb_capacity->value()) { + QMessageBox::critical(this, "Error", "Cargo volume bigger than capacity"); + return; + } + + auto slog = ui->cb_skippers->currentText().split(":")[0].trimmed(); + auto hid = ui->cb_port->currentText().split(":")[1].trimmed().toULongLong(); + auto cap = ui->sb_capacity->value(); + + this->_vessel->set_skipper(slog); + this->_vessel->set_harbor(hid); + this->_vessel->set_capacity(cap); + + QDialog::accept(); +} diff --git a/sea_transport/vesseleditdialog.h b/sea_transport/vesseleditdialog.h index 8aa08af..f616972 100644 --- a/sea_transport/vesseleditdialog.h +++ b/sea_transport/vesseleditdialog.h @@ -2,21 +2,40 @@ #define VESSELEDITDIALOG_H #include +#include +#include + +#include "entities/vessel_entity.h" +#include "system/apparatus.h" +#include "viewmodels/cargoviewmodel.h" +#include "cargoeditdialog.h" namespace Ui { class VesselEditDialog; } -class VesselEditDialog : public QDialog -{ +class VesselEditDialog : public QDialog { Q_OBJECT + Ui::VesselEditDialog *ui; + + CargoViewModel *cvm; + vessel_entity *_vessel; + + void select_proper_skipper(); + void select_proper_port(); public: explicit VesselEditDialog(QWidget *parent = nullptr); ~VesselEditDialog(); -private: - Ui::VesselEditDialog *ui; + vessel_entity* vessel(); + void set_vessel(vessel_entity *ves, bool edit); + +public slots: + void on_cargo_add(); + void on_withdraw_from_harbor(); + void on_withdraw_from_vessel(); + void accept() Q_DECL_OVERRIDE; }; #endif // VESSELEDITDIALOG_H diff --git a/sea_transport/vesseleditdialog.ui b/sea_transport/vesseleditdialog.ui index f802ae8..f70bdc3 100644 --- a/sea_transport/vesseleditdialog.ui +++ b/sea_transport/vesseleditdialog.ui @@ -10,100 +10,146 @@ 425 + + + 361 + 425 + + + + + 361 + 425 + + Dialog - + - - QFormLayout::ExpandingFieldsGrow - - - 24 - - - 8 - - - 4 - - - 4 - - - 4 - - - 4 - - Vessel num.: + Skipper: - - - - Home port: + Harbor: - - - - 0 - 0 - - - - Choose... - - + - Max. capacity: + Capacity (new): + + + - + + + 1 + + + 50000 + + + + + + + Capacity (current): + + + + + + + 50000 + + - - - + + + QAbstractItemView::SelectRows + + + + + + + + + Remove cargo + + - - + + Add cargo + + + + false + + + Get from harbor + + + + + + + false + + + Move to harbor + + + + + + + Qt::Vertical + + + + 20 + 64 + + + + - + Discard - + Save diff --git a/sea_transport/viewmodels/vesselsviewmodel.cpp b/sea_transport/viewmodels/vesselsviewmodel.cpp index 7d4f2ba..bbfeef5 100644 --- a/sea_transport/viewmodels/vesselsviewmodel.cpp +++ b/sea_transport/viewmodels/vesselsviewmodel.cpp @@ -9,7 +9,7 @@ int VesselsViewModel::rowCount(const QModelIndex &/*parent*/) const { } int VesselsViewModel::columnCount(const QModelIndex &/*parent*/) const { - return 5; + return 6; } QVariant VesselsViewModel::headerData(int section, Qt::Orientation orientation, int role) const { @@ -18,12 +18,14 @@ QVariant VesselsViewModel::headerData(int section, Qt::Orientation orientation, case 0: return QString("VID"); case 1: - return QString("Harbor"); + return QString("Skipper"); case 2: - return QString("Capacity"); + return QString("Harbor"); case 3: - return QString("Cargo count"); + return QString("Capacity"); case 4: + return QString("Cargo count"); + case 5: return QString("Cargo volume"); } } @@ -33,20 +35,22 @@ QVariant VesselsViewModel::headerData(int section, Qt::Orientation orientation, QVariant VesselsViewModel::data(const QModelIndex &index, int role) const { if (role == Qt::DisplayRole) { auto item = apparatus::instance()->get_object_subsystem()->vessels()[index.row()]; - bool s = false; - auto harbor = apparatus::instance()->get_object_subsystem()->get_dpoint(item.harbor(), s); + bool hs = false; + auto harbor = apparatus::instance()->get_object_subsystem()->get_dpoint(item.harbor(), hs); int col = index.column(); switch (col) { case 0: return QString::number(item.id()); case 1: - return (s? harbor->title() : "##ERROR##"); + return item.skipper(); case 2: - return item.capacity(); + return (hs? harbor->title() : tr("##ERROR[%1]##").arg(item.harbor())); case 3: - return item.cargo().length(); + return item.capacity(); case 4: + return item.cargo().length(); + case 5: int cvol = 0; foreach (auto cargo, item.cargo()) { cvol += cargo.volume(); From 2be2e9f5e31d4fb6d41f59c6aa593122bc9468bb Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 19:00:57 +0700 Subject: [PATCH 17/18] All entities now have GID --- sea_transport/deliverypointeditdialog.cpp | 2 +- sea_transport/entities/cargo_entity.cpp | 12 +++++++++++- sea_transport/entities/cargo_entity.h | 4 ++++ sea_transport/entities/dpoint_entity.cpp | 12 +++++++++++- sea_transport/entities/dpoint_entity.h | 4 ++++ sea_transport/entities/user_entity.cpp | 12 +++++++++++- sea_transport/entities/user_entity.h | 4 ++++ sea_transport/system/apparatus.cpp | 18 ++++++++++++------ sea_transport/usereditdialog.cpp | 2 +- 9 files changed, 59 insertions(+), 11 deletions(-) diff --git a/sea_transport/deliverypointeditdialog.cpp b/sea_transport/deliverypointeditdialog.cpp index 187d1c5..c57d7e4 100644 --- a/sea_transport/deliverypointeditdialog.cpp +++ b/sea_transport/deliverypointeditdialog.cpp @@ -94,7 +94,7 @@ void DeliveryPointEditDialog::set_dpoint(dpoint_entity* dpoint, bool edit) { void DeliveryPointEditDialog::accept() { bool emptyTitle = ui->et_title->text().trimmed().isEmpty(); if (emptyTitle) {; - QString message = "Some errors happend, while saving your note:" + QString message = "Some errors happend, while saving:" "
- Title cannot be empty (all spaces - empty too)"; QMessageBox::critical(this, "Error", message); return; diff --git a/sea_transport/entities/cargo_entity.cpp b/sea_transport/entities/cargo_entity.cpp index a5d136c..1fee72e 100644 --- a/sea_transport/entities/cargo_entity.cpp +++ b/sea_transport/entities/cargo_entity.cpp @@ -1,8 +1,10 @@ #include "cargo_entity.h" +entity_id cargo_entity::__global_id = 0; + cargo_entity::cargo_entity() { - this->_id += QRandomGenerator().generate64(); + this->_id = ++cargo_entity::__global_id + QRandomGenerator().generate64(); } cargo_entity::cargo_entity(const QString &title, unsigned int volume) : _title(title), _volume(volume) { @@ -33,3 +35,11 @@ void cargo_entity::serialize(QDataStream &output) { void cargo_entity::deserialize(QDataStream &input) { input >> this->_id >> this->_title >> this->_volume; } + +void cargo_entity::preloadGlobalId(entity_id gid) { + cargo_entity::__global_id = gid; +} + +entity_id cargo_entity::GID() { + return cargo_entity::__global_id; +} diff --git a/sea_transport/entities/cargo_entity.h b/sea_transport/entities/cargo_entity.h index 60d8c69..79f928d 100644 --- a/sea_transport/entities/cargo_entity.h +++ b/sea_transport/entities/cargo_entity.h @@ -10,6 +10,8 @@ class cargo_entity : public IEntity { private: + static entity_id __global_id; + entity_id _id = 0; QString _title; unsigned int _volume = 50000; @@ -24,6 +26,8 @@ public: void serialize(QDataStream &output); void deserialize(QDataStream &input); + static void preloadGlobalId(entity_id gid); + static entity_id GID(); }; #endif // CARGO_ENTITY_H diff --git a/sea_transport/entities/dpoint_entity.cpp b/sea_transport/entities/dpoint_entity.cpp index 55a682d..13b7873 100644 --- a/sea_transport/entities/dpoint_entity.cpp +++ b/sea_transport/entities/dpoint_entity.cpp @@ -1,8 +1,10 @@ #include "dpoint_entity.h" +entity_id dpoint_entity::__global_id = 0; + dpoint_entity::dpoint_entity() { - this->_id += QRandomGenerator().generate64(); + this->_id = ++dpoint_entity::__global_id + QRandomGenerator().generate64(); } dpoint_entity::dpoint_entity(entity_id dispatcher_id, const QString &title) : _dispatcher_id(dispatcher_id), _title(title) { @@ -83,3 +85,11 @@ void dpoint_entity::deserialize(QDataStream &input) { this->_storages[i].deserialize(input); } } + +void dpoint_entity::preloadGlobalId(entity_id gid) { + dpoint_entity::__global_id = gid; +} + +entity_id dpoint_entity::GID() { + return dpoint_entity::__global_id; +} diff --git a/sea_transport/entities/dpoint_entity.h b/sea_transport/entities/dpoint_entity.h index 0a536ba..75e3774 100644 --- a/sea_transport/entities/dpoint_entity.h +++ b/sea_transport/entities/dpoint_entity.h @@ -12,6 +12,8 @@ class dpoint_entity : public IEntity { private: + static entity_id __global_id; + entity_id _id = 0; entity_id _dispatcher_id; QString _title; @@ -33,6 +35,8 @@ public: void serialize(QDataStream &output); void deserialize(QDataStream &input); + static void preloadGlobalId(entity_id gid); + static entity_id GID(); }; #endif // DPOINT_ENTITY_H diff --git a/sea_transport/entities/user_entity.cpp b/sea_transport/entities/user_entity.cpp index 9c628e6..9d0e641 100644 --- a/sea_transport/entities/user_entity.cpp +++ b/sea_transport/entities/user_entity.cpp @@ -1,8 +1,10 @@ #include "user_entity.h" +entity_id user_entity::__global_id = 0; + user_entity::user_entity() { - this->_id += QRandomGenerator().generate64(); + this->_id = ++user_entity::__global_id + QRandomGenerator().generate64(); } user_entity::user_entity(const QString &login, const QString &password, UserRole role) : _login(login), _role(role) { @@ -47,3 +49,11 @@ void user_entity::serialize(QDataStream &output) { void user_entity::deserialize(QDataStream &input) { input >> this->_id >> this->_login >> this->_role >> this->_pwd_hash; } + +void user_entity::preloadGlobalId(entity_id gid) { + user_entity::__global_id = gid; +} + +entity_id user_entity::GID() { + return user_entity::__global_id; +} diff --git a/sea_transport/entities/user_entity.h b/sea_transport/entities/user_entity.h index 6ab2de9..f3387a1 100644 --- a/sea_transport/entities/user_entity.h +++ b/sea_transport/entities/user_entity.h @@ -15,6 +15,8 @@ enum class UserRole { class user_entity : public IEntity { private: + static entity_id __global_id; + entity_id _id = 0; QString _login; UserRole _role; @@ -33,6 +35,8 @@ public: void serialize(QDataStream &output); void deserialize(QDataStream &input); + static void preloadGlobalId(entity_id gid); + static entity_id GID(); }; #endif // USER_ENTITY_H diff --git a/sea_transport/system/apparatus.cpp b/sea_transport/system/apparatus.cpp index 9aa878d..3e8e2c7 100644 --- a/sea_transport/system/apparatus.cpp +++ b/sea_transport/system/apparatus.cpp @@ -39,9 +39,12 @@ void apparatus::save() { QDataStream stream(&f); // saving GIDs - entity_id vgid = vessel_entity::GID(); + entity_id cgid = cargo_entity::GID(); + entity_id dgid = dpoint_entity::GID(); entity_id sgid = storage_entity::GID(); - stream << vgid << sgid; + entity_id ugid = user_entity::GID(); + entity_id vgid = vessel_entity::GID(); + stream << cgid << dgid << sgid << ugid << vgid; // serializing data this->_auth_system->serialize_data(&stream); @@ -52,17 +55,20 @@ void apparatus::save() { void apparatus::load() { if (_instance == nullptr) { - throw std::runtime_error("HOW DU FUCK INSTANCE IS NULL????"); + throw std::runtime_error("NO WAY INSTANCE IS NULL!"); } QFile f(apparatus::filename); f.open(QIODevice::ReadOnly); QDataStream stream(&f); // loading GIDs - entity_id vgid, sgid = vgid = 0; - stream >> vgid >> sgid; - vessel_entity::preloadGlobalId(vgid); + entity_id cgid, dgid, sgid, ugid, vgid = ugid = sgid = dgid = cgid = 0; + stream >> cgid >> dgid >> sgid >> ugid >> vgid; + cargo_entity::preloadGlobalId(cgid); + dpoint_entity::preloadGlobalId(dgid); storage_entity::preloadGlobalId(sgid); + user_entity::preloadGlobalId(ugid); + vessel_entity::preloadGlobalId(vgid); // deserializing data this->_auth_system->deserialize_data(&stream); diff --git a/sea_transport/usereditdialog.cpp b/sea_transport/usereditdialog.cpp index a84ba1b..3954ff9 100644 --- a/sea_transport/usereditdialog.cpp +++ b/sea_transport/usereditdialog.cpp @@ -52,7 +52,7 @@ void UserEditDialog::accept() { errDlg.setTextFormat(Qt::RichText); errDlg.setWindowTitle(tr("Error")); errDlg.setIcon(QMessageBox::Critical); - QString message = tr("Some errors happend, while saving your note:"); + QString message = tr("Some errors happend, while saving:"); if (emptyTitle) { message.append("
- Title cannot be empty (all spaces - empty too)"); } From 0dab9e1eb2a99d9ef8366bf653f6fd5436aa8161 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 23 Dec 2020 19:21:23 +0700 Subject: [PATCH 18/18] Post done fixes --- sea_transport/system/object_system.cpp | 6 +++--- sea_transport/usereditdialog.cpp | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sea_transport/system/object_system.cpp b/sea_transport/system/object_system.cpp index 5915b78..1a94dcb 100644 --- a/sea_transport/system/object_system.cpp +++ b/sea_transport/system/object_system.cpp @@ -66,11 +66,11 @@ bool object_system::remove_vessel(entity_id oid) { return false; } -bool object_system::add_vessel(vessel_entity dpoint) { +bool object_system::add_vessel(vessel_entity vessel) { bool exists = false; - this->get_dpoint(dpoint.id(), exists); + this->get_vessel(vessel.id(), exists); if (!exists) { - this->_vessels.push_back(dpoint); + this->_vessels.push_back(vessel); return true; } diff --git a/sea_transport/usereditdialog.cpp b/sea_transport/usereditdialog.cpp index 3954ff9..3239ffe 100644 --- a/sea_transport/usereditdialog.cpp +++ b/sea_transport/usereditdialog.cpp @@ -24,6 +24,7 @@ void UserEditDialog::set_user(user_entity* user, bool edit) { ui->et_login->setText(user->login()); ui->et_password->setText("##########UNEDITED##########"); ui->cb_role->setCurrentIndex((int)user->role()); + ui->cb_role->setEnabled(false); } else { this->_user_data = new user_data_struct{}; @@ -46,8 +47,7 @@ void UserEditDialog::accept() { } bool emptyTitle = ui->et_login->text().trimmed().isEmpty(); bool emptyPassword = ui->et_password->text().trimmed().isEmpty(); - bool lowerank = this->_user_data->edit && this->_user_data->role < role; - if (emptyTitle || emptyPassword || lowerank) { + if (emptyTitle || emptyPassword) { QMessageBox errDlg(this); errDlg.setTextFormat(Qt::RichText); errDlg.setWindowTitle(tr("Error")); @@ -59,9 +59,6 @@ void UserEditDialog::accept() { if (emptyPassword) { message.append("
- Password cannot be empty (all spaces - empty too)"); } - if (lowerank) { - message.append("
- You cannot lower users rank"); - } errDlg.setText(message); errDlg.exec(); return;