diff --git a/LibDataBaseInterface/tasksAmmFim.cpp b/LibDataBaseInterface/tasksAmmFim.cpp index 04a43b2..9e250f6 100644 --- a/LibDataBaseInterface/tasksAmmFim.cpp +++ b/LibDataBaseInterface/tasksAmmFim.cpp @@ -20,6 +20,58 @@ void TaskAmmFim::addMalfunction(Malfunction malfunction) malfunctionList.append(malfunction); } +QString TaskAmmFim::buildStatisticTasksAMM(QList listTasks) +{ + int cntAll = 0; + int cntCompleted = 0; + + for(TaskAmmFim task : listTasks) + { + cntAll++; + + if(task.status == "completed") + cntCompleted++; + } + + QString statHTML = QString("

%1 / " + "%2

").arg( + QString::number(cntCompleted), + QString::number(cntAll)); + + return statHTML; +} + +QString TaskAmmFim::buildStatisticTasksFIM(QList listTasks) +{ + int cntAll = 0; + int cntCompleted = 0; + int cntCheckup = 0; + int cntFailed = 0; + + for(TaskAmmFim task : listTasks) + { + cntAll++; + + if(task.status == "completed") + cntCompleted++; + else if(task.status == "checkup") + cntCheckup++; + else if(task.status == "failed") + cntFailed++; + } + + QString statHTML = QString("

%1/" + "%2/" + "%3 / " + "%4

").arg( + QString::number(cntCompleted), + QString::number(cntFailed), + QString::number(cntCheckup), + QString::number(cntAll)); + + return statHTML; +} + void Malfunction::initialize(QString dmCode, QString num, QString description, QString goName, QString objName) { this->dmCode = dmCode; diff --git a/LibDataBaseInterface/tasksAmmFim.h b/LibDataBaseInterface/tasksAmmFim.h index e742b30..e2407f3 100644 --- a/LibDataBaseInterface/tasksAmmFim.h +++ b/LibDataBaseInterface/tasksAmmFim.h @@ -147,6 +147,10 @@ public: public: void setID(int id){this->id = id;}; int getID(){return id;}; + +public: + static QString buildStatisticTasksAMM(QList listTasks); + static QString buildStatisticTasksFIM(QList listTasks); public: int id; // для идентификации в БД diff --git a/LibInstructorsAndTrainees/commonview.cpp b/LibInstructorsAndTrainees/commonview.cpp index 2434c04..33911a1 100644 --- a/LibInstructorsAndTrainees/commonview.cpp +++ b/LibInstructorsAndTrainees/commonview.cpp @@ -99,11 +99,11 @@ void CommonView::setWidthColumnsTree() treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_AMMtasks, 100); listWidthColumn.append(100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_FIMtasks, 100); + listWidthColumn.append(100); + treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Login, 100); listWidthColumn.append(100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Messages, 100); listWidthColumn.append(100); - treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Login, 100); - listWidthColumn.append(100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Logged, 80); listWidthColumn.append(80); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_ID, 40); @@ -114,7 +114,19 @@ void CommonView::setWidthColumnsTree() void CommonView::reSetHeadTreeWidget() { - QStringList listHeaders = {tr("Name"), tr("Password"), tr("Class"), tr("Computer"), tr("IP address"), tr("Administrator"), tr("Archived"), tr("AMM tasks"), tr("FIM tasks"), tr("Messages"), tr("Login"), tr("Online"), tr("ID")}; + QStringList listHeaders = { tr("Name"), + tr("Password"), + tr("Class"), + tr("Computer"), + tr("IP address"), + tr("Administrator"), + tr("Archived"), + tr("Tasks AMM"), + tr("Tasks FIM"), + tr("Login"), + tr("Messages"), + tr("Online"), + tr("ID")}; treeWidget->setHeaderLabels(listHeaders); } diff --git a/LibInstructorsAndTrainees/commonview.h b/LibInstructorsAndTrainees/commonview.h index 4f28eb0..1a8870c 100644 --- a/LibInstructorsAndTrainees/commonview.h +++ b/LibInstructorsAndTrainees/commonview.h @@ -39,9 +39,9 @@ protected: clmn_Administrator, clmn_Archived, clmn_AMMtasks, - clmn_FIMtasks, - clmn_Messages, + clmn_FIMtasks, clmn_Login, + clmn_Messages, clmn_Logged, clmn_ID, clmn_count diff --git a/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp b/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp index 947cf14..518ee66 100644 --- a/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -282,7 +282,8 @@ void AMMtasksWidget::slot_UpdateTasksAMMforTrainee(int trainee_id) QList listTask = connectorToServer->getListTasksAMMforTrainee(trainee_id); emit signal_prepareAMMListItemsForTrainee(listTask); - emit signal_countTasksAMMforTraineeChanged(trainee_id, listTask.count()); + QString statAMM = TaskAmmFim::buildStatisticTasksAMM(listTask); + emit signal_countTasksAMMforTraineeChanged(trainee_id, statAMM); } } } diff --git a/LibInstructorsAndTrainees/tasks/ammtaskswidget.h b/LibInstructorsAndTrainees/tasks/ammtaskswidget.h index 6c8f5be..5b8104b 100644 --- a/LibInstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/LibInstructorsAndTrainees/tasks/ammtaskswidget.h @@ -80,7 +80,7 @@ Q_SIGNALS: void signal_stopParserPreparation(); - void signal_countTasksAMMforTraineeChanged(int trainee_id, int count); + void signal_countTasksAMMforTraineeChanged(int trainee_id, QString statAMM); public Q_SLOTS: void slot_AMMlistItemsReady(QList listItems); diff --git a/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp index 48a7d93..7878933 100644 --- a/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -240,7 +240,8 @@ void FIMtasksWidget::slot_UpdateTasksFIMforTrainee(int trainee_id) QList listTask = connectorToServer->getListTasksFIMforTrainee(trainee_id); emit signal_prepareFIMListItemsForTrainee(listTask); - emit signal_countTasksFIMforTraineeChanged(trainee_id, listTask.count()); + QString statFIM = TaskAmmFim::buildStatisticTasksFIM(listTask); + emit signal_countTasksFIMforTraineeChanged(trainee_id, statFIM); } } } diff --git a/LibInstructorsAndTrainees/tasks/fimtaskswidget.h b/LibInstructorsAndTrainees/tasks/fimtaskswidget.h index 01cd668..4f7cb3c 100644 --- a/LibInstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/LibInstructorsAndTrainees/tasks/fimtaskswidget.h @@ -72,7 +72,7 @@ Q_SIGNALS: void signal_stopParserPreparation(); - void signal_countTasksFIMforTraineeChanged(int trainee_id, int count); + void signal_countTasksFIMforTraineeChanged(int trainee_id, QString statFIM); public Q_SLOTS: void slot_FIMlistItemsReady(QList listItems); diff --git a/LibInstructorsAndTrainees/trainees/personalcardtrainee.cpp b/LibInstructorsAndTrainees/trainees/personalcardtrainee.cpp index ba2d006..5e91df4 100644 --- a/LibInstructorsAndTrainees/trainees/personalcardtrainee.cpp +++ b/LibInstructorsAndTrainees/trainees/personalcardtrainee.cpp @@ -103,19 +103,19 @@ void PersonalCardTrainee::loadInfo() ui->lblTimeExit->setText(timing.getExitTimeS()); } -void PersonalCardTrainee::slot_countTasksAMMforTraineeChanged(int trainee_id, int count) +void PersonalCardTrainee::slot_countTasksAMMforTraineeChanged(int trainee_id, QString statAMM) { if(id_trainee == trainee_id) { - ui->lblCntAMM->setText(QString::number(count)); + ui->lblCntAMM->setText(statAMM); } } -void PersonalCardTrainee::slot_countTasksFIMforTraineeChanged(int trainee_id, int count) +void PersonalCardTrainee::slot_countTasksFIMforTraineeChanged(int trainee_id, QString statFIM) { if(id_trainee == trainee_id) { - ui->lblCntFIM->setText(QString::number(count)); + ui->lblCntFIM->setText(statFIM); } } diff --git a/LibInstructorsAndTrainees/trainees/personalcardtrainee.h b/LibInstructorsAndTrainees/trainees/personalcardtrainee.h index 4307140..1934a7c 100644 --- a/LibInstructorsAndTrainees/trainees/personalcardtrainee.h +++ b/LibInstructorsAndTrainees/trainees/personalcardtrainee.h @@ -26,8 +26,8 @@ private: void loadInfo(); public slots: - void slot_countTasksAMMforTraineeChanged(int trainee_id, int count); - void slot_countTasksFIMforTraineeChanged(int trainee_id, int count); + void slot_countTasksAMMforTraineeChanged(int trainee_id, QString statAMM); + void slot_countTasksFIMforTraineeChanged(int trainee_id, QString statFIM); void slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee); diff --git a/LibInstructorsAndTrainees/trainees/personalcardtrainee.ui b/LibInstructorsAndTrainees/trainees/personalcardtrainee.ui index f32e728..fd7aacb 100644 --- a/LibInstructorsAndTrainees/trainees/personalcardtrainee.ui +++ b/LibInstructorsAndTrainees/trainees/personalcardtrainee.ui @@ -35,14 +35,14 @@ - Assigned AMM + Tasks AMM - 0 + 0 / 0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -135,14 +135,14 @@ - Assigned FIM + Tasks FIM - 0 + 0/0/0 / 0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/LibInstructorsAndTrainees/trainees/traineesview.cpp b/LibInstructorsAndTrainees/trainees/traineesview.cpp index 2dd0831..9ea1a8f 100644 --- a/LibInstructorsAndTrainees/trainees/traineesview.cpp +++ b/LibInstructorsAndTrainees/trainees/traineesview.cpp @@ -21,70 +21,6 @@ void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) } } -QString TraineesView::buildStatisticTasksAMM(QList listTasks) -{ - QString stat = "X/X"; - int cntAll = 0; - int cntCompleted = 0; - - for(TaskAmmFim task : listTasks) - { - cntAll++; - - if(task.status == "completed") - cntCompleted++; - } - - stat = QString("%1/%2").arg( - QString::number(cntCompleted), - QString::number(cntAll)); - - QString statHTML = QString("

%1/" - "%2

").arg( - QString::number(cntCompleted), - QString::number(cntAll)); - - return /*stat*/statHTML; -} - -QString TraineesView::buildStatisticTasksFIM(QList listTasks) -{ - QString stat = "X/X/X/X"; - int cntAll = 0; - int cntCompleted = 0; - int cntCheckup = 0; - int cntFailed = 0; - - for(TaskAmmFim task : listTasks) - { - cntAll++; - - if(task.status == "completed") - cntCompleted++; - else if(task.status == "checkup") - cntCheckup++; - else if(task.status == "failed") - cntFailed++; - } - - stat = QString("%1/%2/%3/%4").arg( - QString::number(cntCompleted), - QString::number(cntFailed), - QString::number(cntCheckup), - QString::number(cntAll)); - - QString statHTML = QString("

%1/" - "%2/" - "%3/" - "%4

").arg( - QString::number(cntCompleted), - QString::number(cntFailed), - QString::number(cntCheckup), - QString::number(cntAll)); - - return /*stat*/statHTML; -} - void TraineesView::loadTraineesFromDB() { mtxTreeWidget.lock(); @@ -126,9 +62,6 @@ 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_Password, QStringLiteral("******")); @@ -161,8 +94,8 @@ void TraineesView::loadTraineesFromDB() QList listAMM = connectorToServer->getListTasksAMMforTrainee(trainee.getID()); QList listFIM = connectorToServer->getListTasksFIMforTrainee(trainee.getID()); - QString statAMM = buildStatisticTasksAMM(listAMM); - QString statFIM = buildStatisticTasksFIM(listFIM); + QString statAMM = TaskAmmFim::buildStatisticTasksAMM(listAMM); + QString statFIM = TaskAmmFim::buildStatisticTasksFIM(listFIM); QPlainTextEdit *plainTextEditAMM = new QPlainTextEdit(); plainTextEditAMM->setObjectName("plainTextEditAMM"); diff --git a/LibInstructorsAndTrainees/trainees/traineesview.h b/LibInstructorsAndTrainees/trainees/traineesview.h index ca99dba..4840aac 100644 --- a/LibInstructorsAndTrainees/trainees/traineesview.h +++ b/LibInstructorsAndTrainees/trainees/traineesview.h @@ -17,10 +17,6 @@ public Q_SLOTS: //Слот обработки сигнала необходимости обновления интерфейса void slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee); -private: - QString buildStatisticTasksAMM(QList listTasks); - QString buildStatisticTasksFIM(QList listTasks); - protected: virtual void updateButtons(){}; void loadTraineesFromDB();