Установка статуса для AMM

InstructorsAndTrainees/tasks/ammtaskswidget.cpp

@@ -6,6 +6,7 @@
 #include <QResizeEvent>
 #include "ammtaskswidget.h"
 #include "ui_ammtaskswidget.h"
+#include "dialogchecktask.h"
 
 AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) :
     QWidget(parent),
@@ -72,7 +73,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
         ui->verticalLayout->setAlignment(Qt::AlignmentFlag::AlignBottom);
     }
 
-    ui->btnCheck->setVisible(false);
+    //ui->btnCheck->setVisible(false);
 }
 
 AMMtasksWidget::~AMMtasksWidget()
@@ -150,10 +151,12 @@ void AMMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
     if(current == nullptr)
     {
         ui->btnDelete->setEnabled(false);
+        ui->btnCheck->setEnabled(false);
         return;
     }
     else
     {
+        ui->btnCheck->setEnabled(true);
         ui->btnDelete->setEnabled(true);
     }
 
@@ -335,7 +338,29 @@ void AMMtasksWidget::on_btnDelete_clicked()
 
 void AMMtasksWidget::on_btnCheck_clicked()
 {
+    QTreeWidgetItem *treeItemCurrent = treeWidget->currentItem();
 
+    if(treeItemCurrent != nullptr)
+    {//Выбрана задача
+
+        int id = treeItemCurrent->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
+
+        DialogCheckTask dlg(connectorToServer, "amm", this);
+
+        //dlg.setTask(task);
+        dlg.setIDTask(id);
+
+        QDialog* dialog = new QDialog(this);
+        QHBoxLayout *layout = new QHBoxLayout(dialog);
+        layout->addWidget(&dlg);
+        dialog->setWindowTitle(tr("Status Task"));
+        dialog->setMinimumSize(200, 100);
+        dialog->setStyleSheet(this->styleSheet());
+        dialog->exec();
+
+        if(dlg.getFlChanged())
+            waitAnimationWidget->showWithPlay();
+    }
 }
 
 void AMMtasksWidget::on_btnAssignTask_clicked()

InstructorsAndTrainees/tasks/ammtaskswidget.ui

@@ -99,7 +99,7 @@
             </size>
            </property>
            <property name="text">
-            <string>Check</string>
+            <string>Status</string>
            </property>
            <property name="icon">
             <iconset resource="../resources.qrc">

InstructorsAndTrainees/tasks/dialogchecktask.cpp

@@ -1,21 +1,37 @@
 #include "dialogchecktask.h"
 #include "ui_dialogchecktask.h"
 
-DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QWidget *parent) :
+DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DialogCheckTask),
     connectorToServer(connectorToServer),
     fimTasksWidget(nullptr),
-    flChanged(false)
+    flChanged(false),
+    id_task(0),
+    type("fim")
 {
     ui->setupUi(this);
 
-    fimTasksWidget = new FIMtasksWidget(nullptr, TypeListTreeAMMFIM::listOneTask, this);
+    this->type = type;
 
-    ui->verticalLayout_3->addWidget(fimTasksWidget);
+    if(type == "fim")
+    {
+        fimTasksWidget = new FIMtasksWidget(nullptr, TypeListTreeAMMFIM::listOneTask, this);
 
-    ui->plainText->setReadOnly(true);
-    ui->plainText->setObjectName("plainText");
+        ui->verticalLayout_3->addWidget(fimTasksWidget);
+
+        ui->plainText->setReadOnly(true);
+        ui->plainText->setObjectName("plainText");
+    }
+    else
+    {
+        ui->plainText->setVisible(false);
+        ui->label->setVisible(false);
+        ui->label_2->setVisible(false);
+        ui->btnRight->setText(tr("Completed"));
+        ui->btnWrong->setText(tr("New"));
+        ui->btnWrong->setIcon(QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
+    }
 }
 
 DialogCheckTask::~DialogCheckTask()
@@ -27,6 +43,7 @@ DialogCheckTask::~DialogCheckTask()
 void DialogCheckTask::setTask(TaskAmmFim* task)
 {
     this->task = *task;
+    id_task = task->getID();
 
     //Задача
     fimTasksWidget->setOneTaskFim(&this->task);
@@ -84,13 +101,26 @@ void DialogCheckTask::outReport(FIMReport report)
 
 void DialogCheckTask::on_btnWrong_clicked()
 {
-    int id = task.getID();
-    QString status = "failed";
+    TypeQueryToDB typeQuery;
+    QString status;
+    QString msgString;
 
-    if(QMessageBox::warning(this, tr("Attention!"), tr("Change task status?\nThe status will be set: 'failed'"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok)
+    if(type == "fim")
     {
-        connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE, id, (void*)&status);
-        //this->close();
+        typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE;
+        status = "failed";
+        msgString = tr("Change task status?\nThe status will be set:\n'failed'");
+    }
+    else
+    {
+        typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_AMM_TO_TRAINEE;
+        status = "new";
+        msgString = tr("Change task status?\nThe status will be set:\n'new'");
+    }
+
+    if(QMessageBox::warning(this, tr("Attention!"), msgString, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok)
+    {
+        connectorToServer->sendQueryToDB(typeQuery, id_task, (void*)&status);
         this->parentWidget()->close();
         flChanged = true;
     }
@@ -98,13 +128,26 @@ void DialogCheckTask::on_btnWrong_clicked()
 
 void DialogCheckTask::on_btnRight_clicked()
 {
-    int id = task.getID();
-    QString status = "completed";
+    TypeQueryToDB typeQuery;
+    QString status;
+    QString msgString;
 
-    if(QMessageBox::warning(this, tr("Attention!"), tr("Change task status?\nThe status will be set: 'completed'"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok)
+    if(type == "fim")
     {
-        connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE, id, (void*)&status);
-        //this->close();
+        typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE;
+        status = "completed";
+        msgString = tr("Change task status?\nThe status will be set:\n'completed'");
+    }
+    else
+    {
+        typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_AMM_TO_TRAINEE;
+        status = "completed";
+        msgString = tr("Change task status?\nThe status will be set:\n'completed'");
+    }
+
+    if(QMessageBox::warning(this, tr("Attention!"), msgString, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok)
+    {
+        connectorToServer->sendQueryToDB(typeQuery, id_task, (void*)&status);
         this->parentWidget()->close();
         flChanged = true;
     }

InstructorsAndTrainees/tasks/dialogchecktask.h

@@ -14,13 +14,14 @@ class DialogCheckTask : public QWidget
     Q_OBJECT
 
 public:
-    explicit DialogCheckTask(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
+    explicit DialogCheckTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr);
     ~DialogCheckTask();
 
 public:
     void setTask(TaskAmmFim* task);
     TaskAmmFim getTask();
     bool getFlChanged(){return flChanged;}
+    void setIDTask(int id){id_task = id;}
 
 private slots:
     void on_btnWrong_clicked();
@@ -39,6 +40,8 @@ private:
     FIMtasksWidget* fimTasksWidget;
 
     bool flChanged;
+    int id_task;
+    QString type;
 };
 
 #endif // DIALOGCHECKTASK_H

InstructorsAndTrainees/tasks/fimtaskswidget.cpp

@@ -361,7 +361,7 @@ void FIMtasksWidget::on_btnCheck_clicked()
 
             TaskAmmFim* task = taskTreePreparation->getTaskFIMbyID(id);
 
-            DialogCheckTask dlg(connectorToServer, this);
+            DialogCheckTask dlg(connectorToServer, "fim", this);
 
             dlg.setTask(task);