diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index 9750900..93b7d82 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -703,14 +703,28 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array trainee_id = listNode.toElement().attribute("trainee_id").toInt(); for(int i = 0; i < listNode.childNodes().count(); i++) - { + {//Задачи QDomNode taskNode = listNode.childNodes().at(i); if(taskNode.nodeName() == "taskFIM") - {//Задача + { TaskAmmFim task; task.setID(taskNode.toElement().attribute("task_id").toInt()); task.title = taskNode.toElement().attribute("title"); + for(int j = 0; j < taskNode.childNodes().count(); j++) + {//Неисправности + QDomNode malfunctionNode = taskNode.childNodes().at(j); + if(malfunctionNode.nodeName() == "malfunction") + { + Malfunction malfunction; + malfunction.num = malfunctionNode.toElement().attribute("num"); + malfunction.dmCode = malfunctionNode.toElement().attribute("dmCode"); + malfunction.description = malfunctionNode.toElement().attribute("description"); + + task.malfunctionList.append(malfunction); + } + } + listTasks.append(task); } } diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index b567986..ce67808 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -211,8 +211,12 @@ void FIMtasksWidget::fillTree() QTreeWidgetItem* itemMalfunction = new QTreeWidgetItem(); itemMalfunction->setText(0, malfunction.description); - itemMalfunction->setFlags(itemMalfunction->flags() | Qt::ItemIsUserCheckable); - itemMalfunction->setCheckState(0, Qt::Checked); + if(type == TypeList::listCommon) + { + itemMalfunction->setFlags(itemMalfunction->flags() | Qt::ItemIsUserCheckable); + itemMalfunction->setCheckState(0, Qt::Checked); + } + itemMalfunction->setIcon(0, QIcon(":/resources/icons/malfunction.png")); itemMalfunction->setToolTip(0, malfunction.description);