From 559d1862d1ce5b2d8f9ef7894647567c6250ede6 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 22 Jan 2025 14:36:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D1=83=20=D0=B7=D0=B0=D0=B4?= =?UTF-8?q?=D0=B0=D1=87=20=D0=BD=D0=B0=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBaseLMS/CMakeLists.txt | 3 + .../tasks => DataBaseLMS}/tasksAmmFim.cpp | 1 + .../tasks => DataBaseLMS}/tasksAmmFim.h | 15 +-- InstructorsAndTrainees/CMakeLists.txt | 4 +- .../connectorToServer/Core/dataparser.cpp | 18 ++++ .../connectorToServer/Datas.h | 4 +- .../instructorsandtraineeswidget.cpp | 13 +-- .../tasks/ammtaskswidget.cpp | 46 ++++++++- InstructorsAndTrainees/tasks/ammtaskswidget.h | 5 + .../tasks/ammtaskswidget.ui | 9 +- .../tasks/fimtaskswidget.cpp | 99 +++++++++++++++++-- InstructorsAndTrainees/tasks/fimtaskswidget.h | 11 ++- .../tasks/fimtaskswidget.ui | 9 +- ServerLMS/Data/typesDataServerClient.h | 4 +- 14 files changed, 211 insertions(+), 30 deletions(-) rename {InstructorsAndTrainees/tasks => DataBaseLMS}/tasksAmmFim.cpp (96%) rename {InstructorsAndTrainees/tasks => DataBaseLMS}/tasksAmmFim.h (91%) diff --git a/DataBaseLMS/CMakeLists.txt b/DataBaseLMS/CMakeLists.txt index e2eced4..f3f154c 100644 --- a/DataBaseLMS/CMakeLists.txt +++ b/DataBaseLMS/CMakeLists.txt @@ -24,10 +24,13 @@ add_library(DataBaseLMS SHARED task.h classroom.cpp classroom.h + tasksAmmFim.cpp + tasksAmmFim.h ) target_link_libraries(DataBaseLMS PRIVATE Qt5::Widgets) target_link_libraries(DataBaseLMS PRIVATE Qt5::Sql) +target_link_libraries(DataBaseLMS PRIVATE Qt5::Xml) target_compile_definitions(DataBaseLMS PRIVATE DATABASELMS_LIBRARY) diff --git a/InstructorsAndTrainees/tasks/tasksAmmFim.cpp b/DataBaseLMS/tasksAmmFim.cpp similarity index 96% rename from InstructorsAndTrainees/tasks/tasksAmmFim.cpp rename to DataBaseLMS/tasksAmmFim.cpp index 2ebb064..05d42c3 100644 --- a/InstructorsAndTrainees/tasks/tasksAmmFim.cpp +++ b/DataBaseLMS/tasksAmmFim.cpp @@ -3,6 +3,7 @@ #include #include +int TaskAmmFim::lastID = 1; void TaskAmmFim::initialize(int id, QString type, QString title, QString status, QString created_date, QString changed_date) { diff --git a/InstructorsAndTrainees/tasks/tasksAmmFim.h b/DataBaseLMS/tasksAmmFim.h similarity index 91% rename from InstructorsAndTrainees/tasks/tasksAmmFim.h rename to DataBaseLMS/tasksAmmFim.h index 01ee7de..3f278d3 100644 --- a/InstructorsAndTrainees/tasks/tasksAmmFim.h +++ b/DataBaseLMS/tasksAmmFim.h @@ -3,8 +3,9 @@ #include #include +#include "DataBaseLMS_global.h" -class ProcedureID +class DATABASELMS_EXPORT ProcedureID { public: ProcedureID(){}; @@ -16,7 +17,7 @@ public: QString result; // "" - нет результата, "viewed" - процедура изучена (просмотрена при отсутствующем сценарии), "completed" - выполнена (в т.ч. режим "контроль" сценария) }; -class MalfunctionSign // признак неисправности +class DATABASELMS_EXPORT MalfunctionSign // признак неисправности { public: MalfunctionSign(){}; @@ -29,7 +30,7 @@ public: QString description; // описание (напр. "ЭРРД, 25, DOOR_FAIL_TO_CLOSE" - для БСТО) }; -class Malfunction // неисправность +class DATABASELMS_EXPORT Malfunction // неисправность { public: Malfunction(){}; @@ -44,7 +45,7 @@ public: QList malfunctionSigns;// список соответствующих неисправности признаков }; -class FIMReportItem +class DATABASELMS_EXPORT FIMReportItem { public: FIMReportItem(){}; @@ -54,7 +55,7 @@ public: ProcedureID procedure; // ссылка на процедуру, при необходимости }; -class FIMReport +class DATABASELMS_EXPORT FIMReport { public: FIMReport(){}; @@ -63,7 +64,7 @@ public: QList itemList; }; -class TaskAmmFim +class DATABASELMS_EXPORT TaskAmmFim { public: TaskAmmFim(){}; @@ -97,6 +98,8 @@ public: // fim: QList malfunctionList; // список неисправностей FIMReport report; // отчет по выполнению "fim" + + static int lastID; }; #endif // TASKSAMMFIM_H diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index b564953..cae50e6 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -78,8 +78,8 @@ add_library(InstructorsAndTrainees SHARED tasks/fimtaskswidget.cpp tasks/fimtaskswidget.h tasks/fimtaskswidget.ui - tasks/tasksAmmFim.cpp - tasks/tasksAmmFim.h + #tasks/tasksAmmFim.cpp + #tasks/tasksAmmFim.h widgets/newversionwidget.cpp widgets/newversionwidget.h widgets/newversionwidget.ui diff --git a/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp b/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp index 82ebfbf..acf46b5 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp @@ -6,6 +6,7 @@ #include "instructor.h" #include "trainee.h" #include "group.h" +#include "tasksAmmFim.h" #include "streamingversiondata.h" #include @@ -171,6 +172,23 @@ void DataParser::createQueryToDBMessage(ClientQueryToDB *queryToDB, int id, void xmlWriter.writeAttribute("name", group->getName()); } } + else if(queryToDB->typeQuery == TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE) + { + TaskAmmFim* task = (TaskAmmFim*)data; + if(task) + { + xmlWriter.writeAttribute("title", task->ammProcedure.title); + xmlWriter.writeAttribute("dmCode", task->ammProcedure.dmCode); + } + } + else if(queryToDB->typeQuery == TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE) + { + TaskAmmFim* task = (TaskAmmFim*)data; + if(task) + { + xmlWriter.writeAttribute("title", task->title); + } + } } xmlWriter.writeEndElement(); diff --git a/InstructorsAndTrainees/connectorToServer/Datas.h b/InstructorsAndTrainees/connectorToServer/Datas.h index 0d2573f..ef8c985 100644 --- a/InstructorsAndTrainees/connectorToServer/Datas.h +++ b/InstructorsAndTrainees/connectorToServer/Datas.h @@ -52,7 +52,9 @@ enum TypeQueryToDB{ TYPE_QUERY_EDIT_GROUP, TYPE_QUERY_NEW_TRAINEE, TYPE_QUERY_DEL_TRAINEE, - TYPE_QUERY_EDIT_TRAINEE + TYPE_QUERY_EDIT_TRAINEE, + TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE, + TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE }; class ClientQueryToDB{ diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index d00a1ec..0046ee3 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -43,6 +43,13 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer); + ammTasksWidget = new AMMtasksWidget(connectorToServer, this); + fimTasksWidget = new FIMtasksWidget(connectorToServer, this); + + connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI); + connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI); + connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected); + connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected); messangerWidget = new MessangerWidget(this); connect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger); @@ -52,12 +59,6 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(connectorToServer,&ConnectorToServer::signal_msgFromClientReady,messangerWidget,&MessangerWidget::slot_msgFromClientReady); - ammTasksWidget = new AMMtasksWidget(connectorToServer, this); - fimTasksWidget = new FIMtasksWidget(connectorToServer, this); - - connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI); - connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI); - ui->horizontalLayout_3->addWidget(viewerTrainees); ui->horizontalLayout_3->addWidget(messangerWidget); diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index f817aea..d334931 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -8,7 +8,8 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent) : QWidget(parent), ui(new Ui::AMMtasksWidget), - connectorToServer(connectorToServer) + connectorToServer(connectorToServer), + loginTraineeSelected("") { ui->setupUi(this); @@ -18,6 +19,8 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidget_currentItemChanged); preparationTreeWidget(); + + ui->btnAssignTaskToTrainee->setEnabled(false); } AMMtasksWidget::~AMMtasksWidget() @@ -45,17 +48,21 @@ void AMMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, PM* PMmodul = static_cast(module); type = "PM"; code = PMmodul->pmCode(); + ui->btnAssignTaskToTrainee->setEnabled(false); } else { DM* DMmodul = static_cast(module); type = "DM"; code = DMmodul->dmCode(); + ui->btnAssignTaskToTrainee->setEnabled(true); } ui->label->setText(type + " Code"); ui->editCode->setText(code); } + else + ui->btnAssignTaskToTrainee->setEnabled(false); } void AMMtasksWidget::slot_NeedUpdateUI() @@ -63,6 +70,11 @@ void AMMtasksWidget::slot_NeedUpdateUI() loadTasksAMM(); } +void AMMtasksWidget::slot_traineeSelected(QString login) +{ + loginTraineeSelected = login; +} + void AMMtasksWidget::loadTasksAMM() { //Обновление дерева @@ -291,3 +303,35 @@ void AMMtasksWidget::on_btnUpdateTasks_clicked() { connectorToServer->sendQueryTasksXML("amm"); } + +void AMMtasksWidget::on_btnAssignTaskToTrainee_clicked() +{ + QTreeWidgetItem *current = treeWidget->currentItem(); + + if(current == nullptr) + return; + + int id = current->text(ColumnsTree::clmn_ID).toInt(); + + Module* module = searchModuleByID(id); + + if(module) + { + if(module->getType() == ModuleType::TYPE_DM) + { + QString dmCode = ""; + QString techName = ""; + DM* DMmodul = static_cast(module); + dmCode = DMmodul->dmCode(); + techName = DMmodul->getLangStructRus().techName; + + int trainee_id = connectorToServer->getIdTraineeByLogin(loginTraineeSelected); + + TaskAmmFim taskNew; + taskNew.ammProcedure.title = techName; + taskNew.ammProcedure.dmCode = dmCode; + + connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE, trainee_id, &taskNew); + } + } +} diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index b28d278..216f1b7 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h @@ -29,9 +29,13 @@ private Q_SLOTS: void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); void on_btnUpdateTasks_clicked(); + void on_btnAssignTaskToTrainee_clicked(); + public Q_SLOTS: //Слот обработки сигнала необходимости обновления интерфейса void slot_NeedUpdateUI(); + //слот обработки сигнала о выборе обучаемого + void slot_traineeSelected(QString login); private: void loadAMMtasksFromXML(QByteArray array); @@ -54,6 +58,7 @@ private: private: QList listAllModules; + QString loginTraineeSelected; }; #endif // AMMTASKSWIDGET_H diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.ui b/InstructorsAndTrainees/tasks/ammtaskswidget.ui index 97a4b02..b23e553 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.ui @@ -54,7 +54,14 @@ - ... + Update List + + + + + + + Assign task diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index f9c225e..caf7049 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -9,24 +9,55 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent) : QWidget(parent), ui(new Ui::FIMtasksWidget), - connectorToServer(connectorToServer) + connectorToServer(connectorToServer), + loginTraineeSelected("") { ui->setupUi(this); treeWidget = new QTreeWidget(); ui->horizontalLayout_1->addWidget(treeWidget); + connect(treeWidget, &QTreeWidget::currentItemChanged, this, &FIMtasksWidget::on_treeWidget_currentItemChanged); + preparationTreeWidget(); + + ui->btnAssignTaskToTrainee->setEnabled(false); } FIMtasksWidget::~FIMtasksWidget() { + + deleteAllTaskAmmFim(); delete ui; } +void FIMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +{ + if(current == nullptr) + return; + + QString code = ""; + + QTreeWidgetItem *treeItemParent = current->parent(); + if(treeItemParent == nullptr) + {//Выбрана задача + int id = current->text(ColumnsTree::clmn_ID).toInt(); + + TaskAmmFim* task = getTaskByID(id); + + code = task->title; + + ui->btnAssignTaskToTrainee->setEnabled(true); + } + else + ui->btnAssignTaskToTrainee->setEnabled(false); + + ui->editCode->setText(code); +} + void FIMtasksWidget::loadFIMtasksFromXML(QByteArray array) { - listTaskAmmFim.clear(); + deleteAllTaskAmmFim(); QDomDocument docTasksDOM; @@ -47,9 +78,10 @@ void FIMtasksWidget::loadFIMtasksFromXML(QByteArray array) if(name == "task") { - TaskAmmFim task; + TaskAmmFim* task = nullptr; + task = new TaskAmmFim(); - task.initialize(nodeMap.namedItem("id").nodeValue().toInt(), + task->initialize(/*nodeMap.namedItem("id").nodeValue().toInt()*/ TaskAmmFim::lastID++, nodeMap.namedItem("type").nodeValue(), nodeMap.namedItem("title").nodeValue(), nodeMap.namedItem("status").nodeValue(), @@ -92,7 +124,7 @@ void FIMtasksWidget::loadFIMtasksFromXML(QByteArray array) }while(! (signElement = signElement.nextSiblingElement()).isNull()); } - task.addMalfunction(malfunction); + task->addMalfunction(malfunction); } }while(! (malfunctionElement = malfunctionElement.nextSiblingElement()).isNull()); } @@ -107,21 +139,21 @@ void FIMtasksWidget::fillTree() { for(int i = 0; i < listTaskAmmFim.count(); i++) {/*Задачи*/ - TaskAmmFim task = listTaskAmmFim.at(i); + TaskAmmFim* task = listTaskAmmFim.at(i); QTreeWidgetItem* itemTask = new QTreeWidgetItem(); - itemTask->setText(0, task.title); - itemTask->setText(1, QString::number(task.id)); + itemTask->setText(0, task->title); + itemTask->setText(1, QString::number(task->id)); itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable); itemTask->setCheckState(0, Qt::Checked); itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png")); treeWidget->addTopLevelItem(itemTask); - for (int j = 0; j < task.malfunctionList.count(); j++) + for (int j = 0; j < task->malfunctionList.count(); j++) {/*Неисправности*/ - Malfunction malfunction = task.malfunctionList.at(j); + Malfunction malfunction = task->malfunctionList.at(j); QTreeWidgetItem* itemMalfunction = new QTreeWidgetItem(); @@ -172,6 +204,11 @@ void FIMtasksWidget::slot_NeedUpdateUI() loadTasksFIM(); } +void FIMtasksWidget::slot_traineeSelected(QString login) +{ + loginTraineeSelected = login; +} + void FIMtasksWidget::loadTasksFIM() { //Обновление дерева @@ -184,7 +221,49 @@ void FIMtasksWidget::loadTasksFIM() fillTree(); } +TaskAmmFim* FIMtasksWidget::getTaskByID(int id) +{ + for(int i = 0; i < listTaskAmmFim.count(); i++) + {/*Задачи*/ + TaskAmmFim* task = listTaskAmmFim.at(i); + if(task->id == id) + return task; + } + + return nullptr; +} + +void FIMtasksWidget::deleteAllTaskAmmFim() +{ + for(TaskAmmFim* task: listTaskAmmFim) + delete task; + + listTaskAmmFim.clear(); +} + void FIMtasksWidget::on_btnUpdateTasks_clicked() { connectorToServer->sendQueryTasksXML("fim"); } + +void FIMtasksWidget::on_btnAssignTaskToTrainee_clicked() +{ + QTreeWidgetItem *current = treeWidget->currentItem(); + + if(current == nullptr) + return; + + int id = current->text(ColumnsTree::clmn_ID).toInt(); + + TaskAmmFim* task = getTaskByID(id); + + if(task) + { + int trainee_id = connectorToServer->getIdTraineeByLogin(loginTraineeSelected); + + TaskAmmFim taskNew; + taskNew.title = task->title; + + connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE, trainee_id, &taskNew); + } +} diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index df7d975..c55a1a2 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h @@ -25,11 +25,16 @@ public: ~FIMtasksWidget(); private Q_SLOTS: + void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); void on_btnUpdateTasks_clicked(); + void on_btnAssignTaskToTrainee_clicked(); + public Q_SLOTS: //Слот обработки сигнала необходимости обновления интерфейса void slot_NeedUpdateUI(); + //слот обработки сигнала о выборе обучаемого + void slot_traineeSelected(QString login); private: void loadFIMtasksFromXML(QByteArray array); @@ -41,6 +46,9 @@ private: void loadTasksFIM(); + TaskAmmFim* getTaskByID(int id); + void deleteAllTaskAmmFim(); + private: Ui::FIMtasksWidget *ui; ConnectorToServer* connectorToServer; @@ -48,7 +56,8 @@ private: private: QString userName; - QList listTaskAmmFim; + QList listTaskAmmFim; + QString loginTraineeSelected; }; #endif // FIMTASKSWIDGET_H diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.ui b/InstructorsAndTrainees/tasks/fimtaskswidget.ui index 2ceeabe..df023b4 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.ui @@ -27,7 +27,14 @@ - ... + Update List + + + + + + + Assign task diff --git a/ServerLMS/Data/typesDataServerClient.h b/ServerLMS/Data/typesDataServerClient.h index 3e6e719..d3f637c 100644 --- a/ServerLMS/Data/typesDataServerClient.h +++ b/ServerLMS/Data/typesDataServerClient.h @@ -71,7 +71,9 @@ enum TypeQueryToDB{ TYPE_QUERY_EDIT_GROUP, TYPE_QUERY_NEW_TRAINEE, TYPE_QUERY_DEL_TRAINEE, - TYPE_QUERY_EDIT_TRAINEE + TYPE_QUERY_EDIT_TRAINEE, + TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE, + TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE }; class ClientQueryToDB{