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-05-27 15:07:55 +03:00
parent 5a3ba9a75c
commit d76bb562d9
9 changed files with 292 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

2
InstructorsAndTrainees/tasks/ammtaskswidget.ui
View File

@@ -49,7 +49,7 @@
</size>
</property>
<property name="text">
<string>Active</string>
<string>Аvailable</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">

7
InstructorsAndTrainees/tasks/dialogchecktask.cpp
View File

@@ -65,7 +65,12 @@ void DialogCheckTask::outReport(FIMReport report)
ui->plainText->appendHtml(str);
//Result
str = QString("<p>%1</p>").arg(item.procedure.result);
str = item.procedure.result;
if(str == "viewed")
str = tr("viewed");
else if(str == "completed")
str = tr("completed");
str = QString("<p>%1</p>").arg(str);
ui->plainText->appendHtml(str);
//Text

25
InstructorsAndTrainees/tasks/dialogchecktask.ui
View File

@@ -53,10 +53,16 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QPlainTextEdit" name="plainText">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>500</height>
<height>0</height>
</size>
</property>
</widget>
@@ -79,7 +85,7 @@
</size>
</property>
<property name="text">
<string>Wrong</string>
<string>Failed</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
@@ -105,7 +111,7 @@
</size>
</property>
<property name="text">
<string>Right</string>
<string>Completed</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
@@ -124,19 +130,6 @@
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>

10
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -28,6 +28,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
treeWidget = new QTreeWidget();
ui->horizontalLayout_1->addWidget(treeWidget);
//treeWidget->setMinimumSize(400, 400);
connect(treeWidget, &QTreeWidget::currentItemChanged, this, &FIMtasksWidget::on_treeWidget_currentItemChanged);
@@ -92,13 +93,13 @@ void FIMtasksWidget::resizeEvent(QResizeEvent *event)
int width = treeWidget->width();
treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 50);
treeWidget->setColumnWidth(ColumnsTree::clmn_status, 100);
treeWidget->setColumnWidth(ColumnsTree::clmn_status, 110);
int widthTitle;
if(type == TypeList::listCommon)
widthTitle = width - (0 + 10);
else
widthTitle = width - (150 + 10);
widthTitle = width - (160 + 10);
treeWidget->setColumnWidth(ColumnsTree::clmn_Title, widthTitle);
}
@@ -249,24 +250,27 @@ 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);
if(task->status == "completed")
{
itemTask->setText(2, tr("completed"));
itemTask->setIcon(2, QIcon(QStringLiteral(":/resources/icons/circleGreen.png")));
}
else if(task->status == "failed")
{
itemTask->setText(2, tr("failed"));
itemTask->setIcon(2, QIcon(QStringLiteral(":/resources/icons/circleRed.png")));
}
else if(task->status == "checkup")
{
itemTask->setText(2, tr("checkup"));
itemTask->setIcon(2, QIcon(QStringLiteral(":/resources/icons/circleYellow.png")));
}
else
{
itemTask->setText(2, tr("new"));
itemTask->setIcon(2, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
}

7
InstructorsAndTrainees/tasks/tasktreepreparation.cpp
View File

@@ -251,23 +251,26 @@ void TaskTreePreparation::slot_prepareListItemsForTrainee(QList<TaskAmmFim> 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->setText(ColumnsTree::clmn_ID, ID);
if(status == "completed")
{
item->setText(ColumnsTree::clmn_status, tr("completed"));
item->setIcon(ColumnsTree::clmn_status, QIcon(QStringLiteral(":/resources/icons/circleGreen.png")));
}
else if(status == "failed")
{
item->setText(ColumnsTree::clmn_status, tr("failed"));
item->setIcon(ColumnsTree::clmn_status, QIcon(QStringLiteral(":/resources/icons/circleRed.png")));
}
else if(status == "checkup")
{
item->setText(ColumnsTree::clmn_status, tr("checkup"));
item->setIcon(ColumnsTree::clmn_status, QIcon(QStringLiteral(":/resources/icons/circleYellow.png")));
}
else
{
item->setText(ColumnsTree::clmn_status, tr("new"));
item->setIcon(ColumnsTree::clmn_status, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
}