From af243cc4d8fc63aff294e354895273f34934e716 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 18 Sep 2025 11:26:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20CheckerTask?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InstructorsAndTrainees/CMakeLists.txt | 6 ++--- .../tasks/ammtaskswidget.cpp | 4 +-- .../{dialogchecktask.cpp => checkertask.cpp} | 22 ++++++++-------- .../{dialogchecktask.h => checkertask.h} | 10 +++---- .../{dialogchecktask.ui => checkertask.ui} | 4 +-- .../tasks/fimtaskswidget.cpp | 4 +-- .../trainees/viewertrainees.cpp | 26 ++++--------------- 7 files changed, 30 insertions(+), 46 deletions(-) rename InstructorsAndTrainees/tasks/{dialogchecktask.cpp => checkertask.cpp} (89%) rename InstructorsAndTrainees/tasks/{dialogchecktask.h => checkertask.h} (76%) rename InstructorsAndTrainees/tasks/{dialogchecktask.ui => checkertask.ui} (98%) diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index 369707a..2a3d138 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -90,9 +90,9 @@ add_library(InstructorsAndTrainees SHARED tasks/fimtaskswidget.ui tasks/tasktreepreparation.cpp tasks/tasktreepreparation.h - tasks/dialogchecktask.cpp - tasks/dialogchecktask.h - tasks/dialogchecktask.ui + tasks/checkertask.cpp + tasks/checkertask.h + tasks/checkertask.ui widgets/newversionwidget.cpp widgets/newversionwidget.h widgets/newversionwidget.ui diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 28969ff..3b1b9f9 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -6,7 +6,7 @@ #include #include "ammtaskswidget.h" #include "ui_ammtaskswidget.h" -#include "dialogchecktask.h" +#include "checkertask.h" #include "specialmessagebox.h" AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) : @@ -329,7 +329,7 @@ void AMMtasksWidget::on_btnCheck_clicked() if(!task.getID()) return; - DialogCheckTask dlg(connectorToServer, "amm", this); + CheckerTask dlg(connectorToServer, "amm", this); dlg.setTask(&task); diff --git a/InstructorsAndTrainees/tasks/dialogchecktask.cpp b/InstructorsAndTrainees/tasks/checkertask.cpp similarity index 89% rename from InstructorsAndTrainees/tasks/dialogchecktask.cpp rename to InstructorsAndTrainees/tasks/checkertask.cpp index d85da8f..f741006 100644 --- a/InstructorsAndTrainees/tasks/dialogchecktask.cpp +++ b/InstructorsAndTrainees/tasks/checkertask.cpp @@ -1,10 +1,10 @@ -#include "dialogchecktask.h" +#include "checkertask.h" #include "specialmessagebox.h" -#include "ui_dialogchecktask.h" +#include "ui_checkertask.h" -DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) : +CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) : QWidget(parent), - ui(new Ui::DialogCheckTask), + ui(new Ui::CheckerTask), connectorToServer(connectorToServer), fimTasksWidget(nullptr), flChanged(false), @@ -38,7 +38,7 @@ DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QString t } } -DialogCheckTask::~DialogCheckTask() +CheckerTask::~CheckerTask() { if(fimTasksWidget) { @@ -48,7 +48,7 @@ DialogCheckTask::~DialogCheckTask() delete ui; } -void DialogCheckTask::setTask(TaskAmmFim* task) +void CheckerTask::setTask(TaskAmmFim* task) { this->task = *task; id_task = task->getID(); @@ -70,18 +70,18 @@ void DialogCheckTask::setTask(TaskAmmFim* task) } } -TaskAmmFim DialogCheckTask::getTask() +TaskAmmFim CheckerTask::getTask() { return this->task; } -void DialogCheckTask::setModule(Module *module) +void CheckerTask::setModule(Module *module) { this->module = *module; id_task = this->module.getID(); } -void DialogCheckTask::outReport(FIMReport report) +void CheckerTask::outReport(FIMReport report) { QString str; /* @@ -123,7 +123,7 @@ void DialogCheckTask::outReport(FIMReport report) } } -void DialogCheckTask::on_btnWrong_clicked() +void CheckerTask::on_btnWrong_clicked() { TypeQueryToDB typeQuery; QString status; @@ -150,7 +150,7 @@ void DialogCheckTask::on_btnWrong_clicked() } } -void DialogCheckTask::on_btnRight_clicked() +void CheckerTask::on_btnRight_clicked() { TypeQueryToDB typeQuery; QString status; diff --git a/InstructorsAndTrainees/tasks/dialogchecktask.h b/InstructorsAndTrainees/tasks/checkertask.h similarity index 76% rename from InstructorsAndTrainees/tasks/dialogchecktask.h rename to InstructorsAndTrainees/tasks/checkertask.h index e5c8402..2908ca0 100644 --- a/InstructorsAndTrainees/tasks/dialogchecktask.h +++ b/InstructorsAndTrainees/tasks/checkertask.h @@ -6,16 +6,16 @@ #include "fimtaskswidget.h" namespace Ui { -class DialogCheckTask; +class CheckerTask; } -class DialogCheckTask : public QWidget +class CheckerTask : public QWidget { Q_OBJECT public: - explicit DialogCheckTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr); - ~DialogCheckTask(); + explicit CheckerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr); + ~CheckerTask(); public: void setTask(TaskAmmFim* task); @@ -36,7 +36,7 @@ private: Module module; private: - Ui::DialogCheckTask *ui; + Ui::CheckerTask *ui; private: ConnectorToServer* connectorToServer; FIMtasksWidget* fimTasksWidget; diff --git a/InstructorsAndTrainees/tasks/dialogchecktask.ui b/InstructorsAndTrainees/tasks/checkertask.ui similarity index 98% rename from InstructorsAndTrainees/tasks/dialogchecktask.ui rename to InstructorsAndTrainees/tasks/checkertask.ui index 77aaf69..026d626 100644 --- a/InstructorsAndTrainees/tasks/dialogchecktask.ui +++ b/InstructorsAndTrainees/tasks/checkertask.ui @@ -1,7 +1,7 @@ - DialogCheckTask - + CheckerTask + 0 diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index 39cc240..ce16ca6 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -7,7 +7,7 @@ #include "fimtaskswidget.h" #include "ui_fimtaskswidget.h" #include "tasksAmmFim.h" -#include "dialogchecktask.h" +#include "checkertask.h" #include "specialmessagebox.h" FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) : @@ -391,7 +391,7 @@ void FIMtasksWidget::on_btnCheck_clicked() if(!task.getID()) return; - DialogCheckTask* checkTask = new DialogCheckTask(connectorToServer, "fim", this); + CheckerTask* checkTask = new CheckerTask(connectorToServer, "fim", this); checkTask->setTask(&task); diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index 97a6416..2f61e10 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -134,33 +134,17 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column) { int id_trainee = connectorToServer->getIdTraineeByLogin(login); - - /* - PersonalCardTrainee* cardTrainee = new PersonalCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this); - - dlgCardTrainee = new QDialog(this, - Qt::WindowSystemMenuHint - | Qt::WindowMaximizeButtonHint - | Qt::WindowMinimizeButtonHint - | Qt::WindowCloseButtonHint); - - QHBoxLayout *layout = new QHBoxLayout(dlgCardTrainee); - layout->addWidget(cardTrainee); - dlgCardTrainee->setWindowTitle(tr("Personal card trainee")); - dlgCardTrainee->setMinimumSize(1400, 700); - dlgCardTrainee->setWindowState(Qt::WindowMaximized); - dlgCardTrainee->setModal(true); - dlgCardTrainee->exec(); - */ - dlgCardTrainee = new DialogCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this); dlgCardTrainee->exec(); ammTasksWidgetCommon->setParent(this); fimTasksWidgetCommon->setParent(this); - delete dlgCardTrainee; - dlgCardTrainee = nullptr; + if(dlgCardTrainee) + { + delete dlgCardTrainee; + dlgCardTrainee = nullptr; + } } } }