From 9b2fd4eff314add927a6b279f0c044cdd08e4776 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Mon, 19 Jan 2026 16:11:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?= =?UTF-8?q?=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FILES/CSS/styleSheetMain.css | 5 +- FILES/translations/RRJServer_ru_RU.qm | Bin 32600 -> 32820 bytes LibInstructorsAndTrainees/commonview.cpp | 16 +-- .../instructorsandtraineeswidget.cpp | 4 +- .../trainees/traineesview.cpp | 25 ++--- translations/RRJServer_ru_RU.qm | Bin 32600 -> 32820 bytes translations/RRJServer_ru_RU.ts | 94 +++++++++++------- 7 files changed, 81 insertions(+), 63 deletions(-) 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 14a625446eacfc2f0454ec314a384866b48b567f..fd3b66d7a7dc18ffd1205598e7cb80c9bb7f0433 100644 GIT binary patch delta 2931 zcma);dstKF9ml^(&N)d=P67fFM1g=1DTo9F#R@byA%Fy^+>|?71VIo9GTO(-AZm5i zX$40+MXQ|*6y{}Wz1AWYFROxD*E%0Bt*&L&X>r~*pGo(NZ~y4i?T;l-p3gb&dEfW^ zF5lnp&DCMqfkyeeZtAlDOhA7B1~0w+F2JV&69mQ@BQXzHcmYt-cvcK!?L#0;M+@oW zpwmZ;BYqs$PiOa|?lUHBV=SZn61;$dEJoV{Ao&K}|C6zzP7h?B0o4BjicSHcKQPv0 z0(CU531+ON7uxB0)_g{rC%COEXp=z3g45vI+X0;b?ifcezs(pu2yTGxa~`#L$-M2l zU~pgj8VK3KXgR_-gO)qSv%?wlbd32KjD=$v=SDHk|DLg?i?PnkxL5@5+Xl?70B_m> z6g~w%c^L2&UQ&U8ik6RMdi!jg$$hB7;z^bpFJ z*$rj)W1wakOwtPyi4msYkrciLgoimq^9)J%XhVyJBL6!|&!3Sz={Ka8AfybDzb<=_ z+S&uScOYZ-5+GnaG789lX%nOKs+Y9GBasbwW+HdZSm1RnW6>MP?Ih0^6eG7M0Pxcz zPeaT(j#ZXe!1W?F-1i0|YtS8g9x#k%^t0nyY2v%iq4UGBwrW9&A@#AZ3){%@+FNAi%K6(r_C#_CYH)k+2heT^x{WVs1(yFvX^r_Z}JITBxW_hy@}RD{ALI2j*N; zEcbIGr5{xE9;KW{TNHyiivWL-9MLD|KQowoJYlFG^K{7c0Ah&w;G%`GgTl2w907k}yTE?u6+{Vdq zwEqt7{iNe$zlG~O+)ixbcFA3Vl9^ohc)FJbGlmp1TH?9x0g{Sk3Abl?4%yYjxbQi5 z#P$vB7_o#qAyRKip39w;lcDM=?p!OqXvQ+eh56i#bE~Ky9p)ojhXLm_KJo@>xWbp8 z(Q}0&U(8t5&6k?u0c{YY$9_i7BmCO(m85y_>k~^UfVq5I8?EL9WOI6s3al;|wz71f$0TM$dY90>UpVr7NUq)kEbgOP2yE zOO%lg2~^!z*1mU>y7siZBrDkm)* zC?2P3Otk?Sos4xCRQ8p{GRoyC)!GsYbwmiGIZ)NyN202$Q#GF<`W#hl>L866BUB%# zBB=jtWz_dDdb+DR)<#kUe&krKYS$f#fHseDgqd;FBF52+RJ-$c0p2>h>Tx@Hq)t#h zbr4S&vwl!(*Y#8Ao~oUDwgQvN)k&_K=m3$c%kRWe<6Ez;zD?6(`qV3H&(Xyvj9KT^ zhyGp&OfFaV=B@*huBb0fqO;81S$$6$3s`S4+B($tK5V2EwLDfj+rJV$rWmLhrZE=Z zU|jH}7~ot$Ui^u%=(ZSO*h2T~7>l-ufwySWaXn&a-y_n8RWvObLD9?+qeJLm9bYTv zeY+HRHA$Fds7etx)cXSSTgA>M3ZL6V zv2)X>q>l#i^pl%Z<3}|vmtufKSB=XpIwoYtH6GXK1!?t~paBcz-=K+H=0njaVNCdg zX4V^pq?>r-C9iskJHqTC&ObFYgTiP9x!_Feny5`W8�S!rTN_22gIs1H>Z#tp|49$ zaD=}=a(@;^^QTF#rchd^rAwAEq_;pxN*`#a9uRJHT#!Y9QsMgT_tkp3oPWsS5YX95Xmmb9~hLNA?__LPvp!5-4StbNqHMoY(JHfl207>(aD zruQ;dc1tH8xKRokq;uQsIy&%@q&rRzfT(b-^sXN%d={g=M(h4tGHjxeF*Zv(wUrDU zY1YPkOp9|m5_*6r=DA;l)@j$CvhgHG!%{GJw6-gTO(Y$oN}oSOZp zS&7+Fs^|ge?nf~ge2>Jvxiffz?%%A z22;z$a?h6NFvNphg)`IYx9=~ZoV*4F_D0a9me_HeZo0pfHZsDfFLOH2U@8~`27C$=$*%s{A#7Sc~2?V^|t zE0``{G6ybW#s@I7=zTFBw3&@r90p9e1Eig2<`&ati5CF<3t-+^Ab35qU^}ps<_*J{ zg)adc-A{bNEJ}w^T?WKAGSjv~sHp*r6%bAcw0SPmQUIZYu4k{T^iX-)j7<=}exJ_k z&y0;`PPHX`E=3ng1=SsT+o2;z21h07M^z|qV>;mpAknBLEr zLqj3%ngpcC5bJgV@=%C}<^y?mA+}_af<(bWaws1CfScN6GuT;|BUkAh7jcy zy`TXh!v~OjfaOLcKhc zVSOx_&uI=e|I-r~^&It4WInHbOkW*t<(&q`^{9fQXuWlmDq2mxDSB76ppTw6R0Z-i za%0BVs!~5clGt5U`&dneF{+x|-veGVsxEx_BPkM~`r=zMn`4pcP7hUrdMq>O3^VLk zW>f$(&Rs3m{0fX*sSau>Bcm2DmlUfL5-6bI>FW9up}?Y5>YD>>@6fvtLOn5aoVPUZ5}5Y6wWr30`3qRINOFMtP{{Fo>p{FSCChpHgMQ?u6B88Ag^T8~ps z$98BQ&MpLoG;6xcBLJ&*E){~aYH7Y(7`^uhFziPm*HlS27Ul{| z=DZE~&#z1qJZ*&qLdio4baJGyVZ#I<@UBq4yOZjDD0A{lX3}6`YeY2dH$vDRf0Ewc zA=EY3Q2erRQ0)ZFuM+A<(6wqfbHpQN%q5||gDes&2#42_p9ag!f+*ow@qO6fAPA>r z>MikILc5v*)h`h)R?$XN_00S|!kvrM9(2v3xvH0X&`r^Nhdi8ji-Km*?eGJpBgz3J5=^3DPIzWL=XxE0h-U9|TXk#yD zP!VXfi`&kThhJ)!FH5H;QKEhOgpI016R54Ky$a-}X!nmhO&V~BF)i9w z$8I3&b8Wvu^3Tk|W^Mb~V-)Zj?ZXBO;Lxd44y^&gl6A^;^0M?q_gZNwFip^z`z){| zR9Ez2Cn=c2ocg}*kS(k4Mvv~$B9g}9t~<1mBKCTqJDg97C<~Z=7G1|BdQSLMvg^K2 z0iTgZZP*JW9Fr`IdV%rxC2QSCs?w*D^{?bX?-ZurAEoJDR$x-OGzKTw+lQu3Oslz{Ij%$>*w2`Tbo24xmh+Y$<9kt{U|C7>gX%zLHYNl%( zb6~YpyU|Pv{6^nx(!qPAfH8$>-_CS-ENp z%OqW?-oB+8Fn8WT;_s$&_ATV!OP$i-JrZC%^lL z7Lt12^V>ZlLm`=WUYMATw8BJFhGOP2cbsRR7jG(|RuM8Um zQgu)PGo_F@?|Vb}tMQ~}oT0k0m3n~dpZW(#Za38Kp!}v;4F@u#fj8p~4c*k-#2JR8 z*T0}Hoo)Ckp^aqUZ0HNvXIl}JTy)Vr_u^aHI_Zfq%PiW zyjJQ-0ficW$|k61s9%py;_F9s(*Y07x zJ(;j6hyGP7tL*S|X?iZNFgE?<)@!ZoER`w~vIm+y1rH%ah!7&_Z>(S@Mha5}GrSRv z1SCk5Lulz&i7qbAS(Kl-&^tOIp|UW?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 14a625446eacfc2f0454ec314a384866b48b567f..fd3b66d7a7dc18ffd1205598e7cb80c9bb7f0433 100644 GIT binary patch delta 2931 zcma);dstKF9ml^(&N)d=P67fFM1g=1DTo9F#R@byA%Fy^+>|?71VIo9GTO(-AZm5i zX$40+MXQ|*6y{}Wz1AWYFROxD*E%0Bt*&L&X>r~*pGo(NZ~y4i?T;l-p3gb&dEfW^ zF5lnp&DCMqfkyeeZtAlDOhA7B1~0w+F2JV&69mQ@BQXzHcmYt-cvcK!?L#0;M+@oW zpwmZ;BYqs$PiOa|?lUHBV=SZn61;$dEJoV{Ao&K}|C6zzP7h?B0o4BjicSHcKQPv0 z0(CU531+ON7uxB0)_g{rC%COEXp=z3g45vI+X0;b?ifcezs(pu2yTGxa~`#L$-M2l zU~pgj8VK3KXgR_-gO)qSv%?wlbd32KjD=$v=SDHk|DLg?i?PnkxL5@5+Xl?70B_m> z6g~w%c^L2&UQ&U8ik6RMdi!jg$$hB7;z^bpFJ z*$rj)W1wakOwtPyi4msYkrciLgoimq^9)J%XhVyJBL6!|&!3Sz={Ka8AfybDzb<=_ z+S&uScOYZ-5+GnaG789lX%nOKs+Y9GBasbwW+HdZSm1RnW6>MP?Ih0^6eG7M0Pxcz zPeaT(j#ZXe!1W?F-1i0|YtS8g9x#k%^t0nyY2v%iq4UGBwrW9&A@#AZ3){%@+FNAi%K6(r_C#_CYH)k+2heT^x{WVs1(yFvX^r_Z}JITBxW_hy@}RD{ALI2j*N; zEcbIGr5{xE9;KW{TNHyiivWL-9MLD|KQowoJYlFG^K{7c0Ah&w;G%`GgTl2w907k}yTE?u6+{Vdq zwEqt7{iNe$zlG~O+)ixbcFA3Vl9^ohc)FJbGlmp1TH?9x0g{Sk3Abl?4%yYjxbQi5 z#P$vB7_o#qAyRKip39w;lcDM=?p!OqXvQ+eh56i#bE~Ky9p)ojhXLm_KJo@>xWbp8 z(Q}0&U(8t5&6k?u0c{YY$9_i7BmCO(m85y_>k~^UfVq5I8?EL9WOI6s3al;|wz71f$0TM$dY90>UpVr7NUq)kEbgOP2yE zOO%lg2~^!z*1mU>y7siZBrDkm)* zC?2P3Otk?Sos4xCRQ8p{GRoyC)!GsYbwmiGIZ)NyN202$Q#GF<`W#hl>L866BUB%# zBB=jtWz_dDdb+DR)<#kUe&krKYS$f#fHseDgqd;FBF52+RJ-$c0p2>h>Tx@Hq)t#h zbr4S&vwl!(*Y#8Ao~oUDwgQvN)k&_K=m3$c%kRWe<6Ez;zD?6(`qV3H&(Xyvj9KT^ zhyGp&OfFaV=B@*huBb0fqO;81S$$6$3s`S4+B($tK5V2EwLDfj+rJV$rWmLhrZE=Z zU|jH}7~ot$Ui^u%=(ZSO*h2T~7>l-ufwySWaXn&a-y_n8RWvObLD9?+qeJLm9bYTv zeY+HRHA$Fds7etx)cXSSTgA>M3ZL6V zv2)X>q>l#i^pl%Z<3}|vmtufKSB=XpIwoYtH6GXK1!?t~paBcz-=K+H=0njaVNCdg zX4V^pq?>r-C9iskJHqTC&ObFYgTiP9x!_Feny5`W8�S!rTN_22gIs1H>Z#tp|49$ zaD=}=a(@;^^QTF#rchd^rAwAEq_;pxN*`#a9uRJHT#!Y9QsMgT_tkp3oPWsS5YX95Xmmb9~hLNA?__LPvp!5-4StbNqHMoY(JHfl207>(aD zruQ;dc1tH8xKRokq;uQsIy&%@q&rRzfT(b-^sXN%d={g=M(h4tGHjxeF*Zv(wUrDU zY1YPkOp9|m5_*6r=DA;l)@j$CvhgHG!%{GJw6-gTO(Y$oN}oSOZp zS&7+Fs^|ge?nf~ge2>Jvxiffz?%%A z22;z$a?h6NFvNphg)`IYx9=~ZoV*4F_D0a9me_HeZo0pfHZsDfFLOH2U@8~`27C$=$*%s{A#7Sc~2?V^|t zE0``{G6ybW#s@I7=zTFBw3&@r90p9e1Eig2<`&ati5CF<3t-+^Ab35qU^}ps<_*J{ zg)adc-A{bNEJ}w^T?WKAGSjv~sHp*r6%bAcw0SPmQUIZYu4k{T^iX-)j7<=}exJ_k z&y0;`PPHX`E=3ng1=SsT+o2;z21h07M^z|qV>;mpAknBLEr zLqj3%ngpcC5bJgV@=%C}<^y?mA+}_af<(bWaws1CfScN6GuT;|BUkAh7jcy zy`TXh!v~OjfaOLcKhc zVSOx_&uI=e|I-r~^&It4WInHbOkW*t<(&q`^{9fQXuWlmDq2mxDSB76ppTw6R0Z-i za%0BVs!~5clGt5U`&dneF{+x|-veGVsxEx_BPkM~`r=zMn`4pcP7hUrdMq>O3^VLk zW>f$(&Rs3m{0fX*sSau>Bcm2DmlUfL5-6bI>FW9up}?Y5>YD>>@6fvtLOn5aoVPUZ5}5Y6wWr30`3qRINOFMtP{{Fo>p{FSCChpHgMQ?u6B88Ag^T8~ps z$98BQ&MpLoG;6xcBLJ&*E){~aYH7Y(7`^uhFziPm*HlS27Ul{| z=DZE~&#z1qJZ*&qLdio4baJGyVZ#I<@UBq4yOZjDD0A{lX3}6`YeY2dH$vDRf0Ewc zA=EY3Q2erRQ0)ZFuM+A<(6wqfbHpQN%q5||gDes&2#42_p9ag!f+*ow@qO6fAPA>r z>MikILc5v*)h`h)R?$XN_00S|!kvrM9(2v3xvH0X&`r^Nhdi8ji-Km*?eGJpBgz3J5=^3DPIzWL=XxE0h-U9|TXk#yD zP!VXfi`&kThhJ)!FH5H;QKEhOgpI016R54Ky$a-}X!nmhO&V~BF)i9w z$8I3&b8Wvu^3Tk|W^Mb~V-)Zj?ZXBO;Lxd44y^&gl6A^;^0M?q_gZNwFip^z`z){| zR9Ez2Cn=c2ocg}*kS(k4Mvv~$B9g}9t~<1mBKCTqJDg97C<~Z=7G1|BdQSLMvg^K2 z0iTgZZP*JW9Fr`IdV%rxC2QSCs?w*D^{?bX?-ZurAEoJDR$x-OGzKTw+lQu3Oslz{Ij%$>*w2`Tbo24xmh+Y$<9kt{U|C7>gX%zLHYNl%( zb6~YpyU|Pv{6^nx(!qPAfH8$>-_CS-ENp z%OqW?-oB+8Fn8WT;_s$&_ATV!OP$i-JrZC%^lL z7Lt12^V>ZlLm`=WUYMATw8BJFhGOP2cbsRR7jG(|RuM8Um zQgu)PGo_F@?|Vb}tMQ~}oT0k0m3n~dpZW(#Za38Kp!}v;4F@u#fj8p~4c*k-#2JR8 z*T0}Hoo)Ckp^aqUZ0HNvXIl}JTy)Vr_u^aHI_Zfq%PiW zyjJQ-0ficW$|k61s9%py;_F9s(*Y07x zJ(;j6hyGP7tL*S|X?iZNFgE?<)@!ZoER`w~vIm+y1rH%ah!7&_Z>(S@Mha5}GrSRv z1SCk5Lulz&i7qbAS(Kl-&^tOIp|UW?требуется обновление - - + + 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 нет