diff --git a/DOCS/Андрей/Board.md b/DOCS/Андрей/Board.md
index 9173dcc..c868171 100644
--- a/DOCS/Андрей/Board.md
+++ b/DOCS/Андрей/Board.md
@@ -11,6 +11,7 @@ kanban-plugin: board
## Completed
+- [ ] Сделать отправку сообщения на Enter
- [ ] Введение логина только латиницей и цифрами
- [ ] Кнопка открытия Персональной карты обучаемого
- [ ] Блокировка авторизации не работает при входе в редакторы И/О
@@ -53,7 +54,6 @@ kanban-plugin: board
## GUI Messenger
- [ ] Не влазиют слишком большие сообщения
-- [ ] Сделать отправку сообщения на Enter
## GUI общие
diff --git a/InstructorsAndTrainees/commonview.cpp b/InstructorsAndTrainees/commonview.cpp
index d746484..6b71455 100644
--- a/InstructorsAndTrainees/commonview.cpp
+++ b/InstructorsAndTrainees/commonview.cpp
@@ -125,8 +125,7 @@ void CommonView::preparationTreeWidget()
archiveVisible = false;
treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_ID, true);
- treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Archived, true);
- treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Administrator, true);
+ treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Archived, true);
}
else
{//control
@@ -145,6 +144,7 @@ void CommonView::preparationTreeWidget()
treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_ID, true);
}
}
+ treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Administrator, true);
treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Password, true);
treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Class, true);
treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Computer, true);
diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
index 2462370..f4da171 100644
--- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
+++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
@@ -272,9 +272,9 @@ void AMMtasksWidget::reSetHeadTreeWidget()
QStringList listHeaders;
if(type == TypeListTreeAMMFIM::listForTrainee)
- listHeaders = QStringList{tr("Task AMM"), tr("DM code"), tr("Status"), tr("ID")};
+ listHeaders = QStringList{tr("Procedure AMM"), tr("DM code"), tr("Status"), tr("ID")};
else
- listHeaders = QStringList{tr("Task AMM"), tr("DM code"), tr("Status"), tr("ID")};
+ listHeaders = QStringList{tr("Procedure AMM"), tr("DM code"), tr("Status"), tr("ID")};
treeWidget->setHeaderLabels(listHeaders);
diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
index bbcbf26..942dd29 100644
--- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
+++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
@@ -303,9 +303,9 @@ void FIMtasksWidget::reSetHeadTreeWidget()
QStringList listHeaders;
if(type == TypeListTreeAMMFIM::listForTrainee)
- listHeaders = QStringList{tr("Task FIM"), tr("Status"), tr("ID")};
+ listHeaders = QStringList{tr("Procedure FIM"), tr("Status"), tr("ID")};
else
- listHeaders = QStringList{tr("Task FIM"), tr("Status"), tr("ID")};
+ listHeaders = QStringList{tr("Procedure FIM"), tr("Status"), tr("ID")};
treeWidget->setHeaderLabels(listHeaders);
}
diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
index 8eac562..0007e96 100644
--- a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
+++ b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
@@ -17,6 +17,8 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, M
loadInfo();
+ ui->lblName->setObjectName("PersonalCard_lblName");
+
ammTasksWidget_personal = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
fimTasksWidget_personal = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.ui b/InstructorsAndTrainees/trainees/personalcardtrainee.ui
index d4945d2..5ac5638 100644
--- a/InstructorsAndTrainees/trainees/personalcardtrainee.ui
+++ b/InstructorsAndTrainees/trainees/personalcardtrainee.ui
@@ -65,7 +65,7 @@
-
- Last login time
+ Last login
@@ -128,7 +128,7 @@
-
- Time of operation
+ Time spent on the simulator
@@ -149,7 +149,7 @@
-
- Last time of exit
+ Last exit
diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm
index 667a594..ffce4cc 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 58b8434..a69559a 100644
--- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts
+++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts
@@ -23,12 +23,6 @@
Delete
Удалить
-
-
-
- Task AMM
- Задача AMM
-
@@ -41,6 +35,12 @@
ID
ID
+
+
+
+ Procedure AMM
+ Процедура AMM
+
@@ -670,12 +670,6 @@ The changes will not be accepted.
Delete
Удалить
-
-
-
- Task FIM
- Задача FIM
-
@@ -688,6 +682,12 @@ The changes will not be accepted.
Status
Статус
+
+
+
+ Procedure FIM
+ Процедура FIM
+
The deletion will be irrevocable.
@@ -841,17 +841,17 @@ Delete it anyway?
-
+
Send
Отправить
-
+
Trainee
Обучаемый
-
+
Instructor
Инструктор
@@ -934,11 +934,6 @@ Delete it anyway?
Name
Имя
-
-
- Last login time
- Время последнего входа
-
@@ -958,15 +953,20 @@ Delete it anyway?
Assigned AMM
Назначенные AMM
+
+
+ Last login
+ Последний вход
+
- Time of operation
- Время работы
+ Time spent on the simulator
+ Время работы на тренажере
- Last time of exit
- Время последнего выхода
+ Last exit
+ Последний выход