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
2025-03-26 10:19:58 +03:00
parent d42f784403
commit 1e39c57cca
4 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -51,11 +51,10 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
waitAnimationWidget->moveToThread(threadAnimation); waitAnimationWidget->moveToThread(threadAnimation);
threadAnimation->start(); threadAnimation->start();
ui->btnDelete->setObjectName("btnDelete");
ui->btnDelete->setEnabled(false); ui->btnDelete->setEnabled(false);
if(type == TypeList::listCommon) if(type == TypeList::listCommon)
ui->btnDelete->setVisible(false); ui->btnDelete->setVisible(false);
ui->btnDelete->setObjectName("btnDelete");
} }
AMMtasksWidget::~AMMtasksWidget() AMMtasksWidget::~AMMtasksWidget()

3
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -42,11 +42,10 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
waitAnimationWidget->moveToThread(threadAnimation); waitAnimationWidget->moveToThread(threadAnimation);
threadAnimation->start(); threadAnimation->start();
ui->btnDelete->setObjectName("btnDelete");
ui->btnDelete->setEnabled(false); ui->btnDelete->setEnabled(false);
if(type == TypeList::listCommon) if(type == TypeList::listCommon)
ui->btnDelete->setVisible(false); ui->btnDelete->setVisible(false);
ui->btnDelete->setObjectName("btnDelete");
} }
FIMtasksWidget::~FIMtasksWidget() FIMtasksWidget::~FIMtasksWidget()

4
ServerLMS/Data/PacketType.h
View File

@@ -27,8 +27,8 @@ enum PacketType
TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS = 103, TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS = 103,
TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS = 104, TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS = 104,
TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE = 106, TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE = 106,
TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE = 107, TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE = 107,
//xml-ответы на запросы AdditionalFiles //xml-ответы на запросы AdditionalFiles
TYPE_XMLANSWER_QUERY_TASKS_XML_FIM = 130, TYPE_XMLANSWER_QUERY_TASKS_XML_FIM = 130,

29
ServerLMS/Systems/processingsystem.cpp
View File

@@ -95,12 +95,12 @@ void ProcessingSystem::processingClientAutorization(ClientHandler *client, Clien
//AMM //AMM
QList<TaskAmmFim> listTasksAMM = providerDBLMS->GetListTasksAMMofTrainee(id_trainee); QList<TaskAmmFim> listTasksAMM = providerDBLMS->GetListTasksAMMofTrainee(id_trainee);
QByteArray arrayAnswerTasksAMM = dataParser->DbAnswer()->listTasksAMMofTrainee(true, &listTasksAMM, id_trainee); QByteArray arrayAnswerTasksAMM = dataParser->DbAnswer()->listTasksAMMofTrainee(true, &listTasksAMM, id_trainee);
client->sendXmlAnswer(arrayAnswerTasksAMM, PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE); client->sendXmlAnswer(arrayAnswerTasksAMM, PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE);
//FIM //FIM
QList<TaskAmmFim> listTasksFIM = providerDBLMS->GetListTasksFIMofTrainee(id_trainee); QList<TaskAmmFim> listTasksFIM = providerDBLMS->GetListTasksFIMofTrainee(id_trainee);
QByteArray arrayAnswerFIM = dataParser->DbAnswer()->listTasksFIMofTrainee(true, &listTasksFIM, id_trainee); QByteArray arrayAnswerFIM = dataParser->DbAnswer()->listTasksFIMofTrainee(true, &listTasksFIM, id_trainee);
client->sendXmlAnswer(arrayAnswerFIM, PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE); client->sendXmlAnswer(arrayAnswerFIM, PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE);
} }
QString str = QString(arrayAnswer); QString str = QString(arrayAnswer);
@@ -157,9 +157,8 @@ void ProcessingSystem::processingClientDeAutorization(ClientHandler *client, Cli
void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB, int id, void* data) void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB, int id, void* data)
{ {
QByteArray arrayAnswer;
qDebug() << "ProcessingQueryThread " << QThread::currentThreadId(); qDebug() << "ProcessingQueryThread " << QThread::currentThreadId();
switch (clientQueryToDB.typeQuery) switch (clientQueryToDB.typeQuery)
{ {
case TypeQueryToDB::TYPE_QUERY_GET_ALL_LISTS: case TypeQueryToDB::TYPE_QUERY_GET_ALL_LISTS:
@@ -168,6 +167,8 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
QList<Trainee> listTrainees = providerDBLMS->GetListAllTrainees(); QList<Trainee> listTrainees = providerDBLMS->GetListAllTrainees();
QList<Group> listGroups = providerDBLMS->GetListAllGroups(); QList<Group> listGroups = providerDBLMS->GetListAllGroups();
QByteArray arrayAnswer;
arrayAnswer = dataParser->DbAnswer()->listInstructors(true, &listInstructors); arrayAnswer = dataParser->DbAnswer()->listInstructors(true, &listInstructors);
client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS); client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS);
@@ -261,9 +262,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
sendListTasksAMMofTraineetoClient(client, id); sendListTasksAMMofTraineetoClient(client, id);
//Отправка списка задач AMM клиенту Юнити //Отправка списка задач AMM клиенту Юнити
if(ClientHandler* handler = getUnityClientById(id)) if(ClientHandler* clientUnity = getUnityClientById(id))
{//Есть такой {//Есть такой
sendListTasksAMMofTraineetoClient(handler, id); sendListTasksAMMofTraineetoClient(clientUnity, id);
} }
} }
break; break;
@@ -276,9 +277,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
sendListTasksFIMofTraineetoClient(client, id); sendListTasksFIMofTraineetoClient(client, id);
//Отправка списка задач FIM клиенту Юнити //Отправка списка задач FIM клиенту Юнити
if(ClientHandler* handler = getUnityClientById(id)) if(ClientHandler* clientUnity = getUnityClientById(id))
{//Есть такой {//Есть такой
sendListTasksFIMofTraineetoClient(handler, id); sendListTasksFIMofTraineetoClient(clientUnity, id);
} }
} }
break; break;
@@ -305,9 +306,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
sendListTasksAMMofTraineetoClient(client, id_trainee); sendListTasksAMMofTraineetoClient(client, id_trainee);
//Отправка списка задач AMM клиенту Юнити //Отправка списка задач AMM клиенту Юнити
if(ClientHandler* handler = getUnityClientById(id_trainee)) if(ClientHandler* clientUnity = getUnityClientById(id_trainee))
{//Есть такой {//Есть такой
sendListTasksAMMofTraineetoClient(handler, id_trainee); sendListTasksAMMofTraineetoClient(clientUnity, id_trainee);
} }
} }
break; break;
@@ -320,9 +321,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
sendListTasksFIMofTraineetoClient(client, id_trainee); sendListTasksFIMofTraineetoClient(client, id_trainee);
//Отправка списка задач FIM клиенту Юнити //Отправка списка задач FIM клиенту Юнити
if(ClientHandler* handler = getUnityClientById(id_trainee)) if(ClientHandler* clientUnity = getUnityClientById(id_trainee))
{//Есть такой {//Есть такой
sendListTasksFIMofTraineetoClient(handler, id_trainee); sendListTasksFIMofTraineetoClient(clientUnity, id_trainee);
} }
} }
break; break;
@@ -423,14 +424,14 @@ void ProcessingSystem::sendListTasksAMMofTraineetoClient(ClientHandler *client,
{ {
QList<TaskAmmFim> listTasks = providerDBLMS->GetListTasksAMMofTrainee(id_trainee); QList<TaskAmmFim> listTasks = providerDBLMS->GetListTasksAMMofTrainee(id_trainee);
QByteArray arrayAnswer = dataParser->DbAnswer()->listTasksAMMofTrainee(true, &listTasks, id_trainee); QByteArray arrayAnswer = dataParser->DbAnswer()->listTasksAMMofTrainee(true, &listTasks, id_trainee);
client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE); client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE);
} }
void ProcessingSystem::sendListTasksFIMofTraineetoClient(ClientHandler *client, int id_trainee) void ProcessingSystem::sendListTasksFIMofTraineetoClient(ClientHandler *client, int id_trainee)
{ {
QList<TaskAmmFim> listTasks = providerDBLMS->GetListTasksFIMofTrainee(id_trainee); QList<TaskAmmFim> listTasks = providerDBLMS->GetListTasksFIMofTrainee(id_trainee);
QByteArray arrayAnswer = dataParser->DbAnswer()->listTasksFIMofTrainee(true, &listTasks, id_trainee); QByteArray arrayAnswer = dataParser->DbAnswer()->listTasksFIMofTrainee(true, &listTasks, id_trainee);
client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE); client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE);
} }
ClientHandler *ProcessingSystem::getUnityClientById(int id) ClientHandler *ProcessingSystem::getUnityClientById(int id)