From c46986f9e387774aee868ee0e643e58c0390de49 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Fri, 31 Jan 2025 11:27:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20GUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InstructorsAndTrainees/commonview.h | 2 +- .../connectorToServer/Core/tcpclient.cpp | 1 + .../connectorToServer/connectortoserver.cpp | 3 ++- .../instructors/viewerinstructors.cpp | 6 +++++ .../instructors/viewerinstructors.h | 2 ++ .../instructorsandtraineeswidget.cpp | 25 ++++++++++++------- InstructorsAndTrainees/tasks/ammtaskswidget.h | 4 ++- InstructorsAndTrainees/tasks/fimtaskswidget.h | 3 ++- .../trainees/viewertrainees.cpp | 8 ++++++ .../trainees/viewertrainees.h | 7 +----- 10 files changed, 42 insertions(+), 19 deletions(-) diff --git a/InstructorsAndTrainees/commonview.h b/InstructorsAndTrainees/commonview.h index 0f7755c..dd1305d 100644 --- a/InstructorsAndTrainees/commonview.h +++ b/InstructorsAndTrainees/commonview.h @@ -35,7 +35,7 @@ public: { this->adminMode = adminMode; } - void clearTree() + void deactivate() { treeWidget->clear(); lastCurrentID = 0; diff --git a/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp b/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp index c6fcde2..ebbcb7b 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp @@ -48,6 +48,7 @@ void TCPClient::setConnect(ServerSettings *serverSettings) else { isConnected = false; + emit signal_ConnectedToServer(false); emit sigServerDisconnect(); } } diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 27e1637..0982b27 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -383,7 +383,8 @@ void ConnectorToServer::initialize() emit sigInitializeClient(recognizeSystem,sendSystem,connectionThread); - emit sigSetConnect(dataParser->getServerSettings(),connectionThread); + SetConnectToServer(); + //emit sigSetConnect(dataParser->getServerSettings(),connectionThread); // QByteArray answer = dataParser->xmlAnswer_notify() // sendSystem->sendXMLAnswer() diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/InstructorsAndTrainees/instructors/viewerinstructors.cpp index 9ef38c9..2ba92ec 100644 --- a/InstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/InstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -28,6 +28,12 @@ void ViewerInstructors::setAuthComplited(bool authComplited) updateButtons(); } +void ViewerInstructors::deactivate() +{ + CommonView::deactivate(); + updateButtons(); +} + void ViewerInstructors::changeEvent(QEvent *event) { // В случае получения события изменения языка приложения diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.h b/InstructorsAndTrainees/instructors/viewerinstructors.h index e055b0f..8d551b5 100644 --- a/InstructorsAndTrainees/instructors/viewerinstructors.h +++ b/InstructorsAndTrainees/instructors/viewerinstructors.h @@ -20,6 +20,8 @@ public: public: void setAuthComplited(bool authComplited); + void deactivate(); + protected: void changeEvent(QEvent * event) override; diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 30a33ec..0deea32 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -102,7 +102,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : messangerWidget->setMinimumSize(400, 500); messangerWidget->setMaximumWidth(500); - //ui->btnAuthorizationInstructor->setEnabled(false); + ui->btnAuthorizationInstructor->setEnabled(false); ui->btnAssignTask->setEnabled(false); @@ -263,13 +263,19 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state) ui->btnSetVersion->hide(); ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png"))); - viewerTrainees->clearTree(); - viewerInstructors->clearTree(); + viewerInstructors->setAuthComplited(false); + viewerTrainees->setAuthComplited(false); - ammTasksWidget->clearTree(); - fimTasksWidget->clearTree(); + viewerTrainees->deactivate(); + viewerInstructors->deactivate(); + + ammTasksWidget->deactivate(); + fimTasksWidget->deactivate(); + ui->btnAssignTask->setEnabled(false); messangerWidget->clear(); + + QMessageBox::warning(this, tr("Warning!"), tr("The server is disabled")); } } @@ -366,11 +372,12 @@ void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked() disconnect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerTrainees,&ViewerTrainees::slot_NeedUpdateUI); disconnect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger); - viewerTrainees->clearTree(); - viewerInstructors->clearTree(); + viewerTrainees->deactivate(); + viewerInstructors->deactivate(); - ammTasksWidget->clearTree(); - fimTasksWidget->clearTree(); + ammTasksWidget->deactivate(); + fimTasksWidget->deactivate(); + ui->btnAssignTask->setEnabled(false); messangerWidget->clear(); } diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index 1c69759..43252a7 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h @@ -29,8 +29,10 @@ public: ~AMMtasksWidget(); public: - void clearTree() + void deactivate() { + accessAssignTask = false; + //taskTreePreparation->stopParser(); treeWidget->clear(); loginTraineeSelected = ""; idTraineeSelected = 0; diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index 99d649b..65a4ce8 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h @@ -33,8 +33,9 @@ public: ~FIMtasksWidget(); public: - void clearTree() + void deactivate() { + accessAssignTask = false; treeWidget->clear(); loginTraineeSelected = ""; idTraineeSelected = 0; diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index 042d6bf..52f7f1a 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -41,6 +41,14 @@ void ViewerTrainees::setAuthComplited(bool authComplited) updateButtons(); } +void ViewerTrainees::deactivate() +{ + CommonView::deactivate(); + ammTasksWidget->deactivate(); + fimTasksWidget->deactivate(); + updateButtons(); +} + /* void ViewerTrainees::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column) { diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h index 638843d..40cd3e7 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.h +++ b/InstructorsAndTrainees/trainees/viewertrainees.h @@ -22,12 +22,7 @@ public: public: void setAuthComplited(bool authComplited); - void clearTree() - { - CommonView::clearTree(); - ammTasksWidget->clearTree(); - fimTasksWidget->clearTree(); - } + void deactivate(); protected: void changeEvent(QEvent * event) override;