diff --git a/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc b/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc
index a81d934..54493e6 100644
--- a/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc
+++ b/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc
@@ -56,5 +56,6 @@
resources/icons/eye.png
resources/icons/exchange.png
resources/icons/link.png
+ resources/icons/new.png
diff --git a/LibInstructorsAndTrainees/resources/icons/new.png b/LibInstructorsAndTrainees/resources/icons/new.png
new file mode 100644
index 0000000..2eb82d6
Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/new.png differ
diff --git a/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp b/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp
index 44a83c2..2ef696b 100644
--- a/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp
+++ b/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp
@@ -529,7 +529,7 @@ void AMMtasksWidget::on_btnStatus_clicked()
if(!task.getID())
return;
- dlgStatusTask = new DialogChekerTask(connectorToServer, CheckerTask::TypeChecker::amm_status, this);
+ dlgStatusTask = new DialogChekerTask(connectorToServer, CheckerTask::TypeChecker::amm_check, this);
dlgStatusTask->setTask(&task);
dlgStatusTask->exec();
diff --git a/LibInstructorsAndTrainees/tasks/checkertask.cpp b/LibInstructorsAndTrainees/tasks/checkertask.cpp
index 0ef86b9..ddaec4e 100644
--- a/LibInstructorsAndTrainees/tasks/checkertask.cpp
+++ b/LibInstructorsAndTrainees/tasks/checkertask.cpp
@@ -14,30 +14,31 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, TypeChecker type,
{
ui->setupUi(this);
+ ui->btnNew->setObjectName("btnNew");
+ ui->btnCheckup->setObjectName("btnCheckup");
+ ui->btnWrong->setObjectName("btnWrong");
+ ui->btnCompleted->setObjectName("btnCompleted");
+
this->type = type;
if(type == TypeChecker::fim_check)
{
fimTasksWidget = new FIMtasksWidget(nullptr, TypeListTreeAMMFIM::listOneTask, this);
-
ui->verticalLayout_3->addWidget(fimTasksWidget);
+
ui->lblName->setVisible(false);
ui->lblDMcode->setVisible(false);
ui->plainText->setReadOnly(true);
ui->plainText->setObjectName("plainText");
}
- else if(type == TypeChecker::amm_status)
+ else if(type == TypeChecker::amm_check)
{
ui->plainText->setVisible(false);
ui->label->setVisible(false);
- //ui->label_Task->setVisible(false);
- ui->btnRight->setText(tr("Completed"));
- ui->btnWrong->setText(tr("New"));
- ui->btnWrong->setIcon(QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
- ui->btnRight->setEnabled(false);
ui->btnWrong->setEnabled(false);
+ ui->btnCheckup->setEnabled(false);
}
}
@@ -70,12 +71,14 @@ void CheckerTask::setTask(TaskAmmFim* task)
//Репорт
outReport(this->task.report);
}
- else if(type == TypeChecker::amm_status)
+ else if(type == TypeChecker::amm_check)
{
+ /*
if(this->task.status == "new")
- ui->btnRight->setEnabled(true);
+ ui->btnCompleted->setEnabled(true);
else
ui->btnWrong->setEnabled(true);
+ */
ui->lblName->setText(task->ammProcedure.title);
ui->lblDMcode->setText(task->ammProcedure.dmCode);
@@ -100,7 +103,7 @@ void CheckerTask::setTask(TaskAmmFim* task)
else
{
ui->lblStatusCurrText->setText(tr("new"));
- ui->lblStatusCurrIco->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
+ ui->lblStatusCurrIco->setPixmap(QPixmap(QStringLiteral(":/resources/icons/new.png")));
}
}
@@ -157,6 +160,7 @@ void CheckerTask::outReport(FIMReport report)
}
}
+//НЕВЕРНО
void CheckerTask::on_btnWrong_clicked()
{
TypeQueryToDB typeQuery;
@@ -169,7 +173,57 @@ void CheckerTask::on_btnWrong_clicked()
status = "failed";
msgString = tr("Change task status?\nThe status will be set:\n'failed'");
}
- else if(type == TypeChecker::amm_status)
+
+ if(SpecMsgBox::WarningYesNo(this, msgString) == QDialog::Accepted)
+ {
+ connectorToServer->sendQueryToDB(typeQuery, id_task, (void*)&status);
+ this->parentWidget()->close();
+ flChanged = true;
+ }
+}
+
+//ВЫПОЛНЕНО
+void CheckerTask::on_btnCompleted_clicked()
+{
+ TypeQueryToDB typeQuery;
+ QString status;
+ QString msgString;
+
+ if(type == TypeChecker::fim_check)
+ {
+ typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE;
+ status = "completed";
+ msgString = tr("Change task status?\nThe status will be set:\n'completed'");
+ }
+ else if(type == TypeChecker::amm_check)
+ {
+ typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_AMM_TO_TRAINEE;
+ status = "completed";
+ msgString = tr("Change task status?\nThe status will be set:\n'completed'");
+ }
+
+ if(SpecMsgBox::WarningYesNo(this, msgString) == QDialog::Accepted)
+ {
+ connectorToServer->sendQueryToDB(typeQuery, id_task, (void*)&status);
+ this->parentWidget()->close();
+ flChanged = true;
+ }
+}
+
+//НОВАЯ
+void CheckerTask::on_btnNew_clicked()
+{
+ TypeQueryToDB typeQuery;
+ QString status;
+ QString msgString;
+
+ if(type == TypeChecker::fim_check)
+ {
+ typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE;
+ status = "new";
+ msgString = tr("Change task status?\nThe status will be set:\n'new'");
+ }
+ else if(type == TypeChecker::amm_check)
{
typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_AMM_TO_TRAINEE;
status = "new";
@@ -184,7 +238,8 @@ void CheckerTask::on_btnWrong_clicked()
}
}
-void CheckerTask::on_btnRight_clicked()
+//НА ПРОВЕРКЕ
+void CheckerTask::on_btnCheckup_clicked()
{
TypeQueryToDB typeQuery;
QString status;
@@ -193,14 +248,8 @@ void CheckerTask::on_btnRight_clicked()
if(type == TypeChecker::fim_check)
{
typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE;
- status = "completed";
- msgString = tr("Change task status?\nThe status will be set:\n'completed'");
- }
- else if(type == TypeChecker::amm_status)
- {
- typeQuery = TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_AMM_TO_TRAINEE;
- status = "completed";
- msgString = tr("Change task status?\nThe status will be set:\n'completed'");
+ status = "checkup";
+ msgString = tr("Change task status?\nThe status will be set:\n'checkup'");
}
if(SpecMsgBox::WarningYesNo(this, msgString) == QDialog::Accepted)
diff --git a/LibInstructorsAndTrainees/tasks/checkertask.h b/LibInstructorsAndTrainees/tasks/checkertask.h
index 07be77f..79eccf1 100644
--- a/LibInstructorsAndTrainees/tasks/checkertask.h
+++ b/LibInstructorsAndTrainees/tasks/checkertask.h
@@ -21,9 +21,7 @@ class CheckerTask : public QWidget
public:
enum TypeChecker
{
- amm_status,
amm_check,
- fim_status,
fim_check
};
@@ -42,7 +40,9 @@ public:
private slots:
void on_btnWrong_clicked();
- void on_btnRight_clicked();
+ void on_btnCompleted_clicked();
+ void on_btnNew_clicked();
+ void on_btnCheckup_clicked();
private:
void outReport(FIMReport report);
diff --git a/LibInstructorsAndTrainees/tasks/checkertask.ui b/LibInstructorsAndTrainees/tasks/checkertask.ui
index 5d3ce90..c54b38d 100644
--- a/LibInstructorsAndTrainees/tasks/checkertask.ui
+++ b/LibInstructorsAndTrainees/tasks/checkertask.ui
@@ -53,6 +53,9 @@
:/resources/icons/rectGray.png
+
+ true
+
-
@@ -159,6 +162,58 @@
+ -
+
+
+
+ 50
+ 50
+
+
+
+ New
+
+
+
+ :/resources/icons/new.png:/resources/icons/new.png
+
+
+
+ 32
+ 32
+
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
+
+ -
+
+
+
+ 50
+ 50
+
+
+
+ Checkup
+
+
+
+ :/resources/icons/circleYellow.png:/resources/icons/circleYellow.png
+
+
+
+ 32
+ 32
+
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
+
-
@@ -186,7 +241,7 @@
-
-
+
50
@@ -194,7 +249,7 @@
- Right
+ Completed
diff --git a/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp b/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp
index 523e419..63c1a3a 100644
--- a/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp
+++ b/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp
@@ -17,13 +17,11 @@ DialogChekerTask::DialogChekerTask(ConnectorToServer* connectorToServer, Checker
switch (type)
{
case CheckerTask::TypeChecker::fim_check:
- case CheckerTask::TypeChecker::amm_check:
this->setWindowTitle(tr("Check Task"));
this->setMinimumSize(1400, 700);
this->setWindowState(Qt::WindowMaximized);
break;
- case CheckerTask::TypeChecker::fim_status:
- case CheckerTask::TypeChecker::amm_status:
+ case CheckerTask::TypeChecker::amm_check:
this->setWindowTitle(tr("Status Task"));
this->setMinimumSize(400, 200);
break;
diff --git a/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp
index 198ed34..2a4b3ba 100644
--- a/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp
+++ b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp
@@ -191,10 +191,11 @@ void FIMtasksWidget::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
ui->btnDelete->setEnabled(true);
- if(task.status != "new")
+ ui->btnCheck->setEnabled(true);
+ /*if(task.status != "new")
ui->btnCheck->setEnabled(true);
else
- ui->btnCheck->setEnabled(false);
+ ui->btnCheck->setEnabled(false);*/
}
else
{
diff --git a/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp b/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp
index 94edffe..06dc0cc 100644
--- a/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp
+++ b/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp
@@ -525,7 +525,7 @@ void TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee(QListsetText(ColumnsTreeAMM::clmnAMM_status, tr("new"));
- item->setIcon(ColumnsTreeAMM::clmnAMM_status, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
+ item->setIcon(ColumnsTreeAMM::clmnAMM_status, QIcon(QStringLiteral(":/resources/icons/new.png")));
}
item->setToolTip(0, text);
@@ -598,7 +598,7 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItems(QByteArray array)
else
{
itemTask->setText(ColumnsTreeFIM::clmnFIM_status, tr("new"));
- itemTask->setIcon(ColumnsTreeFIM::clmnFIM_status, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
+ itemTask->setIcon(ColumnsTreeFIM::clmnFIM_status, QIcon(QStringLiteral(":/resources/icons/new.png")));
}
@@ -691,7 +691,7 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItemsForTrainee(QListsetText(ColumnsTreeFIM::clmnFIM_status, tr("new"));
- itemTask->setIcon(ColumnsTreeFIM::clmnFIM_status, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
+ itemTask->setIcon(ColumnsTreeFIM::clmnFIM_status, QIcon(QStringLiteral(":/resources/icons/new.png")));
}