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:
Кривошеин Андрей
2025-05-15 17:37:39 +03:00
parent 77096e2a61
commit 0f7d9e6531
10 changed files with 247 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ServerLMS/Systems/Parsers/processparser.cpp
View File

@@ -134,7 +134,7 @@ void ProcessParser::clientUnityTaskAMMreport(QXmlStreamReader &xmlReader, Client
void* data = nullptr;
data = &task;
ClientQueryToDB queryToDB;
queryToDB.typeQuery = TypeQueryToDB::TYPE_QUERY_EDIT_TASK_AMM_TO_TRAINEE;
queryToDB.typeQuery = TypeQueryToDB::TYPE_QUERY_SET_REPORT_TASK_AMM_TO_TRAINEE;
processingSystem->processingClientQueryToDB(client, queryToDB, trainee_id, data);
}
}
@@ -176,13 +176,41 @@ void ProcessParser::clientUnityTaskFIMreport(QXmlStreamReader &xmlReader, Client
}
}
//TODO -------------- (!Заглушка!) Отчет о выполнении
FIMReport report;
FIMReportItem reportItem;
QString text; // текст, вводимый обучаемым
ProcedureID procedure; // ссылка на процедуру, при необходимости
text = "1. Выполнил такую процедуру";
procedure.doc = "fim";
procedure.title = "Процедура №1";
procedure.dmCode = "RRJ-N-27-92-00-51D01-420A-A";
procedure.result = "viewed";
reportItem.text = text;
reportItem.procedure = procedure;
report.itemList.append(reportItem);
text = "2. Выполнил такую процедуру";
procedure.doc = "fim";
procedure.title = "Процедура №2";
procedure.dmCode = "RRJ-N-28-22-00-01A01-420A-A";
procedure.result = "viewed";
reportItem.text = text;
reportItem.procedure = procedure;
report.itemList.append(reportItem);
task.report = report;
//-----------------
listTasks.append(task);
//Изменение задачи
void* data = nullptr;
data = &task;
ClientQueryToDB queryToDB;
queryToDB.typeQuery = TypeQueryToDB::TYPE_QUERY_EDIT_TASK_FIM_TO_TRAINEE;
queryToDB.typeQuery = TypeQueryToDB::TYPE_QUERY_SET_REPORT_TASK_FIM_TO_TRAINEE;
processingSystem->processingClientQueryToDB(client, queryToDB, trainee_id, data);
}
}

20
ServerLMS/Systems/processingsystem.cpp
View File

@@ -333,20 +333,24 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
break;
}
case TypeQueryToDB::TYPE_QUERY_EDIT_TASK_AMM_TO_TRAINEE:
case TypeQueryToDB::TYPE_QUERY_SET_REPORT_TASK_AMM_TO_TRAINEE:
{
if(int id_trainee = providerDBLMS->editTaskAMM(*(TaskAmmFim*)data))
{
TaskAmmFim* task = (TaskAmmFim*)data;
if(task->status == "completed")
if( int id_task = providerDBLMS->editStatusTaskAMM(task->getID(), "checkup") )
{
}
}
break;
}
case TypeQueryToDB::TYPE_QUERY_EDIT_TASK_FIM_TO_TRAINEE:
case TypeQueryToDB::TYPE_QUERY_SET_REPORT_TASK_FIM_TO_TRAINEE:
{
if(int id_trainee = providerDBLMS->editTaskFIM(*(TaskAmmFim*)data))
{
TaskAmmFim* task = (TaskAmmFim*)data;
if(task->status == "completed")
if(int id_report = providerDBLMS->replaceReportFIM(*task))
{
}
}
break;
}
}

15
ServerLMS/providerdblms.cpp
View File

@@ -372,6 +372,11 @@ int ProviderDBLMS::editTaskAMM(TaskAmmFim task)
return dbLMS->editTaskAMM(task);
}
int ProviderDBLMS::editStatusTaskAMM(int task_id, QString status)
{
return dbLMS->editStatusTaskAMM(task_id, status);
}
int ProviderDBLMS::newTaskFIM(TaskAmmFim task, int id_trainee)
{
return dbLMS->newTaskFIM(task, id_trainee);
@@ -387,6 +392,16 @@ int ProviderDBLMS::editTaskFIM(TaskAmmFim task)
return dbLMS->editTaskFIM(task);
}
int ProviderDBLMS::editStatusTaskFIM(int task_id, QString status)
{
return dbLMS->editStatusTaskFIM(task_id, status);
}
int ProviderDBLMS::replaceReportFIM(TaskAmmFim task)
{
return dbLMS->replaceReportFIM(task);
}
QList<TaskAmmFim> ProviderDBLMS::GetListTasksAMMofTrainee(int id_trainee)
{
QList<TaskAmmFim> listTasks;

3
ServerLMS/providerdblms.h
View File

@@ -51,10 +51,13 @@ public:
int newTaskAMM(TaskAmmFim task, int id_trainee);
int delTaskAMM(int id);
int editTaskAMM(TaskAmmFim task);
int editStatusTaskAMM(int task_id, QString status);
int newTaskFIM(TaskAmmFim task, int id_trainee);
int delTaskFIM(int id);
int editTaskFIM(TaskAmmFim task);
int editStatusTaskFIM(int task_id, QString status);
int replaceReportFIM(TaskAmmFim task);
QList<TaskAmmFim> GetListTasksAMMofTrainee(int id_trainee);
QList<TaskAmmFim> GetListTasksFIMofTrainee(int id_trainee);