diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp index e559a76..8e55373 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp @@ -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 listTasksAMM = connectorToServer->getListTasksAMMforTrainee(id_trainee); - QList listTasksFIM = connectorToServer->getListTasksFIMforTrainee(id_trainee); + //QList listTasksAMM = connectorToServer->getListTasksAMMforTrainee(id_trainee); + //QList 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(); diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.h b/InstructorsAndTrainees/trainees/personalcardtrainee.h index 8a30a47..24009df 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.h +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.h @@ -2,6 +2,8 @@ #define PERSONALCARDTRAINEE_H #include"connectortoserver.h" +#include "ammtaskswidget.h" +#include "fimtaskswidget.h" #include namespace Ui { @@ -23,6 +25,12 @@ private: ConnectorToServer* connectorToServer; int id_trainee; + AMMtasksWidget* ammTasksWidget_personal; + FIMtasksWidget* fimTasksWidget_personal; + + AMMtasksWidget* ammTasksWidget; + FIMtasksWidget* fimTasksWidget; + private: Ui::PersonalCardTrainee *ui; }; diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.ui b/InstructorsAndTrainees/trainees/personalcardtrainee.ui index be8e6f9..d73e86a 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.ui +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.ui @@ -6,8 +6,8 @@ 0 0 - 537 - 300 + 1125 + 764 @@ -200,22 +200,59 @@ - - - QFrame::Box + + + + 0 + 0 + - - <Здесь будут задачи> - - - true - - - Qt::AlignCenter - - - false + + Tasks + + + + + 0 + + + + AMM + + + + + + + + + + + + + + + + + FIM + + + + + + + + + + + + + + + + + diff --git a/ServerLMS/Systems/Parsers/processparser.cpp b/ServerLMS/Systems/Parsers/processparser.cpp index 2d9e667..3926e56 100644 --- a/ServerLMS/Systems/Parsers/processparser.cpp +++ b/ServerLMS/Systems/Parsers/processparser.cpp @@ -181,11 +181,11 @@ void ProcessParser::clientUnityTaskFIMreport(QXmlStreamReader &xmlReader, Client for(int k = 0; k < malfOrReportNode.childNodes().count(); k++) { QDomNode reportItemNode = malfOrReportNode.childNodes().at(k); - if(reportItemNode.nodeName() == "reportItem") + if(reportItemNode.nodeName() == "item") { FIMReportItem reportItem; reportItem.id = 0; //reportItemNode.toElement().attribute("item_id").toInt(); - reportItem.text = reportItemNode.toElement().attribute("text"); + reportItem.text = reportItemNode.toElement().attribute("title"); if(reportItemNode.childNodes().count()) {