diff --git a/InstructorsAndTrainees/resources.qrc b/InstructorsAndTrainees/resources.qrc index 30ce2a3..2370395 100644 --- a/InstructorsAndTrainees/resources.qrc +++ b/InstructorsAndTrainees/resources.qrc @@ -46,5 +46,6 @@ resources/icons/filter.png resources/icons/check.png resources/icons/circleRed.png + resources/icons/circleYellow.png diff --git a/InstructorsAndTrainees/resources/icons/circleYellow.png b/InstructorsAndTrainees/resources/icons/circleYellow.png new file mode 100644 index 0000000..3ad6b3b Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/circleYellow.png differ diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 24f5a02..8db648a 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -94,13 +94,13 @@ void AMMtasksWidget::resizeEvent(QResizeEvent *event) treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50); treeWidget->setColumnWidth(ColumnsTree::clmn_code, 250); - treeWidget->setColumnWidth(ColumnsTree::clmn_status, 70); + treeWidget->setColumnWidth(ColumnsTree::clmn_status, 100); int widthPMorDM; if(type == TypeList::listCommon) widthPMorDM = width - (250 + 10); else - widthPMorDM = width - (370 + 10); + widthPMorDM = width - (400 + 10); treeWidget->setColumnWidth(ColumnsTree::clmn_PMorDM, widthPMorDM); } diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index da14e41..0ece978 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -92,13 +92,13 @@ void FIMtasksWidget::resizeEvent(QResizeEvent *event) int width = treeWidget->width(); treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50); - treeWidget->setColumnWidth(ColumnsTree::clmn_status, 70); + treeWidget->setColumnWidth(ColumnsTree::clmn_status, 100); int widthTitle; if(type == TypeList::listCommon) widthTitle = width - (0 + 10); else - widthTitle = width - (120 + 10); + widthTitle = width - (150 + 10); treeWidget->setColumnWidth(ColumnsTree::clmn_Title, widthTitle); } @@ -252,6 +252,25 @@ void FIMtasksWidget::fillTree() itemTask->setText(2, task->status); //itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable); //itemTask->setCheckState(0, Qt::Checked); + + if(task->status == "completed") + { + itemTask->setIcon(2, QIcon(QStringLiteral(":/resources/icons/circleGreen.png"))); + } + else if(task->status == "failed") + { + itemTask->setIcon(2, QIcon(QStringLiteral(":/resources/icons/circleRed.png"))); + } + else if(task->status == "checkup") + { + itemTask->setIcon(2, QIcon(QStringLiteral(":/resources/icons/circleYellow.png"))); + } + else + { + itemTask->setIcon(2, QIcon(QStringLiteral(":/resources/icons/circleGray.png"))); + } + + itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png")); itemTask->setToolTip(0, task->title); diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp index c3cf224..956d8c9 100644 --- a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp +++ b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp @@ -253,6 +253,24 @@ void TaskTreePreparation::slot_prepareListItemsForTrainee(QList list item->setText(ColumnsTree::clmn_code, code); item->setText(ColumnsTree::clmn_ID, ID); item->setText(ColumnsTree::clmn_status, status); + + if(status == "completed") + { + item->setIcon(ColumnsTree::clmn_status, QIcon(QStringLiteral(":/resources/icons/circleGreen.png"))); + } + else if(status == "failed") + { + item->setIcon(ColumnsTree::clmn_status, QIcon(QStringLiteral(":/resources/icons/circleRed.png"))); + } + else if(status == "checkup") + { + item->setIcon(ColumnsTree::clmn_status, QIcon(QStringLiteral(":/resources/icons/circleYellow.png"))); + } + else + { + item->setIcon(ColumnsTree::clmn_status, QIcon(QStringLiteral(":/resources/icons/circleGray.png"))); + } + item->setToolTip(0, text); listItems.append(item); diff --git a/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/Systems/processingsystem.cpp index 631f6a06..8bc25fa 100644 --- a/ServerLMS/Systems/processingsystem.cpp +++ b/ServerLMS/Systems/processingsystem.cpp @@ -337,7 +337,7 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu { TaskAmmFim* task = (TaskAmmFim*)data; if(task->status == "completed") - if( int id_task = providerDBLMS->editStatusTaskAMM(task->getID(), "checkup") ) + if( int id_task = providerDBLMS->editStatusTaskAMM(task->getID(), "completed") ) { }