bugFixing 7

This commit is contained in:
2025-09-16 17:09:34 +03:00
parent ac66951d76
commit bd1bcd4e71
4 changed files with 79 additions and 70 deletions

View File

@@ -77,12 +77,10 @@ void InstructorsView::preparationTreeWidget()
if(adminMode)
{
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, false);
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, false);
}
else
{
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, true);
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, true);
}
}
@@ -114,8 +112,7 @@ void InstructorsView::loadInstructorsFromDB()
ItemInstructor->setText(ColumnsTreeInsructors::clmn_Password, instructor.getPassword());
//Сокрытие пароля
if(!adminMode)
ItemInstructor->setText(ColumnsTreeInsructors::clmn_Password, QStringLiteral("******"));
ItemInstructor->setText(ColumnsTreeInsructors::clmn_Password, QStringLiteral("******"));
if(instructor.getArchived())
{//Архивный

View File

@@ -32,7 +32,7 @@ void TraineesView::resizeEvent(QResizeEvent *event)
if(adminMode)
widthTrainee = width - (470 + 10);
else
widthTrainee = width - (340 + 10);
widthTrainee = width - (440 + 10);
}
if(widthTrainee < 250)
widthTrainee = 250;
@@ -81,12 +81,10 @@ void TraineesView::preparationTreeWidget()
if(adminMode)
{
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, false);
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, false);
}
else
{
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, true);
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true);
}
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Class, true);
@@ -144,8 +142,7 @@ void TraineesView::loadTraineesFromDB()
ItemTrainee->setText(ColumnsTreeTrainees::clmn_IP_address, trainee.getComputer().getIpAddress());
//Сокрытие пароля
if(!adminMode)
ItemTrainee->setText(ColumnsTreeTrainees::clmn_Password, QStringLiteral("******"));
ItemTrainee->setText(ColumnsTreeTrainees::clmn_Password, QStringLiteral("******"));
if(trainee.getArchived())
{//Архивный

View File

@@ -179,12 +179,12 @@ The status will be set:
<translation>Группа</translation>
</message>
<message>
<location filename="../trainees/dialogeditgroup.ui" line="39"/>
<location filename="../trainees/dialogeditgroup.ui" line="35"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
<location filename="../trainees/dialogeditgroup.ui" line="78"/>
<location filename="../trainees/dialogeditgroup.ui" line="74"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
@@ -240,32 +240,32 @@ The status will be set:
<translation>Обучаемый</translation>
</message>
<message>
<location filename="../trainees/dialogedittrainee.ui" line="41"/>
<location filename="../trainees/dialogedittrainee.ui" line="37"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
<location filename="../trainees/dialogedittrainee.ui" line="53"/>
<location filename="../trainees/dialogedittrainee.ui" line="49"/>
<source>Login</source>
<translation>Логин</translation>
</message>
<message>
<location filename="../trainees/dialogedittrainee.ui" line="65"/>
<location filename="../trainees/dialogedittrainee.ui" line="61"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
<location filename="../trainees/dialogedittrainee.ui" line="127"/>
<location filename="../trainees/dialogedittrainee.ui" line="123"/>
<source>Archived</source>
<translation>Архивный</translation>
</message>
<message>
<location filename="../trainees/dialogedittrainee.ui" line="154"/>
<location filename="../trainees/dialogedittrainee.ui" line="150"/>
<source>Logged</source>
<translation>Залогирован</translation>
</message>
<message>
<location filename="../trainees/dialogedittrainee.ui" line="192"/>
<location filename="../trainees/dialogedittrainee.ui" line="188"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
@@ -347,7 +347,7 @@ The status will be set:
</message>
<message>
<location filename="../instructors/editorinstructors.ui" line="121"/>
<location filename="../instructors/editorinstructors.cpp" line="245"/>
<location filename="../instructors/editorinstructors.cpp" line="261"/>
<source>To archive</source>
<translation>Архивировать</translation>
</message>
@@ -362,60 +362,60 @@ The status will be set:
<translation>Показать архив</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="112"/>
<location filename="../instructors/editorinstructors.cpp" line="114"/>
<source>You cannot delete the Administrator.</source>
<translation>Нельзя удалить администратора.</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="118"/>
<location filename="../instructors/editorinstructors.cpp" line="120"/>
<source>You cannot delete a logged-in instructor.</source>
<translation>Вы не можете удалить инструктора, вошедшего в систему.</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="122"/>
<location filename="../instructors/editorinstructors.cpp" line="124"/>
<source>The deletion will be irrevocable.
Delete it anyway?</source>
<translation>Удаление будет безвозвратным.
Всё равно удалить?</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="157"/>
<location filename="../instructors/editorinstructors.cpp" line="159"/>
<source>You cannot archive a logged-in instructor.</source>
<translation>Вы не можете заархивировать инструктора, вошедшего в систему.</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="194"/>
<location filename="../instructors/editorinstructors.cpp" line="196"/>
<source>You cannot edit a logged-in instructor.</source>
<translation>Вы не можете редактировать инструктора, вошедшего в систему.</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="240"/>
<location filename="../instructors/editorinstructors.cpp" line="256"/>
<source>From archive</source>
<translation>Разархивировать</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="280"/>
<location filename="../instructors/editorinstructors.cpp" line="302"/>
<source>Unacceptable instructor name has been entered.
The changes will not be accepted.</source>
<translation>Введено неприемлемое имя инструктора.
Изменения приняты не будут.</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="286"/>
<location filename="../instructors/editorinstructors.cpp" line="308"/>
<source>Unacceptable instructor login has been entered.
The changes will not be accepted.</source>
<translation>Введен неприемлемый логин инструктора.
Изменения приняты не будут.</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="292"/>
<location filename="../instructors/editorinstructors.cpp" line="314"/>
<source>Unacceptable instructor password has been entered.
The changes will not be accepted.</source>
<translation>Введен неприемлемый пароль инструктора.
Изменения приняты не будут.</translation>
</message>
<message>
<location filename="../instructors/editorinstructors.cpp" line="301"/>
<location filename="../instructors/editorinstructors.cpp" line="323"/>
<source>An existing instructor or trainee login has been entered.
The changes will not be accepted.</source>
<translation>Введен существующий логин инструктора или обучаемого.
@@ -451,8 +451,8 @@ The changes will not be accepted.</source>
</message>
<message>
<location filename="../trainees/editortrainees.ui" line="206"/>
<location filename="../trainees/editortrainees.cpp" line="375"/>
<location filename="../trainees/editortrainees.cpp" line="400"/>
<location filename="../trainees/editortrainees.cpp" line="416"/>
<location filename="../trainees/editortrainees.cpp" line="441"/>
<source>To archive</source>
<translation>Архивировать</translation>
</message>
@@ -467,76 +467,76 @@ The changes will not be accepted.</source>
<translation>Показать архив</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="115"/>
<location filename="../trainees/editortrainees.cpp" line="117"/>
<source>The group is not empty.
It is not possible to delete a non-empty group.</source>
<translation>Группа не пуста. Невозможно удалить непустую группу.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="120"/>
<location filename="../trainees/editortrainees.cpp" line="224"/>
<location filename="../trainees/editortrainees.cpp" line="122"/>
<location filename="../trainees/editortrainees.cpp" line="226"/>
<source>The deletion will be irrevocable.
Delete it anyway?</source>
<translation>Удаление будет безвозвратным.
Всё равно удалить?</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="220"/>
<location filename="../trainees/editortrainees.cpp" line="222"/>
<source>You cannot delete a logged-in trainee.</source>
<translation>Вы не можете удалить обучаемого, вошедшего в систему.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="259"/>
<location filename="../trainees/editortrainees.cpp" line="261"/>
<source>You cannot archive a logged-in trainee.</source>
<translation>Вы не можете заархивировать обучаемого, вошедшего в систему.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="305"/>
<location filename="../trainees/editortrainees.cpp" line="307"/>
<source>You cannot edit a logged-in trainee.</source>
<translation>Вы не можете редактировать обучаемого, вошедшего в систему.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="393"/>
<location filename="../trainees/editortrainees.cpp" line="434"/>
<source>From archive</source>
<translation>Разархивировать</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="435"/>
<location filename="../trainees/editortrainees.cpp" line="476"/>
<source>Unacceptable group name has been entered.
The changes will not be accepted.</source>
<translation>Введено неприемлемое название группы.
Изменения приняты не будут.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="445"/>
<location filename="../trainees/editortrainees.cpp" line="486"/>
<source>An existing group name has been entered.
The changes will not be accepted.</source>
<translation>Введено существующее название группы.
Изменения приняты не будут.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="459"/>
<location filename="../trainees/editortrainees.cpp" line="500"/>
<source>Unacceptable trainee name has been entered.
The changes will not be accepted.</source>
<translation>Введено неприемлемое имя обучаемого.
Изменения приняты не будут.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="465"/>
<location filename="../trainees/editortrainees.cpp" line="506"/>
<source>Unacceptable trainee login has been entered.
The changes will not be accepted.</source>
<translation>Введен неприемлемый логин обучаемого.
Изменения приняты не будут.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="471"/>
<location filename="../trainees/editortrainees.cpp" line="512"/>
<source>Unacceptable trainee password has been entered.
The changes will not be accepted.</source>
<translation>Был введен неприемлемый пароль обучаемого.
Изменения приняты не будут.</translation>
</message>
<message>
<location filename="../trainees/editortrainees.cpp" line="480"/>
<location filename="../trainees/editortrainees.cpp" line="521"/>
<source>An existing instructor or trainee login has been entered.
The changes will not be accepted.</source>
<translation>Введен существующий логин инструктора или обучаемого.
@@ -671,6 +671,11 @@ Delete it anyway?</source>
<source>The file could not be opened </source>
<translation>Файл не может быть открыт </translation>
</message>
<message>
<location filename="../instructorsandtraineeswidget.cpp" line="189"/>
<source>Instructor authorization.</source>
<translation>Авторизация инструктора.</translation>
</message>
<message>
<location filename="../instructorsandtraineeswidget.cpp" line="214"/>
<source>Instructor deauthorization</source>
@@ -684,7 +689,7 @@ Delete it anyway?</source>
<message>
<location filename="../instructorsandtraineeswidget.cpp" line="254"/>
<source>The server is not available!</source>
<translation>Сервер не доступен!</translation>
<translation>Сервер недоступен!</translation>
</message>
<message>
<location filename="../instructorsandtraineeswidget.cpp" line="442"/>
@@ -692,7 +697,6 @@ Delete it anyway?</source>
<translation>Настройки сервера изменены. Выполните переподключение к серверу.</translation>
</message>
<message>
<location filename="../instructorsandtraineeswidget.cpp" line="189"/>
<location filename="../instructorsandtraineeswidget.cpp" line="289"/>
<source>Instructor authorization</source>
<translation>Авторизация инструктора</translation>
@@ -706,49 +710,49 @@ Delete it anyway?</source>
<context>
<name>InstructorsView</name>
<message>
<location filename="../instructors/instructorsview.cpp" line="119"/>
<location filename="../instructors/instructorsview.cpp" line="132"/>
<location filename="../instructors/instructorsview.cpp" line="122"/>
<location filename="../instructors/instructorsview.cpp" line="135"/>
<source>yes</source>
<translation>да</translation>
</message>
<message>
<location filename="../instructors/instructorsview.cpp" line="125"/>
<location filename="../instructors/instructorsview.cpp" line="137"/>
<location filename="../instructors/instructorsview.cpp" line="128"/>
<location filename="../instructors/instructorsview.cpp" line="140"/>
<source>no</source>
<translation>нет</translation>
</message>
<message>
<location filename="../instructors/instructorsview.cpp" line="183"/>
<location filename="../instructors/instructorsview.cpp" line="186"/>
<source>Instructor</source>
<translation>Инструктор</translation>
</message>
<message>
<location filename="../instructors/instructorsview.cpp" line="183"/>
<location filename="../instructors/instructorsview.cpp" line="186"/>
<source>Login</source>
<translation>Логин</translation>
</message>
<message>
<location filename="../instructors/instructorsview.cpp" line="183"/>
<location filename="../instructors/instructorsview.cpp" line="186"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
<location filename="../instructors/instructorsview.cpp" line="183"/>
<location filename="../instructors/instructorsview.cpp" line="186"/>
<source>Administrator</source>
<translation>Администратор</translation>
</message>
<message>
<location filename="../instructors/instructorsview.cpp" line="183"/>
<location filename="../instructors/instructorsview.cpp" line="186"/>
<source>Archived</source>
<translation>Архивный</translation>
</message>
<message>
<location filename="../instructors/instructorsview.cpp" line="183"/>
<location filename="../instructors/instructorsview.cpp" line="186"/>
<source>Logged</source>
<translation>Залогирован</translation>
</message>
<message>
<location filename="../instructors/instructorsview.cpp" line="183"/>
<location filename="../instructors/instructorsview.cpp" line="186"/>
<source>ID</source>
<translation>ID</translation>
</message>
@@ -978,6 +982,12 @@ Delete it anyway?</source>
<source>Attention!</source>
<translation>Внимание!</translation>
</message>
<message>
<location filename="../specialmessagebox.cpp" line="23"/>
<location filename="../specialmessagebox.cpp" line="30"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
<location filename="../specialmessagebox.cpp" line="28"/>
<source>Error!</source>
@@ -988,6 +998,11 @@ Delete it anyway?</source>
<source>Information</source>
<translation>Информация</translation>
</message>
<message>
<location filename="../specialmessagebox.cpp" line="37"/>
<source>Ok</source>
<translation>Хорошо</translation>
</message>
</context>
<context>
<name>TaskAMMFIMTreePreparation</name>
@@ -1023,57 +1038,57 @@ Delete it anyway?</source>
<context>
<name>TraineesView</name>
<message>
<location filename="../trainees/traineesview.cpp" line="145"/>
<location filename="../trainees/traineesview.cpp" line="152"/>
<source>yes</source>
<translation>да</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="151"/>
<location filename="../trainees/traineesview.cpp" line="158"/>
<source>no</source>
<translation>нет</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>Trainee</source>
<translation>Обучаемый</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>Login</source>
<translation>Логин</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>Class</source>
<translation>Класс</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>Computer</source>
<translation>Компьютер</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>IP address</source>
<translation>IP адрес</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>Archived</source>
<translation>Архивный</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>Logged</source>
<translation>Залогирован</translation>
</message>
<message>
<location filename="../trainees/traineesview.cpp" line="213"/>
<location filename="../trainees/traineesview.cpp" line="220"/>
<source>ID</source>
<translation>ID</translation>
</message>
@@ -1182,7 +1197,7 @@ Delete it anyway?</source>
<translation>Редактор инструкторов</translation>
</message>
<message>
<location filename="../instructors/viewerinstructors.cpp" line="64"/>
<location filename="../instructors/viewerinstructors.cpp" line="69"/>
<source>Editor of instructors</source>
<translation>Редактор инструкторов</translation>
</message>
@@ -1200,12 +1215,12 @@ Delete it anyway?</source>
<translation>Редактор обучаемых</translation>
</message>
<message>
<location filename="../trainees/viewertrainees.cpp" line="80"/>
<location filename="../trainees/viewertrainees.cpp" line="93"/>
<source>Editor of trainees</source>
<translation>Редактор обучаемых</translation>
</message>
<message>
<location filename="../trainees/viewertrainees.cpp" line="113"/>
<location filename="../trainees/viewertrainees.cpp" line="130"/>
<source>Personal card trainee</source>
<translation>Персональная карта обучаемого</translation>
</message>