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

Перекомпоновал ГУИ

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-02 12:24:31 +03:00
parent eaf5668528
commit 0da66544f0
7 changed files with 84 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
GUIdataBaseLMS/mainwindow.cpp
View File

@@ -18,9 +18,9 @@ MainWindow::MainWindow(QWidget *parent)
ui->horizontalLayout->addWidget(m_instructorsAndTraineesWidget); ui->horizontalLayout->addWidget(m_instructorsAndTraineesWidget);
//this->move(0, 0); this->move(100, 100);
//this->showNormal(); this->showNormal();
this->showMaximized(); //this->showMaximized();
if(m_instructorsAndTraineesWidget->getLanguage() == "ENG") if(m_instructorsAndTraineesWidget->getLanguage() == "ENG")
{ {

47
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -12,8 +12,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
viewerTrainees(nullptr), viewerTrainees(nullptr),
viewerInstructors(nullptr), viewerInstructors(nullptr),
messangerWidget(nullptr), messangerWidget(nullptr),
ammTasksWidget(nullptr), //ammTasksWidget(nullptr),
fimTasksWidget(nullptr), //fimTasksWidget(nullptr),
adminMode(false), adminMode(false),
loginInstructorLoggedInLocal(QStringLiteral("")), loginInstructorLoggedInLocal(QStringLiteral("")),
nameInstructorLoggedInLocal(QStringLiteral("")), nameInstructorLoggedInLocal(QStringLiteral("")),
@@ -22,7 +22,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
ui->btnSettings->setObjectName("btnSettings"); ui->btnSettings->setObjectName("btnSettings");
ui->tabWidget_Tasks->setObjectName("tabWidgetTasks"); //ui->tabWidget_Tasks->setObjectName("tabWidgetTasks");
ui->widget_Top->setObjectName("widgetTop"); ui->widget_Top->setObjectName("widgetTop");
ui->groupBox_Trainees->setObjectName("groupBox_Trainees"); ui->groupBox_Trainees->setObjectName("groupBox_Trainees");
@@ -64,6 +64,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer); connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer);
/*
ammTasksWidget = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this); ammTasksWidget = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
fimTasksWidget = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this); fimTasksWidget = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
@@ -71,6 +72,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI); connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);
connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected); connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected); connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
*/
messangerWidget = new MessangerWidget(this); messangerWidget = new MessangerWidget(this);
//connect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger); //connect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger);
@@ -79,33 +81,38 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(messangerWidget, &MessangerWidget::signal_sendMessage, connectorToServer, &ConnectorToServer::slot_sendMessage); connect(messangerWidget, &MessangerWidget::signal_sendMessage, connectorToServer, &ConnectorToServer::slot_sendMessage);
connect(connectorToServer,&ConnectorToServer::signal_receiveMessage,messangerWidget,&MessangerWidget::slot_showMessage); connect(connectorToServer,&ConnectorToServer::signal_receiveMessage,messangerWidget,&MessangerWidget::slot_showMessage);
connect(fimTasksWidget, &FIMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM); //connect(fimTasksWidget, &FIMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
connect(ammTasksWidget, &AMMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM); //connect(ammTasksWidget, &AMMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//Размещение //Размещение
ui->verticalLayout_Trainees->addWidget(viewerTrainees); ui->verticalLayout_Trainees->addWidget(viewerTrainees);
ui->verticalLayout_AMM->addWidget(ammTasksWidget); //ui->verticalLayout_AMM->addWidget(ammTasksWidget);
ui->verticalLayout_FIM->addWidget(fimTasksWidget); //ui->verticalLayout_FIM->addWidget(fimTasksWidget);
ui->verticalLayout_Messenger->addWidget(messangerWidget); ui->verticalLayout_Messenger->addWidget(messangerWidget);
ui->verticalLayout_Instructors->addWidget(viewerInstructors); ui->verticalLayout_Instructors->addWidget(viewerInstructors);
ui->groupBox_Messenger->setMaximumWidth(500); ui->groupBox_Messenger->setMaximumWidth(600);
ui->groupBox_Instructors->setMaximumWidth(500); //ui->groupBox_Instructors->setMaximumWidth(500);
ui->groupBox_Messenger->setMinimumWidth(600);
ui->groupBox_Messenger->setMinimumWidth(490);
ui->groupBox_Instructors->setMinimumWidth(490);
ui->groupBox_Messenger->setMinimumHeight(500); ui->groupBox_Messenger->setMinimumHeight(500);
ui->groupBox_Instructors->setMinimumHeight(300);
ui->groupBox_Instructors->setMaximumHeight(300); ui->groupBox_Instructors->setMinimumHeight(400);
ui->groupBox_Instructors->setMaximumHeight(400);
ui->groupBox_Trainees->setMinimumHeight(500);
//ui->groupBox_Trainees->setMaximumHeight(500);
ui->groupBox_Trainees->setMinimumWidth(700); ui->groupBox_Trainees->setMinimumWidth(700);
ui->groupBox_Tasks->setMinimumWidth(600); ui->groupBox_Instructors->setMinimumWidth(700);
//ui->groupBox_Tasks->setMinimumWidth(600);
ui->btnAuthorizationInstructor->setEnabled(false); ui->btnAuthorizationInstructor->setEnabled(false);
@@ -121,8 +128,8 @@ InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()
if(authorizationIsCompleted()) if(authorizationIsCompleted())
deAuthorizationInstructor(loginInstructorLoggedInLocal); deAuthorizationInstructor(loginInstructorLoggedInLocal);
delete ammTasksWidget; //delete ammTasksWidget;
delete fimTasksWidget; //delete fimTasksWidget;
delete messangerWidget; delete messangerWidget;
delete viewerInstructors; delete viewerInstructors;
delete viewerTrainees; delete viewerTrainees;
@@ -293,8 +300,8 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
viewerTrainees->deactivate(); viewerTrainees->deactivate();
viewerInstructors->deactivate(); viewerInstructors->deactivate();
ammTasksWidget->deactivate(); //ammTasksWidget->deactivate();
fimTasksWidget->deactivate(); //fimTasksWidget->deactivate();
messangerWidget->clear(); messangerWidget->clear();
@@ -384,8 +391,8 @@ void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
viewerTrainees->deactivate(); viewerTrainees->deactivate();
viewerInstructors->deactivate(); viewerInstructors->deactivate();
ammTasksWidget->deactivate(); //ammTasksWidget->deactivate();
fimTasksWidget->deactivate(); //fimTasksWidget->deactivate();
messangerWidget->clear(); messangerWidget->clear();
} }

4
InstructorsAndTrainees/instructorsandtraineeswidget.h
View File

@@ -95,8 +95,8 @@ private:
ViewerTrainees* viewerTrainees; ViewerTrainees* viewerTrainees;
ViewerInstructors* viewerInstructors; ViewerInstructors* viewerInstructors;
MessangerWidget* messangerWidget; MessangerWidget* messangerWidget;
AMMtasksWidget* ammTasksWidget; //AMMtasksWidget* ammTasksWidget;
FIMtasksWidget* fimTasksWidget; //FIMtasksWidget* fimTasksWidget;
bool adminMode; bool adminMode;
QString loginInstructorLoggedInLocal; QString loginInstructorLoggedInLocal;

130
InstructorsAndTrainees/instructorsandtraineeswidget.ui
View File

@@ -309,85 +309,49 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_L"> <layout class="QHBoxLayout" name="horizontalLayout_L">
<item> <item>
<widget class="QGroupBox" name="groupBox_Trainees"> <layout class="QVBoxLayout" name="verticalLayout_TI">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <widget class="QGroupBox" name="groupBox_Trainees">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="title"> </sizepolicy>
<string>Trainees</string> </property>
</property> <property name="title">
<layout class="QGridLayout" name="gridLayout_2"> <string>Trainees</string>
<item row="0" column="0"> </property>
<layout class="QVBoxLayout" name="verticalLayout_Trainees"/> <layout class="QGridLayout" name="gridLayout_2">
</item> <item row="0" column="0">
</layout> <layout class="QVBoxLayout" name="verticalLayout_Trainees"/>
</widget> </item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_Instructors">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Instructors</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_Instructors"/>
</item>
</layout>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_Tasks">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Tasks</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_Tasks">
<item>
<widget class="QTabWidget" name="tabWidget_Tasks">
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="tab_AMM">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<attribute name="title">
<string>AMM</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_AMM"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_FIM">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<attribute name="title">
<string>FIM</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_FIM"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_R"> <layout class="QVBoxLayout" name="verticalLayout_R">
<item> <item>
@@ -408,24 +372,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_Instructors">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Instructors</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_Instructors"/>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

18
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -5,8 +5,8 @@
ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent) : ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent) :
TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent), TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent),
ammTasksWidget_pers0(nullptr), //ammTasksWidget_pers0(nullptr),
fimTasksWidget_pers0(nullptr), //fimTasksWidget_pers0(nullptr),
ammTasksWidgetCommon(nullptr), ammTasksWidgetCommon(nullptr),
fimTasksWidgetCommon(nullptr), fimTasksWidgetCommon(nullptr),
ui(new Ui::ViewerTrainees) ui(new Ui::ViewerTrainees)
@@ -18,7 +18,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
ui->horizontalLayout_11->addWidget(treeWidget); ui->horizontalLayout_11->addWidget(treeWidget);
//------ /*
ammTasksWidget_pers0 = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this); ammTasksWidget_pers0 = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
fimTasksWidget_pers0 = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this); fimTasksWidget_pers0 = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
@@ -30,7 +30,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
ui->verticalLayout_2->addWidget(ammTasksWidget_pers0); ui->verticalLayout_2->addWidget(ammTasksWidget_pers0);
ui->verticalLayout_2->addWidget(fimTasksWidget_pers0); ui->verticalLayout_2->addWidget(fimTasksWidget_pers0);
//------ */
//------ //------
ammTasksWidgetCommon = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr); ammTasksWidgetCommon = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr);
@@ -41,8 +41,8 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidgetCommon, &FIMtasksWidget::slot_traineeSelected); connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidgetCommon, &FIMtasksWidget::slot_traineeSelected);
connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidgetCommon, &AMMtasksWidget::slot_traineeSelected); connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidgetCommon, &AMMtasksWidget::slot_traineeSelected);
connect(fimTasksWidgetCommon, &FIMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM); //connect(fimTasksWidgetCommon, &FIMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
connect(ammTasksWidgetCommon, &AMMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM); //connect(ammTasksWidgetCommon, &AMMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//ammTasksWidgetCommon->setParent(this); //ammTasksWidgetCommon->setParent(this);
//fimTasksWidgetCommon->setParent(this); //fimTasksWidgetCommon->setParent(this);
@@ -71,8 +71,8 @@ void ViewerTrainees::setAuthComplited(bool authComplited)
void ViewerTrainees::deactivate() void ViewerTrainees::deactivate()
{ {
CommonView::deactivate(); CommonView::deactivate();
ammTasksWidget_pers0->deactivate(); //ammTasksWidget_pers0->deactivate();
fimTasksWidget_pers0->deactivate(); //fimTasksWidget_pers0->deactivate();
ammTasksWidgetCommon->deactivate(); ammTasksWidgetCommon->deactivate();
fimTasksWidgetCommon->deactivate(); fimTasksWidgetCommon->deactivate();
@@ -118,6 +118,7 @@ void ViewerTrainees::slot_tabMessengerChanged(QString login)
} }
} }
/*
void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM() void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM()
{ {
fimTasksWidget_pers0->waitAnimationWidgetShowWithPlay(); fimTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
@@ -127,6 +128,7 @@ void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM()
{ {
ammTasksWidget_pers0->waitAnimationWidgetShowWithPlay(); ammTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
} }
*/
void ViewerTrainees::changeEvent(QEvent *event) void ViewerTrainees::changeEvent(QEvent *event)
{ {

8
InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -42,8 +42,8 @@ public Q_SLOTS:
//слот обработки сигнала об изменении вкладки диалога в мессенджере //слот обработки сигнала об изменении вкладки диалога в мессенджере
void slot_tabMessengerChanged(QString login); void slot_tabMessengerChanged(QString login);
void slot_waitAnimationWidgetShowWithPlayFIM(); //void slot_waitAnimationWidgetShowWithPlayFIM();
void slot_waitAnimationWidgetShowWithPlayAMM(); //void slot_waitAnimationWidgetShowWithPlayAMM();
Q_SIGNALS: Q_SIGNALS:
//сигнал о выборе обучаемого //сигнал о выборе обучаемого
@@ -53,8 +53,8 @@ private:
void updateButtons() override; void updateButtons() override;
private: private:
AMMtasksWidget* ammTasksWidget_pers0; //AMMtasksWidget* ammTasksWidget_pers0;
FIMtasksWidget* fimTasksWidget_pers0; //FIMtasksWidget* fimTasksWidget_pers0;
AMMtasksWidget* ammTasksWidgetCommon; AMMtasksWidget* ammTasksWidgetCommon;
FIMtasksWidget* fimTasksWidgetCommon; FIMtasksWidget* fimTasksWidgetCommon;

3
InstructorsAndTrainees/trainees/viewertrainees.ui
View File

@@ -35,9 +35,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>