This commit is contained in:
2025-11-07 10:57:02 +03:00
parent e79186cb4f
commit 364d3f44a9
9 changed files with 131 additions and 129 deletions

View File

@@ -12,7 +12,7 @@
#include "tasksAmmFim.h"
#include "timingoftrainee.h"
static const QString backupEmptyName = "DBLMS_EMPTY.backup";
static const QString backupEmptyName = ".\\restoreDB\\DBLMS_EMPTY.backup";
static const QString restoreDBscriptName = "restoreDBscript.bat";
class DATABASELMS_EXPORT DataBaseSettings

View File

@@ -1,17 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ru_RU">
<context>
<name>DataBaseLMS</name>
<message>
<location filename="../databaselms.cpp" line="97"/>
<source>Attention!</source>
<translation>Внимание!</translation>
</message>
<message>
<location filename="../databaselms.cpp" line="97"/>
<source>The file could not be opened:</source>
<translation>Файл не может быть открыт:</translation>
</message>
</context>
</TS>

View File

@@ -83,10 +83,14 @@ QToolButton {
QToolButton#btnSend, QToolButton#btnDelete, QToolButton#btnCheck, QToolButton#btnOnlyActive,
QToolButton#btnSave, QToolButton#btnUpdateStyle, QToolButton#btnSetVersion,
QToolButton#btnAssignTask {
QToolButton#btnAssignTask, QToolButton#btnCheckDB, QToolButton#btnRepare {
width: 80px;
height: 55px;
}
QToolButton#btnCheckDB {
width: 100px;
height: 55px;
}
QToolButton#btnViewPassword, QToolButton#btnChangePassword {
min-width: 18px;

View File

@@ -226,27 +226,27 @@ The status will be set:
<message>
<location filename="../authorization/dialogauthorization.ui" line="20"/>
<source>Instructor authorization</source>
<translation type="unfinished">Авторизация инструктора</translation>
<translation>Авторизация инструктора</translation>
</message>
<message>
<location filename="../authorization/dialogauthorization.ui" line="41"/>
<source>Login</source>
<translation type="unfinished">Логин</translation>
<translation>Логин</translation>
</message>
<message>
<location filename="../authorization/dialogauthorization.ui" line="53"/>
<source>Password</source>
<translation type="unfinished">Пароль</translation>
<translation>Пароль</translation>
</message>
<message>
<location filename="../authorization/dialogauthorization.ui" line="90"/>
<source>...</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../authorization/dialogauthorization.ui" line="128"/>
<source>Log in</source>
<translation type="unfinished">Войти</translation>
<translation>Войти</translation>
</message>
</context>
<context>
@@ -408,57 +408,57 @@ The status will be set:
<context>
<name>DialogSettings</name>
<message>
<location filename="../dialogsettings.ui" line="26"/>
<location filename="../settings/dialogsettings.ui" line="26"/>
<source>Settings</source>
<translation>Настройки</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="47"/>
<location filename="../settings/dialogsettings.ui" line="47"/>
<source>Main</source>
<translation>Основные</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="57"/>
<location filename="../settings/dialogsettings.ui" line="57"/>
<source>Language</source>
<translation>Язык</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="98"/>
<location filename="../settings/dialogsettings.ui" line="98"/>
<source>Server</source>
<translation>Сервер</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="108"/>
<location filename="../settings/dialogsettings.ui" line="108"/>
<source>Address</source>
<translation>Адрес</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="145"/>
<location filename="../settings/dialogsettings.ui" line="145"/>
<source>Port</source>
<translation>Порт</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="191"/>
<location filename="../settings/dialogsettings.ui" line="191"/>
<source>Auto start</source>
<translation>Авто старт</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="242"/>
<location filename="../settings/dialogsettings.ui" line="242"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="281"/>
<location filename="../settings/dialogsettings.ui" line="281"/>
<source>Additional</source>
<translation>Расширенные</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="301"/>
<location filename="../settings/dialogsettings.ui" line="301"/>
<source>Version</source>
<translation>Версия</translation>
</message>
<message>
<location filename="../dialogsettings.ui" line="333"/>
<location filename="../settings/dialogsettings.ui" line="333"/>
<source>Style</source>
<translation>Стиль</translation>
</message>
@@ -1066,49 +1066,49 @@ Delete it anyway?</source>
<context>
<name>SpecialMessageBox</name>
<message>
<location filename="../specialmessagebox.ui" line="14"/>
<location filename="../specialmessagebox/specialmessagebox.ui" line="14"/>
<source>Dialog</source>
<translation></translation>
</message>
<message>
<location filename="../specialmessagebox.ui" line="46"/>
<location filename="../specialmessagebox/specialmessagebox.ui" line="46"/>
<source>text</source>
<translation></translation>
</message>
<message>
<location filename="../specialmessagebox.ui" line="89"/>
<location filename="../specialmessagebox/specialmessagebox.ui" line="89"/>
<source>Yes</source>
<translation>Да</translation>
</message>
<message>
<location filename="../specialmessagebox.ui" line="102"/>
<location filename="../specialmessagebox/specialmessagebox.ui" line="102"/>
<source>No</source>
<translation>Нет</translation>
</message>
<message>
<location filename="../specialmessagebox.cpp" line="16"/>
<location filename="../specialmessagebox.cpp" line="21"/>
<location filename="../specialmessagebox/specialmessagebox.cpp" line="16"/>
<location filename="../specialmessagebox/specialmessagebox.cpp" line="21"/>
<source>Attention!</source>
<translation>Внимание!</translation>
</message>
<message>
<location filename="../specialmessagebox.cpp" line="23"/>
<location filename="../specialmessagebox.cpp" line="30"/>
<location filename="../specialmessagebox/specialmessagebox.cpp" line="23"/>
<location filename="../specialmessagebox/specialmessagebox.cpp" line="30"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
<location filename="../specialmessagebox.cpp" line="28"/>
<location filename="../specialmessagebox/specialmessagebox.cpp" line="28"/>
<source>Error!</source>
<translation>Ошибка!</translation>
</message>
<message>
<location filename="../specialmessagebox.cpp" line="35"/>
<location filename="../specialmessagebox/specialmessagebox.cpp" line="35"/>
<source>Information</source>
<translation>Информация</translation>
</message>
<message>
<location filename="../specialmessagebox.cpp" line="37"/>
<location filename="../specialmessagebox/specialmessagebox.cpp" line="37"/>
<source>Ok</source>
<translation>Хорошо</translation>
</message>

View File

@@ -12,84 +12,84 @@
<context>
<name>DialogCheckDB</name>
<message>
<location filename="../dialogcheckdb.ui" line="14"/>
<location filename="../dialogcheckdb.ui" line="178"/>
<location filename="../settings/dialogcheckdb.ui" line="14"/>
<location filename="../settings/dialogcheckdb.ui" line="178"/>
<source>Database</source>
<translation>База данных</translation>
</message>
<message>
<location filename="../dialogcheckdb.ui" line="36"/>
<location filename="../settings/dialogcheckdb.ui" line="36"/>
<source>Driver PostgreSQL</source>
<translation>Драйвер PostgreSQL</translation>
</message>
<message>
<location filename="../dialogcheckdb.ui" line="43"/>
<location filename="../dialogcheckdb.ui" line="114"/>
<location filename="../dialogcheckdb.ui" line="185"/>
<location filename="../settings/dialogcheckdb.ui" line="43"/>
<location filename="../settings/dialogcheckdb.ui" line="114"/>
<location filename="../settings/dialogcheckdb.ui" line="185"/>
<source>...</source>
<translation></translation>
</message>
<message>
<location filename="../dialogcheckdb.ui" line="107"/>
<location filename="../settings/dialogcheckdb.ui" line="107"/>
<source>User</source>
<translation>Пользователь</translation>
</message>
<message>
<location filename="../dialogcheckdb.ui" line="259"/>
<location filename="../settings/dialogcheckdb.ui" line="259"/>
<source>Repare</source>
<translation>Восстановить</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="38"/>
<location filename="../settings/dialogcheckdb.cpp" line="38"/>
<source>Installed</source>
<translation>Установлен</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="43"/>
<location filename="../settings/dialogcheckdb.cpp" line="43"/>
<source>Not installed</source>
<translation>Не установлен</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="50"/>
<location filename="../dialogcheckdb.cpp" line="62"/>
<location filename="../settings/dialogcheckdb.cpp" line="50"/>
<location filename="../settings/dialogcheckdb.cpp" line="62"/>
<source>Exist</source>
<translation>Существует</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="55"/>
<location filename="../dialogcheckdb.cpp" line="67"/>
<location filename="../settings/dialogcheckdb.cpp" line="55"/>
<location filename="../settings/dialogcheckdb.cpp" line="67"/>
<source>Not exist</source>
<translation>Не существует</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="114"/>
<location filename="../settings/dialogcheckdb.cpp" line="114"/>
<source>Completed!</source>
<translation type="unfinished"></translation>
<translation>Завершено!</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="114"/>
<location filename="../settings/dialogcheckdb.cpp" line="114"/>
<source>The database has been successfully restored!</source>
<translation type="unfinished"></translation>
<translation>База данных успешно восстановлена!</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="83"/>
<location filename="../settings/dialogcheckdb.cpp" line="83"/>
<source>Install PostgreSQL.</source>
<translation>Установите PostgreSQL.</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="83"/>
<location filename="../dialogcheckdb.cpp" line="93"/>
<location filename="../dialogcheckdb.cpp" line="104"/>
<location filename="../settings/dialogcheckdb.cpp" line="83"/>
<location filename="../settings/dialogcheckdb.cpp" line="93"/>
<location filename="../settings/dialogcheckdb.cpp" line="104"/>
<source>Error!</source>
<translation>Ошибка!</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="93"/>
<location filename="../settings/dialogcheckdb.cpp" line="93"/>
<source>Failed to create user!</source>
<translation>Ошибка создания пользователя!</translation>
</message>
<message>
<location filename="../dialogcheckdb.cpp" line="104"/>
<location filename="../settings/dialogcheckdb.cpp" line="104"/>
<source>Failed to create Database!</source>
<translation>Ошибка создания Базы данных!</translation>
</message>
@@ -97,114 +97,114 @@
<context>
<name>DialogSettingsTray</name>
<message>
<location filename="../dialogsettingstray.ui" line="14"/>
<location filename="../settings/dialogsettingstray.ui" line="14"/>
<source>Settings</source>
<translation>Настройки</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="22"/>
<location filename="../settings/dialogsettingstray.ui" line="22"/>
<source>Main</source>
<translation>Основные</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="32"/>
<location filename="../settings/dialogsettingstray.ui" line="32"/>
<source>Language</source>
<translation>Язык</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="67"/>
<location filename="../settings/dialogsettingstray.ui" line="67"/>
<source>Database</source>
<translation type="unfinished">База данных</translation>
<translation>База данных</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="77"/>
<location filename="../settings/dialogsettingstray.ui" line="77"/>
<source>Host name</source>
<translation>Хост</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="97"/>
<location filename="../settings/dialogsettingstray.ui" line="97"/>
<source>Localhost</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="121"/>
<location filename="../settings/dialogsettingstray.ui" line="121"/>
<source>Port</source>
<translation>Порт</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="145"/>
<location filename="../settings/dialogsettingstray.ui" line="145"/>
<source>Database name</source>
<translation type="unfinished"></translation>
<translation>Имя базы данных</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="172"/>
<location filename="../settings/dialogsettingstray.ui" line="172"/>
<source>User name</source>
<translation>Имя пользователя</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="199"/>
<location filename="../settings/dialogsettingstray.ui" line="199"/>
<source>User password</source>
<translation type="unfinished"></translation>
<translation>Пароль пользователя</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="245"/>
<location filename="../settings/dialogsettingstray.ui" line="245"/>
<source>Check&amp;&amp;Repare</source>
<translation type="unfinished"></translation>
<translation>Проверить&amp;&amp;Восстановить</translation>
</message>
<message>
<location filename="../dialogsettingstray.ui" line="293"/>
<location filename="../settings/dialogsettingstray.ui" line="293"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="272"/>
<location filename="../dialogsettingstray.cpp" line="324"/>
<location filename="../dialogsettingstray.cpp" line="329"/>
<location filename="../settings/dialogsettingstray.cpp" line="287"/>
<location filename="../settings/dialogsettingstray.cpp" line="339"/>
<location filename="../settings/dialogsettingstray.cpp" line="344"/>
<source>Error!</source>
<translation type="unfinished">Ошибка!</translation>
<translation>Ошибка!</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="272"/>
<location filename="../settings/dialogsettingstray.cpp" line="287"/>
<source>Driver PostgreSQL is not installed!</source>
<translation type="unfinished"></translation>
<translation>Драйвер PostgreSQL не установлен!</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="281"/>
<location filename="../settings/dialogsettingstray.cpp" line="296"/>
<source>Superuser PostgreSQL authorization</source>
<translation type="unfinished"></translation>
<translation>Авторизация суперпользователя PostgreSQL</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="324"/>
<location filename="../dialogsettingstray.cpp" line="329"/>
<location filename="../settings/dialogsettingstray.cpp" line="339"/>
<location filename="../settings/dialogsettingstray.cpp" line="344"/>
<source>Error connecting to PostgreSQL!</source>
<translation type="unfinished"></translation>
<translation>Ошибка соединения с PostgreSQL!</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="325"/>
<location filename="../dialogsettingstray.cpp" line="330"/>
<location filename="../settings/dialogsettingstray.cpp" line="340"/>
<location filename="../settings/dialogsettingstray.cpp" line="345"/>
<source>Possible reasons:</source>
<translation type="unfinished"></translation>
<translation>Возможные причины:</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="326"/>
<location filename="../dialogsettingstray.cpp" line="331"/>
<location filename="../settings/dialogsettingstray.cpp" line="341"/>
<location filename="../settings/dialogsettingstray.cpp" line="346"/>
<source>*superuser PostgreSQL login or password is incorrect;</source>
<translation type="unfinished"></translation>
<translation>*логин или пароль суперпользователя PostgreSQL некорректен;</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="327"/>
<location filename="../settings/dialogsettingstray.cpp" line="342"/>
<source>*Port is incorrect.</source>
<translation type="unfinished"></translation>
<translation>*Порт некорректен.</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="332"/>
<location filename="../settings/dialogsettingstray.cpp" line="347"/>
<source>*Port is incorrect;</source>
<translation type="unfinished"></translation>
<translation>*Порт некорректен;</translation>
</message>
<message>
<location filename="../dialogsettingstray.cpp" line="333"/>
<location filename="../settings/dialogsettingstray.cpp" line="348"/>
<source>*file &apos;pg_hba.conf&apos; does not contain an entry for the IP address:</source>
<translation type="unfinished"></translation>
<translation>*файл &apos;pg_hba.conf не содержит записи доступа для IP адреса:</translation>
</message>
</context>
<context>
@@ -261,66 +261,77 @@
<translation>Остановить</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="153"/>
<location filename="../serverlmswidget.cpp" line="159"/>
<source>Server is started!</source>
<translation>Сервер запущен!</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="166"/>
<location filename="../serverlmswidget.cpp" line="172"/>
<source>Server is stoped!</source>
<translation>Сервер остановлен!</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="196"/>
<location filename="../serverlmswidget.cpp" line="245"/>
<location filename="../serverlmswidget.cpp" line="209"/>
<location filename="../serverlmswidget.cpp" line="258"/>
<source>Warning!</source>
<translation>Внимание!</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="196"/>
<location filename="../serverlmswidget.cpp" line="209"/>
<source>Database settings have been changed.
The server will be restarted.</source>
<translation>Настройки Базы Данных были изменены.
Сервер будет перезапущен.</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="245"/>
<location filename="../serverlmswidget.cpp" line="258"/>
<source>The file could not be opened </source>
<translation>Файл не может быть открыт </translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="314"/>
<location filename="../serverlmswidget.cpp" line="318"/>
<location filename="../serverlmswidget.cpp" line="328"/>
<location filename="../serverlmswidget.cpp" line="332"/>
<source>Database connection error!</source>
<translation>Ошибка подключения Базы данных!</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="318"/>
<location filename="../serverlmswidget.cpp" line="182"/>
<location filename="../serverlmswidget.cpp" line="332"/>
<source>Error!</source>
<translation>Ошибка!</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="333"/>
<location filename="../serverlmswidget.cpp" line="113"/>
<source>Error PostgreSQL!</source>
<translation>Ошибка PostgreSQL!</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="182"/>
<source>Settings file could not be opened:</source>
<translation>Файл настроек не открыт:</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="347"/>
<source>Database connection OK!</source>
<translation>База данных подключена!</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="347"/>
<location filename="../serverlmswidget.cpp" line="361"/>
<source>started</source>
<translation>запущен</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="352"/>
<location filename="../serverlmswidget.cpp" line="366"/>
<source>stoped</source>
<translation>остановлен</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="372"/>
<location filename="../serverlmswidget.cpp" line="386"/>
<source>connected</source>
<translation>подключена</translation>
</message>
<message>
<location filename="../serverlmswidget.cpp" line="381"/>
<location filename="../serverlmswidget.cpp" line="395"/>
<source>not connected</source>
<translation>не подключена</translation>
</message>

View File

@@ -9,43 +9,43 @@
<translation>Сервер Системы управления обучением (СУО)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="177"/>
<location filename="../mainwindow.cpp" line="232"/>
<location filename="../mainwindow.cpp" line="171"/>
<location filename="../mainwindow.cpp" line="230"/>
<source>Server LMS</source>
<translation>Сервер СУО</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="233"/>
<location filename="../mainwindow.cpp" line="231"/>
<source>Expand window</source>
<translation>Развернуть окно</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="234"/>
<location filename="../mainwindow.cpp" line="232"/>
<source>Minimize window</source>
<translation>Свернуть окно</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="235"/>
<location filename="../mainwindow.cpp" line="233"/>
<source>Exit</source>
<translation>Выход</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="67"/>
<location filename="../mainwindow.cpp" line="68"/>
<source>Starting the server...</source>
<translation>Запуск сервера...</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="213"/>
<location filename="../mainwindow.cpp" line="211"/>
<source>Error!</source>
<translation>Ошибка!</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="215"/>
<location filename="../mainwindow.cpp" line="213"/>
<source>No Client files found!</source>
<translation>Файлы Клиента не найдены!</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="216"/>
<location filename="../mainwindow.cpp" line="214"/>
<source>* check Application for the presence of a folder with a build
* check SharedData for a folder with the base version and the name base</source>
<translation>* проверьте Application на наличие папки со сборкой