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

Мессенджер полностью работает

Browse Source
This commit is contained in:
krivoshein
2024-12-17 12:54:43 +03:00
parent e393244bf7
commit a839f964fe
69 changed files with 724 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2024-12-16T17:46:50. -->
<!-- Written by QtCreator 4.11.1, 2024-12-17T12:54:17. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>

20
DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -357,6 +357,26 @@ void RecognizeSystem::xmlParser(QByteArray array)
emit sigAuth(serverAuth);
}
if(xmlReader.name() == "ServerMessage"){
ClientMessage *clientMessage = new ClientMessage;
foreach(const QXmlStreamAttribute &attr, xmlReader.attributes())
{
QString name = attr.name().toString();
QString value = attr.value().toString();
if (name == "Login"){
clientMessage->Login = value;
}
if (name == "Text"){
clientMessage->Text = value;
}
}
emit signal_MessageForGUI(clientMessage->Login, clientMessage->Text);
}
if(xmlReader.name() == "ServerDeAuthorization"){
ServerDeAuthorization *serverDeAuth = new ServerDeAuthorization;

3
DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
View File

@@ -10,6 +10,7 @@
#include "instructor.h"
#include "trainee.h"
#include "group.h"
#include "Datas.h"
class RecognizeSystem : public QObject
@@ -38,6 +39,8 @@ signals:
void sigSocketWaitForReadyRead(int waitTime);
void sigStartCompare();
void signal_MessageForGUI(QString login, QString text);
void sigAnswerQueryToDB_ListInstructors(QList<Instructor> listInstructors);
void sigAnswerQueryToDB_ListGroups(QList<Group> listGroups);
void sigAnswerQueryToDB_ListTrainees(QList<Trainee> listTrainees);

2
DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h
View File

@@ -32,6 +32,8 @@ enum PacketType{
TYPE_QT = 9,
TYPE_DISABLE = 11,
TYPE_XMLANSWER_MESSAGE_FOR_GUI = 90,
//xml-ответы на запросы к БД
TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS = 100,
TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS = 101,

1
DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h
View File

@@ -69,6 +69,7 @@ public:
class ClientMessage
{
public:
QString Login;
QString Text;
};

3
DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -281,8 +281,6 @@ void ConnectorToServer::slot_msgToClientReady(QString login, QString text)
sendMessageForClient(id, login, text);
}
void ConnectorToServer::initialize()
{
createObjects();
@@ -302,6 +300,7 @@ void ConnectorToServer::bindConnection()
connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::sigLoginResult);
connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult);
connect(recognizeSystem,&RecognizeSystem::signal_MessageForGUI,this,&ConnectorToServer::signal_msgFromClientReady);
//connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB,this,&ConnectorToServer::slot_AnswerQueryToDB);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors);

2
DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -80,6 +80,8 @@ signals:
void signal_InitMessanger(QList<Trainee> listTrainees);
void signal_msgFromClientReady(QString login, QString text);
private:
void initialize();

1
DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -48,6 +48,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, messangerWidget, &MessangerWidget::slot_traineeSelected);
connect(messangerWidget, &MessangerWidget::signal_tabMessengerChanged, viewerTrainees, &ViewerTrainees::slot_tabMessengerChanged);
connect(messangerWidget, &MessangerWidget::signal_msgToClientReady, connectorToServer, &ConnectorToServer::slot_msgToClientReady);
connect(connectorToServer,&ConnectorToServer::signal_msgFromClientReady,messangerWidget,&MessangerWidget::slot_msgFromClientReady);
docTasksWidget = new DocTasksWidget(this);

5
DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp
View File

@@ -143,6 +143,11 @@ void MessangerWidget::slot_InitMessanger(QList<Trainee> listTrainees)
}
}
void MessangerWidget::slot_msgFromClientReady(QString login, QString text)
{
addMsg(login, "name", text, MessangerWidget::ETypeMsg::fromClient);
}
void MessangerWidget::keyPressEvent(QKeyEvent *event)
{
if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)

2
DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h
View File

@@ -5,6 +5,7 @@
#include <QListWidget>
#include <QTranslator>
#include <trainee.h>
#include "Datas.h"
class DialogMsg
{
@@ -66,6 +67,7 @@ public slots:
void slot_LanguageChanged(QString language);
//слот обработки сигнала об инициализации мессенджера
void slot_InitMessanger(QList<Trainee> listTrainees);
void slot_msgFromClientReady(QString login, QString text);
private:
virtual void keyPressEvent(QKeyEvent *event) override;