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

Пофиксил неправильную распаковку репорта от Клиента

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-01 15:03:08 +03:00
parent 2c5def54ca
commit b13b59beed
4 changed files with 111 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
InstructorsAndTrainees/trainees/personalcardtrainee.cpp
View File

@@ -5,15 +5,59 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i
QWidget(parent),
connectorToServer(connectorToServer),
id_trainee(id_trainee),
ammTasksWidget_personal(nullptr),
fimTasksWidget_personal(nullptr),
ammTasksWidget(nullptr),
fimTasksWidget(nullptr),
ui(new Ui::PersonalCardTrainee)
{
ui->setupUi(this);
loadInfo();
ammTasksWidget_personal = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
fimTasksWidget_personal = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
//connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
//connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget_personal, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIMforTrainee, fimTasksWidget_personal, &FIMtasksWidget::slot_UpdateTasksFIMforTrainee);
fimTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
ammTasksWidget_personal->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
ui->verticalLayout_AMMpersonal->addWidget(ammTasksWidget_personal);
ui->verticalLayout_FIMpersonal->addWidget(fimTasksWidget_personal);
ammTasksWidget = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
fimTasksWidget = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);
//connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
//connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
fimTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
ammTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget);
ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget);
//connectorToServer->sendQueryTasksXML("fim");
//connectorToServer->sendQueryTasksXML("amm");
fimTasksWidget->slot_NeedUpdateUI();
ammTasksWidget->slot_NeedUpdateUI();
}
PersonalCardTrainee::~PersonalCardTrainee()
{
delete ammTasksWidget;
delete fimTasksWidget;
delete ammTasksWidget_personal;
delete fimTasksWidget_personal;
delete ui;
}
@@ -28,11 +72,11 @@ void PersonalCardTrainee::loadInfo()
else
ui->lblLoginIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
QList<TaskAmmFim> listTasksAMM = connectorToServer->getListTasksAMMforTrainee(id_trainee);
QList<TaskAmmFim> listTasksFIM = connectorToServer->getListTasksFIMforTrainee(id_trainee);
//QList<TaskAmmFim> listTasksAMM = connectorToServer->getListTasksAMMforTrainee(id_trainee);
//QList<TaskAmmFim> listTasksFIM = connectorToServer->getListTasksFIMforTrainee(id_trainee);
ui->lblCntAMM->setText(QString::number(listTasksAMM.count()));
ui->lblCntFIM->setText(QString::number(listTasksFIM.count()));
//ui->lblCntAMM->setText(QString::number(listTasksAMM.count()));
//ui->lblCntFIM->setText(QString::number(listTasksFIM.count()));
TimingOfTrainee timing = trainee.getTiming();