mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
Задачи в цвете
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
#include <QHeaderView>
|
||||
#include <QResizeEvent>
|
||||
#include <QPlainTextEdit>
|
||||
#include "traineesview.h"
|
||||
|
||||
TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent):
|
||||
@@ -38,12 +39,17 @@ QString TraineesView::buildStatisticTasksAMM(QList<TaskAmmFim> listTasks)
|
||||
QString::number(cntCompleted),
|
||||
QString::number(cntAll));
|
||||
|
||||
return stat;
|
||||
QString statHTML = QString("<p><span style=\"color: green;\">%1</span>/"
|
||||
"<span style=\"color: black;\">%2</span></p>").arg(
|
||||
QString::number(cntCompleted),
|
||||
QString::number(cntAll));
|
||||
|
||||
return /*stat*/statHTML;
|
||||
}
|
||||
|
||||
QString TraineesView::buildStatisticTasksFIM(QList<TaskAmmFim> listTasks)
|
||||
{
|
||||
QString stat = "X/X/X";
|
||||
QString stat = "X/X/X/X";
|
||||
int cntAll = 0;
|
||||
int cntCompleted = 0;
|
||||
int cntCheckup = 0;
|
||||
@@ -67,7 +73,16 @@ QString TraineesView::buildStatisticTasksFIM(QList<TaskAmmFim> listTasks)
|
||||
QString::number(cntCheckup),
|
||||
QString::number(cntAll));
|
||||
|
||||
return stat;
|
||||
QString statHTML = QString("<p><span style=\"color: green;\">%1</span>/"
|
||||
"<span style=\"color: red;\">%2</span>/"
|
||||
"<span style=\"color: darkorange;\">%3</span>/"
|
||||
"<span style=\"color: black;\">%4</span></p>").arg(
|
||||
QString::number(cntCompleted),
|
||||
QString::number(cntFailed),
|
||||
QString::number(cntCheckup),
|
||||
QString::number(cntAll));
|
||||
|
||||
return /*stat*/statHTML;
|
||||
}
|
||||
|
||||
void TraineesView::loadTraineesFromDB()
|
||||
@@ -101,11 +116,6 @@ void TraineesView::loadTraineesFromDB()
|
||||
if(trainee.getGroup().getID() != group.getID())
|
||||
continue;
|
||||
|
||||
QList<TaskAmmFim> listAMM = connectorToServer->getListTasksAMMforTrainee(trainee.getID());
|
||||
QList<TaskAmmFim> listFIM = connectorToServer->getListTasksFIMforTrainee(trainee.getID());
|
||||
QString statAMM = buildStatisticTasksAMM(listAMM);
|
||||
QString statFIM = buildStatisticTasksFIM(listFIM);
|
||||
|
||||
QTreeWidgetItem *ItemTrainee = new QTreeWidgetItem();
|
||||
|
||||
ItemTrainee->setText(ColumnsTreeUsers::clmn_ID, QString::number(trainee.getID()));
|
||||
@@ -116,8 +126,8 @@ void TraineesView::loadTraineesFromDB()
|
||||
ItemTrainee->setText(ColumnsTreeUsers::clmn_Computer, trainee.getComputer().getName());
|
||||
ItemTrainee->setText(ColumnsTreeUsers::clmn_IP_address, trainee.getComputer().getIpAddress());
|
||||
|
||||
ItemTrainee->setText(ColumnsTreeUsers::clmn_AMMtasks, statAMM);
|
||||
ItemTrainee->setText(ColumnsTreeUsers::clmn_FIMtasks, statFIM);
|
||||
//ItemTrainee->setText(ColumnsTreeUsers::clmn_AMMtasks, statAMM);
|
||||
//ItemTrainee->setText(ColumnsTreeUsers::clmn_FIMtasks, statFIM);
|
||||
|
||||
//Сокрытие пароля
|
||||
ItemTrainee->setText(ColumnsTreeUsers::clmn_Password, QStringLiteral("******"));
|
||||
@@ -149,6 +159,27 @@ void TraineesView::loadTraineesFromDB()
|
||||
|
||||
ItemGroup->addChild(ItemTrainee);
|
||||
|
||||
QList<TaskAmmFim> listAMM = connectorToServer->getListTasksAMMforTrainee(trainee.getID());
|
||||
QList<TaskAmmFim> listFIM = connectorToServer->getListTasksFIMforTrainee(trainee.getID());
|
||||
QString statAMM = buildStatisticTasksAMM(listAMM);
|
||||
QString statFIM = buildStatisticTasksFIM(listFIM);
|
||||
|
||||
QPlainTextEdit *plainTextEditAMM = new QPlainTextEdit();
|
||||
plainTextEditAMM->setObjectName("plainTextEditAMM");
|
||||
plainTextEditAMM->setFocusPolicy(Qt::FocusPolicy::NoFocus);
|
||||
plainTextEditAMM->setReadOnly(true);
|
||||
plainTextEditAMM->setEnabled(false);
|
||||
treeWidget->setItemWidget(ItemTrainee, ColumnsTreeUsers::clmn_AMMtasks, plainTextEditAMM);
|
||||
plainTextEditAMM->appendHtml(statAMM);
|
||||
|
||||
QPlainTextEdit *plainTextEditFIM = new QPlainTextEdit();
|
||||
plainTextEditFIM->setObjectName("plainTextEditAMM");
|
||||
plainTextEditFIM->setFocusPolicy(Qt::FocusPolicy::NoFocus);
|
||||
plainTextEditFIM->setReadOnly(true);
|
||||
plainTextEditFIM->setEnabled(false);
|
||||
treeWidget->setItemWidget(ItemTrainee, ColumnsTreeUsers::clmn_FIMtasks, plainTextEditFIM);
|
||||
plainTextEditFIM->appendHtml(statFIM);
|
||||
|
||||
//Скрываем архивных (при необходимости)
|
||||
if(trainee.getArchived())
|
||||
if(! archiveVisible)
|
||||
|
||||
Reference in New Issue
Block a user