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:
@@ -21,7 +21,8 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
|
||||
taskTreePreparation(nullptr),
|
||||
waitAnimationWidget(nullptr),
|
||||
dlgCheckerTask(nullptr),
|
||||
flOnlyActive(false)
|
||||
flOnlyActive(false),
|
||||
lastCurrentID(0)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
@@ -30,7 +31,8 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
|
||||
treeWidget = new QTreeWidget();
|
||||
ui->horizontalLayout_Tree->addWidget(treeWidget);
|
||||
|
||||
connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidgetCurrentItemChanged);
|
||||
//connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidgetItemClicked);
|
||||
connect(treeWidget, &QTreeWidget::itemClicked, this, &AMMtasksWidget::on_treeWidgetItemClicked);
|
||||
|
||||
preparationTreeWidget();
|
||||
|
||||
@@ -144,9 +146,9 @@ void AMMtasksWidget::changeEvent(QEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
void AMMtasksWidget::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
|
||||
void AMMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
|
||||
{
|
||||
if(current == nullptr)
|
||||
if(item == nullptr)
|
||||
{
|
||||
ui->btnDelete->setEnabled(false);
|
||||
ui->btnCheck->setEnabled(false);
|
||||
@@ -158,12 +160,19 @@ void AMMtasksWidget::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, Q
|
||||
ui->btnDelete->setEnabled(true);
|
||||
}
|
||||
|
||||
int id = current->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
|
||||
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;
|
||||
}
|
||||
|
||||
void AMMtasksWidget::slot_NeedUpdateUI()
|
||||
@@ -227,6 +236,9 @@ void AMMtasksWidget::slot_AMMlistItemsReady(QList<QTreeWidgetItem *> listItems)
|
||||
if(item != nullptr)
|
||||
treeWidget->setCurrentItem(item);
|
||||
|
||||
if(type == TypeListTreeAMMFIM::listForTrainee)
|
||||
setCurrentTask(lastCurrentID);
|
||||
|
||||
waitAnimationWidget->hideWithStop();
|
||||
|
||||
ui->btnOnlyActive->setEnabled(true);
|
||||
@@ -322,6 +334,20 @@ void AMMtasksWidget::assignTaskAMMtoTrainee()
|
||||
}
|
||||
}
|
||||
|
||||
void AMMtasksWidget::setCurrentTask(int id)
|
||||
{
|
||||
for(int i = 0; i < treeWidget->topLevelItemCount(); i++)
|
||||
{
|
||||
QTreeWidgetItem * item = treeWidget->topLevelItem(i);
|
||||
if(item != nullptr)
|
||||
if(item->text(ColumnsTreeAMM::clmnAMM_ID).toInt() == id)
|
||||
{
|
||||
treeWidget->setCurrentItem(item);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void AMMtasksWidget::on_btnDelete_clicked()
|
||||
{
|
||||
QTreeWidgetItem *treeItemCurrent = treeWidget->currentItem();
|
||||
|
||||
Reference in New Issue
Block a user