diff --git a/GUIdataBaseLMS/mainwindow.cpp b/GUIdataBaseLMS/mainwindow.cpp
index d201e97..2011784 100644
--- a/GUIdataBaseLMS/mainwindow.cpp
+++ b/GUIdataBaseLMS/mainwindow.cpp
@@ -18,9 +18,9 @@ MainWindow::MainWindow(QWidget *parent)
ui->horizontalLayout->addWidget(m_instructorsAndTraineesWidget);
- //this->move(0, 0);
- //this->showNormal();
- this->showMaximized();
+ this->move(100, 100);
+ this->showNormal();
+ //this->showMaximized();
if(m_instructorsAndTraineesWidget->getLanguage() == "ENG")
{
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
index c545047..c05692b 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
@@ -12,8 +12,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
viewerTrainees(nullptr),
viewerInstructors(nullptr),
messangerWidget(nullptr),
- ammTasksWidget(nullptr),
- fimTasksWidget(nullptr),
+ //ammTasksWidget(nullptr),
+ //fimTasksWidget(nullptr),
adminMode(false),
loginInstructorLoggedInLocal(QStringLiteral("")),
nameInstructorLoggedInLocal(QStringLiteral("")),
@@ -22,7 +22,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->setupUi(this);
ui->btnSettings->setObjectName("btnSettings");
- ui->tabWidget_Tasks->setObjectName("tabWidgetTasks");
+ //ui->tabWidget_Tasks->setObjectName("tabWidgetTasks");
ui->widget_Top->setObjectName("widgetTop");
ui->groupBox_Trainees->setObjectName("groupBox_Trainees");
@@ -64,6 +64,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer);
+ /*
ammTasksWidget = new AMMtasksWidget(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(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
+ */
messangerWidget = new MessangerWidget(this);
//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(connectorToServer,&ConnectorToServer::signal_receiveMessage,messangerWidget,&MessangerWidget::slot_showMessage);
- connect(fimTasksWidget, &FIMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
- connect(ammTasksWidget, &AMMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
+ //connect(fimTasksWidget, &FIMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
+ //connect(ammTasksWidget, &AMMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//Размещение
ui->verticalLayout_Trainees->addWidget(viewerTrainees);
- ui->verticalLayout_AMM->addWidget(ammTasksWidget);
- ui->verticalLayout_FIM->addWidget(fimTasksWidget);
+ //ui->verticalLayout_AMM->addWidget(ammTasksWidget);
+ //ui->verticalLayout_FIM->addWidget(fimTasksWidget);
ui->verticalLayout_Messenger->addWidget(messangerWidget);
ui->verticalLayout_Instructors->addWidget(viewerInstructors);
- ui->groupBox_Messenger->setMaximumWidth(500);
- ui->groupBox_Instructors->setMaximumWidth(500);
+ ui->groupBox_Messenger->setMaximumWidth(600);
+ //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_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_Tasks->setMinimumWidth(600);
+ ui->groupBox_Instructors->setMinimumWidth(700);
+ //ui->groupBox_Tasks->setMinimumWidth(600);
ui->btnAuthorizationInstructor->setEnabled(false);
@@ -121,8 +128,8 @@ InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()
if(authorizationIsCompleted())
deAuthorizationInstructor(loginInstructorLoggedInLocal);
- delete ammTasksWidget;
- delete fimTasksWidget;
+ //delete ammTasksWidget;
+ //delete fimTasksWidget;
delete messangerWidget;
delete viewerInstructors;
delete viewerTrainees;
@@ -293,8 +300,8 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
viewerTrainees->deactivate();
viewerInstructors->deactivate();
- ammTasksWidget->deactivate();
- fimTasksWidget->deactivate();
+ //ammTasksWidget->deactivate();
+ //fimTasksWidget->deactivate();
messangerWidget->clear();
@@ -384,8 +391,8 @@ void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
viewerTrainees->deactivate();
viewerInstructors->deactivate();
- ammTasksWidget->deactivate();
- fimTasksWidget->deactivate();
+ //ammTasksWidget->deactivate();
+ //fimTasksWidget->deactivate();
messangerWidget->clear();
}
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.h b/InstructorsAndTrainees/instructorsandtraineeswidget.h
index 99752ab..cffea76 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.h
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.h
@@ -95,8 +95,8 @@ private:
ViewerTrainees* viewerTrainees;
ViewerInstructors* viewerInstructors;
MessangerWidget* messangerWidget;
- AMMtasksWidget* ammTasksWidget;
- FIMtasksWidget* fimTasksWidget;
+ //AMMtasksWidget* ammTasksWidget;
+ //FIMtasksWidget* fimTasksWidget;
bool adminMode;
QString loginInstructorLoggedInLocal;
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui
index e18d4ce..c3df089 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui
@@ -309,85 +309,49 @@
-
-
-
-
-
- 0
- 0
-
-
-
- Trainees
-
-
-
-
-
-
-
-
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Trainees
+
+
+
-
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Instructors
+
+
+
-
+
+
+
+
+
+
- -
-
-
-
- 0
- 0
-
-
-
- Tasks
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
- 0
- 0
-
-
-
- AMM
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- FIM
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -408,24 +372,6 @@
- -
-
-
-
- 0
- 0
-
-
-
- Instructors
-
-
-
-
-
-
-
-
-
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp
index 3f24c2a..3138aac 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.cpp
+++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp
@@ -5,8 +5,8 @@
ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent) :
TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent),
- ammTasksWidget_pers0(nullptr),
- fimTasksWidget_pers0(nullptr),
+ //ammTasksWidget_pers0(nullptr),
+ //fimTasksWidget_pers0(nullptr),
ammTasksWidgetCommon(nullptr),
fimTasksWidgetCommon(nullptr),
ui(new Ui::ViewerTrainees)
@@ -18,7 +18,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
ui->horizontalLayout_11->addWidget(treeWidget);
- //------
+ /*
ammTasksWidget_pers0 = new AMMtasksWidget(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(fimTasksWidget_pers0);
- //------
+ */
//------
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, ammTasksWidgetCommon, &AMMtasksWidget::slot_traineeSelected);
- connect(fimTasksWidgetCommon, &FIMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
- connect(ammTasksWidgetCommon, &AMMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
+ //connect(fimTasksWidgetCommon, &FIMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
+ //connect(ammTasksWidgetCommon, &AMMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//ammTasksWidgetCommon->setParent(this);
//fimTasksWidgetCommon->setParent(this);
@@ -71,8 +71,8 @@ void ViewerTrainees::setAuthComplited(bool authComplited)
void ViewerTrainees::deactivate()
{
CommonView::deactivate();
- ammTasksWidget_pers0->deactivate();
- fimTasksWidget_pers0->deactivate();
+ //ammTasksWidget_pers0->deactivate();
+ //fimTasksWidget_pers0->deactivate();
ammTasksWidgetCommon->deactivate();
fimTasksWidgetCommon->deactivate();
@@ -118,6 +118,7 @@ void ViewerTrainees::slot_tabMessengerChanged(QString login)
}
}
+/*
void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM()
{
fimTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
@@ -127,6 +128,7 @@ void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM()
{
ammTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
}
+*/
void ViewerTrainees::changeEvent(QEvent *event)
{
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h
index f03a11e..c8fbd36 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.h
+++ b/InstructorsAndTrainees/trainees/viewertrainees.h
@@ -42,8 +42,8 @@ public Q_SLOTS:
//слот обработки сигнала об изменении вкладки диалога в мессенджере
void slot_tabMessengerChanged(QString login);
- void slot_waitAnimationWidgetShowWithPlayFIM();
- void slot_waitAnimationWidgetShowWithPlayAMM();
+ //void slot_waitAnimationWidgetShowWithPlayFIM();
+ //void slot_waitAnimationWidgetShowWithPlayAMM();
Q_SIGNALS:
//сигнал о выборе обучаемого
@@ -53,8 +53,8 @@ private:
void updateButtons() override;
private:
- AMMtasksWidget* ammTasksWidget_pers0;
- FIMtasksWidget* fimTasksWidget_pers0;
+ //AMMtasksWidget* ammTasksWidget_pers0;
+ //FIMtasksWidget* fimTasksWidget_pers0;
AMMtasksWidget* ammTasksWidgetCommon;
FIMtasksWidget* fimTasksWidgetCommon;
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.ui b/InstructorsAndTrainees/trainees/viewertrainees.ui
index 6086340..cac960c 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.ui
+++ b/InstructorsAndTrainees/trainees/viewertrainees.ui
@@ -35,9 +35,6 @@
- -
-
-
-
-