From b0abac8352715d486046b7532661e1b033ffef66 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 18 Dec 2025 11:27:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B2=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81?= =?UTF-8?q?=D1=81=D0=B5=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InstructorsAndTrainees.qrc | 1 + .../resources/icons/new.png | Bin 0 -> 23703 bytes .../tasks/ammtaskswidget.cpp | 2 +- .../tasks/checkertask.cpp | 89 ++++++++++++++---- LibInstructorsAndTrainees/tasks/checkertask.h | 6 +- .../tasks/checkertask.ui | 59 +++++++++++- .../tasks/dialogchekertask.cpp | 4 +- .../tasks/fimtaskswidget.cpp | 5 +- .../tasks/tasktreepreparation.cpp | 6 +- 9 files changed, 138 insertions(+), 34 deletions(-) create mode 100644 LibInstructorsAndTrainees/resources/icons/new.png diff --git a/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc b/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc index a81d934..54493e6 100644 --- a/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc +++ b/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc @@ -56,5 +56,6 @@ resources/icons/eye.png resources/icons/exchange.png resources/icons/link.png + resources/icons/new.png diff --git a/LibInstructorsAndTrainees/resources/icons/new.png b/LibInstructorsAndTrainees/resources/icons/new.png new file mode 100644 index 0000000000000000000000000000000000000000..2eb82d629d040a33b3eee26a4a04a7bb4b7b47a3 GIT binary patch literal 23703 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 dlgStatusTask->exec(); diff --git a/LibInstructorsAndTrainees/tasks/checkertask.cpp b/LibInstructorsAndTrainees/tasks/checkertask.cpp index 0ef86b9..ddaec4e 100644 --- a/LibInstructorsAndTrainees/tasks/checkertask.cpp +++ b/LibInstructorsAndTrainees/tasks/checkertask.cpp @@ -14,30 +14,31 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, TypeChecker type, { ui->setupUi(this); + ui->btnNew->setObjectName("btnNew"); + ui->btnCheckup->setObjectName("btnCheckup"); + ui->btnWrong->setObjectName("btnWrong"); + ui->btnCompleted->setObjectName("btnCompleted"); + this->type = type; if(type == TypeChecker::fim_check) { fimTasksWidget = new FIMtasksWidget(nullptr, TypeListTreeAMMFIM::listOneTask, this); - ui->verticalLayout_3->addWidget(fimTasksWidget); + ui->lblName->setVisible(false); ui->lblDMcode->setVisible(false); ui->plainText->setReadOnly(true); ui->plainText->setObjectName("plainText"); } - else if(type == TypeChecker::amm_status) + else if(type == TypeChecker::amm_check) { ui->plainText->setVisible(false); ui->label->setVisible(false); - //ui->label_Task->setVisible(false); - ui->btnRight->setText(tr("Completed")); - ui->btnWrong->setText(tr("New")); - ui->btnWrong->setIcon(QIcon(QStringLiteral(":/resources/icons/circleGray.png"))); - ui->btnRight->setEnabled(false); ui->btnWrong->setEnabled(false); + ui->btnCheckup->setEnabled(false); } } @@ -70,12 +71,14 @@ void CheckerTask::setTask(TaskAmmFim* task) //Репорт outReport(this->task.report); } - else if(type == TypeChecker::amm_status) + else if(type == TypeChecker::amm_check) { + /* if(this->task.status == "new") - ui->btnRight->setEnabled(true); + ui->btnCompleted->setEnabled(true); else ui->btnWrong->setEnabled(true); + */ ui->lblName->setText(task->ammProcedure.title); ui->lblDMcode->setText(task->ammProcedure.dmCode); @@ -100,7 +103,7 @@ void CheckerTask::setTask(TaskAmmFim* task) else { ui->lblStatusCurrText->setText(tr("new")); - ui->lblStatusCurrIco->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png"))); + ui->lblStatusCurrIco->setPixmap(QPixmap(QStringLiteral(":/resources/icons/new.png"))); } } @@ -157,6 +160,7 @@ void CheckerTask::outReport(FIMReport report) } } +//НЕВЕРНО void CheckerTask::on_btnWrong_clicked() { TypeQueryToDB typeQuery; @@ -169,7 +173,57 @@ void CheckerTask::on_btnWrong_clicked() status = "failed"; msgString = tr("Change task status?\nThe status will be set:\n'failed'"); } - else if(type == TypeChecker::amm_status) + + if(SpecMsgBox::WarningYesNo(this, msgString) == QDialog::Accepted) + { + connectorToServer->sendQueryToDB(typeQuery, id_task, (void*)&status); + this->parentWidget()->close(); + flChanged = true; + } +} + +//ВЫПОЛНЕНО +void CheckerTask::on_btnCompleted_clicked() +{ + TypeQueryToDB typeQuery; + QString status; + QString msgString; + + if(type == TypeChecker::fim_check) + { + 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 if(type == TypeChecker::amm_check) + { + 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(SpecMsgBox::WarningYesNo(this, msgString) == QDialog::Accepted) + { + connectorToServer->sendQueryToDB(typeQuery, id_task, (void*)&status); + this->parentWidget()->close(); + flChanged = true; + } +} + +//НОВАЯ +void CheckerTask::on_btnNew_clicked() +{ + TypeQueryToDB typeQuery; + QString status; + QString msgString; + + if(type == TypeChecker::fim_check) + { + typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE; + status = "new"; + msgString = tr("Change task status?\nThe status will be set:\n'new'"); + } + else if(type == TypeChecker::amm_check) { typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_AMM_TO_TRAINEE; status = "new"; @@ -184,7 +238,8 @@ void CheckerTask::on_btnWrong_clicked() } } -void CheckerTask::on_btnRight_clicked() +//НА ПРОВЕРКЕ +void CheckerTask::on_btnCheckup_clicked() { TypeQueryToDB typeQuery; QString status; @@ -193,14 +248,8 @@ void CheckerTask::on_btnRight_clicked() if(type == TypeChecker::fim_check) { 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 if(type == TypeChecker::amm_status) - { - 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'"); + status = "checkup"; + msgString = tr("Change task status?\nThe status will be set:\n'checkup'"); } if(SpecMsgBox::WarningYesNo(this, msgString) == QDialog::Accepted) diff --git a/LibInstructorsAndTrainees/tasks/checkertask.h b/LibInstructorsAndTrainees/tasks/checkertask.h index 07be77f..79eccf1 100644 --- a/LibInstructorsAndTrainees/tasks/checkertask.h +++ b/LibInstructorsAndTrainees/tasks/checkertask.h @@ -21,9 +21,7 @@ class CheckerTask : public QWidget public: enum TypeChecker { - amm_status, amm_check, - fim_status, fim_check }; @@ -42,7 +40,9 @@ public: private slots: void on_btnWrong_clicked(); - void on_btnRight_clicked(); + void on_btnCompleted_clicked(); + void on_btnNew_clicked(); + void on_btnCheckup_clicked(); private: void outReport(FIMReport report); diff --git a/LibInstructorsAndTrainees/tasks/checkertask.ui b/LibInstructorsAndTrainees/tasks/checkertask.ui index 5d3ce90..c54b38d 100644 --- a/LibInstructorsAndTrainees/tasks/checkertask.ui +++ b/LibInstructorsAndTrainees/tasks/checkertask.ui @@ -53,6 +53,9 @@ :/resources/icons/rectGray.png + + true + @@ -159,6 +162,58 @@ + + + + + 50 + 50 + + + + New + + + + :/resources/icons/new.png:/resources/icons/new.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 50 + 50 + + + + Checkup + + + + :/resources/icons/circleYellow.png:/resources/icons/circleYellow.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + @@ -186,7 +241,7 @@ - + 50 @@ -194,7 +249,7 @@ - Right + Completed diff --git a/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp b/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp index 523e419..63c1a3a 100644 --- a/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp +++ b/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp @@ -17,13 +17,11 @@ DialogChekerTask::DialogChekerTask(ConnectorToServer* connectorToServer, Checker switch (type) { case CheckerTask::TypeChecker::fim_check: - case CheckerTask::TypeChecker::amm_check: this->setWindowTitle(tr("Check Task")); this->setMinimumSize(1400, 700); this->setWindowState(Qt::WindowMaximized); break; - case CheckerTask::TypeChecker::fim_status: - case CheckerTask::TypeChecker::amm_status: + case CheckerTask::TypeChecker::amm_check: this->setWindowTitle(tr("Status Task")); this->setMinimumSize(400, 200); break; diff --git a/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp index 198ed34..2a4b3ba 100644 --- a/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -191,10 +191,11 @@ void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column) ui->btnDelete->setEnabled(true); - if(task.status != "new") + ui->btnCheck->setEnabled(true); + /*if(task.status != "new") ui->btnCheck->setEnabled(true); else - ui->btnCheck->setEnabled(false); + ui->btnCheck->setEnabled(false);*/ } else { diff --git a/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp b/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp index 94edffe..06dc0cc 100644 --- a/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp +++ b/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp @@ -525,7 +525,7 @@ void TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee(QListsetText(ColumnsTreeAMM::clmnAMM_status, tr("new")); - item->setIcon(ColumnsTreeAMM::clmnAMM_status, QIcon(QStringLiteral(":/resources/icons/circleGray.png"))); + item->setIcon(ColumnsTreeAMM::clmnAMM_status, QIcon(QStringLiteral(":/resources/icons/new.png"))); } item->setToolTip(0, text); @@ -598,7 +598,7 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItems(QByteArray array) else { itemTask->setText(ColumnsTreeFIM::clmnFIM_status, tr("new")); - itemTask->setIcon(ColumnsTreeFIM::clmnFIM_status, QIcon(QStringLiteral(":/resources/icons/circleGray.png"))); + itemTask->setIcon(ColumnsTreeFIM::clmnFIM_status, QIcon(QStringLiteral(":/resources/icons/new.png"))); } @@ -691,7 +691,7 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItemsForTrainee(QListsetText(ColumnsTreeFIM::clmnFIM_status, tr("new")); - itemTask->setIcon(ColumnsTreeFIM::clmnFIM_status, QIcon(QStringLiteral(":/resources/icons/circleGray.png"))); + itemTask->setIcon(ColumnsTreeFIM::clmnFIM_status, QIcon(QStringLiteral(":/resources/icons/new.png"))); }