diff --git a/InstructorsAndTrainees/dialogsettings.cpp b/InstructorsAndTrainees/dialogsettings.cpp index a08919c..f676228 100644 --- a/InstructorsAndTrainees/dialogsettings.cpp +++ b/InstructorsAndTrainees/dialogsettings.cpp @@ -65,6 +65,9 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru ui->btnSetVersion->setEnabled(true); } + ui->label_AutoStart->setVisible(false); + ui->checkAutoStart->setVisible(false); + if(settings->Language == "ENG") qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + "en_EN", "."); else diff --git a/InstructorsAndTrainees/dialogsettings.ui b/InstructorsAndTrainees/dialogsettings.ui index 01a1fca..b9040a0 100644 --- a/InstructorsAndTrainees/dialogsettings.ui +++ b/InstructorsAndTrainees/dialogsettings.ui @@ -162,6 +162,9 @@ + + false + Auto start @@ -182,6 +185,9 @@ + + false + @@ -231,6 +237,12 @@ + + + 150 + 0 + + Additional diff --git a/InstructorsAndTrainees/instructors/instructorsview.cpp b/InstructorsAndTrainees/instructors/instructorsview.cpp index 0df79e3..673e4bc 100644 --- a/InstructorsAndTrainees/instructors/instructorsview.cpp +++ b/InstructorsAndTrainees/instructors/instructorsview.cpp @@ -23,7 +23,7 @@ void InstructorsView::resizeEvent(QResizeEvent *event) if(typeView == TypeView::onlyView) {//onlyView - widthInstructor = width - (200 + 10); + widthInstructor = width - (300 + 10); } else {//control diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index d2d81f5..fd66901 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -78,6 +78,9 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(messangerWidget, &MessangerWidget::signal_msgToClientReady, connectorToServer, &ConnectorToServer::slot_msgToClientReady); connect(connectorToServer,&ConnectorToServer::signal_msgFromClientReady,messangerWidget,&MessangerWidget::slot_msgFromClientReady); + connect(fimTasksWidget, &FIMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM); + connect(ammTasksWidget, &AMMtasksWidget::signal_AssignedTask, viewerTrainees, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM); + //Размещение ui->verticalLayout_Trainees->addWidget(viewerTrainees); @@ -133,15 +136,15 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->groupBox_Messenger->setMaximumWidth(500); ui->groupBox_Instructors->setMaximumWidth(500); - ui->groupBox_Messenger->setMinimumWidth(500); - ui->groupBox_Instructors->setMinimumWidth(500); + ui->groupBox_Messenger->setMinimumWidth(490); + ui->groupBox_Instructors->setMinimumWidth(490); - ui->groupBox_Messenger->setMinimumHeight(600); - ui->groupBox_Instructors->setMinimumHeight(400); - ui->groupBox_Instructors->setMaximumHeight(400); + ui->groupBox_Messenger->setMinimumHeight(500); + ui->groupBox_Instructors->setMinimumHeight(300); + ui->groupBox_Instructors->setMaximumHeight(300); ui->groupBox_Trainees->setMinimumWidth(700); - ui->groupBox_Tasks->setMinimumWidth(700); + ui->groupBox_Tasks->setMinimumWidth(600); ui->btnAuthorizationInstructor->setEnabled(false); diff --git a/InstructorsAndTrainees/messanger/messangerwidget.ui b/InstructorsAndTrainees/messanger/messangerwidget.ui index 3e3db99..94deaf5 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.ui +++ b/InstructorsAndTrainees/messanger/messangerwidget.ui @@ -68,7 +68,7 @@ 0 - 70 + 50 @@ -92,7 +92,7 @@ 65 - 58 + 44 diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 6b56dae..52167cc 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -101,6 +101,11 @@ void AMMtasksWidget::deactivate() idTraineeSelected = 0; } +void AMMtasksWidget::waitAnimationWidgetShowWithPlay() +{ + waitAnimationWidget->showWithPlay(); +} + void AMMtasksWidget::resizeEvent(QResizeEvent *event) { QSize size = event->size(); @@ -301,6 +306,7 @@ void AMMtasksWidget::assignTaskAMMtoTrainee() taskNew.ammProcedure.title = techName; taskNew.ammProcedure.dmCode = dmCode; + emit signal_AssignedTask(); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE, trainee_id, &taskNew); } } @@ -320,6 +326,7 @@ void AMMtasksWidget::on_btnDelete_clicked() if(QMessageBox::warning(this, tr("Attention!"), tr("The deletion will be irrevocable.\nDelete it anyway?"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) { + waitAnimationWidget->showWithPlay(); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_DEL_TASK_AMM_TO_TRAINEE, id); } } diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index 9419add..42bd91d 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h @@ -22,6 +22,7 @@ public: public: void deactivate(); + void waitAnimationWidgetShowWithPlay(); public: void resizeEvent(QResizeEvent *event) override; @@ -53,6 +54,9 @@ private: Q_SIGNALS: void signal_prepareAMMListItems(QByteArray array, bool flOnlyActive); void signal_prepareAMMListItemsForTrainee(QList listTask); + + void signal_AssignedTask(); + public Q_SLOTS: void slot_AMMlistItemsReady(QList listItems); diff --git a/InstructorsAndTrainees/tasks/dialogchecktask.cpp b/InstructorsAndTrainees/tasks/dialogchecktask.cpp index bdf1fff..1fcd9ae 100644 --- a/InstructorsAndTrainees/tasks/dialogchecktask.cpp +++ b/InstructorsAndTrainees/tasks/dialogchecktask.cpp @@ -5,7 +5,8 @@ DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QWidget * QWidget(parent), ui(new Ui::DialogCheckTask), connectorToServer(connectorToServer), - fimTasksWidget(nullptr) + fimTasksWidget(nullptr), + flChanged(false) { ui->setupUi(this); @@ -91,6 +92,7 @@ void DialogCheckTask::on_btnWrong_clicked() connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE, id, (void*)&status); //this->close(); this->parentWidget()->close(); + flChanged = true; } } @@ -104,5 +106,6 @@ void DialogCheckTask::on_btnRight_clicked() connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_CHANGE_STATUS_REPORT_TASK_FIM_TO_TRAINEE, id, (void*)&status); //this->close(); this->parentWidget()->close(); + flChanged = true; } } diff --git a/InstructorsAndTrainees/tasks/dialogchecktask.h b/InstructorsAndTrainees/tasks/dialogchecktask.h index 0369e6b..35893ef 100644 --- a/InstructorsAndTrainees/tasks/dialogchecktask.h +++ b/InstructorsAndTrainees/tasks/dialogchecktask.h @@ -20,6 +20,7 @@ public: public: void setTask(TaskAmmFim* task); TaskAmmFim getTask(); + bool getFlChanged(){return flChanged;} private slots: void on_btnWrong_clicked(); @@ -36,6 +37,8 @@ private: private: ConnectorToServer* connectorToServer; FIMtasksWidget* fimTasksWidget; + + bool flChanged; }; #endif // DIALOGCHECKTASK_H diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index d202c3d..504d171 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -228,6 +228,11 @@ void FIMtasksWidget::slot_UpdateTasksFIMforTrainee(int trainee_id) } } +void FIMtasksWidget::waitAnimationWidgetShowWithPlay() +{ + waitAnimationWidget->showWithPlay(); +} + void FIMtasksWidget::loadTasksFIM() { //Обновление дерева @@ -314,6 +319,7 @@ void FIMtasksWidget::assignTaskFIMtoTrainee() } } + emit signal_AssignedTask(); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE, trainee_id, &taskNew); updateTaskItem(current); @@ -334,6 +340,7 @@ void FIMtasksWidget::on_btnDelete_clicked() if(QMessageBox::warning(this, tr("Attention!"), tr("The deletion will be irrevocable.\nDelete it anyway?"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) { + waitAnimationWidget->showWithPlay(); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_DEL_TASK_FIM_TO_TRAINEE, id); } } @@ -365,6 +372,9 @@ void FIMtasksWidget::on_btnCheck_clicked() dialog->setMinimumSize(1600, 800); dialog->setStyleSheet(this->styleSheet()); dialog->exec(); + + if(dlg.getFlChanged()) + waitAnimationWidget->showWithPlay(); } } } diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index f185183..d65dc20 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h @@ -25,6 +25,7 @@ public: public: void deactivate(); void setOneTaskFim(TaskAmmFim* task); //FIM + void waitAnimationWidgetShowWithPlay(); public: void resizeEvent(QResizeEvent *event) override; @@ -43,7 +44,7 @@ public Q_SLOTS: //слот обработки сигнала о выборе обучаемого void slot_traineeSelected(QString login); - void slot_UpdateTasksFIMforTrainee(int trainee_id); + void slot_UpdateTasksFIMforTrainee(int trainee_id); private: void preparationTreeWidget(); @@ -55,6 +56,9 @@ private: Q_SIGNALS: void signal_prepareFIMListItems(QByteArray array); void signal_prepareFIMListItemsForTrainee(QList listTask); + + void signal_AssignedTask(); + public Q_SLOTS: void slot_FIMlistItemsReady(QList listItems); diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index 1aa3dc4..26d0f39 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -90,6 +90,16 @@ void ViewerTrainees::slot_tabMessengerChanged(QString login) } } +void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM() +{ + fimTasksWidget->waitAnimationWidgetShowWithPlay(); +} + +void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM() +{ + ammTasksWidget->waitAnimationWidgetShowWithPlay(); +} + void ViewerTrainees::changeEvent(QEvent *event) { // В случае получения события изменения языка приложения diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h index ec323c2..45b3edf 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.h +++ b/InstructorsAndTrainees/trainees/viewertrainees.h @@ -41,6 +41,9 @@ public Q_SLOTS: //слот обработки сигнала об изменении вкладки диалога в мессенджере void slot_tabMessengerChanged(QString login); + void slot_waitAnimationWidgetShowWithPlayFIM(); + void slot_waitAnimationWidgetShowWithPlayAMM(); + Q_SIGNALS: //сигнал о выборе обучаемого void signal_traineeSelected(QString login);