Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

tasksAMM.xml заменил на docs.xml

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-07-22 11:20:20 +03:00
parent 82b605ae50
commit fa34975bee
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,7 +371,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
break; break;
}; };
//xml-ответы на запросы AdditionalFiles //xml-ответы на запросы AdditionalFiles (сигнал о чтении ранее принятого)
if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM || if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM ||
packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_AMM) 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) if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM)
xmlFileName = "./" + additionalFilesFolderName + "/tasksFIM.xml"; xmlFileName = "./" + additionalFilesFolderName + "/tasksFIM.xml";
else else
xmlFileName = "./" + additionalFilesFolderName + "/tasksAMM.xml"; xmlFileName = "./" + additionalFilesFolderName + "/docs.xml"; //"/tasksAMM.xml";
QFile xmlInFile(xmlFileName); QFile xmlInFile(xmlFileName);
if (!xmlInFile.open(QFile::ReadOnly | QFile::Text)) if (!xmlInFile.open(QFile::ReadOnly | QFile::Text))

6
InstructorsAndTrainees/tasks/tasktreepreparation.cpp
View File

@@ -233,7 +233,11 @@ void TaskAMMFIMTreePreparation::domElementParserAMM(QDomElement element, Module*
QDomNamedNodeMap nodeMap = childElement.attributes(); QDomNamedNodeMap nodeMap = childElement.attributes();
if(name == "pm") if(name == "doc")
{
module = new PM();
}
else if(name == "pm")
{ {
module = new PM(); module = new PM();
PM* PMmodul = static_cast<PM*>(module); PM* PMmodul = static_cast<PM*>(module);

2
ServerLMS/Systems/tools.h
View File

@@ -25,7 +25,7 @@ static const QString versionListFile = staticDataFolderName + "/versionList.xml"
static const QString hashFileName = staticDataFolderName + "/serverHash.xml"; static const QString hashFileName = staticDataFolderName + "/serverHash.xml";
static const QString buildHashName = staticDataFolderName + "/buildHash.xml"; static const QString buildHashName = staticDataFolderName + "/buildHash.xml";
static const QString buildDataPath = "/Application/" + projectFolderName + "/RRJ_Data/"; 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 tasksFIMfileName = "/tasksFIM.xml";
static const QString clientHash = staticDataFolderName + "/clientHash.xml"; static const QString clientHash = staticDataFolderName + "/clientHash.xml";