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

GUI. subProc отобр. выпад-м списком в ранее назн.

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-11-19 15:01:23 +03:00
parent ee97f83856
commit 069aa80826
6 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InstructorsAndTrainees/InstructorsAndTrainees.qrc
View File

@@ -55,5 +55,6 @@
<file>resources/icons/personalCard.png</file>
<file>resources/icons/eye.png</file>
<file>resources/icons/exchange.png</file>
<file>resources/icons/link.png</file>
</qresource>
</RCC>

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

@@ -799,6 +799,20 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array
task.ammProcedure.dmCode = taskNode.toElement().attribute("dmCode");
task.status = taskNode.toElement().attribute("status");
for(int j = 0; j < taskNode.childNodes().count(); j++)
{
QDomNode subProcNode = taskNode.childNodes().at(j);
if(subProcNode.nodeName() == "SubProc")
{//Подпроцедура
SubProc subProc;
subProc.setDmCode(subProcNode.toElement().attribute("dmCode"));
subProc.setTitle(subProcNode.toElement().attribute("title"));
subProc.setModeListStr(subProcNode.toElement().attribute("canplay"));
task.listSubProc.append(subProc);
}
}
listTasks.append(task);
}
}

BIN
InstructorsAndTrainees/resources/icons/link.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

52
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -182,27 +182,51 @@ void AMMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
{
ui->btnDelete->setEnabled(false);
ui->btnCheck->setEnabled(false);
ui->btnAssignTask->setEnabled(false);
return;
}
else
if(this->type == TypeListTreeAMMFIM::listCommon)
{
ui->btnCheck->setEnabled(true);
ui->btnDelete->setEnabled(true);
int id = item->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
TaskAmmFim task = taskTreePreparation->getTaskAMMbyID(id);
if(taskTreePreparation->getTypeModuleAMMbyID(id) == ModuleType::TYPE_PM)
ui->btnAssignTask->setEnabled(false);
else
{
ui->btnAssignTask->setEnabled(true);
}
if(task.getID())
lastCurrentID = id;
ui->btnDelete->setEnabled(false);
ui->btnCheck->setEnabled(false);
}
else if(this->type == TypeListTreeAMMFIM::listForTrainee)
{
QTreeWidgetItem *treeItemParent = item->parent();
if(treeItemParent == nullptr)
{//Выбрана задача
ui->btnCheck->setEnabled(true);
ui->btnDelete->setEnabled(true);
int id = item->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
int id = item->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
TaskAmmFim task = taskTreePreparation->getTaskAMMbyID(id);
TaskAmmFim task = taskTreePreparation->getTaskAMMbyID(id);
if(taskTreePreparation->getTypeModuleAMMbyID(id) == ModuleType::TYPE_PM)
if(task.getID())
lastCurrentID = id;
}
else
{
ui->btnCheck->setEnabled(false);
ui->btnDelete->setEnabled(false);
}
ui->btnAssignTask->setEnabled(false);
else
{
ui->btnAssignTask->setEnabled(true);
}
if(task.getID())
lastCurrentID = id;
else
lastCurrentID = 0;
}
void AMMtasksWidget::slot_NeedUpdateUI()
@@ -233,7 +257,7 @@ void AMMtasksWidget::slot_UpdateTasksAMMforTrainee(int trainee_id)
if(idTraineeSelected == trainee_id)
{
QList<TaskAmmFim> listTask = connectorToServer->getListTasksAMMforTrainee(trainee_id);
signal_prepareAMMListItemsForTrainee(listTask);
emit signal_prepareAMMListItemsForTrainee(listTask);
emit signal_countTasksAMMforTraineeChanged(trainee_id, listTask.count());
}

5
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -161,11 +161,10 @@ void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
{
ui->btnDelete->setEnabled(false);
ui->btnCheck->setEnabled(false);
ui->btnAssignTask->setEnabled(false);
return;
}
QString code = "";
QTreeWidgetItem *treeItemParent = item->parent();
if(treeItemParent == nullptr)
{//Выбрана задача
@@ -185,8 +184,6 @@ void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
lastCurrentID = task.getID();
}
code = task.title;
ui->btnAssignTask->setEnabled(true);
ui->btnDelete->setEnabled(true);

20
InstructorsAndTrainees/tasks/tasktreepreparation.cpp
View File

@@ -515,6 +515,26 @@ void TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee(QList<TaskAmm
item->setToolTip(0, text);
if(type == TypeListTreeAMMFIM::listForTrainee)
{
for (int j = 0; j < task.listSubProc.count(); j++)
{/*Подпроцедуры*/
SubProc subProc = task.listSubProc.at(j);
QTreeWidgetItem* itemSubProc = new QTreeWidgetItem();
itemSubProc->setText(ColumnsTreeAMM::clmnAMM_PMorDM, subProc.getTitle());
itemSubProc->setIcon(ColumnsTreeAMM::clmnAMM_PMorDM, QIcon(":/resources/icons/link.png"));
itemSubProc->setToolTip(ColumnsTreeAMM::clmnAMM_PMorDM, subProc.getTitle());
itemSubProc->setText(ColumnsTreeAMM::clmnAMM_code, subProc.getDmCode());
item->addChild(itemSubProc);
}
}
listItemsAll.append(item);
}