Merge branch 'work_tasks' into DEV

This commit is contained in:
2025-06-03 15:33:42 +03:00

View File

@@ -262,8 +262,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
{ {
if(int id_new = providerDBLMS->newTaskAMM(*(TaskAmmFim*)data, id)) if(int id_new = providerDBLMS->newTaskAMM(*(TaskAmmFim*)data, id))
{ {
//Отправка списка задач AMM клиенту GUI //Отправка списка задач AMM всем клиентам GUI
sendListTasksAMMofTraineetoClient(client, id); //sendListTasksAMMofTraineetoClient(client, id);
emit sigStatusTasksAMMofTraineeChanged(id);
//Отправка списка задач AMM клиенту Юнити //Отправка списка задач AMM клиенту Юнити
if(ClientHandler* clientUnity = getUnityClientById(id)) if(ClientHandler* clientUnity = getUnityClientById(id))
@@ -277,8 +278,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
{ {
if(int id_new = providerDBLMS->newTaskFIM(*(TaskAmmFim*)data, id)) if(int id_new = providerDBLMS->newTaskFIM(*(TaskAmmFim*)data, id))
{ {
//Отправка списка задач FIM клиенту GUI //Отправка списка задач FIM всем клиентам GUI
sendListTasksFIMofTraineetoClient(client, id); //sendListTasksFIMofTraineetoClient(client, id);
emit sigStatusTasksFIMofTraineeChanged(id);
//Отправка списка задач FIM клиенту Юнити //Отправка списка задач FIM клиенту Юнити
if(ClientHandler* clientUnity = getUnityClientById(id)) if(ClientHandler* clientUnity = getUnityClientById(id))
@@ -306,8 +308,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
{ {
if(int id_trainee = providerDBLMS->delTaskAMM(id)) if(int id_trainee = providerDBLMS->delTaskAMM(id))
{ {
//Отправка списка задач AMM клиенту GUI //Отправка списка задач AMM всем клиентам GUI
sendListTasksAMMofTraineetoClient(client, id_trainee); //sendListTasksAMMofTraineetoClient(client, id_trainee);
emit sigStatusTasksAMMofTraineeChanged(id_trainee);
//Отправка списка задач AMM клиенту Юнити //Отправка списка задач AMM клиенту Юнити
if(ClientHandler* clientUnity = getUnityClientById(id_trainee)) if(ClientHandler* clientUnity = getUnityClientById(id_trainee))
@@ -322,7 +325,8 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
if(int id_trainee = providerDBLMS->delTaskFIM(id)) if(int id_trainee = providerDBLMS->delTaskFIM(id))
{ {
//Отправка списка задач FIM клиенту GUI //Отправка списка задач FIM клиенту GUI
sendListTasksFIMofTraineetoClient(client, id_trainee); //sendListTasksFIMofTraineetoClient(client, id_trainee);
emit sigStatusTasksFIMofTraineeChanged(id_trainee);
//Отправка списка задач FIM клиенту Юнити //Отправка списка задач FIM клиенту Юнити
if(ClientHandler* clientUnity = getUnityClientById(id_trainee)) if(ClientHandler* clientUnity = getUnityClientById(id_trainee))
@@ -346,7 +350,7 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
case TypeQueryToDB::TYPE_QUERY_SET_REPORT_TASK_FIM_TO_TRAINEE: case TypeQueryToDB::TYPE_QUERY_SET_REPORT_TASK_FIM_TO_TRAINEE:
{ {
TaskAmmFim* task = (TaskAmmFim*)data; TaskAmmFim* task = (TaskAmmFim*)data;
if(task->status == "completed") if(task->status == "checkup")
if(int id_report = providerDBLMS->replaceReportFIM(*task)) if(int id_report = providerDBLMS->replaceReportFIM(*task))
{ {
@@ -359,8 +363,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
QString* status = (QString*)data; QString* status = (QString*)data;
if(int id_trainee = providerDBLMS->changeStatusTaskFIM(id, *status)) if(int id_trainee = providerDBLMS->changeStatusTaskFIM(id, *status))
{ {
//Отправка списка задач FIM клиенту GUI //Отправка списка задач FIM всем клиентам GUI
sendListTasksFIMofTraineetoClient(client, id_trainee); //sendListTasksFIMofTraineetoClient(client, id_trainee);
emit sigStatusTasksFIMofTraineeChanged(id_trainee);
//Отправка списка задач FIM клиенту Юнити //Отправка списка задач FIM клиенту Юнити
if(ClientHandler* clientUnity = getUnityClientById(id_trainee)) if(ClientHandler* clientUnity = getUnityClientById(id_trainee))