diff --git a/DataBaseLMS/translations/DataBaseLMS_ru_RU.qm b/DataBaseLMS/translations/DataBaseLMS_ru_RU.qm
index b9f889e..4814024 100644
Binary files a/DataBaseLMS/translations/DataBaseLMS_ru_RU.qm and b/DataBaseLMS/translations/DataBaseLMS_ru_RU.qm differ
diff --git a/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts b/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts
index 10b8136..9484832 100644
--- a/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts
+++ b/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts
@@ -1,108 +1,25 @@
+
+ DataBaseLMS
+
+
+ Attention!
+ Внимание!
+
+
+
+ The file could not be opened:
+ Файл не может быть открыт:
+
+
InterfaceDataBaseLMS
-
- Connection error:
- Ошибка соединения:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Editing error!
- Ошибка редактирования!
-
-
-
- Unacceptable instructor name has been entered.
-The changes will not be accepted.
- Введено недопустимое имя инструктора.
-Изменения не будут приняты.
-
-
-
- Unacceptable instructor login has been entered.
-The changes will not be accepted.
- Введен недопустимый логин инструктора.
-Изменения не будут приняты.
-
-
-
- Unacceptable instructor password has been entered.
-The changes will not be accepted.
- Введен недопустимый пароль инструктора.
-Изменения не будут приняты.
-
-
-
- An existing instructor name has been entered.
- Введено существующее имя инструктора.
-
-
-
- An existing instructor login has been entered.
-The changes will not be accepted.
- Введен существующий логин инструктора.
-Изменения не будут приняты.
-
-
-
- Unacceptable group name has been entered.
-The changes will not be accepted.
- Введено недопустимое имя группы.
-Изменения не будут приняты.
-
-
-
- An existing group name has been entered.
-The changes will not be accepted.
- Введено существующее имя группы.
-Изменения не будут приняты.
-
-
-
- Unacceptable trainee name has been entered.
-The changes will not be accepted.
- Введено недопустимое имя обучаемого.
-Изменения не будут приняты.
-
-
-
- Unacceptable trainee login has been entered.
-The changes will not be accepted.
- Введен недопустимый логин обучаемого.
-Изменения не будут приняты.
-
-
-
- Unacceptable trainee password has been entered.
-The changes will not be accepted.
- Введен недопустимый пароль обучаемого.
-Изменения не будут приняты.
-
-
-
- An existing trainee name has been entered.
- Введено существующее имя обучаемого.
-
-
-
- An existing trainee login has been entered.
-The changes will not be accepted.
- Введен существующий логин обучаемого.
-Изменения не будут приняты.
+
+ Connection error
+ Ошибка подключения
diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
index 8b52d0b..c29eb3d 100644
--- a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
+++ b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
@@ -26,6 +26,7 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, M
connect(ammTasksWidget_personal, &AMMtasksWidget::signal_countTasksAMMforTraineeChanged, this, &PersonalCardTrainee::slot_countTasksAMMforTraineeChanged);
connect(fimTasksWidget_personal, &FIMtasksWidget::signal_countTasksFIMforTraineeChanged, this, &PersonalCardTrainee::slot_countTasksFIMforTraineeChanged);
+ connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, this, &PersonalCardTrainee::slot_NeedUpdateUI);
fimTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
ammTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
@@ -98,3 +99,12 @@ void PersonalCardTrainee::slot_countTasksFIMforTraineeChanged(int trainee_id, in
ui->lblCntFIM->setText(QString::number(count));
}
}
+
+void PersonalCardTrainee::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
+{
+ if(treeTrainee)
+ {
+ //TODO Собственно обновление
+ loadInfo();
+ }
+}
diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.h b/InstructorsAndTrainees/trainees/personalcardtrainee.h
index 61729c8..8859499 100644
--- a/InstructorsAndTrainees/trainees/personalcardtrainee.h
+++ b/InstructorsAndTrainees/trainees/personalcardtrainee.h
@@ -28,6 +28,8 @@ public slots:
void slot_countTasksAMMforTraineeChanged(int trainee_id, int count);
void slot_countTasksFIMforTraineeChanged(int trainee_id, int count);
+ void slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee);
+
private:
ConnectorToServer* connectorToServer;
MessangerController* messangerController;
diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm
index dc2d7fb..85daa08 100644
Binary files a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm and b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm differ
diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts
index 6ae559b..7b9a1ee 100644
--- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts
+++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts
@@ -9,77 +9,77 @@
Форма
-
+
Assign
Назначить
-
+
Аvailable
Доступные
-
+
Delete
Удалить
-
+
Task AMM
Задача AMM
-
+
DM code
DM код
-
-
+
+
ID
ID
-
-
-
+
+
+
Status
Статус
-
+
PM/DM
PM/DM
-
+
Code
Код
-
+
Attention!
Внимание!
-
+
The deletion will be irrevocable.
Delete it anyway?
Удаление будет безвозвратным.
Всё равно удалить?
-
+
Status Task
Статус задачи
-
+
New task
Новая задача
-
+
Assign this task?
Назначить эту задачу?
@@ -146,17 +146,17 @@ Delete it anyway?
Новая
-
+
viewed
Просмотрено
-
+
completed
Выполнена
-
+
Change task status?
The status will be set:
'failed'
@@ -165,7 +165,7 @@ The status will be set:
'неверно'
-
+
Change task status?
The status will be set:
'new'
@@ -174,14 +174,14 @@ The status will be set:
'новая'
-
-
+
+
Attention!
Внимание!
-
-
+
+
Change task status?
The status will be set:
'completed'
@@ -414,8 +414,7 @@ Delete it anyway?
-
-
+
Editing error!
Ошибка редактирования!
@@ -441,16 +440,11 @@ The changes will not be accepted.
Изменения приняты не будут.
-
- An existing instructor name has been entered.
- Введено имя существующего инструктора.
-
-
-
- An existing instructor login has been entered.
+
+ An existing instructor or trainee login has been entered.
The changes will not be accepted.
- Был введен существующий логин инструктора.
-Изменения приняты не будут.
+ Введен существующий логин инструктора или обучаемого.
+Изменения не будут приняты.
@@ -482,8 +476,8 @@ The changes will not be accepted.
-
-
+
+
To archive
Архивировать
@@ -498,109 +492,103 @@ The changes will not be accepted.
Показать архив
-
-
-
-
+
+
+
-
-
+
+
Editing error!
Ошибка редактирования!
-
+
The group is not empty.
It is not possible to delete a non-empty group.
Группа не пуста. Невозможно удалить непустую группу.
-
-
+
+
Attention!
Внимание!
-
-
+
+
The deletion will be irrevocable.
Delete anyway?
Удаление будет безвозвратным. Всё равно удалить?
-
-
-
+
+
+
Error!
Ошибка!
-
+
You cannot delete a logged-in trainee.
Вы не можете удалить обучаемого, вошедшего в систему.
-
+
You cannot archive a logged-in trainee.
Вы не можете заархивировать обучаемого, вошедшего в систему.
-
+
You cannot edit a logged-in trainee.
Вы не можете редактировать обучаемого, вошедшего в систему.
-
+
From archive
Разархивировать
-
+
Unacceptable group name has been entered.
The changes will not be accepted.
Введено неприемлемое название группы.
Изменения приняты не будут.
-
+
An existing group name has been entered.
The changes will not be accepted.
Введено существующее название группы.
Изменения приняты не будут.
-
+
Unacceptable trainee name has been entered.
The changes will not be accepted.
Введено неприемлемое имя обучаемого.
Изменения приняты не будут.
-
+
Unacceptable trainee login has been entered.
The changes will not be accepted.
Введен неприемлемый логин обучаемого.
Изменения приняты не будут.
-
+
Unacceptable trainee password has been entered.
The changes will not be accepted.
Был введен неприемлемый пароль обучаемого.
Изменения приняты не будут.
-
- An existing trainee name has been entered.
- Введено имя существующего обучаемого.
-
-
-
- An existing trainee login has been entered.
+
+ An existing instructor or trainee login has been entered.
The changes will not be accepted.
- Был введен существующий логин обучаемого.
-Изменения приняты не будут.
+ Введен существующий логин инструктора или обучаемого.
+Изменения не будут приняты.
@@ -611,66 +599,66 @@ The changes will not be accepted.
Форма
-
+
Assign
Назначить
-
+
Check
Проверить
-
+
Delete
Удалить
-
+
Task FIM
Задача FIM
-
-
+
+
ID
ID
-
-
+
+
Status
Статус
-
+
Title
Заголовок
-
+
Attention!
Внимание!
-
+
The deletion will be irrevocable.
Delete it anyway?
Удаление будет безвозвратным.
Всё равно удалить?
-
+
Check Task
Проверка задачи
-
+
New task
Новая задача
-
+
Assign this task?
Назначить эту задачу?
@@ -723,87 +711,72 @@ Delete it anyway?
Настройки
-
+
Trainees
Обучаемые
-
- Tasks
- Задачи
-
-
-
- AMM
-
-
-
-
- FIM
-
-
-
-
+
Messenger
Мессенджер
-
+
Instructors
Инструкторы
-
-
+
+
none
нет
-
-
+
+
Attention!
Внимание!
-
+
The file could not be opened
Файл не может быть открыт
-
+
Instructor deauthorization
Деавторизация инструктора
-
+
Error!
Ошибка!
-
+
Warning!
Внимание!
-
+
The server is disabled
Сервер отключен
-
+
Server settings have been changed. Please reconnect to the server.
Настройки сервера изменены. Выполните переподключение к серверу.
-
-
+
+
Instructor authorization
Авторизация инструктора
-
+
Invalid login or password!
Неправильный логин или пароль!
@@ -868,17 +841,17 @@ Delete it anyway?
Форма
-
+
Send
Отправить
-
+
Tab 1
-
+
Tab 2
@@ -942,30 +915,114 @@ Delete it anyway?
Ошибка
+
+ PersonalCardTrainee
+
+
+ Form
+ Форма
+
+
+
+ Trainee
+ Обучаемый
+
+
+
+ Name
+ Имя
+
+
+
+ Last login time
+ Время последнего входа
+
+
+
+
+
+
+
+ 0
+
+
+
+
+ Assigned FIM
+ Назначенные FIM
+
+
+
+ Assigned AMM
+ Назначенные AMM
+
+
+
+ Time of operation
+ Время работы
+
+
+
+ Last time of exit
+ Время последнего выхода
+
+
+
+ Messenger
+ Мессенджер
+
+
+
+ Tasks
+ Задачи
+
+
+
+ AMM
+
+
+
+
+
+ List
+ Перечень
+
+
+
+
+ Attached
+ Назначенные
+
+
+
+ FIM
+
+
+
RecognizeSystem
-
+
Attention!
Внимание!
-
+
The file could not be opened
Файл не может быть открыт
-
+
You cannot delete the basic version!
Вы не можете удалить базовую версию!
-
+
You cannot delete the active version
Вы не можете удалить активную версию
-
+
This name already exists
Это имя уже существует
@@ -973,30 +1030,30 @@ Delete it anyway?
TaskAMMFIMTreePreparation
-
-
-
+
+
+
completed
выполнена
-
-
-
+
+
+
failed
неверно
-
-
-
+
+
+
checkup
на проверке
-
-
-
+
+
+
new
новая
@@ -1178,15 +1235,20 @@ Delete it anyway?
Обучаемые
-
+
Editor of Trainees
Редактор обучаемых
-
+
Editor of trainees
Редактор обучаемых
+
+
+ Personal card trainee
+ Персональная карта обучаемого
+
WaitAnimationWidget
diff --git a/InstructorsAndTrainees/translations/InstructorsAndTrainees_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTrainees_ru_RU.ts
new file mode 100644
index 0000000..f04e874
--- /dev/null
+++ b/InstructorsAndTrainees/translations/InstructorsAndTrainees_ru_RU.ts
@@ -0,0 +1,1242 @@
+
+
+
+
+ AMMtasksWidget
+
+
+ Form
+
+
+
+
+ Assign
+
+
+
+
+ Аvailable
+
+
+
+
+
+
+ Status
+
+
+
+
+ Delete
+
+
+
+
+ Task AMM
+
+
+
+
+ DM code
+
+
+
+
+
+ ID
+
+
+
+
+ PM/DM
+
+
+
+
+ Code
+
+
+
+
+ Attention!
+
+
+
+
+ The deletion will be irrevocable.
+Delete it anyway?
+
+
+
+
+ Status Task
+
+
+
+
+ New task
+
+
+
+
+ Assign this task?
+
+
+
+
+ DialogAuthorizationInstructor
+
+
+ Instructor authorization
+
+
+
+
+ Login
+
+
+
+
+ Password
+
+
+
+
+
+ admin
+
+
+
+
+ DialogCheckTask
+
+
+ Form
+
+
+
+
+ Task
+
+
+
+
+ Completion Report
+
+
+
+
+ Failed
+
+
+
+
+ Right
+
+
+
+
+ Completed
+
+
+
+
+ New
+
+
+
+
+ viewed
+
+
+
+
+ completed
+
+
+
+
+ Change task status?
+The status will be set:
+'failed'
+
+
+
+
+ Change task status?
+The status will be set:
+'new'
+
+
+
+
+
+ Attention!
+
+
+
+
+
+ Change task status?
+The status will be set:
+'completed'
+
+
+
+
+ DialogEditGroup
+
+
+ Group
+
+
+
+
+ Name
+
+
+
+
+ DialogEditInstructor
+
+
+ Instructor
+
+
+
+
+ Name
+
+
+
+
+ Login
+
+
+
+
+ Password
+
+
+
+
+ Administrator
+
+
+
+
+ Archived
+
+
+
+
+ Logged
+
+
+
+
+ DialogEditTrainee
+
+
+ Trainee
+
+
+
+
+ Name
+
+
+
+
+ Login
+
+
+
+
+ Password
+
+
+
+
+ Archived
+
+
+
+
+ Logged
+
+
+
+
+ DialogSettings
+
+
+ Learning management system - Settings
+
+
+
+
+ Main
+
+
+
+
+ Language
+
+
+
+
+ Server
+
+
+
+
+ Address
+
+
+
+
+ Port
+
+
+
+
+ Auto start
+
+
+
+
+ Save
+
+
+
+
+ Additional
+
+
+
+
+ Version
+
+
+
+
+ Style
+
+
+
+
+ EditorInstructors
+
+
+ List instructors
+
+
+
+
+ New instructor
+
+
+
+
+ Delete instructor
+
+
+
+
+
+ To archive
+
+
+
+
+ Edit
+
+
+
+
+ Show archive
+
+
+
+
+
+
+
+ Error!
+
+
+
+
+ You cannot delete the Administrator.
+
+
+
+
+ You cannot delete a logged-in instructor.
+
+
+
+
+ Attention!
+
+
+
+
+ The deletion will be irrevocable.
+Delete it anyway?
+
+
+
+
+ You cannot archive a logged-in instructor.
+
+
+
+
+ You cannot edit a logged-in instructor.
+
+
+
+
+ From archive
+
+
+
+
+
+
+
+ Editing error!
+
+
+
+
+ Unacceptable instructor name has been entered.
+The changes will not be accepted.
+
+
+
+
+ Unacceptable instructor login has been entered.
+The changes will not be accepted.
+
+
+
+
+ Unacceptable instructor password has been entered.
+The changes will not be accepted.
+
+
+
+
+ An existing instructor or trainee login has been entered.
+The changes will not be accepted.
+
+
+
+
+ EditorTrainees
+
+
+ List trainees
+
+
+
+
+ New group
+
+
+
+
+ Delete group
+
+
+
+
+ New trainee
+
+
+
+
+ Delete trainee
+
+
+
+
+
+
+ To archive
+
+
+
+
+ Edit
+
+
+
+
+ Show archive
+
+
+
+
+
+
+
+
+
+
+ Editing error!
+
+
+
+
+ The group is not empty.
+It is not possible to delete a non-empty group.
+
+
+
+
+
+ Attention!
+
+
+
+
+
+ The deletion will be irrevocable.
+Delete anyway?
+
+
+
+
+
+
+ Error!
+
+
+
+
+ You cannot delete a logged-in trainee.
+
+
+
+
+ You cannot archive a logged-in trainee.
+
+
+
+
+ You cannot edit a logged-in trainee.
+
+
+
+
+ From archive
+
+
+
+
+ Unacceptable group name has been entered.
+The changes will not be accepted.
+
+
+
+
+ An existing group name has been entered.
+The changes will not be accepted.
+
+
+
+
+ Unacceptable trainee name has been entered.
+The changes will not be accepted.
+
+
+
+
+ Unacceptable trainee login has been entered.
+The changes will not be accepted.
+
+
+
+
+ Unacceptable trainee password has been entered.
+The changes will not be accepted.
+
+
+
+
+ An existing instructor or trainee login has been entered.
+The changes will not be accepted.
+
+
+
+
+ FIMtasksWidget
+
+
+ Form
+
+
+
+
+ Assign
+
+
+
+
+ Check
+
+
+
+
+ Delete
+
+
+
+
+ Task FIM
+
+
+
+
+
+ ID
+
+
+
+
+
+ Status
+
+
+
+
+ Title
+
+
+
+
+ Attention!
+
+
+
+
+ The deletion will be irrevocable.
+Delete it anyway?
+
+
+
+
+ Check Task
+
+
+
+
+ New task
+
+
+
+
+ Assign this task?
+
+
+
+
+ InstructorsAndTraineesWidget
+
+
+ Form
+
+
+
+
+ Connection
+
+
+
+
+ Authorization
+
+
+
+
+ Server:
+
+
+
+
+
+
+
+ none
+
+
+
+
+ Logged in Instructor:
+
+
+
+
+ ChangeVersion
+
+
+
+
+ Editor Trainees
+
+
+
+
+ Editor Instructors
+
+
+
+
+ Settings
+
+
+
+
+ Trainees
+
+
+
+
+ Instructors
+
+
+
+
+ Messenger
+
+
+
+
+
+ Attention!
+
+
+
+
+ The file could not be opened
+
+
+
+
+
+ Instructor authorization
+
+
+
+
+ Invalid login or password!
+
+
+
+
+ Instructor deauthorization
+
+
+
+
+ Error!
+
+
+
+
+ Warning!
+
+
+
+
+ The server is disabled
+
+
+
+
+ Server settings have been changed. Please reconnect to the server.
+
+
+
+
+ InstructorsView
+
+
+
+
+ yes
+
+
+
+
+
+
+ no
+
+
+
+
+ Instructor
+
+
+
+
+ Login
+
+
+
+
+ Password
+
+
+
+
+ Administrator
+
+
+
+
+ Archived
+
+
+
+
+ Logged
+
+
+
+
+ ID
+
+
+
+
+ MessangerWidget
+
+
+ Form
+
+
+
+
+ Tab 1
+
+
+
+
+ Tab 2
+
+
+
+
+ Send
+
+
+
+
+ MsgWidget
+
+
+ Form
+
+
+
+
+ TextLabel
+
+
+
+
+ NewVersionWidget
+
+
+ Create copy...
+
+
+
+
+ Basic version:
+
+
+
+
+ TextLabel
+
+
+
+
+ New name version:
+
+
+
+
+ Create
+
+
+
+
+ Cancel
+
+
+
+
+ Only Latin letters and numbers
+
+
+
+
+ NotifyController
+
+
+ Error
+
+
+
+
+ PersonalCardTrainee
+
+
+ Form
+
+
+
+
+ Trainee
+
+
+
+
+ Name
+
+
+
+
+ Last login time
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+ Assigned FIM
+
+
+
+
+ Assigned AMM
+
+
+
+
+ Time of operation
+
+
+
+
+ Last time of exit
+
+
+
+
+ Messenger
+
+
+
+
+ Tasks
+
+
+
+
+ AMM
+
+
+
+
+
+ List
+
+
+
+
+
+ Attached
+
+
+
+
+ FIM
+
+
+
+
+ RecognizeSystem
+
+
+ Attention!
+
+
+
+
+ The file could not be opened
+
+
+
+
+ You cannot delete the basic version!
+
+
+
+
+ You cannot delete the active version
+
+
+
+
+ This name already exists
+
+
+
+
+ TaskAMMFIMTreePreparation
+
+
+
+
+ completed
+
+
+
+
+
+
+ failed
+
+
+
+
+
+
+ checkup
+
+
+
+
+
+
+ new
+
+
+
+
+ TraineesView
+
+
+
+ yes
+
+
+
+
+
+ no
+
+
+
+
+ Trainee
+
+
+
+
+ Login
+
+
+
+
+ Password
+
+
+
+
+ Class
+
+
+
+
+ Computer
+
+
+
+
+ IP address
+
+
+
+
+ Archived
+
+
+
+
+ Logged
+
+
+
+
+ ID
+
+
+
+
+ VersionSelectWidget
+
+
+ Form
+
+
+
+
+ Available versions on the server:
+
+
+
+
+ Info:
+
+
+
+
+ Double click on the version to see information...
+
+
+
+
+ Current server version:
+
+
+
+
+ none
+
+
+
+
+ Create copy
+
+
+
+
+ Delete
+
+
+
+
+ Change server version
+
+
+
+
+ Version control
+
+
+
+
+ Version name:
+
+
+
+
+ Created:
+
+
+
+
+ Changeable:
+
+
+
+
+ Author:
+
+
+
+
+ Yes
+
+
+
+
+ No
+
+
+
+
+
+
+
+ Version not selected
+
+
+
+
+ ViewerInstructors
+
+
+ Instructors
+
+
+
+
+ Editor of Instructors
+
+
+
+
+ Editor of instructors
+
+
+
+
+ ViewerTrainees
+
+
+ Trainees
+
+
+
+
+ Editor of Trainees
+
+
+
+
+ Editor of trainees
+
+
+
+
+ Personal card trainee
+
+
+
+
+ WaitAnimationWidget
+
+
+ Form
+
+
+
+
diff --git a/ServerLMS/translations/ServerLMS_ru_RU.ts b/ServerLMS/translations/ServerLMS_ru_RU.ts
index 367b518..2db6a19 100644
--- a/ServerLMS/translations/ServerLMS_ru_RU.ts
+++ b/ServerLMS/translations/ServerLMS_ru_RU.ts
@@ -4,7 +4,7 @@
AssetsManager
-
+
LLC Constanta-Design
ООО Константа-Дизайн
@@ -17,7 +17,7 @@
Форма
-
+
List of clients
Список клиентов
@@ -32,12 +32,12 @@
Сервер СУО
-
+
Start
Запустить
-
+
Stop
Остановить