Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

доработка интерфейс

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-19 16:11:24 +03:00
parent f2b08887c7
commit 9b2fd4eff3
7 changed files with 81 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
FILES/CSS/styleSheetMain.css
View File

@@ -401,6 +401,10 @@ QLabel#DeviceWidget_lbl_Code {
color: gray; color: gray;
} }
QLabel#lblStatAMM, QLabel#lblStatFIM {
padding-top: 1px;
}
QPlainTextEdit#ActionWidget_plainTextEdit_Procedure{ QPlainTextEdit#ActionWidget_plainTextEdit_Procedure{
border-radius: 5px; border-radius: 5px;
border: 1px solid gray; border: 1px solid gray;
@@ -417,7 +421,6 @@ QPlainTextEdit#plainText{ /*Репорт*/
margin-right: 100pt; margin-right: 100pt;
} }
QComboBox::drop-down { QComboBox::drop-down {
subcontrol-position: right center; /*Выравнивание стрелки по центру */ subcontrol-position: right center; /*Выравнивание стрелки по центру */
width: 20px; /* Ширина области со стрелкой */ width: 20px; /* Ширина области со стрелкой */

BIN
FILES/translations/RRJServer_ru_RU.qm
View File

Binary file not shown.

16
LibInstructorsAndTrainees/commonview.cpp
View File

@@ -96,14 +96,14 @@ void CommonView::setWidthColumnsTree()
listWidthColumn.append(140); listWidthColumn.append(140);
treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Archived, 100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Archived, 100);
listWidthColumn.append(100); listWidthColumn.append(100);
treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_AMMtasks, 100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_AMMtasks, 120);
listWidthColumn.append(100); listWidthColumn.append(120);
treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_FIMtasks, 100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_FIMtasks, 120);
listWidthColumn.append(100); listWidthColumn.append(120);
treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Login, 100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Login, 120);
listWidthColumn.append(100); listWidthColumn.append(120);
treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Messages, 100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Messages, 120);
listWidthColumn.append(100); listWidthColumn.append(120);
treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Logged, 80); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Logged, 80);
listWidthColumn.append(80); listWidthColumn.append(80);
treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_ID, 40); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_ID, 40);

4
LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -88,8 +88,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->groupBox_Trainees->setMinimumHeight(500); ui->groupBox_Trainees->setMinimumHeight(500);
ui->groupBox_Trainees->setMinimumWidth(900); ui->groupBox_Trainees->setMinimumWidth(1000);
ui->groupBox_Instructors->setMinimumWidth(900); ui->groupBox_Instructors->setMinimumWidth(1000);
//Доступность кнопок //Доступность кнопок

25
LibInstructorsAndTrainees/trainees/traineesview.cpp
View File

@@ -1,6 +1,7 @@
#include <QHeaderView> #include <QHeaderView>
#include <QResizeEvent> #include <QResizeEvent>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QLabel>
#include "traineesview.h" #include "traineesview.h"
TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent): TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent):
@@ -92,26 +93,22 @@ void TraineesView::loadTraineesFromDB()
ItemGroup->addChild(ItemTrainee); ItemGroup->addChild(ItemTrainee);
//Статистика AMM FIM
QList<TaskAmmFim> listAMM = connectorToServer->getListTasksAMMforTrainee(trainee.getID()); QList<TaskAmmFim> listAMM = connectorToServer->getListTasksAMMforTrainee(trainee.getID());
QList<TaskAmmFim> listFIM = connectorToServer->getListTasksFIMforTrainee(trainee.getID()); QList<TaskAmmFim> listFIM = connectorToServer->getListTasksFIMforTrainee(trainee.getID());
QString statAMM = TaskAmmFim::buildStatisticTasksAMM(listAMM); QString statAMM = TaskAmmFim::buildStatisticTasksAMM(listAMM);
QString statFIM = TaskAmmFim::buildStatisticTasksFIM(listFIM); QString statFIM = TaskAmmFim::buildStatisticTasksFIM(listFIM);
QPlainTextEdit *plainTextEditAMM = new QPlainTextEdit(); QLabel *lblStatAMM = new QLabel();
plainTextEditAMM->setObjectName("plainTextEditAMM"); lblStatAMM->setObjectName("lblStatAMM");
plainTextEditAMM->setFocusPolicy(Qt::FocusPolicy::NoFocus); treeWidget->setItemWidget(ItemTrainee, ColumnsTreeUsers::clmn_AMMtasks, lblStatAMM);
plainTextEditAMM->setReadOnly(true); lblStatAMM->setText(statAMM);
plainTextEditAMM->setEnabled(false);
treeWidget->setItemWidget(ItemTrainee, ColumnsTreeUsers::clmn_AMMtasks, plainTextEditAMM); QLabel *lblStatFIM = new QLabel();
plainTextEditAMM->appendHtml(statAMM); 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()) if(trainee.getArchived())

BIN
translations/RRJServer_ru_RU.qm
View File

Binary file not shown.

94
translations/RRJServer_ru_RU.ts
View File

@@ -44,46 +44,46 @@
<translation>требуется обновление</translation> <translation>требуется обновление</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="430"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="431"/>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="432"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="433"/>
<source>DM code</source> <source>DM code</source>
<translation>DM код</translation> <translation>DM код</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="430"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="431"/>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="432"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="433"/>
<source>ID</source> <source>ID</source>
<translation>ID</translation> <translation>ID</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="430"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="431"/>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="432"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="433"/>
<source>Procedure AMM</source> <source>Procedure AMM</source>
<translation>Процедура AMM</translation> <translation>Процедура AMM</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="430"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="431"/>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="432"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="433"/>
<source>Canplay</source> <source>Canplay</source>
<translation>Режимы</translation> <translation>Режимы</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.ui" line="144"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.ui" line="144"/>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="430"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="431"/>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="432"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="433"/>
<source>Status</source> <source>Status</source>
<translation>Статус</translation> <translation>Статус</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="537"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="538"/>
<source>The deletion will be irrevocable. <source>The deletion will be irrevocable.
Delete it anyway?</source> Delete it anyway?</source>
<translation>Удаление будет безвозвратным. <translation>Удаление будет безвозвратным.
Всё равно удалить?</translation> Всё равно удалить?</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="358"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="359"/>
<location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="380"/> <location filename="../LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp" line="381"/>
<source>Assign this task?</source> <source>Assign this task?</source>
<translation>Назначить эту задачу?</translation> <translation>Назначить эту задачу?</translation>
</message> </message>
@@ -238,57 +238,67 @@ The status will be set:
<context> <context>
<name>CommonView</name> <name>CommonView</name>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="117"/>
<source>Name</source> <source>Name</source>
<translation>Имя</translation> <translation>Имя</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="126"/>
<source>Login</source> <source>Login</source>
<translation>Логин</translation> <translation>Логин</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="118"/>
<source>Password</source> <source>Password</source>
<translation>Пароль</translation> <translation>Пароль</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="119"/>
<source>Class</source> <source>Class</source>
<translation>Класс</translation> <translation>Класс</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="120"/>
<source>Computer</source> <source>Computer</source>
<translation>Компьютер</translation> <translation>Компьютер</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="121"/>
<source>IP address</source> <source>IP address</source>
<translation>IP адрес</translation> <translation>IP адрес</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="122"/>
<source>Administrator</source> <source>Administrator</source>
<translation>Администратор</translation> <translation>Администратор</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="123"/>
<source>Archived</source> <source>Archived</source>
<translation>Архивный</translation> <translation>Архивный</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="124"/>
<source>Tasks AMM</source>
<translation>Задачи AMM</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="125"/>
<source>Tasks FIM</source>
<translation>Задачи FIM</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="128"/>
<source>Online</source> <source>Online</source>
<translation>В сети</translation> <translation>В сети</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="129"/>
<source>ID</source> <source>ID</source>
<translation>ID</translation> <translation>ID</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/> <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="127"/>
<source>Messages</source> <source>Messages</source>
<translation>Сообщения</translation> <translation>Сообщения</translation>
</message> </message>
@@ -1538,24 +1548,12 @@ Please reconnect to the server.</source>
<translation>Имя</translation> <translation>Имя</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="45"/>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="96"/> <location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="96"/>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="117"/> <location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="117"/>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="145"/>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="166"/> <location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="166"/>
<source>0</source> <source>0</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="138"/>
<source>Assigned FIM</source>
<translation>Назначенные FIM</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="38"/>
<source>Assigned AMM</source>
<translation>Назначенные AMM</translation>
</message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="159"/> <location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="159"/>
<source>Last login</source> <source>Last login</source>
@@ -1566,11 +1564,31 @@ Please reconnect to the server.</source>
<source>Time spent on the simulator</source> <source>Time spent on the simulator</source>
<translation>Время работы на тренажере</translation> <translation>Время работы на тренажере</translation>
</message> </message>
<message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="38"/>
<source>Tasks AMM</source>
<translation>Задачи AMM</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="45"/>
<source>0 / 0</source>
<translation></translation>
</message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="110"/> <location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="110"/>
<source>Last exit</source> <source>Last exit</source>
<translation>Последний выход</translation> <translation>Последний выход</translation>
</message> </message>
<message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="138"/>
<source>Tasks FIM</source>
<translation>Задачи FIM</translation>
</message>
<message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="145"/>
<source>0/0/0 / 0</source>
<translation></translation>
</message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="188"/> <location filename="../LibInstructorsAndTrainees/trainees/personalcardtrainee.ui" line="188"/>
<source>Chat</source> <source>Chat</source>
@@ -1891,12 +1909,12 @@ The server will be restarted.</source>
<context> <context>
<name>TraineesView</name> <name>TraineesView</name>
<message> <message>
<location filename="../LibInstructorsAndTrainees/trainees/traineesview.cpp" line="69"/> <location filename="../LibInstructorsAndTrainees/trainees/traineesview.cpp" line="71"/>
<source>yes</source> <source>yes</source>
<translation>да</translation> <translation>да</translation>
</message> </message>
<message> <message>
<location filename="../LibInstructorsAndTrainees/trainees/traineesview.cpp" line="75"/> <location filename="../LibInstructorsAndTrainees/trainees/traineesview.cpp" line="77"/>
<source>no</source> <source>no</source>
<translation>нет</translation> <translation>нет</translation>
</message> </message>