mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
refact
This commit is contained in:
@@ -41,4 +41,3 @@ add_dependencies(GUIdataBaseLMS InstructorsAndTrainees)
|
|||||||
add_dependencies(ServerLMS DataBaseLMS)
|
add_dependencies(ServerLMS DataBaseLMS)
|
||||||
add_dependencies(ServerLMS InstructorsAndTrainees)
|
add_dependencies(ServerLMS InstructorsAndTrainees)
|
||||||
add_dependencies(TrayServerLMS ServerLMS)
|
add_dependencies(TrayServerLMS ServerLMS)
|
||||||
add_dependencies(TrayServerLMS InstructorsAndTrainees)
|
|
||||||
|
|||||||
@@ -387,7 +387,7 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
|
|||||||
if(cntTryConnectToServer < 10)
|
if(cntTryConnectToServer < 10)
|
||||||
{
|
{
|
||||||
cntTryConnectToServer++;
|
cntTryConnectToServer++;
|
||||||
QTimer::singleShot(1000, this, SLOT(slot_ConnectToServer()));
|
QTimer::singleShot(1000, this, SLOT(slot_TryConnectToServer()));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -460,7 +460,7 @@ void InstructorsAndTraineesWidget::slot_AnswerDocsChanged()
|
|||||||
viewerTrainees->getAmmTasksWidgetCommon()->setDocsActualed(false);
|
viewerTrainees->getAmmTasksWidgetCommon()->setDocsActualed(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstructorsAndTraineesWidget::slot_ConnectToServer()
|
void InstructorsAndTraineesWidget::slot_TryConnectToServer()
|
||||||
{
|
{
|
||||||
updateLabelServer();
|
updateLabelServer();
|
||||||
connectorToServer->SetConnectToServer();
|
connectorToServer->SetConnectToServer();
|
||||||
@@ -540,7 +540,7 @@ void InstructorsAndTraineesWidget::on_btnConnectionToServer_clicked()
|
|||||||
|
|
||||||
updateLabelServer();
|
updateLabelServer();
|
||||||
|
|
||||||
QTimer::singleShot(1000, this, SLOT(slot_ConnectToServer()));
|
QTimer::singleShot(1000, this, SLOT(slot_TryConnectToServer()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
|
void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public Q_SLOTS:
|
|||||||
|
|
||||||
void slot_AnswerDocsChanged();
|
void slot_AnswerDocsChanged();
|
||||||
|
|
||||||
void slot_ConnectToServer();
|
void slot_TryConnectToServer();
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
//сигнал смены языка
|
//сигнал смены языка
|
||||||
@@ -79,19 +79,15 @@ private Q_SLOTS:
|
|||||||
void on_btnSettings_clicked();
|
void on_btnSettings_clicked();
|
||||||
void on_btnEditorTrainees_clicked();
|
void on_btnEditorTrainees_clicked();
|
||||||
void on_btnEditorInstructors_clicked();
|
void on_btnEditorInstructors_clicked();
|
||||||
|
|
||||||
void on_btnPersonalCard_clicked();
|
void on_btnPersonalCard_clicked();
|
||||||
|
|
||||||
void on_btnTasksCommon_clicked();
|
void on_btnTasksCommon_clicked();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//Авторизация инструктора локальная (на ГУИ)
|
|
||||||
bool authorizationInstructorDialog(QWidget* parent = nullptr);
|
bool authorizationInstructorDialog(QWidget* parent = nullptr);
|
||||||
bool deAuthorizationInstructor(QString login);
|
bool deAuthorizationInstructor(QString login);
|
||||||
bool authorizationIsCompleted();
|
bool authorizationIsCompleted();
|
||||||
void updateLabelLoggedInInstructor(QString login, QString name);
|
void updateLabelLoggedInInstructor(QString login, QString name);
|
||||||
void updateLabelServer();
|
void updateLabelServer();
|
||||||
|
|
||||||
void setLanguageInterfase();
|
void setLanguageInterfase();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -113,6 +109,8 @@ private:
|
|||||||
QString nameInstructorLoggedInLocal;
|
QString nameInstructorLoggedInLocal;
|
||||||
QString idInstructorLoggedInLocal;
|
QString idInstructorLoggedInLocal;
|
||||||
|
|
||||||
|
Instructor instructorLoggedInLocal;
|
||||||
|
|
||||||
QTranslator qtLanguageTranslator;
|
QTranslator qtLanguageTranslator;
|
||||||
QString language;
|
QString language;
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1314</width>
|
<width>1300</width>
|
||||||
<height>901</height>
|
<height>900</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
|
|||||||
Reference in New Issue
Block a user