From 9a7f4903f681d9c7c80fc42044ea007a18187666 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 30 Apr 2025 13:21:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=93=D0=A3=D0=98=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=B8?= =?UTF-8?q?=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D1=87=D0=B8=20=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connectorToServer/Core/recognizesystem.cpp | 2 ++ InstructorsAndTrainees/tasks/ammtaskswidget.cpp | 5 +++-- InstructorsAndTrainees/tasks/fimtaskswidget.cpp | 6 ++++-- InstructorsAndTrainees/tasks/fimtaskswidget.h | 1 + InstructorsAndTrainees/tasks/tasktreepreparation.cpp | 2 ++ InstructorsAndTrainees/tasks/tasktreepreparation.h | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index be3d0c3..4da5c17 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -667,6 +667,7 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array task.setID(taskNode.toElement().attribute("task_id").toInt()); task.ammProcedure.title = taskNode.toElement().attribute("title"); task.ammProcedure.dmCode = taskNode.toElement().attribute("dmCode"); + task.status = taskNode.toElement().attribute("status"); listTasks.append(task); } @@ -689,6 +690,7 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array TaskAmmFim task; task.setID(taskNode.toElement().attribute("task_id").toInt()); task.title = taskNode.toElement().attribute("title"); + task.status = taskNode.toElement().attribute("status"); for(int j = 0; j < taskNode.childNodes().count(); j++) {//Неисправности diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 0c93034..87da14c 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -89,6 +89,7 @@ void AMMtasksWidget::resizeEvent(QResizeEvent *event) treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50); treeWidget->setColumnWidth(ColumnsTree::clmn_code, 250); + treeWidget->setColumnWidth(ColumnsTree::clmn_status, 50); int widthPMorDM; if(type == TypeList::listCommon) @@ -246,9 +247,9 @@ void AMMtasksWidget::reSetHeadTreeWidget() QStringList listHeaders; if(type == TypeList::listForTrainee) - listHeaders = QStringList{tr("Task AMM"), tr("DM code"), tr("ID")}; + listHeaders = QStringList{tr("Task AMM"), tr("DM code"), tr("ID"), tr("Status")}; else - listHeaders = QStringList{tr("PM/DM"), tr("Code"), tr("ID")}; + listHeaders = QStringList{tr("PM/DM"), tr("Code"), tr("ID"), tr("Status")}; treeWidget->setHeaderLabels(listHeaders); diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index f832f3c..c9090aa 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -73,6 +73,7 @@ void FIMtasksWidget::resizeEvent(QResizeEvent *event) int width = treeWidget->width(); treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50); + treeWidget->setColumnWidth(ColumnsTree::clmn_status, 50); int widthTitle; if(type == TypeList::listCommon) @@ -222,6 +223,7 @@ void FIMtasksWidget::fillTree() itemTask->setText(0, task->title); itemTask->setText(1, QString::number(task->id)); + itemTask->setText(2, task->status); //itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable); //itemTask->setCheckState(0, Qt::Checked); itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png")); @@ -297,9 +299,9 @@ void FIMtasksWidget::reSetHeadTreeWidget() QStringList listHeaders; if(type == TypeList::listForTrainee) - listHeaders = QStringList{tr("Task FIM"), tr("ID")}; + listHeaders = QStringList{tr("Task FIM"), tr("ID"), tr("Status")}; else - listHeaders = QStringList{tr("Title"), tr("ID")}; + listHeaders = QStringList{tr("Title"), tr("ID"), tr("Status")}; treeWidget->setHeaderLabels(listHeaders); } diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index 1c36d65..94d556d 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h @@ -25,6 +25,7 @@ private: enum ColumnsTree{ clmn_Title = 0, clmn_ID, + clmn_status, clmn_count }; diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp index c7980c9..c3cf224 100644 --- a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp +++ b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp @@ -244,6 +244,7 @@ void TaskTreePreparation::slot_prepareListItemsForTrainee(QList list QString text = task.ammProcedure.title; QString ID = QString::number(task.getID()); QString code = task.ammProcedure.dmCode; + QString status = task.status; item = new QTreeWidgetItem(); item->setIcon(0, QIcon(":/resources/icons/procedure.png")); @@ -251,6 +252,7 @@ void TaskTreePreparation::slot_prepareListItemsForTrainee(QList list item->setText(ColumnsTree::clmn_PMorDM, text); item->setText(ColumnsTree::clmn_code, code); item->setText(ColumnsTree::clmn_ID, ID); + item->setText(ColumnsTree::clmn_status, status); item->setToolTip(0, text); listItems.append(item); diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.h b/InstructorsAndTrainees/tasks/tasktreepreparation.h index 8cb0847..c7dc7c2 100644 --- a/InstructorsAndTrainees/tasks/tasktreepreparation.h +++ b/InstructorsAndTrainees/tasks/tasktreepreparation.h @@ -11,6 +11,7 @@ enum ColumnsTree{ clmn_PMorDM = 0, clmn_code, clmn_ID, + clmn_status, clmn_count };