mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
До трансляции message на ГУИ от Клиента
This commit is contained in:
@@ -25,7 +25,7 @@ bool ConnectorToServer::authorizationInstructorLocal(QString login, QString pass
|
||||
autorization->TypeClient = TypeClientAutorization::TYPE_GUI;
|
||||
|
||||
dataParser->createAuthMessage(autorization);
|
||||
emit sigSendAutorization();
|
||||
emit signal_sendXMLmsgGUItoServer();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -41,7 +41,7 @@ bool ConnectorToServer::deAuthorizationInstructorLocal(QString login)
|
||||
deAutorization->Login = login;
|
||||
|
||||
dataParser->createDeAuthMessage(deAutorization);
|
||||
emit sigSendDeAutorization();
|
||||
emit signal_sendXMLmsgGUItoServer();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -57,7 +57,25 @@ bool ConnectorToServer::sendQueryToDB(TypeQueryToDB typeQuery, int id, void* dat
|
||||
queryToDB->typeQuery = typeQuery;
|
||||
|
||||
dataParser->createQueryToDBMessage(queryToDB, id, data);
|
||||
emit sigSendQueryToDB();
|
||||
emit signal_sendXMLmsgGUItoServer();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ConnectorToServer::sendMessageForClient(int id, QString login, QString text)
|
||||
{
|
||||
if (!client->getIsConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
ToClientMessage *toClientMessage = new ToClientMessage;
|
||||
toClientMessage->id = id;
|
||||
toClientMessage->Login = login;
|
||||
toClientMessage->Text = text;
|
||||
|
||||
dataParser->createToClientMessage(toClientMessage);
|
||||
emit signal_sendXMLmsgGUItoServer();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -198,6 +216,16 @@ Group ConnectorToServer::getGroup(int id)
|
||||
return Group();
|
||||
}
|
||||
|
||||
int ConnectorToServer::getIdTraineeByLogin(QString login)
|
||||
{
|
||||
for(Trainee trainee : listTrainees)
|
||||
{
|
||||
if(trainee.getLogin() == login)
|
||||
return trainee.getID();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
void ConnectorToServer::slot_AnswerQueryToDB(QList<Instructor>* listInstructors,
|
||||
QList<Trainee>* listTrainees,
|
||||
@@ -246,6 +274,13 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListTasks(QList<Task> listTasks)
|
||||
//emit signal_UpdateDB(false, true);
|
||||
}
|
||||
|
||||
void ConnectorToServer::slot_msgToClientReady(QString login, QString text)
|
||||
{
|
||||
int id = getIdTraineeByLogin(login);
|
||||
if(id)
|
||||
sendMessageForClient(id, login, text);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void ConnectorToServer::initialize()
|
||||
@@ -263,10 +298,7 @@ void ConnectorToServer::bindConnection()
|
||||
{
|
||||
connect(this,&ConnectorToServer::sigInitializeClient,client,&TCPClient::initialize,Qt::AutoConnection);
|
||||
connect(this,&ConnectorToServer::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection);
|
||||
connect(this,&ConnectorToServer::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization);
|
||||
connect(this,&ConnectorToServer::sigSendDeAutorization,sendSystem,&SendSystem::sendClientAutorization);
|
||||
|
||||
connect(this,&ConnectorToServer::sigSendQueryToDB,sendSystem,&SendSystem::sendClientQueryToDB);
|
||||
connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer);
|
||||
|
||||
connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::sigLoginResult);
|
||||
connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult);
|
||||
|
||||
Reference in New Issue
Block a user