From 808ebe81a3ab773992b121901330a510bd6d11ad Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 30 Apr 2025 12:09:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=20=D0=91=D0=94=20status=20=D0=B4=D0=BB=D1=8F=20=D0=90?= =?UTF-8?q?=D0=9C=D0=9C=20=D0=B8=20=D0=A4=D0=98=D0=9C=20=D0=B7=D0=B0=D0=B4?= =?UTF-8?q?=D0=B0=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBaseLMS/databaselms.cpp | 6 ++++-- ServerLMS/Systems/Parsers/dbanswerparser.cpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DataBaseLMS/databaselms.cpp b/DataBaseLMS/databaselms.cpp index af0941b..0be38cc 100644 --- a/DataBaseLMS/databaselms.cpp +++ b/DataBaseLMS/databaselms.cpp @@ -588,7 +588,7 @@ QList DataBaseLMS::selectTasksAMMofTrainee(int id_trainee) { QList 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 " "FROM public.tasks_amm JOIN public.trainees ON trainees.trainee_id = tasks_amm.trainee_task " "WHERE tasks_amm.trainee_task = %1 " @@ -606,6 +606,7 @@ QList DataBaseLMS::selectTasksAMMofTrainee(int id_trainee) task.setID(query.value(0).toInt()); task.ammProcedure.title = query.value(1).toString(); task.ammProcedure.dmCode = query.value(2).toString(); + task.status = query.value(3).toString(); listTasks.append(task); } @@ -733,7 +734,7 @@ QList DataBaseLMS::selectTasksFIMofTrainee(int id_trainee) 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 " "FROM public.tasks_fim JOIN public.trainees ON trainees.trainee_id = tasks_fim.trainee_task " "WHERE tasks_fim.trainee_task = %1 " @@ -750,6 +751,7 @@ QList DataBaseLMS::selectTasksFIMofTrainee(int id_trainee) task.setID(query.value(0).toInt()); task.title = query.value(1).toString(); + task.status = query.value(2).toString(); //Выгребаем все malfunction для этой задачи queryStr = QString("SELECT malfunctions.malfunction_id, malfunctions.num, malfunctions.dm_code, malfunctions.description, " diff --git a/ServerLMS/Systems/Parsers/dbanswerparser.cpp b/ServerLMS/Systems/Parsers/dbanswerparser.cpp index cfce748..9a340d1 100644 --- a/ServerLMS/Systems/Parsers/dbanswerparser.cpp +++ b/ServerLMS/Systems/Parsers/dbanswerparser.cpp @@ -119,6 +119,7 @@ QByteArray DBAnswerParser::listTasksAMMofTrainee(bool result, QList taskNode.toElement().setAttribute("task_id", QString::number(task.getID())); taskNode.toElement().setAttribute("title", task.ammProcedure.title); taskNode.toElement().setAttribute("dmCode", task.ammProcedure.dmCode); + taskNode.toElement().setAttribute("status", task.status); } dataParser->saveDOMtoXML("ListTasksAMM.xml", &commonDOM); @@ -142,6 +143,7 @@ QByteArray DBAnswerParser::listTasksFIMofTrainee(bool result, QList listNode.appendChild(taskNode); taskNode.toElement().setAttribute("task_id", QString::number(task.getID())); taskNode.toElement().setAttribute("title", task.title); + taskNode.toElement().setAttribute("status", task.status); for(Malfunction malfunction : task.malfunctionList) {//Неисправность