Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

bugFixing 5

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-16 15:52:24 +03:00
parent cba4008a06
commit cf92ae0483
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InstructorsAndTrainees/instructors/viewerinstructors.cpp
View File

@@ -52,7 +52,6 @@ void ViewerInstructors::changeEvent(QEvent *event)
ui->retranslateUi(this); ui->retranslateUi(this);
reSetHeadTreeWidget(); reSetHeadTreeWidget();
//loadInstructorsFromDB();
slot_NeedUpdateUI(true, false); slot_NeedUpdateUI(true, false);
} }
} }

3
InstructorsAndTrainees/trainees/personalcardtrainee.cpp
View File

@@ -52,6 +52,9 @@ PersonalCardTrainee::~PersonalCardTrainee()
messangerController->deleteWidget(messangerWidget); messangerController->deleteWidget(messangerWidget);
//ui->verticalLayout_AMMcommon->removeWidget(ammTasksWidget_common);
//ui->verticalLayout_FIMcommon->removeWidget(fimTasksWidget_common);
delete ui; delete ui;
} }

25
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -9,6 +9,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo
fimTasksWidgetCommon(nullptr), fimTasksWidgetCommon(nullptr),
messangerController(messangerController), messangerController(messangerController),
dlgEditor(nullptr), dlgEditor(nullptr),
dlgCardTrainee(nullptr),
ui(new Ui::ViewerTrainees) ui(new Ui::ViewerTrainees)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -40,6 +41,9 @@ ViewerTrainees::~ViewerTrainees()
if(dlgEditor) if(dlgEditor)
dlgEditor->close(); dlgEditor->close();
if(dlgCardTrainee)
dlgCardTrainee->close();
delete ui; delete ui;
} }
@@ -54,6 +58,9 @@ void ViewerTrainees::deactivate()
if(dlgEditor) if(dlgEditor)
dlgEditor->close(); dlgEditor->close();
if(dlgCardTrainee)
dlgCardTrainee->close();
CommonView::deactivate(); CommonView::deactivate();
ammTasksWidgetCommon->deactivate(); ammTasksWidgetCommon->deactivate();
@@ -69,7 +76,6 @@ void ViewerTrainees::changeEvent(QEvent *event)
ui->retranslateUi(this); ui->retranslateUi(this);
reSetHeadTreeWidget(); reSetHeadTreeWidget();
//loadTraineesFromDB();
slot_NeedUpdateUI(false, true); slot_NeedUpdateUI(false, true);
} }
} }
@@ -111,22 +117,25 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
int id_trainee = connectorToServer->getIdTraineeByLogin(login); 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::WindowSystemMenuHint
| Qt::WindowMaximizeButtonHint | Qt::WindowMaximizeButtonHint
| Qt::WindowMinimizeButtonHint | Qt::WindowMinimizeButtonHint
| Qt::WindowCloseButtonHint); | Qt::WindowCloseButtonHint);
QHBoxLayout *layout = new QHBoxLayout(dialog); QHBoxLayout *layout = new QHBoxLayout(dlgCardTrainee);
layout->addWidget(&cardTrainee); layout->addWidget(cardTrainee);
dialog->setWindowTitle(tr("Personal card trainee")); dlgCardTrainee->setWindowTitle(tr("Personal card trainee"));
dialog->setMinimumSize(1900, 1000); dlgCardTrainee->setMinimumSize(1900, 1000);
dialog->exec(); dlgCardTrainee->exec();
ammTasksWidgetCommon->setParent(this); ammTasksWidgetCommon->setParent(this);
fimTasksWidgetCommon->setParent(this); fimTasksWidgetCommon->setParent(this);
delete dlgCardTrainee;
dlgCardTrainee = nullptr;
} }
} }
} }

1
InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -53,6 +53,7 @@ private:
MessangerController* messangerController; MessangerController* messangerController;
QDialog* dlgEditor; QDialog* dlgEditor;
QDialog* dlgCardTrainee;
private: private:
Ui::ViewerTrainees *ui; Ui::ViewerTrainees *ui;