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

Перед mulf_sign

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-05-26 12:37:35 +03:00
parent 0bdaa7ed5e
commit 25d11dc88f
6 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InstructorsAndTrainees/resources.qrc
View File

@@ -46,5 +46,6 @@
<file>resources/icons/filter.png</file> <file>resources/icons/filter.png</file>
<file>resources/icons/check.png</file> <file>resources/icons/check.png</file>
<file>resources/icons/circleRed.png</file> <file>resources/icons/circleRed.png</file>
<file>resources/icons/circleYellow.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
InstructorsAndTrainees/resources/icons/circleYellow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

4
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -94,13 +94,13 @@ 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, 70); treeWidget->setColumnWidth(ColumnsTree::clmn_status, 100);
int widthPMorDM; int widthPMorDM;
if(type == TypeList::listCommon) if(type == TypeList::listCommon)
widthPMorDM = width - (250 + 10); widthPMorDM = width - (250 + 10);
else else
widthPMorDM = width - (370 + 10); widthPMorDM = width - (400 + 10);
treeWidget->setColumnWidth(ColumnsTree::clmn_PMorDM, widthPMorDM); treeWidget->setColumnWidth(ColumnsTree::clmn_PMorDM, widthPMorDM);
} }

23
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -92,13 +92,13 @@ 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, 70); treeWidget->setColumnWidth(ColumnsTree::clmn_status, 100);
int widthTitle; int widthTitle;
if(type == TypeList::listCommon) if(type == TypeList::listCommon)
widthTitle = width - (0 + 10); widthTitle = width - (0 + 10);
else else
widthTitle = width - (120 + 10); widthTitle = width - (150 + 10);
treeWidget->setColumnWidth(ColumnsTree::clmn_Title, widthTitle); treeWidget->setColumnWidth(ColumnsTree::clmn_Title, widthTitle);
} }
@@ -252,6 +252,25 @@ void FIMtasksWidget::fillTree()
itemTask->setText(2, task->status); 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);
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->setIcon(0, QIcon(":/resources/icons/procedure.png"));
itemTask->setToolTip(0, task->title); itemTask->setToolTip(0, task->title);

18
InstructorsAndTrainees/tasks/tasktreepreparation.cpp
View File

@@ -253,6 +253,24 @@ void TaskTreePreparation::slot_prepareListItemsForTrainee(QList<TaskAmmFim> list
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->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); item->setToolTip(0, text);
listItems.append(item); listItems.append(item);

2
ServerLMS/Systems/processingsystem.cpp
View File

@@ -337,7 +337,7 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
{ {
TaskAmmFim* task = (TaskAmmFim*)data; TaskAmmFim* task = (TaskAmmFim*)data;
if(task->status == "completed") if(task->status == "completed")
if( int id_task = providerDBLMS->editStatusTaskAMM(task->getID(), "checkup") ) if( int id_task = providerDBLMS->editStatusTaskAMM(task->getID(), "completed") )
{ {
} }