mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
Сделал отпраку запросов в сервер на получение списков задач для конкретного обучаемого
This commit is contained in:
@@ -15,7 +15,9 @@ enum TypeQueryToDB{
|
|||||||
TYPE_QUERY_DEL_TRAINEE,
|
TYPE_QUERY_DEL_TRAINEE,
|
||||||
TYPE_QUERY_EDIT_TRAINEE,
|
TYPE_QUERY_EDIT_TRAINEE,
|
||||||
TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE,
|
TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE,
|
||||||
TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE
|
TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE,
|
||||||
|
TYPE_QUERY_GET_TASKS_AMM_FOR_TRAINEE,
|
||||||
|
TYPE_QUERY_GET_TASKS_FIM_FOR_TRAINEE
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TYPEQUERYTODB_H
|
#endif // TYPEQUERYTODB_H
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
|
|||||||
connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer);
|
connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer);
|
||||||
|
|
||||||
ammTasksWidget = new AMMtasksWidget(connectorToServer, AMMtasksWidget::TypeList::listCommon, this);
|
ammTasksWidget = new AMMtasksWidget(connectorToServer, AMMtasksWidget::TypeList::listCommon, this);
|
||||||
fimTasksWidget = new FIMtasksWidget(connectorToServer, FIMtasksWidget::TypeList::listForTrainee, this);
|
fimTasksWidget = new FIMtasksWidget(connectorToServer, FIMtasksWidget::TypeList::listCommon, this);
|
||||||
|
|
||||||
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI);
|
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI);
|
||||||
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);
|
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);
|
||||||
|
|||||||
@@ -114,6 +114,12 @@ void AMMtasksWidget::slot_traineeSelected(QString login)
|
|||||||
{
|
{
|
||||||
qDebug() << "AMMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId();
|
qDebug() << "AMMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId();
|
||||||
loginTraineeSelected = login;
|
loginTraineeSelected = login;
|
||||||
|
|
||||||
|
if(type == TypeList::listForTrainee)
|
||||||
|
{
|
||||||
|
int trainee_id = connectorToServer->getIdTraineeByLogin(loginTraineeSelected);
|
||||||
|
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_GET_TASKS_AMM_FOR_TRAINEE, trainee_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMMtasksWidget::loadTasksAMM()
|
void AMMtasksWidget::loadTasksAMM()
|
||||||
|
|||||||
@@ -223,6 +223,12 @@ void FIMtasksWidget::slot_traineeSelected(QString login)
|
|||||||
{
|
{
|
||||||
qDebug() << "FIMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId();
|
qDebug() << "FIMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId();
|
||||||
loginTraineeSelected = login;
|
loginTraineeSelected = login;
|
||||||
|
|
||||||
|
if(type == TypeList::listForTrainee)
|
||||||
|
{
|
||||||
|
int trainee_id = connectorToServer->getIdTraineeByLogin(loginTraineeSelected);
|
||||||
|
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_GET_TASKS_FIM_FOR_TRAINEE, trainee_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FIMtasksWidget::loadTasksFIM()
|
void FIMtasksWidget::loadTasksFIM()
|
||||||
|
|||||||
@@ -17,6 +17,9 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
|
|||||||
ammTasksWidget = new AMMtasksWidget(connectorToServer, AMMtasksWidget::TypeList::listForTrainee, this);
|
ammTasksWidget = new AMMtasksWidget(connectorToServer, AMMtasksWidget::TypeList::listForTrainee, this);
|
||||||
fimTasksWidget = new FIMtasksWidget(connectorToServer, FIMtasksWidget::TypeList::listForTrainee, this);
|
fimTasksWidget = new FIMtasksWidget(connectorToServer, FIMtasksWidget::TypeList::listForTrainee, this);
|
||||||
|
|
||||||
|
connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
|
||||||
|
connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
|
||||||
|
|
||||||
ui->verticalLayout_2->addWidget(ammTasksWidget);
|
ui->verticalLayout_2->addWidget(ammTasksWidget);
|
||||||
ui->verticalLayout_2->addWidget(fimTasksWidget);
|
ui->verticalLayout_2->addWidget(fimTasksWidget);
|
||||||
|
|
||||||
@@ -47,6 +50,9 @@ void ViewerTrainees::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column
|
|||||||
|
|
||||||
void ViewerTrainees::slot_tabMessengerChanged(QString login)
|
void ViewerTrainees::slot_tabMessengerChanged(QString login)
|
||||||
{
|
{
|
||||||
|
if(login == "")
|
||||||
|
return;
|
||||||
|
|
||||||
for (int i = 0; i < treeWidget->topLevelItemCount(); i++)
|
for (int i = 0; i < treeWidget->topLevelItemCount(); i++)
|
||||||
{//Проход по группам
|
{//Проход по группам
|
||||||
int countChild = treeWidget->topLevelItem(i)->childCount();
|
int countChild = treeWidget->topLevelItem(i)->childCount();
|
||||||
@@ -58,7 +64,12 @@ void ViewerTrainees::slot_tabMessengerChanged(QString login)
|
|||||||
{
|
{
|
||||||
treeWidget->setCurrentItem(treeWidget->topLevelItem(i)->child(j));
|
treeWidget->setCurrentItem(treeWidget->topLevelItem(i)->child(j));
|
||||||
typeObject = TypeObject::objTrainee;
|
typeObject = TypeObject::objTrainee;
|
||||||
lastCurrentID = connectorToServer->getIdTraineeByLogin(login);
|
int newCurrentID = connectorToServer->getIdTraineeByLogin(login);
|
||||||
|
|
||||||
|
if(newCurrentID == lastCurrentID)
|
||||||
|
return;
|
||||||
|
|
||||||
|
lastCurrentID = newCurrentID;
|
||||||
Q_EMIT signal_traineeSelected(login);
|
Q_EMIT signal_traineeSelected(login);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -106,7 +117,17 @@ void ViewerTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
|
|||||||
if(current->childCount() == 0)
|
if(current->childCount() == 0)
|
||||||
{//Выбран обучаемый
|
{//Выбран обучаемый
|
||||||
QString login = current->text(ColumnsTreeTrainees::clmn_Login);
|
QString login = current->text(ColumnsTreeTrainees::clmn_Login);
|
||||||
Q_EMIT signal_traineeSelected(login);
|
if(login != "")
|
||||||
|
{
|
||||||
|
int newCurrentID = connectorToServer->getIdTraineeByLogin(login);
|
||||||
|
|
||||||
|
if(newCurrentID == lastCurrentID)
|
||||||
|
return;
|
||||||
|
|
||||||
|
lastCurrentID = newCurrentID;
|
||||||
|
|
||||||
|
Q_EMIT signal_traineeSelected(login);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user