diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 69f422b..5103a8c 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -471,7 +471,7 @@ void AMMtasksWidget::on_treeWidgetDoubleClicked(QTreeWidgetItem *item, int colum return; dlgListSubProc = new DialogListSubProc(connectorToServer, this); - //dlgListSubProc->setTask(&task); + dlgListSubProc->setTask(&task); dlgListSubProc->exec(); //if(dlgListSubProc->getFlChanged()) diff --git a/InstructorsAndTrainees/tasks/dialoglistsubproc.cpp b/InstructorsAndTrainees/tasks/dialoglistsubproc.cpp index 1f2dbee..5075d8f 100644 --- a/InstructorsAndTrainees/tasks/dialoglistsubproc.cpp +++ b/InstructorsAndTrainees/tasks/dialoglistsubproc.cpp @@ -31,5 +31,5 @@ void DialogListSubProc::closeEvent(QCloseEvent *event) void DialogListSubProc::setTask(TaskAmmFim *task) { - //listSubProc->setTask(task); + listSubProc->setTask(task); } diff --git a/InstructorsAndTrainees/tasks/listsubproc.cpp b/InstructorsAndTrainees/tasks/listsubproc.cpp index 7615e5a..aed8a34 100644 --- a/InstructorsAndTrainees/tasks/listsubproc.cpp +++ b/InstructorsAndTrainees/tasks/listsubproc.cpp @@ -3,12 +3,41 @@ ListSubProc::ListSubProc(ConnectorToServer* connectorToServer, QWidget *parent) : QWidget(parent), - ui(new Ui::ListSubProc) + ui(new Ui::ListSubProc), + waitAnimationWidget(nullptr) { ui->setupUi(this); + + waitAnimationWidget = new WaitAnimationWidget; + QMovie *movie = new QMovie(":/resources/icons/762.gif"); + waitAnimationWidget->setParent(this); + waitAnimationWidget->initialize(movie,this); } ListSubProc::~ListSubProc() { + waitAnimationWidget->hideWithStop(); + delete waitAnimationWidget; delete ui; } + +void ListSubProc::closeEvent(QCloseEvent *event) +{ + +} + +void ListSubProc::resizeEvent(QResizeEvent *event) +{ + QSize size = event->size(); + waitAnimationWidget->resize(size); +} + +void ListSubProc::setTask(TaskAmmFim *task) +{ + this->task = *task; + + ui->lbl_Title->setText(task->ammProcedure.title); + ui->lbl_DMCode->setText(task->ammProcedure.dmCode); + + waitAnimationWidget->showWithPlay(); +} diff --git a/InstructorsAndTrainees/tasks/listsubproc.h b/InstructorsAndTrainees/tasks/listsubproc.h index 9315538..82fb785 100644 --- a/InstructorsAndTrainees/tasks/listsubproc.h +++ b/InstructorsAndTrainees/tasks/listsubproc.h @@ -2,6 +2,7 @@ #define LISTSUBPROC_H #include +#include #include "connectorToServer.h" namespace Ui { @@ -16,8 +17,17 @@ public: explicit ListSubProc(ConnectorToServer* connectorToServer, QWidget *parent = nullptr); ~ListSubProc(); + void closeEvent(QCloseEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + + void setTask(TaskAmmFim* task); + private: Ui::ListSubProc *ui; + + TaskAmmFim task; + + WaitAnimationWidget *waitAnimationWidget; }; #endif // LISTSUBPROC_H diff --git a/InstructorsAndTrainees/tasks/listsubproc.ui b/InstructorsAndTrainees/tasks/listsubproc.ui index 3f8a4f1..c853c6d 100644 --- a/InstructorsAndTrainees/tasks/listsubproc.ui +++ b/InstructorsAndTrainees/tasks/listsubproc.ui @@ -19,14 +19,14 @@ - + Title - + DM code