mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
Merge branch 'new-init-behaviour' into DEV
# Conflicts: # InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp # InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user