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

Сделал выдачу tasksAMM.xml из сервера по запросу GUI-клиента

Browse Source
This commit is contained in:
krivoshein
2025-01-21 12:36:24 +03:00
parent 1950690f82
commit 3baccee9b3
15 changed files with 117 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,9 +2,9 @@
#include <QThread>
#include <QDir>
#include <QDomDocument>
#include <QMessageBox>
#include "instructor.h"
#include "tasksAmmFim.h"
#include "fimtaskswidget.h"
RecognizeSystem::RecognizeSystem(QObject *parent):
@@ -282,12 +282,25 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM ||
packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_AMM)
{
QByteArray array;
stream.startTransaction();
stream >> array;
QByteArray array;
QString xmlFileName = "";
if(!stream.commitTransaction())
continue;
if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM)
xmlFileName = "./AdditionalFiles/tasksFIM.xml";
else
xmlFileName = "./AdditionalFiles/tasksAMM.xml";
QFile xmlInFile(xmlFileName);
if (!xmlInFile.open(QFile::ReadOnly | QFile::Text))
{
QMessageBox::critical(nullptr, tr("Attention!"), tr("The file could not be opened ") + xmlFileName);
return;
}
else
{
array = xmlInFile.readAll();
xmlInFile.close();
}
xmlParserQueryTasksXML(packetType, array);
@@ -567,15 +580,14 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array
void RecognizeSystem::xmlParserQueryTasksXML(PacketType packetType, QByteArray array)
{
QList<TaskAmmFim> listTaskAmmFim;
//парсинг XML
listTaskAmmFim = FIMtasksWidget::loadTasksAmmFimFromXML(array);
if(packetType == TYPE_XMLANSWER_QUERY_TASKS_XML_FIM)
emit sigAnswerQueryTasksXML_FIM(listTaskAmmFim);
{
emit sigAnswerQueryTasksXML_FIM(array);
}
else if(packetType == TYPE_XMLANSWER_QUERY_TASKS_XML_AMM)
emit sigAnswerQueryTasksXML_AMM(listTaskAmmFim);
{
emit sigAnswerQueryTasksXML_AMM(array);
}
}
void RecognizeSystem::checkAccessType(QString type)

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

@@ -49,8 +49,8 @@ signals:
void sigAnswerQueryToDB_ListClassrooms(QList<Classroom> listClassrooms);
void sigAnswerQueryToDB_ListTasks(QList<Task> listTasks);
void sigAnswerQueryTasksXML_FIM(QList<TaskAmmFim> listTaskFim);
void sigAnswerQueryTasksXML_AMM(QList<TaskAmmFim> listTaskAmm);
void sigAnswerQueryTasksXML_FIM(QByteArray array);
void sigAnswerQueryTasksXML_AMM(QByteArray array);
private:
QList<QString> *folderList;

2
InstructorsAndTrainees/connectorToServer/Core/tools.cpp
View File

@@ -27,7 +27,7 @@ QString Tools::createLocalPath(QString path)
QString Tools::createFullPath(QString path)
{
QString fullPath;
qint8 pos = path.indexOf("Application");
qint8 pos = path.indexOf("AdditionalFiles");
QString localPath = path.remove(0,--pos);