From fa34975beedf20abd401bc846f178c99646e1d8a Mon Sep 17 00:00:00 2001 From: krivoshein Date: Tue, 22 Jul 2025 11:20:20 +0300 Subject: [PATCH] =?UTF-8?q?tasksAMM.xml=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BD=D0=B0=20docs.xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connectorToServer/Core/recognizesystem.cpp | 4 ++-- InstructorsAndTrainees/tasks/tasktreepreparation.cpp | 6 +++++- ServerLMS/Systems/tools.h | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index de36320..0fbb331 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -371,7 +371,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket) break; }; - //xml-ответы на запросы AdditionalFiles + //xml-ответы на запросы AdditionalFiles (сигнал о чтении ранее принятого) if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM || packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_AMM) { @@ -381,7 +381,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket) if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM) xmlFileName = "./" + additionalFilesFolderName + "/tasksFIM.xml"; else - xmlFileName = "./" + additionalFilesFolderName + "/tasksAMM.xml"; + xmlFileName = "./" + additionalFilesFolderName + "/docs.xml"; //"/tasksAMM.xml"; QFile xmlInFile(xmlFileName); if (!xmlInFile.open(QFile::ReadOnly | QFile::Text)) diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp index e86f688..aaed516 100644 --- a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp +++ b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp @@ -233,7 +233,11 @@ void TaskAMMFIMTreePreparation::domElementParserAMM(QDomElement element, Module* QDomNamedNodeMap nodeMap = childElement.attributes(); - if(name == "pm") + if(name == "doc") + { + module = new PM(); + } + else if(name == "pm") { module = new PM(); PM* PMmodul = static_cast(module); diff --git a/ServerLMS/Systems/tools.h b/ServerLMS/Systems/tools.h index 8d86925..327f37a 100644 --- a/ServerLMS/Systems/tools.h +++ b/ServerLMS/Systems/tools.h @@ -25,7 +25,7 @@ static const QString versionListFile = staticDataFolderName + "/versionList.xml" static const QString hashFileName = staticDataFolderName + "/serverHash.xml"; static const QString buildHashName = staticDataFolderName + "/buildHash.xml"; static const QString buildDataPath = "/Application/" + projectFolderName + "/RRJ_Data/"; -static const QString tasksAMMfileName = "/tasksAmm.xml"; +static const QString tasksAMMfileName = "/docs.xml"; //"/tasksAmm.xml"; static const QString tasksFIMfileName = "/tasksFIM.xml"; static const QString clientHash = staticDataFolderName + "/clientHash.xml";