From 8e931f229beda5f58aa4797d8ddbfbbe8cbb4c50 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 15 Oct 2025 18:04:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOCS/Андрей/Board.md | 2 +- InstructorsAndTrainees/commonview.cpp | 4 +- .../tasks/ammtaskswidget.cpp | 4 +- .../tasks/fimtaskswidget.cpp | 4 +- .../trainees/personalcardtrainee.cpp | 2 + .../trainees/personalcardtrainee.ui | 6 +-- .../InstructorsAndTraineesWidget_ru_RU.qm | Bin 20334 -> 20347 bytes .../InstructorsAndTraineesWidget_ru_RU.ts | 48 +++++++++--------- 8 files changed, 36 insertions(+), 34 deletions(-) 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 667a59456946240cf5e3d0009b37e9e72bd35f67..ffce4cc43a2673790c94eed51e9a8be56972858b 100644 GIT binary patch delta 2069 zcmZ{kdr;I>6vw~6bN_|}MQ%oq*R$UiJ`6wMse(b8s2U^?qS^?5*~?-46F9Zn#Hd?K#`qiz7h zy947d0GfPY$~UzCIcG`(P(I8GwL4L83w!&#Ayx% zyY>kss^Qdh;|yu!9C(Q{;yS0zpL2K;XR^YX>V!IcFA&`g>S0}Q!Dk@UsaDE3nN!}+ zspN4QLOG4=Ic=jkqsKvAvI+2+4)r!tMXBI4?BFy$=k#$yU6BM>)1ltCgW_C-_;xZW znChX6&Q-wY$wN%42&AE2at|qlx;I$uSfcp zMhYB-%(M_7IRWF|>jLCOoZ82n`ad|0S$Lx0t0E^DWT?(3V6LqxNzwX6*5)0 z@r-6exXI~zlC$p}&d}{Db#(_NdQ5dQuo)OO#cP^t%w(X~39q~qJJ9Wv*SXVE0sl2# zkIQHvRV_?&A`7sUv%xcJ0Ixl)U}*~tVi+r^B8pDV_#Ld|9wj{BIV;=Q3i{&=KF+p{ zJWKxVY~RUh3K+y{RVET!r~ijWKXrC^GPUHYx}xG7&B`Tp z?HW>0sO1cu?$U@~j-$*vG^YJ@Kv1b>MDzR9<2#y##gpkeHEH(7HBgH_=j=0E^D+^! zf;0Y(s2o@h`1*=U3$;LzZn!bVZIcT(**?XlG2YnBZt4F4F7bJI7OO}VWHt^kd~$w z0z*4FQv;>dr9A-0V`;6knp!!Zv)>$P<9U*N#6@Z21)}#YX{QuH1-dw0`XFu?u1mFT zRDsruQ#XXuFqzZ%m2_}YEh%+GdRk41s?SP)dWh|^ejN?dpbpu)u@dNBCtH78MngMH z9%(8E5|7I>+wAlZjg|9m)AqiyeBuEW*rQH9m$i=We^`xt#TH7vejv9i{eZ!DIY*Sr z?YpZ;nLy6?Os!v(8L-rF#uRB|2GZ-6I6yn`*Cjyj#o8I4l~T(-)Rv6u0^Tgue*3Hy zhxM(8LBJmjHkfGy2`^eRQeoFtD>tZCuyU0>3&Q*PnD+WTBGRr6dzsJ0vh6^ z3}yHjQmX$ZCG&DMy{xl{E;7t>l*#LN(bUgZDjGAXLX&dHNdX*3lrsYL*d%aTCMiu- zbdYJD(q?=F^eoXU8v>}8QJl&(z3+B9&vzDQ-|hPQGyBl>9%6`2-c7SoZb)4y5Q7an znn|I6a>L=o=6UqyXBfwd8%g>Pj2i&E-$av+K6_ojD8q(Xj zK#39_ xP{me{&1^)nUq$RWK6h@mxo}=~UXeLJ&s;Q<7P)ha=QxY<3p}UQcO(=je*>-X4v+u< delta 2068 zcma)+dr(wW9LK-AoV)kly?1w!H3c8AJVfOst}Jh1S9ys7PBNzWf)tfhP-IY>WHFhE z&{W(cR789rD&!+AEz?2E$kAk+&@x{ci8elR8gXh$>W8OsYWk<0+5Oye_MG$k{=UE8 zJ-^p$9@T3$405^v)&XduIAsscpe{hj0urk@la~{x(fBwZ(tN}sPDeJ7G8l;d6iB}T z#JU05ZGdhLFzYi~|9~^)Fi=AC;#p3I7vQA-oe`V)gJUIFeFYG5hco69*a-%_G?3F` z0lV@J3Dt4xRL-CeIYU3LF(U{_wqeqY9zb5qslUT%xW{SA!jxweM^}xUDt~gI4mqvPA%J-lsvmj-p8L>} zZ~^EOh3^)e0{r)AMkG*%;d?a>E!8U3LzCA__X15>Kme^fplN!f1^S-Sv|ad-5}BmA z(M`Rf>EP`5KBwvirq%ZYKoA#D7;35z;&TaODnZTeHx5AVJp#K54 zGoR!FKILwYtEe%x=a}wT4iH(vM$Byj+-g~Ic?UJ5FDq^!ijz6*>saYs5K8ZY5YRM?GkZ&A2h!B*1)=ywUW8??^wH%$g1KRlUA(OUWYrwq?nKJWyp_{C zSNB|qSj}nwMpT>M1o|nW+Cildri;VN%7CziV)1)7Nl-9nXt&rrkIwTsFE+33q!Kz` z7Y`Pa5;;n2|B4igzeuLXl(Du-@|-&p7&AwTpVtEf)JT~hbkl~Pr7WLJvN%pE&s++O zy33i?U#hGa0603OwRw$H!nvIOdD6zSWOeE(X=5AF{fe~Bags9MByG!DNw0ozlC)il zpiE0R4Ffri?b7~E%0&K^QwiiWPU18jl@3hbPma||PZ~+Ea9DcUOKg@6>!_!~x@7m( zdcbRkY`eFLn%Gw!XWjyg-6zlQOrVP?SuXs6;=|G-AA3NV4%i`|$yrAiP_=w1GMH+9 zTfVRQ10&iwQw%Ga#kR_agvRxf-v8lU%2c1zw4g&N4WWRR14<>MOx%MwZQD8H1C^?0 zb_y_GS#ym_5O-OrKSa%Bn9dpTRB75mPR6WJzRoxc_>NI-#!#FTLFrj$1d_(6u@lId zA#bY_+Z*X-okeuggC$R$xqb(A`y92dbs{NzrXI|rK#oTBgobMD@s!h=qMmD@gUtDA zC*5usxWJ%p@T1a&ajNGH{WjBi{bq6ct~2~J-i;$pHq#`Lndk*uC=+UWNN-B6D?ZN;3CGdQF3O_#2(CglfBcU#=4IWHFgX;rSu z@Q@=tx@e87T(S-A%lfl$7D3-s77hy>$UuffK0rrbDLZfJ0*fOf!{se`x{9p3j!cnj zhtWnq*L15{`Nw9L#%dOxFL!xc2OTN0-ZrL$Fb`&DHWtsaU}1?YfjL+ljU(7-`W?j* zXx7S-X`bT0h-sRTx3t8vuxMUEp{1l?QNF9eJ~%n-e;qacKZo^sepv4@mZG_?l@34G zLq}7D=f6&~Q}QE8#27aIg@``ce2b-Maei@LNkLIzuMC&cf0%2x-RnsD*pcdAU#1A3 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 + Последний выход