Рефакт интерфейс

DOCS/Андрей/Board.md

@@ -11,6 +11,7 @@ kanban-plugin: board
 
 ## Completed
 
+- [ ] Сделать отправку сообщения на Enter
 - [ ] Введение логина только латиницей и цифрами
 - [ ] Кнопка открытия Персональной карты обучаемого
 - [ ] Блокировка авторизации не работает при входе в редакторы И/О
@@ -53,7 +54,6 @@ kanban-plugin: board
 ## GUI Messenger
 
 - [ ] Не влазиют слишком большие сообщения
-- [ ] Сделать отправку сообщения на Enter
 
 
 ## GUI общие

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_Archived, true);        
-        treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Administrator, 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);

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);

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);
 }

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);
 

InstructorsAndTrainees/trainees/personalcardtrainee.ui

@@ -65,7 +65,7 @@
             <item>
              <widget class="QLabel" name="label_13">
               <property name="text">
-               <string>Last login time</string>
+               <string>Last login</string>
               </property>
              </widget>
             </item>
@@ -128,7 +128,7 @@
             <item>
              <widget class="QLabel" name="label_12">
               <property name="text">
-               <string>Time of operation</string>
+               <string>Time spent on the simulator</string>
               </property>
              </widget>
             </item>
@@ -149,7 +149,7 @@
             <item>
              <widget class="QLabel" name="label_14">
               <property name="text">
-               <string>Last time of exit</string>
+               <string>Last exit</string>
               </property>
              </widget>
             </item>

InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts

@@ -23,12 +23,6 @@
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
-    <message>
-        <location filename="../tasks/ammtaskswidget.cpp" line="275"/>
-        <location filename="../tasks/ammtaskswidget.cpp" line="277"/>
-        <source>Task AMM</source>
-        <translation>Задача AMM</translation>
-    </message>
     <message>
         <location filename="../tasks/ammtaskswidget.cpp" line="275"/>
         <location filename="../tasks/ammtaskswidget.cpp" line="277"/>
@@ -41,6 +35,12 @@
         <source>ID</source>
         <translation>ID</translation>
     </message>
+    <message>
+        <location filename="../tasks/ammtaskswidget.cpp" line="275"/>
+        <location filename="../tasks/ammtaskswidget.cpp" line="277"/>
+        <source>Procedure AMM</source>
+        <translation>Процедура AMM</translation>
+    </message>
     <message>
         <location filename="../tasks/ammtaskswidget.ui" line="60"/>
         <location filename="../tasks/ammtaskswidget.cpp" line="275"/>
@@ -670,12 +670,6 @@ The changes will not be accepted.</source>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
-    <message>
-        <location filename="../tasks/fimtaskswidget.cpp" line="306"/>
-        <location filename="../tasks/fimtaskswidget.cpp" line="308"/>
-        <source>Task FIM</source>
-        <translation>Задача FIM</translation>
-    </message>
     <message>
         <location filename="../tasks/fimtaskswidget.cpp" line="306"/>
         <location filename="../tasks/fimtaskswidget.cpp" line="308"/>
@@ -688,6 +682,12 @@ The changes will not be accepted.</source>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
+    <message>
+        <location filename="../tasks/fimtaskswidget.cpp" line="306"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="308"/>
+        <source>Procedure FIM</source>
+        <translation>Процедура FIM</translation>
+    </message>
     <message>
         <location filename="../tasks/fimtaskswidget.cpp" line="396"/>
         <source>The deletion will be irrevocable.
@@ -841,17 +841,17 @@ Delete it anyway?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../messanger/messangerwidget.ui" line="147"/>
+        <location filename="../messanger/messangerwidget.ui" line="128"/>
         <source>Send</source>
         <translation>Отправить</translation>
     </message>
     <message>
-        <location filename="../messanger/messangerwidget.cpp" line="111"/>
+        <location filename="../messanger/messangerwidget.cpp" line="120"/>
         <source>Trainee</source>
         <translation>Обучаемый</translation>
     </message>
     <message>
-        <location filename="../messanger/messangerwidget.cpp" line="120"/>
+        <location filename="../messanger/messangerwidget.cpp" line="129"/>
         <source>Instructor</source>
         <translation>Инструктор</translation>
     </message>
@@ -934,11 +934,6 @@ Delete it anyway?</source>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
-    <message>
-        <location filename="../trainees/personalcardtrainee.ui" line="68"/>
-        <source>Last login time</source>
-        <translation>Время последнего входа</translation>
-    </message>
     <message>
         <location filename="../trainees/personalcardtrainee.ui" line="75"/>
         <location filename="../trainees/personalcardtrainee.ui" line="96"/>
@@ -958,15 +953,20 @@ Delete it anyway?</source>
         <source>Assigned AMM</source>
         <translation>Назначенные AMM</translation>
     </message>
+    <message>
+        <location filename="../trainees/personalcardtrainee.ui" line="68"/>
+        <source>Last login</source>
+        <translation>Последний вход</translation>
+    </message>
     <message>
         <location filename="../trainees/personalcardtrainee.ui" line="131"/>
-        <source>Time of operation</source>
+        <source>Time spent on the simulator</source>
-        <translation>Время работы</translation>
+        <translation>Время работы на тренажере</translation>
     </message>
     <message>
         <location filename="../trainees/personalcardtrainee.ui" line="152"/>
-        <source>Last time of exit</source>
+        <source>Last exit</source>
-        <translation>Время последнего выхода</translation>
+        <translation>Последний выход</translation>
     </message>
     <message>
         <location filename="../trainees/personalcardtrainee.ui" line="174"/>