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

Подкорректировал репорт xml

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-06-02 16:56:07 +03:00
parent 457a9c202e
commit bd2adde230
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -731,9 +731,15 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array
FIMReportItem reportItem; FIMReportItem reportItem;
reportItem.id = reportItemNode.toElement().attribute("item_id").toInt(); reportItem.id = reportItemNode.toElement().attribute("item_id").toInt();
reportItem.text = reportItemNode.toElement().attribute("text"); reportItem.text = reportItemNode.toElement().attribute("text");
reportItem.procedure.title = reportItemNode.toElement().attribute("title");
reportItem.procedure.dmCode = reportItemNode.toElement().attribute("dmCode"); if(reportItemNode.childNodes().count())
reportItem.procedure.result = reportItemNode.toElement().attribute("result"); {
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); report.itemList.append(reportItem);
} }

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

@@ -170,14 +170,20 @@ QByteArray DBAnswerParser::listTasksFIMofTrainee(bool result, QList<TaskAmmFim>
reportNode.toElement().setAttribute("report_id", report.id); reportNode.toElement().setAttribute("report_id", report.id);
for(FIMReportItem reportItem : task.report.itemList) for(FIMReportItem reportItem : task.report.itemList)
{//report_item {//FIMReportItem
QDomNode reportItemNode = commonDOM.createElement("reportItem"); QDomNode reportItemNode = commonDOM.createElement("reportItem");
reportNode.appendChild(reportItemNode); reportNode.appendChild(reportItemNode);
reportItemNode.toElement().setAttribute("item_id", reportItem.id); reportItemNode.toElement().setAttribute("item_id", reportItem.id);
reportItemNode.toElement().setAttribute("text", reportItem.text); reportItemNode.toElement().setAttribute("text", reportItem.text);
reportItemNode.toElement().setAttribute("title", reportItem.procedure.title);
reportItemNode.toElement().setAttribute("dmCode", reportItem.procedure.dmCode); //ProcedureID
reportItemNode.toElement().setAttribute("result", reportItem.procedure.result); 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);
} }
} }
} }