Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

refact0

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-17 17:42:34 +03:00
parent bd1bcd4e71
commit 8cf98ea2d9
17 changed files with 85 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GUIdataBaseLMS/mainwindow.cpp
View File

@@ -19,8 +19,8 @@ MainWindow::MainWindow(QWidget *parent)
ui->horizontalLayout->addWidget(instructorsAndTraineesWidget); ui->horizontalLayout->addWidget(instructorsAndTraineesWidget);
this->move(0, 0); this->move(0, 0);
this->showNormal(); //this->showNormal();
//this->showMaximized(); this->showMaximized();
qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + instructorsAndTraineesWidget->getLanguage(), "."); qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + instructorsAndTraineesWidget->getLanguage(), ".");
qApp->installTranslator(&qtLanguageTranslator); qApp->installTranslator(&qtLanguageTranslator);

2
InstructorsAndTrainees/commonview.cpp
View File

@@ -19,6 +19,8 @@ CommonView::CommonView(ConnectorToServer* connectorToServer, TypeView type, QWid
treeWidget = new QTreeWidget(); treeWidget = new QTreeWidget();
treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus); treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus);
treeWidget->setEnabled(false);
waitAnimationWidget = new WaitAnimationWidget; waitAnimationWidget = new WaitAnimationWidget;
QMovie *movie = new QMovie(":/resources/icons/762.gif"); QMovie *movie = new QMovie(":/resources/icons/762.gif");
//waitAnimationWidget->setParent(this); //waitAnimationWidget->setParent(this);

5
InstructorsAndTrainees/commonview.h
View File

@@ -36,9 +36,14 @@ public:
{ {
this->adminMode = adminMode; this->adminMode = adminMode;
} }
void activate()
{
treeWidget->setEnabled(true);
}
void deactivate() void deactivate()
{ {
treeWidget->clear(); treeWidget->clear();
treeWidget->setEnabled(false);
lastCurrentID = 0; lastCurrentID = 0;
} }
void clearSelection() void clearSelection()

3
InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp
View File

@@ -30,7 +30,7 @@ void SendSystem::sendDisable()
stream << data; stream << data;
socket->waitForBytesWritten(); socket->waitForBytesWritten();
} }
/*
void SendSystem::sendXMLmsgGUItoServer(QByteArray array) void SendSystem::sendXMLmsgGUItoServer(QByteArray array)
{ {
qDebug() << "SendSystem" << QThread::currentThreadId(); qDebug() << "SendSystem" << QThread::currentThreadId();
@@ -41,6 +41,7 @@ void SendSystem::sendXMLmsgGUItoServer(QByteArray array)
stream << array; stream << array;
socket->waitForBytesWritten(6000); socket->waitForBytesWritten(6000);
} }
*/
void SendSystem::sendFileBlock(QString path) void SendSystem::sendFileBlock(QString path)
{ {

2
InstructorsAndTrainees/connectorToServer/Core/sendsystem.h
View File

@@ -14,7 +14,7 @@ class SendSystem :public QObject
public: public:
explicit SendSystem(QObject* parent = nullptr); explicit SendSystem(QObject* parent = nullptr);
void setSocket(QTcpSocket *socket); void setSocket(QTcpSocket *socket);
void sendXMLmsgGUItoServer(QByteArray array); //void sendXMLmsgGUItoServer(QByteArray array);
void sendDisable(); void sendDisable();
void sendFileBlock(QString path); void sendFileBlock(QString path);
void sendFolderBlock(QString path); void sendFolderBlock(QString path);

12
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -47,7 +47,7 @@ bool ConnectorToServer::authorizationInstructorLocal(QString login, QString pass
isLoggedIn = true; isLoggedIn = true;
QByteArray array = dataParser->createAuthMessage(autorization); QByteArray array = dataParser->createAuthMessage(autorization);
emit signal_sendXMLmsgGUItoServer(array); emit sigSendAnswerToServer(array);
return true; return true;
} }
@@ -64,7 +64,7 @@ bool ConnectorToServer::deAuthorizationInstructorLocal(QString login)
isLoggedIn = false; isLoggedIn = false;
QByteArray array = dataParser->createDeAuthMessage(deAutorization); QByteArray array = dataParser->createDeAuthMessage(deAutorization);
emit signal_sendXMLmsgGUItoServer(array); emit sigSendAnswerToServer(array);
return true; return true;
} }
@@ -80,7 +80,7 @@ bool ConnectorToServer::sendQueryToDB(TypeQueryToDB typeQuery, int id, void* dat
queryToDB->typeQuery = typeQuery; queryToDB->typeQuery = typeQuery;
QByteArray array = dataParser->createQueryToDBMessage(queryToDB, id, data); QByteArray array = dataParser->createQueryToDBMessage(queryToDB, id, data);
emit signal_sendXMLmsgGUItoServer(array); emit sigSendAnswerToServer(array);
return true; return true;
} }
@@ -92,7 +92,7 @@ bool ConnectorToServer::sendMessage(ClientMessage clientMessage)
return false; return false;
} }
QByteArray array = dataParser->createMessage(clientMessage); QByteArray array = dataParser->createMessage(clientMessage);
emit signal_sendXMLmsgGUItoServer(array); emit sigSendAnswerToServer(array);
return true; return true;
} }
@@ -111,7 +111,7 @@ bool ConnectorToServer::sendQueryTasksXML(QString type)
} }
QByteArray array = dataParser->createQueryTasksXMLMessage(type); QByteArray array = dataParser->createQueryTasksXMLMessage(type);
emit signal_sendXMLmsgGUItoServer(array); emit sigSendAnswerToServer(array);
return true; return true;
} }
@@ -466,7 +466,7 @@ void ConnectorToServer::bindConnection()
connect(this,&ConnectorToServer::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection); connect(this,&ConnectorToServer::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection);
connect(this,&ConnectorToServer::sigStopConnect,client,&TCPClient::setDisconnect,Qt::AutoConnection); connect(this,&ConnectorToServer::sigStopConnect,client,&TCPClient::setDisconnect,Qt::AutoConnection);
connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer); //Sconnect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer);
connect(this,&ConnectorToServer::sigSendAnswerToServer,sendSystem,&SendSystem::sendXMLAnswer,Qt::AutoConnection); connect(this,&ConnectorToServer::sigSendAnswerToServer,sendSystem,&SendSystem::sendXMLAnswer,Qt::AutoConnection);
connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::slot_Auth); // ::sigLoginResult); connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::slot_Auth); // ::sigLoginResult);

2
InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -100,7 +100,7 @@ signals:
SendSystem *sendSystem, SendSystem *sendSystem,
QThread *thread); QThread *thread);
void signal_sendXMLmsgGUItoServer(QByteArray array); //void signal_sendXMLmsgGUItoServer(QByteArray array);
void sigLoginResult(ServerAuthorization * serverAuth); void sigLoginResult(ServerAuthorization * serverAuth);
void sigDeLoginResult(ServerDeAuthorization * serverDeAuth); void sigDeLoginResult(ServerDeAuthorization * serverDeAuth);

7
InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp
View File

@@ -11,6 +11,11 @@ DialogAuthorizationInstructor::DialogAuthorizationInstructor(QWidget *parent) :
ui->editPassword->setProperty("mandatoryField", true); ui->editPassword->setProperty("mandatoryField", true);
ui->editPassword->setEchoMode(QLineEdit::EchoMode::Password); ui->editPassword->setEchoMode(QLineEdit::EchoMode::Password);
#ifdef PROJECT_TYPE_DEBUG
ui->editLogin->setText("admin");
ui->editPassword->setText("admin");
#endif
} }
DialogAuthorizationInstructor::~DialogAuthorizationInstructor() DialogAuthorizationInstructor::~DialogAuthorizationInstructor()
@@ -18,7 +23,7 @@ DialogAuthorizationInstructor::~DialogAuthorizationInstructor()
delete ui; delete ui;
} }
void DialogAuthorizationInstructor::on_btnOK_clicked() void DialogAuthorizationInstructor::on_btnLogIn_clicked()
{ {
this->accept(); this->accept();
} }

2
InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h
View File

@@ -28,7 +28,7 @@ public:
} }
private slots: private slots:
void on_btnOK_clicked(); void on_btnLogIn_clicked();
private: private:
Ui::DialogAuthorizationInstructor *ui; Ui::DialogAuthorizationInstructor *ui;

8
InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui
View File

@@ -66,7 +66,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>admin</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
@@ -78,7 +78,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>admin</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
@@ -102,7 +102,7 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QPushButton" name="btnOK"> <widget class="QPushButton" name="btnLogIn">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -110,7 +110,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Login in</string> <string>Log in</string>
</property> </property>
</widget> </widget>
</item> </item>

3
InstructorsAndTrainees/instructors/viewerinstructors.cpp
View File

@@ -62,12 +62,13 @@ void ViewerInstructors::on_btnEditorInstructors_clicked()
EditorInstructors* editorInstructors = new EditorInstructors(connectorToServer, adminMode); EditorInstructors* editorInstructors = new EditorInstructors(connectorToServer, adminMode);
connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, editorInstructors, &EditorInstructors::slot_NeedUpdateUI); connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, editorInstructors, &EditorInstructors::slot_NeedUpdateUI);
editorInstructors->activate();
dlgEditor = new QDialog(this); dlgEditor = new QDialog(this);
QHBoxLayout *layout = new QHBoxLayout(dlgEditor); QHBoxLayout *layout = new QHBoxLayout(dlgEditor);
layout->addWidget(editorInstructors); layout->addWidget(editorInstructors);
dlgEditor->setWindowTitle(tr("Editor of instructors")); dlgEditor->setWindowTitle(tr("Editor of instructors"));
dlgEditor->setMinimumSize(1600, 800); dlgEditor->setMinimumSize(1400, 700);
dlgEditor->setWindowFlags(dlgEditor->windowFlags() & ~Qt::WindowContextHelpButtonHint); dlgEditor->setWindowFlags(dlgEditor->windowFlags() & ~Qt::WindowContextHelpButtonHint);
dlgEditor->exec(); dlgEditor->exec();

17
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -23,6 +23,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
nameInstructorLoggedInLocal(QStringLiteral("")), nameInstructorLoggedInLocal(QStringLiteral("")),
idInstructorLoggedInLocal("0"), idInstructorLoggedInLocal("0"),
language(languageENG), language(languageENG),
flSettingsServerIsChanged(false),
ui(new Ui::InstructorsAndTraineesWidget) ui(new Ui::InstructorsAndTraineesWidget)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -62,15 +63,15 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->verticalLayout_Trainees->addWidget(viewerTrainees); ui->verticalLayout_Trainees->addWidget(viewerTrainees);
ui->verticalLayout_Instructors->addWidget(viewerInstructors); ui->verticalLayout_Instructors->addWidget(viewerInstructors);
ui->groupBox_Messenger->setMinimumHeight(900); ui->groupBox_Messenger->setMinimumHeight(600);
ui->groupBox_Messenger->setMaximumWidth(500); ui->groupBox_Messenger->setMaximumWidth(500);
ui->groupBox_Messenger->setMinimumWidth(500); ui->groupBox_Messenger->setMinimumWidth(500);
ui->groupBox_Instructors->setMinimumHeight(300); ui->groupBox_Instructors->setMinimumHeight(200);
ui->groupBox_Instructors->setMaximumHeight(300); ui->groupBox_Instructors->setMaximumHeight(300);
ui->groupBox_Trainees->setMinimumHeight(600); ui->groupBox_Trainees->setMinimumHeight(400);
ui->groupBox_Trainees->setMinimumWidth(600); ui->groupBox_Trainees->setMinimumWidth(600);
ui->groupBox_Instructors->setMinimumWidth(600); ui->groupBox_Instructors->setMinimumWidth(600);
@@ -182,6 +183,9 @@ void InstructorsAndTraineesWidget::slot_checkLoginResult(ServerAuthorization *se
connectorToServer->sendQueryTasksXML("fim"); connectorToServer->sendQueryTasksXML("fim");
connectorToServer->sendQueryTasksXML("amm"); connectorToServer->sendQueryTasksXML("amm");
viewerTrainees->activate();
viewerInstructors->activate();
} }
else else
{ {
@@ -251,7 +255,10 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
updateLabelLoggedInInstructor(loginInstructorLoggedInLocal, nameInstructorLoggedInLocal); updateLabelLoggedInInstructor(loginInstructorLoggedInLocal, nameInstructorLoggedInLocal);
updateLabelServer(); updateLabelServer();
SpecialMessageBox(this, SpecialMessageBox::TypeSpecMsgBox::warningClose, tr("The server is not available!")).exec(); if(!flSettingsServerIsChanged)
SpecialMessageBox(this, SpecialMessageBox::TypeSpecMsgBox::warningClose, tr("The server is not available!")).exec();
else
flSettingsServerIsChanged = false;
} }
} }
@@ -441,6 +448,8 @@ void InstructorsAndTraineesWidget::on_btnSettings_clicked()
{ {
SpecialMessageBox(this, SpecialMessageBox::TypeSpecMsgBox::warningClose, tr("Server settings have been changed. Please reconnect to the server.")).exec(); SpecialMessageBox(this, SpecialMessageBox::TypeSpecMsgBox::warningClose, tr("Server settings have been changed. Please reconnect to the server.")).exec();
flSettingsServerIsChanged = true;
if(authorizationIsCompleted()) if(authorizationIsCompleted())
deAuthorizationInstructor(loginInstructorLoggedInLocal); deAuthorizationInstructor(loginInstructorLoggedInLocal);

2
InstructorsAndTrainees/instructorsandtraineeswidget.h
View File

@@ -95,6 +95,8 @@ private:
QTranslator qtLanguageTranslator; QTranslator qtLanguageTranslator;
QString language; QString language;
bool flSettingsServerIsChanged;
Ui::InstructorsAndTraineesWidget *ui; Ui::InstructorsAndTraineesWidget *ui;
}; };

3
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -86,12 +86,13 @@ void ViewerTrainees::on_btnEditorTrainees_clicked()
EditorTrainees* editorTraineesGroups = new EditorTrainees(connectorToServer, adminMode); EditorTrainees* editorTraineesGroups = new EditorTrainees(connectorToServer, adminMode);
connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, editorTraineesGroups, &EditorTrainees::slot_NeedUpdateUI); connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, editorTraineesGroups, &EditorTrainees::slot_NeedUpdateUI);
editorTraineesGroups->activate();
dlgEditor = new QDialog(this); dlgEditor = new QDialog(this);
QHBoxLayout *layout = new QHBoxLayout(dlgEditor); QHBoxLayout *layout = new QHBoxLayout(dlgEditor);
layout->addWidget(editorTraineesGroups); layout->addWidget(editorTraineesGroups);
dlgEditor->setWindowTitle(tr("Editor of trainees")); dlgEditor->setWindowTitle(tr("Editor of trainees"));
dlgEditor->setMinimumSize(1600, 800); dlgEditor->setMinimumSize(1400, 700);
dlgEditor->setWindowFlags(dlgEditor->windowFlags() & ~Qt::WindowContextHelpButtonHint); dlgEditor->setWindowFlags(dlgEditor->windowFlags() & ~Qt::WindowContextHelpButtonHint);
dlgEditor->exec(); dlgEditor->exec();

BIN
InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm
View File

Binary file not shown.

78
InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts
View File

@@ -78,15 +78,9 @@ Delete it anyway?</source>
<source>Login</source> <source>Login</source>
<translation>Логин</translation> <translation>Логин</translation>
</message> </message>
<message>
<location filename="../instructors/dialogauthorizationinstructor.ui" line="69"/>
<location filename="../instructors/dialogauthorizationinstructor.ui" line="81"/>
<source>admin</source>
<translation></translation>
</message>
<message> <message>
<location filename="../instructors/dialogauthorizationinstructor.ui" line="113"/> <location filename="../instructors/dialogauthorizationinstructor.ui" line="113"/>
<source>Login in</source> <source>Log in</source>
<translation>Войти</translation> <translation>Войти</translation>
</message> </message>
<message> <message>
@@ -661,48 +655,48 @@ Delete it anyway?</source>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="317"/> <location filename="../instructorsandtraineeswidget.ui" line="317"/>
<location filename="../instructorsandtraineeswidget.ui" line="391"/> <location filename="../instructorsandtraineeswidget.ui" line="391"/>
<location filename="../instructorsandtraineeswidget.cpp" line="385"/> <location filename="../instructorsandtraineeswidget.cpp" line="402"/>
<location filename="../instructorsandtraineeswidget.cpp" line="401"/> <location filename="../instructorsandtraineeswidget.cpp" line="418"/>
<source>none</source> <source>none</source>
<translation>нет</translation> <translation>нет</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="128"/> <location filename="../instructorsandtraineeswidget.cpp" line="130"/>
<source>The file could not be opened </source> <source>The file could not be opened </source>
<translation>Файл не может быть открыт </translation> <translation>Файл не может быть открыт </translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="189"/> <location filename="../instructorsandtraineeswidget.cpp" line="194"/>
<source>Instructor authorization.</source> <source>Instructor authorization.</source>
<translation>Авторизация инструктора.</translation> <translation>Авторизация инструктора.</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="214"/> <location filename="../instructorsandtraineeswidget.cpp" line="228"/>
<source>Instructor deauthorization</source> <source>Instructor deauthorization</source>
<translation>Деавторизация инструктора</translation> <translation>Деавторизация инструктора</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="214"/> <location filename="../instructorsandtraineeswidget.cpp" line="228"/>
<source>Error!</source> <source>Error!</source>
<translation>Ошибка!</translation> <translation>Ошибка!</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="254"/> <location filename="../instructorsandtraineeswidget.cpp" line="269"/>
<source>The server is not available!</source> <source>The server is not available!</source>
<translation>Сервер недоступен!</translation> <translation>Сервер недоступен!</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="442"/> <location filename="../instructorsandtraineeswidget.cpp" line="459"/>
<source>Server settings have been changed. Please reconnect to the server.</source> <source>Server settings have been changed. Please reconnect to the server.</source>
<translation>Настройки сервера изменены. Выполните переподключение к серверу.</translation> <translation>Настройки сервера изменены. Выполните переподключение к серверу.</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="289"/> <location filename="../instructorsandtraineeswidget.cpp" line="306"/>
<source>Instructor authorization</source> <source>Instructor authorization</source>
<translation>Авторизация инструктора</translation> <translation>Авторизация инструктора</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="189"/> <location filename="../instructorsandtraineeswidget.cpp" line="194"/>
<source>Invalid login or password!</source> <source>Invalid login or password!</source>
<translation>Неправильный логин или пароль!</translation> <translation>Неправильный логин или пароль!</translation>
</message> </message>
@@ -710,49 +704,49 @@ Delete it anyway?</source>
<context> <context>
<name>InstructorsView</name> <name>InstructorsView</name>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="122"/> <location filename="../instructors/instructorsview.cpp" line="119"/>
<location filename="../instructors/instructorsview.cpp" line="135"/> <location filename="../instructors/instructorsview.cpp" line="132"/>
<source>yes</source> <source>yes</source>
<translation>да</translation> <translation>да</translation>
</message> </message>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="128"/> <location filename="../instructors/instructorsview.cpp" line="125"/>
<location filename="../instructors/instructorsview.cpp" line="140"/> <location filename="../instructors/instructorsview.cpp" line="137"/>
<source>no</source> <source>no</source>
<translation>нет</translation> <translation>нет</translation>
</message> </message>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="186"/> <location filename="../instructors/instructorsview.cpp" line="183"/>
<source>Instructor</source> <source>Instructor</source>
<translation>Инструктор</translation> <translation>Инструктор</translation>
</message> </message>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="186"/> <location filename="../instructors/instructorsview.cpp" line="183"/>
<source>Login</source> <source>Login</source>
<translation>Логин</translation> <translation>Логин</translation>
</message> </message>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="186"/> <location filename="../instructors/instructorsview.cpp" line="183"/>
<source>Password</source> <source>Password</source>
<translation>Пароль</translation> <translation>Пароль</translation>
</message> </message>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="186"/> <location filename="../instructors/instructorsview.cpp" line="183"/>
<source>Administrator</source> <source>Administrator</source>
<translation>Администратор</translation> <translation>Администратор</translation>
</message> </message>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="186"/> <location filename="../instructors/instructorsview.cpp" line="183"/>
<source>Archived</source> <source>Archived</source>
<translation>Архивный</translation> <translation>Архивный</translation>
</message> </message>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="186"/> <location filename="../instructors/instructorsview.cpp" line="183"/>
<source>Logged</source> <source>Logged</source>
<translation>Залогирован</translation> <translation>Залогирован</translation>
</message> </message>
<message> <message>
<location filename="../instructors/instructorsview.cpp" line="186"/> <location filename="../instructors/instructorsview.cpp" line="183"/>
<source>ID</source> <source>ID</source>
<translation>ID</translation> <translation>ID</translation>
</message> </message>
@@ -1038,57 +1032,57 @@ Delete it anyway?</source>
<context> <context>
<name>TraineesView</name> <name>TraineesView</name>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="152"/> <location filename="../trainees/traineesview.cpp" line="149"/>
<source>yes</source> <source>yes</source>
<translation>да</translation> <translation>да</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="158"/> <location filename="../trainees/traineesview.cpp" line="155"/>
<source>no</source> <source>no</source>
<translation>нет</translation> <translation>нет</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>Trainee</source> <source>Trainee</source>
<translation>Обучаемый</translation> <translation>Обучаемый</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>Login</source> <source>Login</source>
<translation>Логин</translation> <translation>Логин</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>Password</source> <source>Password</source>
<translation>Пароль</translation> <translation>Пароль</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>Class</source> <source>Class</source>
<translation>Класс</translation> <translation>Класс</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>Computer</source> <source>Computer</source>
<translation>Компьютер</translation> <translation>Компьютер</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>IP address</source> <source>IP address</source>
<translation>IP адрес</translation> <translation>IP адрес</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>Archived</source> <source>Archived</source>
<translation>Архивный</translation> <translation>Архивный</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>Logged</source> <source>Logged</source>
<translation>Залогирован</translation> <translation>Залогирован</translation>
</message> </message>
<message> <message>
<location filename="../trainees/traineesview.cpp" line="220"/> <location filename="../trainees/traineesview.cpp" line="217"/>
<source>ID</source> <source>ID</source>
<translation>ID</translation> <translation>ID</translation>
</message> </message>
@@ -1197,7 +1191,7 @@ Delete it anyway?</source>
<translation>Редактор инструкторов</translation> <translation>Редактор инструкторов</translation>
</message> </message>
<message> <message>
<location filename="../instructors/viewerinstructors.cpp" line="69"/> <location filename="../instructors/viewerinstructors.cpp" line="70"/>
<source>Editor of instructors</source> <source>Editor of instructors</source>
<translation>Редактор инструкторов</translation> <translation>Редактор инструкторов</translation>
</message> </message>
@@ -1215,12 +1209,12 @@ Delete it anyway?</source>
<translation>Редактор обучаемых</translation> <translation>Редактор обучаемых</translation>
</message> </message>
<message> <message>
<location filename="../trainees/viewertrainees.cpp" line="93"/> <location filename="../trainees/viewertrainees.cpp" line="94"/>
<source>Editor of trainees</source> <source>Editor of trainees</source>
<translation>Редактор обучаемых</translation> <translation>Редактор обучаемых</translation>
</message> </message>
<message> <message>
<location filename="../trainees/viewertrainees.cpp" line="130"/> <location filename="../trainees/viewertrainees.cpp" line="131"/>
<source>Personal card trainee</source> <source>Personal card trainee</source>
<translation>Персональная карта обучаемого</translation> <translation>Персональная карта обучаемого</translation>
</message> </message>

1242
InstructorsAndTrainees/translations/InstructorsAndTrainees_ru_RU.ts
View File

File diff suppressed because it is too large Load Diff