Сделал общую кнопку AssignTask

This commit is contained in:
krivoshein
2025-01-29 14:43:17 +03:00
parent ed75de6e04
commit c7021968d9
9 changed files with 162 additions and 27 deletions

View File

@@ -18,7 +18,8 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
threadPreparation(nullptr),
threadAnimation(nullptr),
taskTreePreparation(nullptr),
waitAnimationWidget(nullptr)
waitAnimationWidget(nullptr),
accessAssignTask(false)
{
ui->setupUi(this);
@@ -32,6 +33,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
preparationTreeWidget();
ui->btnAssignTaskToTrainee->setEnabled(false);
Q_EMIT signal_currentItemChanged();
ui->btnUpdateTasks->setVisible(false);
if(type == TypeList::listForTrainee)
@@ -118,6 +120,7 @@ void AMMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
type = "PM";
code = PMmodul->pmCode();
ui->btnAssignTaskToTrainee->setEnabled(false);
accessAssignTask = false;
}
else
{
@@ -125,13 +128,18 @@ void AMMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
type = "DM";
code = DMmodul->dmCode();
ui->btnAssignTaskToTrainee->setEnabled(true);
accessAssignTask = true;
}
ui->label->setText(type + " Code");
ui->editCode->setText(code);
}
else
{
ui->btnAssignTaskToTrainee->setEnabled(false);
accessAssignTask = false;
}
Q_EMIT signal_currentItemChanged();
}
void AMMtasksWidget::slot_NeedUpdateUI()
@@ -232,6 +240,11 @@ void AMMtasksWidget::on_btnUpdateTasks_clicked()
}
void AMMtasksWidget::on_btnAssignTaskToTrainee_clicked()
{
slot_AssignTaskAMMtoTrainee();
}
void AMMtasksWidget::slot_AssignTaskAMMtoTrainee()
{
QTreeWidgetItem *current = treeWidget->currentItem();

View File

@@ -35,6 +35,7 @@ public:
loginTraineeSelected = "";
idTraineeSelected = 0;
}
bool getAccessAssignTask(){return accessAssignTask;}
public:
void resizeEvent(QResizeEvent *event) override;
@@ -43,6 +44,8 @@ private Q_SLOTS:
void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_btnUpdateTasks_clicked();
void on_btnAssignTaskToTrainee_clicked();
public Q_SLOTS:
void slot_AssignTaskAMMtoTrainee();
public Q_SLOTS:
//Слот обработки сигнала необходимости обновления интерфейса
@@ -52,6 +55,9 @@ public Q_SLOTS:
void slot_UpdateTasksAMMforTrainee(int trainee_id);
Q_SIGNALS:
void signal_currentItemChanged();
private:
Module* searchModuleByID(int id);
void preparationTreeWidget();
@@ -79,6 +85,7 @@ private:
QThread* threadAnimation;
TaskTreePreparation* taskTreePreparation;
WaitAnimationWidget *waitAnimationWidget;
bool accessAssignTask;
};
#endif // AMMTASKSWIDGET_H

View File

@@ -18,7 +18,8 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
loginTraineeSelected(""),
idTraineeSelected(0),
threadAnimation(nullptr),
waitAnimationWidget(nullptr)
waitAnimationWidget(nullptr),
accessAssignTask(false)
{
ui->setupUi(this);
@@ -32,6 +33,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
preparationTreeWidget();
ui->btnAssignTaskToTrainee->setEnabled(false);
Q_EMIT signal_currentItemChanged();
ui->btnUpdateTasks->setVisible(false);
if(type == TypeList::listForTrainee)
@@ -102,11 +104,17 @@ void FIMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
code = task->title;
ui->btnAssignTaskToTrainee->setEnabled(true);
accessAssignTask = true;
}
else
{
ui->btnAssignTaskToTrainee->setEnabled(false);
accessAssignTask = false;
}
ui->editCode->setText(code);
Q_EMIT signal_currentItemChanged();
}
void FIMtasksWidget::loadFIMtasksFromXML(QByteArray array)
@@ -362,6 +370,11 @@ void FIMtasksWidget::on_btnUpdateTasks_clicked()
}
void FIMtasksWidget::on_btnAssignTaskToTrainee_clicked()
{
slot_AssignTaskFIMtoTrainee();
}
void FIMtasksWidget::slot_AssignTaskFIMtoTrainee()
{
QTreeWidgetItem *current = treeWidget->currentItem();

View File

@@ -39,6 +39,7 @@ public:
loginTraineeSelected = "";
idTraineeSelected = 0;
}
bool getAccessAssignTask(){return accessAssignTask;}
public:
void resizeEvent(QResizeEvent *event) override;
@@ -46,8 +47,9 @@ public:
private Q_SLOTS:
void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_btnUpdateTasks_clicked();
void on_btnAssignTaskToTrainee_clicked();
public Q_SLOTS:
void slot_AssignTaskFIMtoTrainee();
public Q_SLOTS:
//Слот обработки сигнала необходимости обновления интерфейса
@@ -57,6 +59,10 @@ public Q_SLOTS:
void slot_UpdateTasksFIMforTrainee(int trainee_id);
Q_SIGNALS:
void signal_currentItemChanged();
private:
TaskAmmFim* getTaskByID(int id);
void loadFIMtasksFromXML(QByteArray array);
@@ -86,6 +92,8 @@ private:
QThread* threadAnimation;
WaitAnimationWidget *waitAnimationWidget;
bool accessAssignTask;
};
#endif // FIMTASKSWIDGET_H