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

InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp

@@ -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)

InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h

@@ -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;

InstructorsAndTrainees/connectorToServer/Core/tools.cpp

@@ -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);
 

InstructorsAndTrainees/connectorToServer/connectortoserver.cpp

@@ -98,14 +98,14 @@ void ConnectorToServer::SetConnectToServer()
     emit sigSetConnect(dataParser->getServerSettings(),connectionThread);
 }
 
-QList<TaskAmmFim> ConnectorToServer::getListTaskFim()
+QByteArray ConnectorToServer::getListTaskFimArray()
 {
-    return listTaskFim;
+    return listTaskFimArray;
 }
 
-QList<TaskAmmFim> ConnectorToServer::getListTaskAmm()
+QByteArray ConnectorToServer::getListTaskAmmArray()
 {
-    return listTaskAmm;
+    return listTaskAmmArray;
 }
 
 QList<Instructor> ConnectorToServer::getListInstructors()
@@ -297,15 +297,15 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListTasks(QList<Task> listTasks)
     //emit signal_UpdateDB(false, true);
 }
 
-void ConnectorToServer::slot_AnswerQueryTasksXML_FIM(QList<TaskAmmFim> listTaskFim)
+void ConnectorToServer::slot_AnswerQueryTasksXML_FIM(QByteArray array)
 {
-    this->listTaskFim = listTaskFim;
+    this->listTaskFimArray = array;
     emit signal_UpdateTasksFIM();
 }
 
-void ConnectorToServer::slot_AnswerQueryTasksXML_AMM(QList<TaskAmmFim> listTaskAmm)
+void ConnectorToServer::slot_AnswerQueryTasksXML_AMM(QByteArray array)
 {
-    this->listTaskAmm = listTaskAmm;
+    this->listTaskAmmArray = array;
     emit signal_UpdateTasksAMM();
 }
 

InstructorsAndTrainees/connectorToServer/connectortoserver.h

@@ -30,8 +30,8 @@ public:
     void SetConnectToServer();
 
 public:
-    QList<TaskAmmFim> getListTaskFim();
-    QList<TaskAmmFim> getListTaskAmm();
+    QByteArray getListTaskFimArray();
+    QByteArray getListTaskAmmArray();
 
 public:
     //Запросы к БД (локальной)
@@ -67,8 +67,8 @@ public slots:
     void slot_AnswerQueryToDB_ListClassrooms(QList<Classroom> listClassrooms);
     void slot_AnswerQueryToDB_ListTasks(QList<Task> listTasks);
 
-    void slot_AnswerQueryTasksXML_FIM(QList<TaskAmmFim> listTaskFim);
-    void slot_AnswerQueryTasksXML_AMM(QList<TaskAmmFim> listTaskAmm);
+    void slot_AnswerQueryTasksXML_FIM(QByteArray array);
+    void slot_AnswerQueryTasksXML_AMM(QByteArray array);
 
     void slot_msgToClientReady(QString login, QString text);
 
@@ -115,8 +115,8 @@ private:
     QList<Classroom> listClassrooms;
     QList<Task> listTasks;
 
-    QList<TaskAmmFim> listTaskFim;
-    QList<TaskAmmFim> listTaskAmm;
+    QByteArray listTaskFimArray;
+    QByteArray listTaskAmmArray;
 };
 
 #endif // CONNECTORTOSERVER_H