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

Добавил в БД status для АММ и ФИМ задач

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-04-30 12:09:45 +03:00
parent 98b01b2e88
commit 808ebe81a3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DataBaseLMS/databaselms.cpp
View File

@@ -588,7 +588,7 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksAMMofTrainee(int id_trainee)
{ {
QList<TaskAmmFim> listTasks; QList<TaskAmmFim> listTasks;
QString queryStr = QString("SELECT tasks_amm.task_id, tasks_amm.title, tasks_amm.dm_code, " QString queryStr = QString("SELECT tasks_amm.task_id, tasks_amm.title, tasks_amm.dm_code, tasks_amm.status, "
"trainees.trainee_id " "trainees.trainee_id "
"FROM public.tasks_amm JOIN public.trainees ON trainees.trainee_id = tasks_amm.trainee_task " "FROM public.tasks_amm JOIN public.trainees ON trainees.trainee_id = tasks_amm.trainee_task "
"WHERE tasks_amm.trainee_task = %1 " "WHERE tasks_amm.trainee_task = %1 "
@@ -606,6 +606,7 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksAMMofTrainee(int id_trainee)
task.setID(query.value(0).toInt()); task.setID(query.value(0).toInt());
task.ammProcedure.title = query.value(1).toString(); task.ammProcedure.title = query.value(1).toString();
task.ammProcedure.dmCode = query.value(2).toString(); task.ammProcedure.dmCode = query.value(2).toString();
task.status = query.value(3).toString();
listTasks.append(task); listTasks.append(task);
} }
@@ -733,7 +734,7 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksFIMofTrainee(int id_trainee)
resBool = db->transaction(); resBool = db->transaction();
queryStr = QString("SELECT tasks_fim.task_id, tasks_fim.title, " queryStr = QString("SELECT tasks_fim.task_id, tasks_fim.title, tasks_fim.status, "
"trainees.trainee_id " "trainees.trainee_id "
"FROM public.tasks_fim JOIN public.trainees ON trainees.trainee_id = tasks_fim.trainee_task " "FROM public.tasks_fim JOIN public.trainees ON trainees.trainee_id = tasks_fim.trainee_task "
"WHERE tasks_fim.trainee_task = %1 " "WHERE tasks_fim.trainee_task = %1 "
@@ -750,6 +751,7 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksFIMofTrainee(int id_trainee)
task.setID(query.value(0).toInt()); task.setID(query.value(0).toInt());
task.title = query.value(1).toString(); task.title = query.value(1).toString();
task.status = query.value(2).toString();
//Выгребаем все malfunction для этой задачи //Выгребаем все malfunction для этой задачи
queryStr = QString("SELECT malfunctions.malfunction_id, malfunctions.num, malfunctions.dm_code, malfunctions.description, " queryStr = QString("SELECT malfunctions.malfunction_id, malfunctions.num, malfunctions.dm_code, malfunctions.description, "

2
ServerLMS/Systems/Parsers/dbanswerparser.cpp
View File

@@ -119,6 +119,7 @@ QByteArray DBAnswerParser::listTasksAMMofTrainee(bool result, QList<TaskAmmFim>
taskNode.toElement().setAttribute("task_id", QString::number(task.getID())); taskNode.toElement().setAttribute("task_id", QString::number(task.getID()));
taskNode.toElement().setAttribute("title", task.ammProcedure.title); taskNode.toElement().setAttribute("title", task.ammProcedure.title);
taskNode.toElement().setAttribute("dmCode", task.ammProcedure.dmCode); taskNode.toElement().setAttribute("dmCode", task.ammProcedure.dmCode);
taskNode.toElement().setAttribute("status", task.status);
} }
dataParser->saveDOMtoXML("ListTasksAMM.xml", &commonDOM); dataParser->saveDOMtoXML("ListTasksAMM.xml", &commonDOM);
@@ -142,6 +143,7 @@ QByteArray DBAnswerParser::listTasksFIMofTrainee(bool result, QList<TaskAmmFim>
listNode.appendChild(taskNode); listNode.appendChild(taskNode);
taskNode.toElement().setAttribute("task_id", QString::number(task.getID())); taskNode.toElement().setAttribute("task_id", QString::number(task.getID()));
taskNode.toElement().setAttribute("title", task.title); taskNode.toElement().setAttribute("title", task.title);
taskNode.toElement().setAttribute("status", task.status);
for(Malfunction malfunction : task.malfunctionList) for(Malfunction malfunction : task.malfunctionList)
{//Неисправность {//Неисправность