GUI. subProc отобр. выпад-м списком в ранее назн.

InstructorsAndTrainees/InstructorsAndTrainees.qrc

@@ -55,5 +55,6 @@
         <file>resources/icons/personalCard.png</file>
         <file>resources/icons/eye.png</file>
         <file>resources/icons/exchange.png</file>
+        <file>resources/icons/link.png</file>
     </qresource>
 </RCC>

InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp

@@ -799,6 +799,20 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array
                     task.ammProcedure.dmCode = taskNode.toElement().attribute("dmCode");
                     task.status = taskNode.toElement().attribute("status");
 
+                    for(int j = 0; j < taskNode.childNodes().count(); j++)
+                    {
+                        QDomNode subProcNode = taskNode.childNodes().at(j);
+                        if(subProcNode.nodeName() == "SubProc")
+                        {//Подпроцедура
+                            SubProc subProc;
+                            subProc.setDmCode(subProcNode.toElement().attribute("dmCode"));
+                            subProc.setTitle(subProcNode.toElement().attribute("title"));
+                            subProc.setModeListStr(subProcNode.toElement().attribute("canplay"));
+
+                            task.listSubProc.append(subProc);
+                        }
+                    }
+
                     listTasks.append(task);
                 }
             }

InstructorsAndTrainees/tasks/ammtaskswidget.cpp

@@ -182,27 +182,51 @@ void AMMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
     {
         ui->btnDelete->setEnabled(false);
         ui->btnCheck->setEnabled(false);
+        ui->btnAssignTask->setEnabled(false);
         return;
     }
-    else
+
+    if(this->type == TypeListTreeAMMFIM::listCommon)
     {
-        ui->btnCheck->setEnabled(true);
+        int id = item->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
-        ui->btnDelete->setEnabled(true);
+        TaskAmmFim task = taskTreePreparation->getTaskAMMbyID(id);
+
+        if(taskTreePreparation->getTypeModuleAMMbyID(id) == ModuleType::TYPE_PM)
+            ui->btnAssignTask->setEnabled(false);
+        else
+        {
+            ui->btnAssignTask->setEnabled(true);
+        }
+
+        if(task.getID())
+            lastCurrentID = id;
+
+        ui->btnDelete->setEnabled(false);
+        ui->btnCheck->setEnabled(false);
     }
+    else if(this->type == TypeListTreeAMMFIM::listForTrainee)
+    {
+        QTreeWidgetItem *treeItemParent = item->parent();
+        if(treeItemParent == nullptr)
+        {//Выбрана задача
+            ui->btnCheck->setEnabled(true);
+            ui->btnDelete->setEnabled(true);
 
-    int id = item->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
+            int id = item->text(ColumnsTreeAMM::clmnAMM_ID).toInt();
+            TaskAmmFim task = taskTreePreparation->getTaskAMMbyID(id);
 
-    TaskAmmFim task = taskTreePreparation->getTaskAMMbyID(id);
+            if(task.getID())
-
+                lastCurrentID = id;
-    if(taskTreePreparation->getTypeModuleAMMbyID(id) == ModuleType::TYPE_PM)
+        }
+        else
+        {
+            ui->btnCheck->setEnabled(false);
+            ui->btnDelete->setEnabled(false);
+        }
         ui->btnAssignTask->setEnabled(false);
-    else
-    {
-        ui->btnAssignTask->setEnabled(true);
     }
-
+    else
-    if(task.getID())
+        lastCurrentID = 0;
-        lastCurrentID = id;
 }
 
 void AMMtasksWidget::slot_NeedUpdateUI()
@@ -233,7 +257,7 @@ void AMMtasksWidget::slot_UpdateTasksAMMforTrainee(int trainee_id)
         if(idTraineeSelected == trainee_id)
         {
             QList<TaskAmmFim> listTask = connectorToServer->getListTasksAMMforTrainee(trainee_id);
-            signal_prepareAMMListItemsForTrainee(listTask);
+            emit signal_prepareAMMListItemsForTrainee(listTask);
 
             emit signal_countTasksAMMforTraineeChanged(trainee_id, listTask.count());
         }

InstructorsAndTrainees/tasks/fimtaskswidget.cpp

@@ -161,11 +161,10 @@ void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
     {
         ui->btnDelete->setEnabled(false);
         ui->btnCheck->setEnabled(false);
+        ui->btnAssignTask->setEnabled(false);
         return;
     }
 
-    QString code = "";
-
     QTreeWidgetItem *treeItemParent = item->parent();
     if(treeItemParent == nullptr)
     {//Выбрана задача
@@ -185,8 +184,6 @@ void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
             lastCurrentID = task.getID();
         }
 
-        code = task.title;
-
         ui->btnAssignTask->setEnabled(true);
 
         ui->btnDelete->setEnabled(true);

InstructorsAndTrainees/tasks/tasktreepreparation.cpp

@@ -515,6 +515,26 @@ void TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee(QList<TaskAmm
 
         item->setToolTip(0, text);
 
+        if(type == TypeListTreeAMMFIM::listForTrainee)
+        {
+            for (int j = 0; j < task.listSubProc.count(); j++)
+            {/*Подпроцедуры*/
+                SubProc subProc = task.listSubProc.at(j);
+
+                QTreeWidgetItem* itemSubProc = new QTreeWidgetItem();
+
+                itemSubProc->setText(ColumnsTreeAMM::clmnAMM_PMorDM, subProc.getTitle());
+
+                itemSubProc->setIcon(ColumnsTreeAMM::clmnAMM_PMorDM, QIcon(":/resources/icons/link.png"));
+                itemSubProc->setToolTip(ColumnsTreeAMM::clmnAMM_PMorDM, subProc.getTitle());
+
+                itemSubProc->setText(ColumnsTreeAMM::clmnAMM_code, subProc.getDmCode());
+
+                item->addChild(itemSubProc);
+            }
+
+        }
+
         listItemsAll.append(item);
     }