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 4

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

30
InstructorsAndTrainees/instructors/viewerinstructors.cpp
View File

@@ -5,6 +5,7 @@
ViewerInstructors::ViewerInstructors(ConnectorToServer* connectorToServer, QWidget *parent) : ViewerInstructors::ViewerInstructors(ConnectorToServer* connectorToServer, QWidget *parent) :
InstructorsView(connectorToServer, CommonView::TypeView::onlyView, parent), InstructorsView(connectorToServer, CommonView::TypeView::onlyView, parent),
dlgEditor(nullptr),
ui(new Ui::ViewerInstructors) ui(new Ui::ViewerInstructors)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -23,6 +24,8 @@ ViewerInstructors::ViewerInstructors(ConnectorToServer* connectorToServer, QWidg
ViewerInstructors::~ViewerInstructors() ViewerInstructors::~ViewerInstructors()
{ {
if(dlgEditor)
dlgEditor->close();
delete ui; delete ui;
} }
@@ -34,6 +37,9 @@ void ViewerInstructors::setAuthComplited(bool authComplited)
void ViewerInstructors::deactivate() void ViewerInstructors::deactivate()
{ {
if(dlgEditor)
dlgEditor->close();
CommonView::deactivate(); CommonView::deactivate();
updateButtons(); updateButtons();
} }
@@ -55,18 +61,22 @@ void ViewerInstructors::on_btnEditorInstructors_clicked()
{ {
Q_EMIT signal_BlockAutorization(true); Q_EMIT signal_BlockAutorization(true);
EditorInstructors editorInstructors(connectorToServer, adminMode); EditorInstructors* editorInstructors = new EditorInstructors(connectorToServer, adminMode);
connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, &editorInstructors, &EditorInstructors::slot_NeedUpdateUI); connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, editorInstructors, &EditorInstructors::slot_NeedUpdateUI);
QDialog* dialog = new QDialog(this); dlgEditor = new QDialog(this);
QHBoxLayout *layout = new QHBoxLayout(dialog); QHBoxLayout *layout = new QHBoxLayout(dlgEditor);
layout->addWidget(&editorInstructors); layout->addWidget(editorInstructors);
dialog->setWindowTitle(tr("Editor of instructors")); dlgEditor->setWindowTitle(tr("Editor of instructors"));
dialog->setMinimumSize(1600, 800); dlgEditor->setMinimumSize(1600, 800);
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); dlgEditor->setWindowFlags(dlgEditor->windowFlags() & ~Qt::WindowContextHelpButtonHint);
dialog->exec(); dlgEditor->exec();
loadInstructorsFromDB(); delete dlgEditor;
dlgEditor = nullptr;
if(authComplited)
loadInstructorsFromDB();
Q_EMIT signal_BlockAutorization(false); Q_EMIT signal_BlockAutorization(false);
} }

3
InstructorsAndTrainees/instructors/viewerinstructors.h
View File

@@ -42,6 +42,9 @@ Q_SIGNALS:
private: private:
void updateButtons() override; void updateButtons() override;
private:
QDialog* dlgEditor;
private: private:
Ui::ViewerInstructors *ui; Ui::ViewerInstructors *ui;
}; };

31
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -8,6 +8,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo
ammTasksWidgetCommon(nullptr), ammTasksWidgetCommon(nullptr),
fimTasksWidgetCommon(nullptr), fimTasksWidgetCommon(nullptr),
messangerController(messangerController), messangerController(messangerController),
dlgEditor(nullptr),
ui(new Ui::ViewerTrainees) ui(new Ui::ViewerTrainees)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -36,6 +37,9 @@ ViewerTrainees::~ViewerTrainees()
delete ammTasksWidgetCommon; delete ammTasksWidgetCommon;
delete fimTasksWidgetCommon; delete fimTasksWidgetCommon;
if(dlgEditor)
dlgEditor->close();
delete ui; delete ui;
} }
@@ -47,6 +51,9 @@ void ViewerTrainees::setAuthComplited(bool authComplited)
void ViewerTrainees::deactivate() void ViewerTrainees::deactivate()
{ {
if(dlgEditor)
dlgEditor->close();
CommonView::deactivate(); CommonView::deactivate();
ammTasksWidgetCommon->deactivate(); ammTasksWidgetCommon->deactivate();
@@ -71,18 +78,22 @@ void ViewerTrainees::on_btnEditorTrainees_clicked()
{ {
Q_EMIT signal_BlockAutorization(true); Q_EMIT signal_BlockAutorization(true);
EditorTrainees editorTraineesGroups(connectorToServer, adminMode); EditorTrainees* editorTraineesGroups = new EditorTrainees(connectorToServer, adminMode);
connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, &editorTraineesGroups, &EditorTrainees::slot_NeedUpdateUI); connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, editorTraineesGroups, &EditorTrainees::slot_NeedUpdateUI);
QDialog* dialog = new QDialog(this); dlgEditor = new QDialog(this);
QHBoxLayout *layout = new QHBoxLayout(dialog); QHBoxLayout *layout = new QHBoxLayout(dlgEditor);
layout->addWidget(&editorTraineesGroups); layout->addWidget(editorTraineesGroups);
dialog->setWindowTitle(tr("Editor of trainees")); dlgEditor->setWindowTitle(tr("Editor of trainees"));
dialog->setMinimumSize(1600, 800); dlgEditor->setMinimumSize(1600, 800);
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); dlgEditor->setWindowFlags(dlgEditor->windowFlags() & ~Qt::WindowContextHelpButtonHint);
dialog->exec(); dlgEditor->exec();
loadTraineesFromDB(); delete dlgEditor;
dlgEditor = nullptr;
if(authComplited)
loadTraineesFromDB();
Q_EMIT signal_BlockAutorization(false); Q_EMIT signal_BlockAutorization(false);
} }

2
InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -52,6 +52,8 @@ private:
MessangerController* messangerController; MessangerController* messangerController;
QDialog* dlgEditor;
private: private:
Ui::ViewerTrainees *ui; Ui::ViewerTrainees *ui;
}; };