Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Передача назначенных задач из сервера в ГУИ

Browse Source
This commit is contained in:
krivoshein
2025-01-28 13:19:33 +03:00
parent eebe56dd6c
commit c7c665bebd
26 changed files with 236 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -274,6 +274,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
case TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS:
case TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS:
case TYPE_XMLANSWER_QUERY_DB__LIST_TASKS:
case TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE:
{
QByteArray array;
stream.startTransaction();
@@ -670,6 +671,29 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array
emit sigAnswerQueryToDB_ListTasks(listTasks);
}
break;
case TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE:
{
QList<TaskAmmFim> listTasks;
int trainee_id = 0;
QDomNode listNode = commonDOM.namedItem("ListTasksAMM");
trainee_id = listNode.toElement().attribute("trainee_id").toInt();
for(int i = 0; i < listNode.childNodes().count(); i++)
{
QDomNode taskNode = listNode.childNodes().at(i);
if(taskNode.nodeName() == "taskAMM")
{//Задача
TaskAmmFim task;
task.setID(taskNode.toElement().attribute("task_id").toInt());
task.ammProcedure.title = taskNode.toElement().attribute("title");
task.ammProcedure.dmCode = taskNode.toElement().attribute("dmCode");
listTasks.append(task);
}
}
emit sigAnswerQueryToDB_ListTasksAMMforTrainee(listTasks, trainee_id);
}
break;
};
}

1
InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
View File

@@ -49,6 +49,7 @@ signals:
void sigAnswerQueryToDB_ListComputers(QList<Computer> listComputers);
void sigAnswerQueryToDB_ListClassrooms(QList<Classroom> listClassrooms);
void sigAnswerQueryToDB_ListTasks(QList<Task> listTasks);
void sigAnswerQueryToDB_ListTasksAMMforTrainee(QList<TaskAmmFim>listTasks, int trainee_id);
void sigAnswerQueryTasksXML_FIM(QByteArray array);
void sigAnswerQueryTasksXML_AMM(QByteArray array);
void sigShowServerDataList(QList<StreamingVersionData*> *versions);

3
InstructorsAndTrainees/connectorToServer/Core/tools.h
View File

@@ -46,6 +46,9 @@ enum PacketType{
TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS = 104,
TYPE_XMLANSWER_QUERY_DB__LIST_TASKS = 105,
TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE = 106,
TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE = 107,
//xml-ответы на запросы AdditionalFiles
TYPE_XMLANSWER_QUERY_TASKS_XML_FIM = 130,
TYPE_XMLANSWER_QUERY_TASKS_XML_AMM = 131,

21
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -148,6 +148,14 @@ QList<Task> ConnectorToServer::getListTasks()
return listTasks;
}
QList<TaskAmmFim> ConnectorToServer::getListTasksAMMforTrainee(int trainee_id)
{
if(mapTasksAMM.contains(trainee_id))
return mapTasksAMM.value(trainee_id);
else
return QList<TaskAmmFim>();
}
bool ConnectorToServer::isArchivedInstructor(int id)
{
for(Instructor instructor : listInstructors)
@@ -313,6 +321,17 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListTasks(QList<Task> listTasks)
//emit signal_UpdateDB(false, true);
}
void ConnectorToServer::slot_AnswerQueryToDB_ListTasksAMMforTrainee(QList<TaskAmmFim> listTasks, int trainee_id)
{
//Удаляем старые задачи этого обучаемого
mapTasksAMM.remove(trainee_id);
//Добавляем новые
mapTasksAMM.insert(trainee_id, listTasks);
emit signal_UpdateTasksAMMforTrainee(trainee_id);
}
void ConnectorToServer::slot_AnswerQueryTasksXML_FIM(QByteArray array)
{
this->listTaskFimArray = array;
@@ -385,6 +404,8 @@ void ConnectorToServer::bindConnection()
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListClassrooms,this,&ConnectorToServer::slot_AnswerQueryToDB_ListClassrooms);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListTasks,this,&ConnectorToServer::slot_AnswerQueryToDB_ListTasks);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListTasksAMMforTrainee,this,&ConnectorToServer::slot_AnswerQueryToDB_ListTasksAMMforTrainee);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryTasksXML_FIM,this,&ConnectorToServer::slot_AnswerQueryTasksXML_FIM);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryTasksXML_AMM,this,&ConnectorToServer::slot_AnswerQueryTasksXML_AMM);
connect(recognizeSystem,&RecognizeSystem::sigAnimationActivated,this,&ConnectorToServer::activateLoadAnimation,Qt::AutoConnection);

11
InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -2,6 +2,7 @@
#define CONNECTORTOSERVER_H
#include <QObject>
#include <QMap>
#include <widgets/versionselectwidget.h>
#include <widgets/waitanimationwidget.h>
#include "Core\tcpclient.h"
@@ -44,6 +45,7 @@ public:
QList<Computer> getListComputers();
QList<Classroom> getListClassrooms();
QList<Task> getListTasks();
QList<TaskAmmFim> getListTasksAMMforTrainee(int trainee_id);
bool isArchivedInstructor(int id);
bool isAdminInstructor(int id);
@@ -72,6 +74,7 @@ public slots:
void slot_AnswerQueryToDB_ListComputers(QList<Computer> listComputers);
void slot_AnswerQueryToDB_ListClassrooms(QList<Classroom> listClassrooms);
void slot_AnswerQueryToDB_ListTasks(QList<Task> listTasks);
void slot_AnswerQueryToDB_ListTasksAMMforTrainee(QList<TaskAmmFim> listTasks, int trainee_id);
void slot_AnswerQueryTasksXML_FIM(QByteArray array);
void slot_AnswerQueryTasksXML_AMM(QByteArray array);
@@ -92,8 +95,11 @@ signals:
void signal_UpdateDB(bool treeInstructor, bool treeTrainee);
void signal_UpdateTasksFIM();
void signal_UpdateTasksAMM();
void signal_UpdateTasksFIM(); //Общий список
void signal_UpdateTasksAMM(); //Общий список
void signal_UpdateTasksFIMforTrainee(int trainee_id);
void signal_UpdateTasksAMMforTrainee(int trainee_id);
void signal_ConnectedToServer(bool state);
@@ -126,6 +132,7 @@ private:
QList<Computer> listComputers;
QList<Classroom> listClassrooms;
QList<Task> listTasks;
QMap<int, QList<TaskAmmFim>> mapTasksAMM;
QByteArray listTaskFimArray;
QByteArray listTaskAmmArray;

1
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -29,6 +29,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
qRegisterMetaType<QList<Classroom>>("QList<Classroom>");
qRegisterMetaType<QList<Module*>>("QList<Module*>");
qRegisterMetaType<QList<QTreeWidgetItem*>>("QList<QTreeWidgetItem*>");
qRegisterMetaType<QList<TaskAmmFim>>("QList<TaskAmmFim>");
qDebug() << "InstructorsAndTraineesWidget init thread ID " << QThread::currentThreadId();

2
InstructorsAndTrainees/instructorsandtraineeswidget.h
View File

@@ -10,6 +10,7 @@
#include "ammtaskswidget.h"
#include "fimtaskswidget.h"
#include "connectortoserver.h"
#include "tasksAmmFim.h"
Q_DECLARE_METATYPE(QList<Instructor>)
Q_DECLARE_METATYPE(QList<Trainee>)
@@ -18,6 +19,7 @@ Q_DECLARE_METATYPE(QList<Computer>)
Q_DECLARE_METATYPE(QList<Classroom>)
Q_DECLARE_METATYPE(QList<Module*>)
Q_DECLARE_METATYPE(QList<QTreeWidgetItem*>)
Q_DECLARE_METATYPE(QList<TaskAmmFim>)
namespace Ui {

26
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -14,6 +14,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
treeWidget(nullptr),
type(type),
loginTraineeSelected(""),
idTraineeSelected(0),
threadPreparation(nullptr),
threadAnimation(nullptr),
taskTreePreparation(nullptr),
@@ -46,6 +47,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
threadPreparation->start();
threadPreparation->setPriority(QThread::HighestPriority);
connect(this, &AMMtasksWidget::signal_prepareListItems, taskTreePreparation, &TaskTreePreparation::slot_prepareListItems);
connect(this, &AMMtasksWidget::signal_prepareListItemsForTrainee, taskTreePreparation, &TaskTreePreparation::slot_prepareListItemsForTrainee);
connect(taskTreePreparation, &TaskTreePreparation::signal_listItemsReady, this, &AMMtasksWidget::slot_listItemsReady);
threadAnimation = new QThread();
@@ -81,6 +83,12 @@ void AMMtasksWidget::resizeEvent(QResizeEvent *event)
{
QSize size = event->size();
waitAnimationWidget->resize(size);
int width = treeWidget->width();
treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50);
treeWidget->setColumnWidth(ColumnsTree::clmn_code, 250);
treeWidget->setColumnWidth(ColumnsTree::clmn_PMorDM, width - 310);
}
void AMMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
@@ -129,11 +137,21 @@ void AMMtasksWidget::slot_traineeSelected(QString login)
{
qDebug() << "AMMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId();
loginTraineeSelected = login;
idTraineeSelected = connectorToServer->getIdTraineeByLogin(loginTraineeSelected);
if(type == TypeList::listForTrainee)
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_GET_TASKS_AMM_FOR_TRAINEE, idTraineeSelected);
}
void AMMtasksWidget::slot_UpdateTasksAMMforTrainee(int trainee_id)
{
if(type == TypeList::listForTrainee)
{
int trainee_id = connectorToServer->getIdTraineeByLogin(loginTraineeSelected);
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_GET_TASKS_AMM_FOR_TRAINEE, trainee_id);
if(idTraineeSelected == trainee_id)
{
QList<TaskAmmFim> listTask = connectorToServer->getListTasksAMMforTrainee(trainee_id);
signal_prepareListItemsForTrainee(listTask, &listAllModules);
}
}
}
@@ -180,10 +198,6 @@ void AMMtasksWidget::preparationTreeWidget()
reSetHeadTreeWidget();
treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 80);
treeWidget->setColumnWidth(ColumnsTree::clmn_PMorDM, 900);
treeWidget->setColumnWidth(ColumnsTree::clmn_code, 200);
//treeWidget->setColumnHidden(ColumnsTree::clmn_ID, true);
}

4
InstructorsAndTrainees/tasks/ammtaskswidget.h
View File

@@ -48,6 +48,8 @@ public Q_SLOTS:
//слот обработки сигнала о выборе обучаемого
void slot_traineeSelected(QString login);
void slot_UpdateTasksAMMforTrainee(int trainee_id);
private:
Module* searchModuleByID(int id);
void preparationTreeWidget();
@@ -56,6 +58,7 @@ private:
Q_SIGNALS:
void signal_prepareListItems(QByteArray array, QList<Module*>* listAllModules);
void signal_prepareListItemsForTrainee(QList<TaskAmmFim> listTask, QList<Module*>* listAllModules);
public Q_SLOTS:
void slot_listItemsReady(QList<QTreeWidgetItem*> listItems);
@@ -68,6 +71,7 @@ private:
private:
QList<Module*> listAllModules;
QString loginTraineeSelected;
int idTraineeSelected;
QThread* threadPreparation;
QThread* threadAnimation;

11
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -45,6 +45,14 @@ FIMtasksWidget::~FIMtasksWidget()
delete ui;
}
void FIMtasksWidget::resizeEvent(QResizeEvent *event)
{
int width = treeWidget->width();
treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50);
treeWidget->setColumnWidth(ColumnsTree::clmn_Title, width - 60);
}
void FIMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
{
if(current == nullptr)
@@ -201,9 +209,6 @@ void FIMtasksWidget::preparationTreeWidget()
reSetHeadTreeWidget();
treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 20);
treeWidget->setColumnWidth(ColumnsTree::clmn_Title, 500);
//treeWidget->setColumnHidden(ColumnsTree::clmn_ID, true);
}

3
InstructorsAndTrainees/tasks/fimtaskswidget.h
View File

@@ -37,6 +37,9 @@ public:
treeWidget->clear();
}
public:
void resizeEvent(QResizeEvent *event) override;
private Q_SLOTS:
void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_btnUpdateTasks_clicked();

32
InstructorsAndTrainees/tasks/tasktreepreparation.cpp
View File

@@ -218,3 +218,35 @@ void TaskTreePreparation::slot_prepareListItems(QByteArray array, QList<Module*>
Q_EMIT signal_listItemsReady(listItems);
}
void TaskTreePreparation::slot_prepareListItemsForTrainee(QList<TaskAmmFim> listTask, QList<Module *> *listAllModules)
{
qDebug() << "TaskTreePreparation::slot_prepareListItemsForTrainee thread ID " << QThread::currentThreadId();
this->listAllModules = listAllModules;
//loadAMMtasksFromList(listTask);
listItems.clear();
for(TaskAmmFim task : listTask)
{
QTreeWidgetItem* item = nullptr;
QString text = task.ammProcedure.title;
QString ID = QString::number(task.getID());
QString code = task.ammProcedure.dmCode;
item = new QTreeWidgetItem();
item->setIcon(0, QIcon(":/resources/icons/procedure.png"));
item->setText(ColumnsTree::clmn_PMorDM, text);
item->setText(ColumnsTree::clmn_code, code);
item->setText(ColumnsTree::clmn_ID, ID);
listItems.append(item);
}
Q_EMIT signal_listItemsReady(listItems);
}

2
InstructorsAndTrainees/tasks/tasktreepreparation.h
View File

@@ -5,6 +5,7 @@
#include <QTreeWidgetItem>
#include <QDomElement>
#include "module.h"
#include "tasksAmmFim.h"
enum ColumnsTree{
clmn_PMorDM = 0,
@@ -30,6 +31,7 @@ private:
public Q_SLOTS:
void slot_prepareListItems(QByteArray array, QList<Module*>* listAllModules);
void slot_prepareListItemsForTrainee(QList<TaskAmmFim> listTask, QList<Module*>* listAllModules);
Q_SIGNALS:
void signal_listItemsReady(QList<QTreeWidgetItem*> listItems);

2
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -20,6 +20,8 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee);
ui->verticalLayout_2->addWidget(ammTasksWidget);
ui->verticalLayout_2->addWidget(fimTasksWidget);