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

ПКМ для FIM AMM

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-19 10:38:23 +03:00
parent 8dd2e386fb
commit 1c44fdb182
10 changed files with 98 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -37,7 +37,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus);
connect(treeWidget, &QTreeWidget::itemClicked, this, &AMMtasksWidget::on_treeWidgetItemClicked);
connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidgetCurrentItemChanged);
connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &AMMtasksWidget::on_treeWidgetDoubleClicked);
preparationTreeWidget();
@@ -199,9 +199,9 @@ void AMMtasksWidget::changeEvent(QEvent *event)
}
}
void AMMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
void AMMtasksWidget::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
{
if(item == nullptr)
if(current == nullptr)
{
ui->btnDelete->setEnabled(false);
ui->btnStatus->setEnabled(false);
@@ -211,7 +211,7 @@ void AMMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
if(this->type == TypeListTreeAMMFIM::listCommon)
{
int id = item->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
int id = current->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
TaskAmmFim task = taskTreePreparation->getTaskAMMbyID(id);
if(taskTreePreparation->getTypeModuleAMMbyID(id) == ModuleType::TYPE_PM)
@@ -229,13 +229,13 @@ void AMMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
}
else if(this->type == TypeListTreeAMMFIM::listForTrainee)
{
QTreeWidgetItem *treeItemParent = item->parent();
QTreeWidgetItem *treeItemParent = current->parent();
if(treeItemParent == nullptr)
{//Выбрана задача
ui->btnStatus->setEnabled(true);
ui->btnDelete->setEnabled(true);
int id = item->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
int id = current->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
TaskAmmFim task = taskTreePreparation->getTaskAMMbyID(id);
if(task.getID())

2
LibInstructorsAndTrainees/tasks/ammtaskswidget.h
View File

@@ -41,7 +41,7 @@ protected:
void changeEvent(QEvent * event) override;
private Q_SLOTS:
void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column);
void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_btnDelete_clicked();
void on_btnStatus_clicked();
void on_btnAssignTask_clicked();

21
LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -34,8 +34,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus);
//connect(treeWidget, &QTreeWidget::currentItemChanged, this, &FIMtasksWidget::on_treeWidgetCurrentItemChanged);
connect(treeWidget, &QTreeWidget::itemClicked, this, &FIMtasksWidget::on_treeWidgetItemClicked);
connect(treeWidget, &QTreeWidget::currentItemChanged, this, &FIMtasksWidget::on_treeWidgetCurrentItemChanged);
preparationTreeWidget();
@@ -160,9 +159,9 @@ void FIMtasksWidget::changeEvent(QEvent *event)
}
}
void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
void FIMtasksWidget::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
{
if(item == nullptr)
if(current == nullptr)
{
ui->btnDelete->setEnabled(false);
ui->btnCheck->setEnabled(false);
@@ -170,10 +169,10 @@ void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
return;
}
QTreeWidgetItem *treeItemParent = item->parent();
QTreeWidgetItem *treeItemParent = current->parent();
if(treeItemParent == nullptr)
{//Выбрана задача
int id = item->text(ColumnsTreeFIM::clmnFIM_ID).toInt();
int id = current->text(ColumnsTreeFIM::clmnFIM_ID).toInt();
TaskAmmFim task = taskTreePreparation->getTaskFIMbyID(id);
@@ -201,14 +200,14 @@ void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
}
else
{
setCurrentParentTask(item);
//setCurrentParentTask(current);
/*
/**/
ui->btnAssignTask->setEnabled(false);
ui->btnDelete->setEnabled(false);
ui->btnCheck->setEnabled(false);
*/
}
}
@@ -469,7 +468,9 @@ void FIMtasksWidget::setCurrentTask(int id)
if(item->text(ColumnsTreeFIM::clmnFIM_ID).toInt() == id)
{
treeWidget->setCurrentItem(item);
treeWidget->itemClicked(item, 0);
//treeWidget->itemClicked(item, 0);
//treeWidget->itemChanged(item, 0);
treeWidget->setItemSelected(item, true);
return;
}
}

2
LibInstructorsAndTrainees/tasks/fimtaskswidget.h
View File

@@ -40,7 +40,7 @@ protected:
void changeEvent(QEvent * event) override;
private Q_SLOTS:
void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column);
void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_btnDelete_clicked();
void on_btnCheck_clicked();
void on_btnAssignTask_clicked();