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

Merge branch 'new-init-behaviour' into DEV

Browse Source 
# Conflicts:
#	InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp
#	InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
This commit is contained in:
semenov
2025-09-18 14:29:26 +03:00
parent 8bb54cb56c 441be217d9
commit 662ae41f68
11 changed files with 168 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp
View File

@@ -30,18 +30,17 @@ void SendSystem::sendDisable()
stream << data;
socket->waitForBytesWritten();
}
/*
void SendSystem::sendXMLmsgGUItoServer(QByteArray array)
{
qDebug() << "SendSystem" << QThread::currentThreadId();
QDataStream stream(socket);
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
stream << PacketType::TYPE_XMLANSWER;
stream << array;
socket->waitForBytesWritten(6000);
}
*/
//void SendSystem::sendXMLmsgGUItoServer(QByteArray array)
//{
// qDebug() << "SendSystem" << QThread::currentThreadId();
// QDataStream stream(socket);
// stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
// stream << PacketType::TYPE_XMLANSWER;
// stream << array;
// socket->waitForBytesWritten(6000);
//}
void SendSystem::sendFileBlock(QString path)
{

8
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -12,7 +12,6 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) :
versionSelectWidget(nullptr),
versionContainer(nullptr),
notifyController(nullptr),
isLoggedIn(false),
fl_GetedOfflineMessages(false)
{
initialize();
@@ -44,7 +43,6 @@ bool ConnectorToServer::authorizationInstructorLocal(QString login, QString pass
autorization->Login = login;
autorization->Password = password;
autorization->TypeClient = TypeClientAutorization::TYPE_GUI;
isLoggedIn = true;
QByteArray array = dataParser->createAuthMessage(autorization);
emit sigSendAnswerToServer(array);
@@ -61,7 +59,6 @@ bool ConnectorToServer::deAuthorizationInstructorLocal(QString login)
ClientDeAutorization *deAutorization = new ClientDeAutorization;
deAutorization->Login = login;
isLoggedIn = false;
QByteArray array = dataParser->createDeAuthMessage(deAutorization);
emit sigSendAnswerToServer(array);
@@ -367,11 +364,6 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListTrainees(QList<Trainee> listTra
listUsers.append(trainee);
}
emit signal_reInitMessangerByUsers(listUsers);
if (isLoggedIn)
{
sendClientNotify(cmd_GetOfflineMessages);
}
}
void ConnectorToServer::slot_AnswerQueryToDB_ListComputers(QList<Computer> listComputers)

2
InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -152,8 +152,6 @@ private:
QByteArray listTaskAmmArray;
ServerSettings serverSettings;
bool isLoggedIn;
ServerAuthorization serverAuth;
bool fl_GetedOfflineMessages;