From bd2adde230251723b062672192aee2a89aa8a67b Mon Sep 17 00:00:00 2001 From: krivoshein Date: Mon, 2 Jun 2025 16:56:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BA=D0=BE=D1=80=D1=80?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=80?= =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D1=80=D1=82=20xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connectorToServer/Core/recognizesystem.cpp | 12 +++++++++--- ServerLMS/Systems/Parsers/dbanswerparser.cpp | 14 ++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index ecf5d94..c59ae10 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -731,9 +731,15 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array FIMReportItem reportItem; reportItem.id = reportItemNode.toElement().attribute("item_id").toInt(); reportItem.text = reportItemNode.toElement().attribute("text"); - reportItem.procedure.title = reportItemNode.toElement().attribute("title"); - reportItem.procedure.dmCode = reportItemNode.toElement().attribute("dmCode"); - reportItem.procedure.result = reportItemNode.toElement().attribute("result"); + + if(reportItemNode.childNodes().count()) + { + QDomNode procedureIDNode = reportItemNode.childNodes().at(0); + reportItem.procedure.doc = procedureIDNode.toElement().attribute("doc"); + reportItem.procedure.title = procedureIDNode.toElement().attribute("title"); + reportItem.procedure.dmCode = procedureIDNode.toElement().attribute("dmCode"); + reportItem.procedure.result = procedureIDNode.toElement().attribute("result"); + } report.itemList.append(reportItem); } diff --git a/ServerLMS/Systems/Parsers/dbanswerparser.cpp b/ServerLMS/Systems/Parsers/dbanswerparser.cpp index c5bf6a3..078b253 100644 --- a/ServerLMS/Systems/Parsers/dbanswerparser.cpp +++ b/ServerLMS/Systems/Parsers/dbanswerparser.cpp @@ -170,14 +170,20 @@ QByteArray DBAnswerParser::listTasksFIMofTrainee(bool result, QList reportNode.toElement().setAttribute("report_id", report.id); for(FIMReportItem reportItem : task.report.itemList) - {//report_item + {//FIMReportItem QDomNode reportItemNode = commonDOM.createElement("reportItem"); reportNode.appendChild(reportItemNode); reportItemNode.toElement().setAttribute("item_id", reportItem.id); reportItemNode.toElement().setAttribute("text", reportItem.text); - reportItemNode.toElement().setAttribute("title", reportItem.procedure.title); - reportItemNode.toElement().setAttribute("dmCode", reportItem.procedure.dmCode); - reportItemNode.toElement().setAttribute("result", reportItem.procedure.result); + + //ProcedureID + QDomNode procedureIDNode = commonDOM.createElement("procedureID"); + reportItemNode.appendChild(procedureIDNode); + + procedureIDNode.toElement().setAttribute("doc", reportItem.procedure.doc); + procedureIDNode.toElement().setAttribute("title", reportItem.procedure.title); + procedureIDNode.toElement().setAttribute("dmCode", reportItem.procedure.dmCode); + procedureIDNode.toElement().setAttribute("result", reportItem.procedure.result); } } }