diff --git a/FILES/CSS/styleSheetMain.css b/FILES/CSS/styleSheetMain.css index dbea2bc..9cdb8a3 100644 --- a/FILES/CSS/styleSheetMain.css +++ b/FILES/CSS/styleSheetMain.css @@ -401,6 +401,10 @@ QLabel#DeviceWidget_lbl_Code { color: gray; } +QLabel#lblStatAMM, QLabel#lblStatFIM { + padding-top: 1px; +} + QPlainTextEdit#ActionWidget_plainTextEdit_Procedure{ border-radius: 5px; border: 1px solid gray; @@ -417,7 +421,6 @@ QPlainTextEdit#plainText{ /*Репорт*/ margin-right: 100pt; } - QComboBox::drop-down { subcontrol-position: right center; /*Выравнивание стрелки по центру */ width: 20px; /* Ширина области со стрелкой */ diff --git a/FILES/translations/RRJServer_ru_RU.qm b/FILES/translations/RRJServer_ru_RU.qm index 14a6254..fd3b66d 100644 Binary files a/FILES/translations/RRJServer_ru_RU.qm and b/FILES/translations/RRJServer_ru_RU.qm differ diff --git a/LibInstructorsAndTrainees/commonview.cpp b/LibInstructorsAndTrainees/commonview.cpp index 33911a1..8f0f5d9 100644 --- a/LibInstructorsAndTrainees/commonview.cpp +++ b/LibInstructorsAndTrainees/commonview.cpp @@ -96,14 +96,14 @@ void CommonView::setWidthColumnsTree() listWidthColumn.append(140); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Archived, 100); listWidthColumn.append(100); - treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_AMMtasks, 100); - listWidthColumn.append(100); - treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_FIMtasks, 100); - listWidthColumn.append(100); - treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Login, 100); - listWidthColumn.append(100); - treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Messages, 100); - listWidthColumn.append(100); + treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_AMMtasks, 120); + listWidthColumn.append(120); + treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_FIMtasks, 120); + listWidthColumn.append(120); + treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Login, 120); + listWidthColumn.append(120); + treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Messages, 120); + listWidthColumn.append(120); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Logged, 80); listWidthColumn.append(80); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_ID, 40); diff --git a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp index 9693879..748837a 100644 --- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -88,8 +88,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->groupBox_Trainees->setMinimumHeight(500); - ui->groupBox_Trainees->setMinimumWidth(900); - ui->groupBox_Instructors->setMinimumWidth(900); + ui->groupBox_Trainees->setMinimumWidth(1000); + ui->groupBox_Instructors->setMinimumWidth(1000); //Доступность кнопок diff --git a/LibInstructorsAndTrainees/trainees/traineesview.cpp b/LibInstructorsAndTrainees/trainees/traineesview.cpp index 9ea1a8f..9103d50 100644 --- a/LibInstructorsAndTrainees/trainees/traineesview.cpp +++ b/LibInstructorsAndTrainees/trainees/traineesview.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "traineesview.h" TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent): @@ -92,26 +93,22 @@ void TraineesView::loadTraineesFromDB() ItemGroup->addChild(ItemTrainee); + //Статистика AMM FIM QList listAMM = connectorToServer->getListTasksAMMforTrainee(trainee.getID()); QList listFIM = connectorToServer->getListTasksFIMforTrainee(trainee.getID()); QString statAMM = TaskAmmFim::buildStatisticTasksAMM(listAMM); QString statFIM = TaskAmmFim::buildStatisticTasksFIM(listFIM); - QPlainTextEdit *plainTextEditAMM = new QPlainTextEdit(); - plainTextEditAMM->setObjectName("plainTextEditAMM"); - plainTextEditAMM->setFocusPolicy(Qt::FocusPolicy::NoFocus); - plainTextEditAMM->setReadOnly(true); - plainTextEditAMM->setEnabled(false); - treeWidget->setItemWidget(ItemTrainee, ColumnsTreeUsers::clmn_AMMtasks, plainTextEditAMM); - plainTextEditAMM->appendHtml(statAMM); + QLabel *lblStatAMM = new QLabel(); + lblStatAMM->setObjectName("lblStatAMM"); + treeWidget->setItemWidget(ItemTrainee, ColumnsTreeUsers::clmn_AMMtasks, lblStatAMM); + lblStatAMM->setText(statAMM); + + QLabel *lblStatFIM = new QLabel(); + lblStatFIM->setObjectName("lblStatFIM"); + treeWidget->setItemWidget(ItemTrainee, ColumnsTreeUsers::clmn_FIMtasks, lblStatFIM); + lblStatFIM->setText(statFIM); - QPlainTextEdit *plainTextEditFIM = new QPlainTextEdit(); - plainTextEditFIM->setObjectName("plainTextEditAMM"); - plainTextEditFIM->setFocusPolicy(Qt::FocusPolicy::NoFocus); - plainTextEditFIM->setReadOnly(true); - plainTextEditFIM->setEnabled(false); - treeWidget->setItemWidget(ItemTrainee, ColumnsTreeUsers::clmn_FIMtasks, plainTextEditFIM); - plainTextEditFIM->appendHtml(statFIM); //Скрываем архивных (при необходимости) if(trainee.getArchived()) diff --git a/translations/RRJServer_ru_RU.qm b/translations/RRJServer_ru_RU.qm index 14a6254..fd3b66d 100644 Binary files a/translations/RRJServer_ru_RU.qm and b/translations/RRJServer_ru_RU.qm differ diff --git a/translations/RRJServer_ru_RU.ts b/translations/RRJServer_ru_RU.ts index c7ac3e0..041a488 100644 --- a/translations/RRJServer_ru_RU.ts +++ b/translations/RRJServer_ru_RU.ts @@ -44,46 +44,46 @@ требуется обновление - - + + DM code DM код - - + + ID ID - - + + Procedure AMM Процедура AMM - - + + Canplay Режимы - - + + Status Статус - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - - + + Assign this task? Назначить эту задачу? @@ -238,57 +238,67 @@ The status will be set: CommonView - + Name Имя - + Login Логин - + Password Пароль - + Class Класс - + Computer Компьютер - + IP address IP адрес - + Administrator Администратор - + Archived Архивный - + + Tasks AMM + Задачи AMM + + + + Tasks FIM + Задачи FIM + + + Online В сети - + ID ID - + Messages Сообщения @@ -1538,24 +1548,12 @@ Please reconnect to the server. Имя - - 0 - - - Assigned FIM - Назначенные FIM - - - - Assigned AMM - Назначенные AMM - Last login @@ -1566,11 +1564,31 @@ Please reconnect to the server. Time spent on the simulator Время работы на тренажере + + + Tasks AMM + Задачи AMM + + + + 0 / 0 + + Last exit Последний выход + + + Tasks FIM + Задачи FIM + + + + 0/0/0 / 0 + + Chat @@ -1891,12 +1909,12 @@ The server will be restarted. TraineesView - + yes да - + no нет