diff --git a/InstructorsAndTrainees/tasks/dialogchecktask.cpp b/InstructorsAndTrainees/tasks/dialogchecktask.cpp index 34916c1..1ead0bc 100644 --- a/InstructorsAndTrainees/tasks/dialogchecktask.cpp +++ b/InstructorsAndTrainees/tasks/dialogchecktask.cpp @@ -1,9 +1,10 @@ #include "dialogchecktask.h" #include "ui_dialogchecktask.h" -DialogCheckTask::DialogCheckTask(QWidget *parent) : +DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QWidget *parent) : QWidget(parent), - ui(new Ui::DialogCheckTask), + ui(new Ui::DialogCheckTask), + connectorToServer(connectorToServer), fimTasksWidget(nullptr) { ui->setupUi(this); @@ -11,6 +12,16 @@ DialogCheckTask::DialogCheckTask(QWidget *parent) : fimTasksWidget = new FIMtasksWidget(nullptr, FIMtasksWidget::TypeList::listOneTask, this); ui->horizontalLayout_3->addWidget(fimTasksWidget); + + /* + ui->plainText->appendHtml("1 Hello World"); + ui->plainText->appendHtml("

2 Hello World

"); + ui->plainText->appendHtml("3 Hello World"); + ui->plainText->appendHtml("4 Hello World"); + ui->plainText->appendHtml("5 Hello World"); + + ui->plainText->appendHtml("

6 Hello World

"); + */ } DialogCheckTask::~DialogCheckTask() @@ -22,10 +33,30 @@ DialogCheckTask::~DialogCheckTask() void DialogCheckTask::setTask(TaskAmmFim* task) { this->task = *task; + + //Задача fimTasksWidget->setOneTaskFim(&this->task); + + //Репорт + outReport(this->task.report); } TaskAmmFim DialogCheckTask::getTask() { return this->task; } + +void DialogCheckTask::outReport(FIMReport report) +{ + //Запрашиваем отчет по этой задаче + + + + for(FIMReportItem item : report.itemList) + { + ui->plainText->appendHtml("Title: "); + ui->plainText->appendHtml("

DMcode:

"); + ui->plainText->appendHtml("

Result:

"); + ui->plainText->appendHtml("

Text:

"); + } +} diff --git a/InstructorsAndTrainees/tasks/dialogchecktask.h b/InstructorsAndTrainees/tasks/dialogchecktask.h index 0be7f07..c9aa187 100644 --- a/InstructorsAndTrainees/tasks/dialogchecktask.h +++ b/InstructorsAndTrainees/tasks/dialogchecktask.h @@ -14,19 +14,23 @@ class DialogCheckTask : public QWidget Q_OBJECT public: - explicit DialogCheckTask(QWidget *parent = nullptr); + explicit DialogCheckTask(ConnectorToServer* connectorToServer, QWidget *parent = nullptr); ~DialogCheckTask(); public: void setTask(TaskAmmFim* task); TaskAmmFim getTask(); + private: + void outReport(FIMReport report); + private: TaskAmmFim task; private: Ui::DialogCheckTask *ui; private: + ConnectorToServer* connectorToServer; FIMtasksWidget* fimTasksWidget; }; diff --git a/InstructorsAndTrainees/tasks/dialogchecktask.ui b/InstructorsAndTrainees/tasks/dialogchecktask.ui index c711192..e576ebb 100644 --- a/InstructorsAndTrainees/tasks/dialogchecktask.ui +++ b/InstructorsAndTrainees/tasks/dialogchecktask.ui @@ -20,7 +20,11 @@ - + + + + + diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index 58528a3..8e9873c 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -498,7 +498,7 @@ void FIMtasksWidget::on_btnCheck_clicked() TaskAmmFim* task = getTaskByID(id); - DialogCheckTask dlg(this); + DialogCheckTask dlg(connectorToServer, this); dlg.setTask(task);