From 9f4120c2d178f9be50c85bd5476077980c7acf82 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 18 Sep 2025 11:03:58 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D1=8B=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BA=D1=80=D1=84=D1=82=D0=B8=D1=8F=20=D0=B2=D0=BB=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BE=D0=BA=D0=BE=D0=BD=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=9F.=D0=A1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InstructorsAndTrainees/CMakeLists.txt | 3 ++ .../trainees/dialogcardtrainee.cpp | 36 +++++++++++++++++++ .../trainees/dialogcardtrainee.h | 23 ++++++++++++ .../trainees/viewertrainees.cpp | 6 ++++ .../trainees/viewertrainees.h | 3 +- 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 InstructorsAndTrainees/trainees/dialogcardtrainee.cpp create mode 100644 InstructorsAndTrainees/trainees/dialogcardtrainee.h diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index 9ce5454..369707a 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -107,6 +107,9 @@ add_library(InstructorsAndTrainees SHARED specialmessagebox.h specialmessagebox.ui + trainees/dialogcardtrainee.cpp + trainees/dialogcardtrainee.h + resources.qrc ) diff --git a/InstructorsAndTrainees/trainees/dialogcardtrainee.cpp b/InstructorsAndTrainees/trainees/dialogcardtrainee.cpp new file mode 100644 index 0000000..14b382b --- /dev/null +++ b/InstructorsAndTrainees/trainees/dialogcardtrainee.cpp @@ -0,0 +1,36 @@ +#include "dialogcardtrainee.h" + +DialogCardTrainee::DialogCardTrainee(ConnectorToServer* connectorToServer, MessangerController* messangerController, + int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, + QWidget *parent) : + QDialog(parent, + Qt::WindowSystemMenuHint + | Qt::WindowMaximizeButtonHint + | Qt::WindowMinimizeButtonHint + | Qt::WindowCloseButtonHint), + cardTrainee(nullptr) +{ + cardTrainee = new PersonalCardTrainee(connectorToServer, messangerController, + id_trainee, ammTasksWidget_common, fimTasksWidget_common, this); + + QHBoxLayout *layout = new QHBoxLayout(this); + layout->addWidget(cardTrainee); + this->setWindowTitle(tr("Personal card trainee")); + this->setMinimumSize(1400, 700); + this->setWindowState(Qt::WindowMaximized); + /*this->setWindowFlags(Qt::WindowSystemMenuHint + | Qt::WindowMaximizeButtonHint + | Qt::WindowMinimizeButtonHint + | Qt::WindowCloseButtonHint);*/ + this->setModal(true); +} + +DialogCardTrainee::~DialogCardTrainee() +{ + delete cardTrainee; +} + +void DialogCardTrainee::closeEvent(QCloseEvent *event) +{ + cardTrainee->close(); +} diff --git a/InstructorsAndTrainees/trainees/dialogcardtrainee.h b/InstructorsAndTrainees/trainees/dialogcardtrainee.h new file mode 100644 index 0000000..f87e092 --- /dev/null +++ b/InstructorsAndTrainees/trainees/dialogcardtrainee.h @@ -0,0 +1,23 @@ +#ifndef DIALOGCARDTRAINEE_H +#define DIALOGCARDTRAINEE_H + +#include +#include +#include "personalcardtrainee.h" + +class DialogCardTrainee : public QDialog +{ + Q_OBJECT +public: + DialogCardTrainee(ConnectorToServer* connectorToServer, MessangerController* messangerController, + int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, + QWidget *parent = nullptr); + ~DialogCardTrainee(); + + void closeEvent(QCloseEvent *event) override; + +private: + PersonalCardTrainee* cardTrainee; +}; + +#endif // DIALOGCARDTRAINEE_H diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index b0be36e..97a6416 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -1,6 +1,7 @@ #include "editortrainees.h" #include "viewertrainees.h" #include "personalcardtrainee.h" +#include "dialogcardtrainee.h" #include "ui_viewertrainees.h" ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerController* messangerController, QWidget *parent) : @@ -134,6 +135,7 @@ 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, @@ -149,6 +151,10 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column) 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); diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h index 666eebb..aa43fcc 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.h +++ b/InstructorsAndTrainees/trainees/viewertrainees.h @@ -5,6 +5,7 @@ #include "ammtaskswidget.h" #include "fimtaskswidget.h" #include "messangercontroller.h" +#include "dialogcardtrainee.h" namespace Ui { class ViewerTrainees; @@ -53,7 +54,7 @@ private: MessangerController* messangerController; QDialog* dlgEditor; - QDialog* dlgCardTrainee; + DialogCardTrainee* dlgCardTrainee; private: Ui::ViewerTrainees *ui;