diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 7217530..12c1c3b 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -406,6 +406,12 @@ void ConnectorToServer::slot_HashReady() sendQueryTasksXML("amm"); } +void ConnectorToServer::slot_Auth(ServerAuthorization *serverAuth) +{ + this->serverAuth = *serverAuth; + emit sigLoginResult(serverAuth); +} + void ConnectorToServer::initialize() { createObjects(); @@ -426,7 +432,7 @@ void ConnectorToServer::bindConnection() connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer); connect(this,&ConnectorToServer::sigSendAnswerToServer,sendSystem,&SendSystem::sendXMLAnswer,Qt::AutoConnection); - connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::sigLoginResult); + connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::slot_Auth); // ::sigLoginResult); connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult); connect(recognizeSystem,&RecognizeSystem::signal_ReceiveMessage,this,&ConnectorToServer::signal_receiveMessage,Qt::AutoConnection); connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::showServerList); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index 0a59fa5..8cff30f 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -69,6 +69,7 @@ public: bool getIsConnected(); SendSystem *getSendSystem() const; + ServerAuthorization getServerAuth(){return serverAuth;} bool sendClientNotify(QString command); public slots: @@ -88,6 +89,8 @@ public slots: void slot_HashReady(); + void slot_Auth(ServerAuthorization * serverAuth); + signals: void sigSetConnect(ServerSettings* serverSettings,QThread *thread); void sigStopConnect(); @@ -148,6 +151,8 @@ private: ServerSettings serverSettings; bool isLoggedIn; + + ServerAuthorization serverAuth; }; #endif // CONNECTORTOSERVER_H diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index c05692b..c93360d 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -96,23 +96,18 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->verticalLayout_Instructors->addWidget(viewerInstructors); - ui->groupBox_Messenger->setMaximumWidth(600); - //ui->groupBox_Instructors->setMaximumWidth(500); - - ui->groupBox_Messenger->setMinimumWidth(600); - - ui->groupBox_Messenger->setMinimumHeight(500); + ui->groupBox_Messenger->setMaximumWidth(600); + ui->groupBox_Messenger->setMinimumWidth(600); + 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_Instructors->setMinimumWidth(700); - //ui->groupBox_Tasks->setMinimumWidth(600); ui->btnAuthorizationInstructor->setEnabled(false); diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp index 2e971fe..0f7d8b2 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp @@ -8,8 +8,9 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i id_trainee(id_trainee), ammTasksWidget_personal(nullptr), fimTasksWidget_personal(nullptr), - ammTasksWidget(ammTasksWidgetIn), - fimTasksWidget(fimTasksWidgetIn), + ammTasksWidget_common(ammTasksWidgetIn), + fimTasksWidget_common(fimTasksWidgetIn), + messangerWidget(nullptr), ui(new Ui::PersonalCardTrainee) { ui->setupUi(this); @@ -43,13 +44,32 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i // fimTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin()); // ammTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin()); - ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget); - ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget); + ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget_common); + ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget_common); //connectorToServer->sendQueryTasksXML("fim"); //connectorToServer->sendQueryTasksXML("amm"); // fimTasksWidget->slot_NeedUpdateUI(); // ammTasksWidget->slot_NeedUpdateUI(); + + + messangerWidget = new MessangerWidget(this); + //connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, messangerWidget, &MessangerWidget::slot_traineeSelected); + //connect(messangerWidget, &MessangerWidget::signal_tabMessengerChanged, viewerTrainees, &ViewerTrainees::slot_tabMessengerChanged); + connect(messangerWidget, &MessangerWidget::signal_sendMessage, connectorToServer, &ConnectorToServer::slot_sendMessage); + connect(connectorToServer,&ConnectorToServer::signal_receiveMessage,messangerWidget,&MessangerWidget::slot_showMessage); + + ui->verticalLayout_Messenger->addWidget(messangerWidget); + + messangerWidget->initialize(connectorToServer->getServerAuth().Id); + + QList listTrainees; + Trainee trainee = connectorToServer->getTrainee(id_trainee); + listTrainees.append(trainee); + messangerWidget->slot_InitMessanger(listTrainees); + + ui->groupBox_Messenger->setMaximumWidth(600); + ui->groupBox_Messenger->setMinimumWidth(600); } PersonalCardTrainee::~PersonalCardTrainee() @@ -65,6 +85,8 @@ PersonalCardTrainee::~PersonalCardTrainee() delete ammTasksWidget_personal; delete fimTasksWidget_personal; + delete messangerWidget; + delete ui; } diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.h b/InstructorsAndTrainees/trainees/personalcardtrainee.h index ee57297..b3a5fff 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.h +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.h @@ -4,6 +4,7 @@ #include"connectortoserver.h" #include "ammtaskswidget.h" #include "fimtaskswidget.h" +#include "messangerwidget.h" #include namespace Ui { @@ -16,7 +17,7 @@ class PersonalCardTrainee : public QWidget public: //explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent = nullptr); - explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, AMMtasksWidget* ammTasksWidget, FIMtasksWidget* fimTasksWidget, QWidget *parent = nullptr); + explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, QWidget *parent = nullptr); ~PersonalCardTrainee(); private: @@ -29,8 +30,10 @@ private: AMMtasksWidget* ammTasksWidget_personal; FIMtasksWidget* fimTasksWidget_personal; - AMMtasksWidget* ammTasksWidget; - FIMtasksWidget* fimTasksWidget; + AMMtasksWidget* ammTasksWidget_common; + FIMtasksWidget* fimTasksWidget_common; + + MessangerWidget* messangerWidget; private: Ui::PersonalCardTrainee *ui; diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.ui b/InstructorsAndTrainees/trainees/personalcardtrainee.ui index d73e86a..45db7d0 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.ui +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.ui @@ -19,7 +19,7 @@ - + Trainee @@ -163,39 +163,16 @@ - - - - - - 0 - 0 - - - - - 300 - 0 - - - - - 320 - 16777215 - - - - QFrame::Box - - - <Здесь будет мессенджер> - - - Qt::AlignCenter - - - - + + + Messenger + + + + + + + @@ -214,7 +191,7 @@ - 0 + 1 @@ -224,10 +201,26 @@ - + + + + + List + + + + - + + + + + Attached + + + + @@ -241,10 +234,26 @@ - + + + + + List + + + + - + + + + + Attached + + + +