Пофиксил неправильную распаковку репорта от Клиента

InstructorsAndTrainees/trainees/personalcardtrainee.cpp

@@ -5,15 +5,59 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i
     QWidget(parent),
     connectorToServer(connectorToServer),
     id_trainee(id_trainee),
+    ammTasksWidget_personal(nullptr),
+    fimTasksWidget_personal(nullptr),
+    ammTasksWidget(nullptr),
+    fimTasksWidget(nullptr),
     ui(new Ui::PersonalCardTrainee)
 {
     ui->setupUi(this);
 
     loadInfo();
+
+    ammTasksWidget_personal = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
+    fimTasksWidget_personal = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
+
+    //connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
+    //connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
+
+    connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget_personal, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee);
+    connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIMforTrainee, fimTasksWidget_personal, &FIMtasksWidget::slot_UpdateTasksFIMforTrainee);
+
+    fimTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
+    ammTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
+
+    ui->verticalLayout_AMMpersonal->addWidget(ammTasksWidget_personal);
+    ui->verticalLayout_FIMpersonal->addWidget(fimTasksWidget_personal);
+
+
+    ammTasksWidget = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
+    fimTasksWidget = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
+
+    connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI);
+    connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);
+    //connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
+    //connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
+
+    fimTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
+    ammTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
+
+    ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget);
+    ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget);
+
+    //connectorToServer->sendQueryTasksXML("fim");
+    //connectorToServer->sendQueryTasksXML("amm");
+    fimTasksWidget->slot_NeedUpdateUI();
+    ammTasksWidget->slot_NeedUpdateUI();
 }
 
 PersonalCardTrainee::~PersonalCardTrainee()
 {
+    delete ammTasksWidget;
+    delete fimTasksWidget;
+    delete ammTasksWidget_personal;
+    delete fimTasksWidget_personal;
+
     delete ui;
 }
 
@@ -28,11 +72,11 @@ void PersonalCardTrainee::loadInfo()
     else
         ui->lblLoginIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
 
-    QList<TaskAmmFim> listTasksAMM = connectorToServer->getListTasksAMMforTrainee(id_trainee);
+    //QList<TaskAmmFim> listTasksAMM = connectorToServer->getListTasksAMMforTrainee(id_trainee);
-    QList<TaskAmmFim> listTasksFIM = connectorToServer->getListTasksFIMforTrainee(id_trainee);
+    //QList<TaskAmmFim> listTasksFIM = connectorToServer->getListTasksFIMforTrainee(id_trainee);
 
-    ui->lblCntAMM->setText(QString::number(listTasksAMM.count()));
+    //ui->lblCntAMM->setText(QString::number(listTasksAMM.count()));
-    ui->lblCntFIM->setText(QString::number(listTasksFIM.count()));
+    //ui->lblCntFIM->setText(QString::number(listTasksFIM.count()));
 
     TimingOfTrainee timing = trainee.getTiming();
 

InstructorsAndTrainees/trainees/personalcardtrainee.h

@@ -2,6 +2,8 @@
 #define PERSONALCARDTRAINEE_H
 
 #include"connectortoserver.h"
+#include "ammtaskswidget.h"
+#include "fimtaskswidget.h"
 #include <QWidget>
 
 namespace Ui {
@@ -23,6 +25,12 @@ private:
     ConnectorToServer* connectorToServer;
     int id_trainee;
 
+    AMMtasksWidget* ammTasksWidget_personal;
+    FIMtasksWidget* fimTasksWidget_personal;
+
+    AMMtasksWidget* ammTasksWidget;
+    FIMtasksWidget* fimTasksWidget;
+
 private:
     Ui::PersonalCardTrainee *ui;
 };

InstructorsAndTrainees/trainees/personalcardtrainee.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>537</width>
+    <width>1125</width>
-    <height>300</height>
+    <height>764</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -200,22 +200,59 @@
       </layout>
      </item>
      <item>
-      <widget class="QLabel" name="label">
+      <widget class="QGroupBox" name="groupBox_2">
-       <property name="frameShape">
+       <property name="sizePolicy">
-        <enum>QFrame::Box</enum>
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="text">
+       <property name="title">
-        <string>&lt;Здесь будут задачи&gt;</string>
+        <string>Tasks</string>
-       </property>
-       <property name="scaledContents">
-        <bool>true</bool>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>false</bool>
        </property>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
+         <widget class="QTabWidget" name="tabWidget">
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <widget class="QWidget" name="tab">
+           <attribute name="title">
+            <string>AMM</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_5">
+            <item row="0" column="0">
+             <layout class="QHBoxLayout" name="horizontalLayout_9">
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_AMMcommon"/>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_AMMpersonal"/>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="tab_2">
+           <attribute name="title">
+            <string>FIM</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_4">
+            <item row="0" column="0">
+             <layout class="QHBoxLayout" name="horizontalLayout_8">
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_FIMcommon"/>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_FIMpersonal"/>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </item>
     </layout>

ServerLMS/Systems/Parsers/processparser.cpp

@@ -181,11 +181,11 @@ void ProcessParser::clientUnityTaskFIMreport(QXmlStreamReader &xmlReader, Client
                         for(int k = 0; k < malfOrReportNode.childNodes().count(); k++)
                         {
                             QDomNode reportItemNode = malfOrReportNode.childNodes().at(k);
-                            if(reportItemNode.nodeName() == "reportItem")
+                            if(reportItemNode.nodeName() == "item")
                             {
                                 FIMReportItem reportItem;
                                 reportItem.id = 0; //reportItemNode.toElement().attribute("item_id").toInt();
-                                reportItem.text = reportItemNode.toElement().attribute("text");
+                                reportItem.text = reportItemNode.toElement().attribute("title");
 
                                 if(reportItemNode.childNodes().count())
                                 {