GUI. Отправка запроса на список ПП в Сервер

InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp

@@ -245,6 +245,24 @@ QByteArray DataParser::createQueryTasksXMLMessage(QString type)
     return array;
 }
 
+QByteArray DataParser::createQueryListSubProcMessage(QString dmCode)
+{
+    QByteArray array;
+    QXmlStreamWriter xmlWriter(&array);
+
+    xmlWriter.setAutoFormatting(true);
+    xmlWriter.writeStartDocument();
+    xmlWriter.writeStartElement("QueryListSubProc");
+
+    xmlWriter.writeAttribute("dmCode", dmCode);
+
+    xmlWriter.writeEndElement();
+    xmlWriter.writeEndElement();
+    xmlWriter.writeEndDocument();
+
+    return array;
+}
+
 QByteArray DataParser::createDeAuthMessage(ClientDeAutorization *deAuth)
 {
     QByteArray array;

InstructorsAndTrainees/connectorToServer/Core/dataparser.h

@@ -26,6 +26,7 @@ public:
     QByteArray createMessage(ClientMessage toClientMessage);
     QByteArray createQueryToDBMessage(ClientQueryToDB *queryToDB, int id = 0, void* data = nullptr);
     QByteArray createQueryTasksXMLMessage(QString type);
+    QByteArray createQueryListSubProcMessage(QString dmCode);
     QByteArray createDeAuthMessage(ClientDeAutorization *deAuth);
 
     QByteArray createQueryBlockAuth(bool block);

InstructorsAndTrainees/connectorToServer/connectortoserver.h

@@ -46,6 +46,7 @@ public:
     bool sendMessage(ClientMessage clientMessage);
 
     bool sendQueryTasksXML(QString type);
+    bool sendQueryListSubProc(QString dmCode);
     bool sendQueryBlockAuth(bool block);
 
     void sendShowVersionSelect();

InstructorsAndTrainees/connectorToServer/connectortoserver_Send.cpp

@@ -82,6 +82,19 @@ bool ConnectorToServer::sendQueryTasksXML(QString type)
     return true;
 }
 
+bool ConnectorToServer::sendQueryListSubProc(QString dmCode)
+{
+    if (!client->getIsConnected())
+    {
+        return false;
+    }
+
+    QByteArray array = dataParser->createQueryListSubProcMessage(dmCode);
+    emit sigSendAnswerToServer(array);
+
+    return true;
+}
+
 bool ConnectorToServer::sendQueryBlockAuth(bool block)
 {
     if (!client->getIsConnected())

InstructorsAndTrainees/tasks/ammtaskswidget.cpp

@@ -149,6 +149,9 @@ void AMMtasksWidget::closeDlgCheckTask()
 {
     if(dlgCheckerTask)
         dlgCheckerTask->close();
+
+    if(dlgListSubProc)
+        dlgListSubProc->close();
 }
 
 void AMMtasksWidget::closeDlgListSubProc()

InstructorsAndTrainees/tasks/listsubproc.cpp

@@ -4,6 +4,7 @@
 ListSubProc::ListSubProc(ConnectorToServer* connectorToServer, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::ListSubProc),
+    connectorToServer(connectorToServer),
     waitAnimationWidget(nullptr)
 {
     ui->setupUi(this);
@@ -40,4 +41,7 @@ void ListSubProc::setTask(TaskAmmFim *task)
     ui->lbl_DMCode->setText(task->ammProcedure.dmCode);
 
     waitAnimationWidget->showWithPlay();
+
+    if(! connectorToServer->sendQueryListSubProc(this->task.ammProcedure.dmCode))
+        waitAnimationWidget->hideWithStop();
 }

InstructorsAndTrainees/tasks/listsubproc.h

@@ -25,6 +25,8 @@ public:
 private:
     Ui::ListSubProc *ui;
 
+    ConnectorToServer* connectorToServer;
+
     TaskAmmFim task;
 
     WaitAnimationWidget *waitAnimationWidget;