Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-29 20:05:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

внедрение мессенджера

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-02 15:52:35 +03:00
parent 0da66544f0
commit 179026d4ca
6 changed files with 95 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -406,6 +406,12 @@ void ConnectorToServer::slot_HashReady()
sendQueryTasksXML("amm"); sendQueryTasksXML("amm");
} }
void ConnectorToServer::slot_Auth(ServerAuthorization *serverAuth)
{
this->serverAuth = *serverAuth;
emit sigLoginResult(serverAuth);
}
void ConnectorToServer::initialize() void ConnectorToServer::initialize()
{ {
createObjects(); createObjects();
@@ -426,7 +432,7 @@ void ConnectorToServer::bindConnection()
connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer); connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer);
connect(this,&ConnectorToServer::sigSendAnswerToServer,sendSystem,&SendSystem::sendXMLAnswer,Qt::AutoConnection); 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::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult);
connect(recognizeSystem,&RecognizeSystem::signal_ReceiveMessage,this,&ConnectorToServer::signal_receiveMessage,Qt::AutoConnection); connect(recognizeSystem,&RecognizeSystem::signal_ReceiveMessage,this,&ConnectorToServer::signal_receiveMessage,Qt::AutoConnection);
connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::showServerList); connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::showServerList);

5
InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -69,6 +69,7 @@ public:
bool getIsConnected(); bool getIsConnected();
SendSystem *getSendSystem() const; SendSystem *getSendSystem() const;
ServerAuthorization getServerAuth(){return serverAuth;}
bool sendClientNotify(QString command); bool sendClientNotify(QString command);
public slots: public slots:
@@ -88,6 +89,8 @@ public slots:
void slot_HashReady(); void slot_HashReady();
void slot_Auth(ServerAuthorization * serverAuth);
signals: signals:
void sigSetConnect(ServerSettings* serverSettings,QThread *thread); void sigSetConnect(ServerSettings* serverSettings,QThread *thread);
void sigStopConnect(); void sigStopConnect();
@@ -148,6 +151,8 @@ private:
ServerSettings serverSettings; ServerSettings serverSettings;
bool isLoggedIn; bool isLoggedIn;
ServerAuthorization serverAuth;
}; };
#endif // CONNECTORTOSERVER_H #endif // CONNECTORTOSERVER_H

11
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -96,23 +96,18 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->verticalLayout_Instructors->addWidget(viewerInstructors); 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->setMinimumHeight(500);
ui->groupBox_Messenger->setMaximumWidth(600);
ui->groupBox_Messenger->setMinimumWidth(600);
ui->groupBox_Instructors->setMinimumHeight(400); ui->groupBox_Instructors->setMinimumHeight(400);
ui->groupBox_Instructors->setMaximumHeight(400); ui->groupBox_Instructors->setMaximumHeight(400);
ui->groupBox_Trainees->setMinimumHeight(500); ui->groupBox_Trainees->setMinimumHeight(500);
//ui->groupBox_Trainees->setMaximumHeight(500);
ui->groupBox_Trainees->setMinimumWidth(700); ui->groupBox_Trainees->setMinimumWidth(700);
ui->groupBox_Instructors->setMinimumWidth(700); ui->groupBox_Instructors->setMinimumWidth(700);
//ui->groupBox_Tasks->setMinimumWidth(600);
ui->btnAuthorizationInstructor->setEnabled(false); ui->btnAuthorizationInstructor->setEnabled(false);

30
InstructorsAndTrainees/trainees/personalcardtrainee.cpp
View File

@@ -8,8 +8,9 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i
id_trainee(id_trainee), id_trainee(id_trainee),
ammTasksWidget_personal(nullptr), ammTasksWidget_personal(nullptr),
fimTasksWidget_personal(nullptr), fimTasksWidget_personal(nullptr),
ammTasksWidget(ammTasksWidgetIn), ammTasksWidget_common(ammTasksWidgetIn),
fimTasksWidget(fimTasksWidgetIn), fimTasksWidget_common(fimTasksWidgetIn),
messangerWidget(nullptr),
ui(new Ui::PersonalCardTrainee) ui(new Ui::PersonalCardTrainee)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -43,13 +44,32 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i
// fimTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin()); // fimTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
// ammTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin()); // ammTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget); ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget_common);
ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget); ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget_common);
//connectorToServer->sendQueryTasksXML("fim"); //connectorToServer->sendQueryTasksXML("fim");
//connectorToServer->sendQueryTasksXML("amm"); //connectorToServer->sendQueryTasksXML("amm");
// fimTasksWidget->slot_NeedUpdateUI(); // fimTasksWidget->slot_NeedUpdateUI();
// ammTasksWidget->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<Trainee> 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() PersonalCardTrainee::~PersonalCardTrainee()
@@ -65,6 +85,8 @@ PersonalCardTrainee::~PersonalCardTrainee()
delete ammTasksWidget_personal; delete ammTasksWidget_personal;
delete fimTasksWidget_personal; delete fimTasksWidget_personal;
delete messangerWidget;
delete ui; delete ui;
} }

9
InstructorsAndTrainees/trainees/personalcardtrainee.h
View File

@@ -4,6 +4,7 @@
#include"connectortoserver.h" #include"connectortoserver.h"
#include "ammtaskswidget.h" #include "ammtaskswidget.h"
#include "fimtaskswidget.h" #include "fimtaskswidget.h"
#include "messangerwidget.h"
#include <QWidget> #include <QWidget>
namespace Ui { namespace Ui {
@@ -16,7 +17,7 @@ class PersonalCardTrainee : public QWidget
public: public:
//explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent = nullptr); //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(); ~PersonalCardTrainee();
private: private:
@@ -29,8 +30,10 @@ private:
AMMtasksWidget* ammTasksWidget_personal; AMMtasksWidget* ammTasksWidget_personal;
FIMtasksWidget* fimTasksWidget_personal; FIMtasksWidget* fimTasksWidget_personal;
AMMtasksWidget* ammTasksWidget; AMMtasksWidget* ammTasksWidget_common;
FIMtasksWidget* fimTasksWidget; FIMtasksWidget* fimTasksWidget_common;
MessangerWidget* messangerWidget;
private: private:
Ui::PersonalCardTrainee *ui; Ui::PersonalCardTrainee *ui;

81
InstructorsAndTrainees/trainees/personalcardtrainee.ui
View File

@@ -19,7 +19,7 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox_Trainee">
<property name="title"> <property name="title">
<string>Trainee</string> <string>Trainee</string>
</property> </property>
@@ -163,39 +163,16 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <widget class="QGroupBox" name="groupBox_Messenger">
<item> <property name="title">
<widget class="QLabel" name="label_15"> <string>Messenger</string>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimumSize"> <layout class="QGridLayout" name="gridLayout_6">
<size> <item row="0" column="0">
<width>300</width> <layout class="QVBoxLayout" name="verticalLayout_Messenger"/>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>320</width>
<height>16777215</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="text">
<string>&lt;Здесь будет мессенджер&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@@ -214,7 +191,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@@ -224,10 +201,26 @@
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_9"> <layout class="QHBoxLayout" name="horizontalLayout_9">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_AMMcommon"/> <layout class="QVBoxLayout" name="verticalLayout_AMMcommon">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>List</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_AMMpersonal"/> <layout class="QVBoxLayout" name="verticalLayout_AMMpersonal">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Attached</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
@@ -241,10 +234,26 @@
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_FIMcommon"/> <layout class="QVBoxLayout" name="verticalLayout_FIMcommon">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>List</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_FIMpersonal"/> <layout class="QVBoxLayout" name="verticalLayout_FIMpersonal">
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Attached</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>