diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/InstructorsAndTrainees/instructors/viewerinstructors.cpp index 2b1c818..92e6ddf 100644 --- a/InstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/InstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -52,7 +52,6 @@ void ViewerInstructors::changeEvent(QEvent *event) ui->retranslateUi(this); reSetHeadTreeWidget(); - //loadInstructorsFromDB(); slot_NeedUpdateUI(true, false); } } diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp index bc1c7d6..39a381f 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp @@ -52,6 +52,9 @@ PersonalCardTrainee::~PersonalCardTrainee() messangerController->deleteWidget(messangerWidget); + //ui->verticalLayout_AMMcommon->removeWidget(ammTasksWidget_common); + //ui->verticalLayout_FIMcommon->removeWidget(fimTasksWidget_common); + delete ui; } diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index bdb9a0e..1af4007 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -9,6 +9,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo fimTasksWidgetCommon(nullptr), messangerController(messangerController), dlgEditor(nullptr), + dlgCardTrainee(nullptr), ui(new Ui::ViewerTrainees) { ui->setupUi(this); @@ -40,6 +41,9 @@ ViewerTrainees::~ViewerTrainees() if(dlgEditor) dlgEditor->close(); + if(dlgCardTrainee) + dlgCardTrainee->close(); + delete ui; } @@ -54,6 +58,9 @@ void ViewerTrainees::deactivate() if(dlgEditor) dlgEditor->close(); + if(dlgCardTrainee) + dlgCardTrainee->close(); + CommonView::deactivate(); ammTasksWidgetCommon->deactivate(); @@ -69,7 +76,6 @@ void ViewerTrainees::changeEvent(QEvent *event) ui->retranslateUi(this); reSetHeadTreeWidget(); - //loadTraineesFromDB(); slot_NeedUpdateUI(false, true); } } @@ -111,22 +117,25 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column) int id_trainee = connectorToServer->getIdTraineeByLogin(login); - PersonalCardTrainee cardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this); + PersonalCardTrainee* cardTrainee = new PersonalCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this); - QDialog* dialog = new QDialog(this, + dlgCardTrainee = new QDialog(this, Qt::WindowSystemMenuHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint); - QHBoxLayout *layout = new QHBoxLayout(dialog); - layout->addWidget(&cardTrainee); - dialog->setWindowTitle(tr("Personal card trainee")); - dialog->setMinimumSize(1900, 1000); - dialog->exec(); + QHBoxLayout *layout = new QHBoxLayout(dlgCardTrainee); + layout->addWidget(cardTrainee); + dlgCardTrainee->setWindowTitle(tr("Personal card trainee")); + dlgCardTrainee->setMinimumSize(1900, 1000); + dlgCardTrainee->exec(); ammTasksWidgetCommon->setParent(this); fimTasksWidgetCommon->setParent(this); + + delete dlgCardTrainee; + dlgCardTrainee = nullptr; } } } diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h index 0a06bb4..666eebb 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.h +++ b/InstructorsAndTrainees/trainees/viewertrainees.h @@ -53,6 +53,7 @@ private: MessangerController* messangerController; QDialog* dlgEditor; + QDialog* dlgCardTrainee; private: Ui::ViewerTrainees *ui;