Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

В ГУИ принимается и отображается статус задачи назначенной

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-04-30 13:21:03 +03:00
parent 808ebe81a3
commit 9a7f4903f6
6 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -667,6 +667,7 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array
task.setID(taskNode.toElement().attribute("task_id").toInt()); task.setID(taskNode.toElement().attribute("task_id").toInt());
task.ammProcedure.title = taskNode.toElement().attribute("title"); task.ammProcedure.title = taskNode.toElement().attribute("title");
task.ammProcedure.dmCode = taskNode.toElement().attribute("dmCode"); task.ammProcedure.dmCode = taskNode.toElement().attribute("dmCode");
task.status = taskNode.toElement().attribute("status");
listTasks.append(task); listTasks.append(task);
} }
@@ -689,6 +690,7 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array
TaskAmmFim task; TaskAmmFim task;
task.setID(taskNode.toElement().attribute("task_id").toInt()); task.setID(taskNode.toElement().attribute("task_id").toInt());
task.title = taskNode.toElement().attribute("title"); task.title = taskNode.toElement().attribute("title");
task.status = taskNode.toElement().attribute("status");
for(int j = 0; j < taskNode.childNodes().count(); j++) for(int j = 0; j < taskNode.childNodes().count(); j++)
{//Неисправности {//Неисправности

5
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -89,6 +89,7 @@ void AMMtasksWidget::resizeEvent(QResizeEvent *event)
treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50); treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50);
treeWidget->setColumnWidth(ColumnsTree::clmn_code, 250); treeWidget->setColumnWidth(ColumnsTree::clmn_code, 250);
treeWidget->setColumnWidth(ColumnsTree::clmn_status, 50);
int widthPMorDM; int widthPMorDM;
if(type == TypeList::listCommon) if(type == TypeList::listCommon)
@@ -246,9 +247,9 @@ void AMMtasksWidget::reSetHeadTreeWidget()
QStringList listHeaders; QStringList listHeaders;
if(type == TypeList::listForTrainee) 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 else
listHeaders = QStringList{tr("PM/DM"), tr("Code"), tr("ID")}; listHeaders = QStringList{tr("PM/DM"), tr("Code"), tr("ID"), tr("Status")};
treeWidget->setHeaderLabels(listHeaders); treeWidget->setHeaderLabels(listHeaders);

6
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -73,6 +73,7 @@ void FIMtasksWidget::resizeEvent(QResizeEvent *event)
int width = treeWidget->width(); int width = treeWidget->width();
treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50); treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50);
treeWidget->setColumnWidth(ColumnsTree::clmn_status, 50);
int widthTitle; int widthTitle;
if(type == TypeList::listCommon) if(type == TypeList::listCommon)
@@ -222,6 +223,7 @@ void FIMtasksWidget::fillTree()
itemTask->setText(0, task->title); itemTask->setText(0, task->title);
itemTask->setText(1, QString::number(task->id)); itemTask->setText(1, QString::number(task->id));
itemTask->setText(2, task->status);
//itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable); //itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable);
//itemTask->setCheckState(0, Qt::Checked); //itemTask->setCheckState(0, Qt::Checked);
itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png")); itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png"));
@@ -297,9 +299,9 @@ void FIMtasksWidget::reSetHeadTreeWidget()
QStringList listHeaders; QStringList listHeaders;
if(type == TypeList::listForTrainee) if(type == TypeList::listForTrainee)
listHeaders = QStringList{tr("Task FIM"), tr("ID")}; listHeaders = QStringList{tr("Task FIM"), tr("ID"), tr("Status")};
else else
listHeaders = QStringList{tr("Title"), tr("ID")}; listHeaders = QStringList{tr("Title"), tr("ID"), tr("Status")};
treeWidget->setHeaderLabels(listHeaders); treeWidget->setHeaderLabels(listHeaders);
} }

1
InstructorsAndTrainees/tasks/fimtaskswidget.h
View File

@@ -25,6 +25,7 @@ private:
enum ColumnsTree{ enum ColumnsTree{
clmn_Title = 0, clmn_Title = 0,
clmn_ID, clmn_ID,
clmn_status,
clmn_count clmn_count
}; };

2
InstructorsAndTrainees/tasks/tasktreepreparation.cpp
View File

@@ -244,6 +244,7 @@ void TaskTreePreparation::slot_prepareListItemsForTrainee(QList<TaskAmmFim> list
QString text = task.ammProcedure.title; QString text = task.ammProcedure.title;
QString ID = QString::number(task.getID()); QString ID = QString::number(task.getID());
QString code = task.ammProcedure.dmCode; QString code = task.ammProcedure.dmCode;
QString status = task.status;
item = new QTreeWidgetItem(); item = new QTreeWidgetItem();
item->setIcon(0, QIcon(":/resources/icons/procedure.png")); item->setIcon(0, QIcon(":/resources/icons/procedure.png"));
@@ -251,6 +252,7 @@ void TaskTreePreparation::slot_prepareListItemsForTrainee(QList<TaskAmmFim> list
item->setText(ColumnsTree::clmn_PMorDM, text); item->setText(ColumnsTree::clmn_PMorDM, text);
item->setText(ColumnsTree::clmn_code, code); item->setText(ColumnsTree::clmn_code, code);
item->setText(ColumnsTree::clmn_ID, ID); item->setText(ColumnsTree::clmn_ID, ID);
item->setText(ColumnsTree::clmn_status, status);
item->setToolTip(0, text); item->setToolTip(0, text);
listItems.append(item); listItems.append(item);

1
InstructorsAndTrainees/tasks/tasktreepreparation.h
View File

@@ -11,6 +11,7 @@ enum ColumnsTree{
clmn_PMorDM = 0, clmn_PMorDM = 0,
clmn_code, clmn_code,
clmn_ID, clmn_ID,
clmn_status,
clmn_count clmn_count
}; };