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:
Кривошеин Андрей
2025-09-11 12:55:28 +03:00
parent d65776ff98
commit 6bcf8a60ba
116 changed files with 179 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -14,7 +14,6 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
connectorToServer(connectorToServer),
treeWidget(nullptr),
type(type),
loginTraineeSelected(""),
idTraineeSelected(0),
threadPreparation(nullptr),
taskTreePreparation(nullptr),
@@ -101,7 +100,6 @@ void AMMtasksWidget::deactivate()
ui->btnAssignTask->setEnabled(false);
ui->btnOnlyActive->setEnabled(false);
treeWidget->clear();
loginTraineeSelected = "";
idTraineeSelected = 0;
}
@@ -177,11 +175,11 @@ void AMMtasksWidget::slot_NeedUpdateUI()
loadTasksAMM();
}
void AMMtasksWidget::slot_traineeSelected(QString login)
void AMMtasksWidget::slot_traineeSelected(int id_trainee)
{
qDebug() << "AMMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId();
loginTraineeSelected = login;
idTraineeSelected = connectorToServer->getIdTraineeByLogin(loginTraineeSelected);
idTraineeSelected = id_trainee;
if(type == TypeListTreeAMMFIM::listForTrainee)
{
@@ -276,10 +274,8 @@ void AMMtasksWidget::assignTaskAMMtoTrainee()
if(taskNew.getID())
{
int trainee_id = connectorToServer->getIdTraineeByLogin(loginTraineeSelected);
emit signal_AssignedTask();
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE, trainee_id, &taskNew);
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE, idTraineeSelected, &taskNew);
}
}

3
InstructorsAndTrainees/tasks/ammtaskswidget.h
View File

@@ -41,7 +41,7 @@ public Q_SLOTS:
//Слот обработки сигнала необходимости обновления интерфейса
void slot_NeedUpdateUI();
//слот обработки сигнала о выборе обучаемого
void slot_traineeSelected(QString login);
void slot_traineeSelected(int id_trainee);
void slot_UpdateTasksAMMforTrainee(int trainee_id);
@@ -70,7 +70,6 @@ private:
QTreeWidget* treeWidget;
TypeListTreeAMMFIM type;
QString loginTraineeSelected;
int idTraineeSelected;
QThread* threadPreparation;

12
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -15,7 +15,6 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
connectorToServer(connectorToServer),
treeWidget(nullptr),
type(type),
loginTraineeSelected(""),
idTraineeSelected(0),
threadPreparation(nullptr),
taskTreePreparation(nullptr),
@@ -103,7 +102,6 @@ void FIMtasksWidget::deactivate()
{
ui->btnAssignTask->setEnabled(false);
treeWidget->clear();
loginTraineeSelected = "";
idTraineeSelected = 0;
}
@@ -204,11 +202,11 @@ void FIMtasksWidget::slot_NeedUpdateUI()
loadTasksFIM();
}
void FIMtasksWidget::slot_traineeSelected(QString login)
void FIMtasksWidget::slot_traineeSelected(int id_trainee)
{
qDebug() << "FIMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId();
loginTraineeSelected = login;
idTraineeSelected = connectorToServer->getIdTraineeByLogin(loginTraineeSelected);
idTraineeSelected = id_trainee;
if(type == TypeListTreeAMMFIM::listForTrainee)
{
@@ -306,8 +304,6 @@ void FIMtasksWidget::assignTaskFIMtoTrainee()
if(task.getID())
{
int trainee_id = connectorToServer->getIdTraineeByLogin(loginTraineeSelected);
TaskAmmFim taskNew;
taskNew.title = task.title;
@@ -324,7 +320,7 @@ void FIMtasksWidget::assignTaskFIMtoTrainee()
}
emit signal_AssignedTask();
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE, trainee_id, &taskNew);
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE, idTraineeSelected, &taskNew);
updateTaskItem(current);
}

3
InstructorsAndTrainees/tasks/fimtaskswidget.h
View File

@@ -42,7 +42,7 @@ public Q_SLOTS:
//Слот обработки сигнала необходимости обновления интерфейса
void slot_NeedUpdateUI();
//слот обработки сигнала о выборе обучаемого
void slot_traineeSelected(QString login);
void slot_traineeSelected(int id_trainee);
void slot_UpdateTasksFIMforTrainee(int trainee_id);
@@ -72,7 +72,6 @@ private:
QTreeWidget* treeWidget;
TypeListTreeAMMFIM type;
QString loginTraineeSelected;
int idTraineeSelected;
QThread* threadPreparation;