diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp index 0c1fef8..bc1c7d6 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp @@ -66,12 +66,6 @@ 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); - - //ui->lblCntAMM->setText(QString::number(listTasksAMM.count())); - //ui->lblCntFIM->setText(QString::number(listTasksFIM.count())); - TimingOfTrainee timing = trainee.getTiming(); ui->lblTimeOperation->setText(timing.getOperatingTimeS()); @@ -99,7 +93,6 @@ void PersonalCardTrainee::slot_NeedUpdateUI(bool treeInstructor, bool treeTraine { if(treeTrainee) { - //TODO Собственно обновление loadInfo(); } } diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.h b/InstructorsAndTrainees/trainees/personalcardtrainee.h index 8859499..dbfcfa2 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.h +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.h @@ -17,7 +17,6 @@ class PersonalCardTrainee : public QWidget Q_OBJECT public: - //explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent = nullptr); explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, MessangerController* messangerController, int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, QWidget *parent = nullptr); ~PersonalCardTrainee(); diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index 480a5ac..b462be8 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -5,8 +5,6 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerController* messangerController, QWidget *parent) : TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent), - //ammTasksWidget_pers0(nullptr), - //fimTasksWidget_pers0(nullptr), ammTasksWidgetCommon(nullptr), fimTasksWidgetCommon(nullptr), messangerController(messangerController), @@ -15,26 +13,10 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo ui->setupUi(this); connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &ViewerTrainees::on_itemDoubleClicked); - connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerTrainees::on_treeWidget_itemClicked); ui->horizontalLayout_1->addWidget(treeWidget); - /* - ammTasksWidget_pers0 = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this); - fimTasksWidget_pers0 = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this); - - connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidget_pers0, &FIMtasksWidget::slot_traineeSelected); - connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidget_pers0, &AMMtasksWidget::slot_traineeSelected); - - connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget_pers0, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee); - connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIMforTrainee, fimTasksWidget_pers0, &FIMtasksWidget::slot_UpdateTasksFIMforTrainee); - - ui->verticalLayout_2->addWidget(ammTasksWidget_pers0); - ui->verticalLayout_2->addWidget(fimTasksWidget_pers0); - */ - - //------ ammTasksWidgetCommon = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr); fimTasksWidgetCommon = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr); @@ -43,13 +25,6 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidgetCommon, &FIMtasksWidget::slot_traineeSelected); connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidgetCommon, &AMMtasksWidget::slot_traineeSelected); - //connect(fimTasksWidgetCommon, &FIMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM); - //connect(ammTasksWidgetCommon, &AMMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM); - - //ammTasksWidgetCommon->setParent(this); - //fimTasksWidgetCommon->setParent(this); - //------ - preparationTreeWidget(); setNotLoggedInVisible(true); @@ -73,8 +48,6 @@ void ViewerTrainees::setAuthComplited(bool authComplited) void ViewerTrainees::deactivate() { CommonView::deactivate(); - //ammTasksWidget_pers0->deactivate(); - //fimTasksWidget_pers0->deactivate(); ammTasksWidgetCommon->deactivate(); fimTasksWidgetCommon->deactivate(); diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h index ceeca9e..9245297 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.h +++ b/InstructorsAndTrainees/trainees/viewertrainees.h @@ -47,9 +47,6 @@ private: void updateButtons() override; private: - //AMMtasksWidget* ammTasksWidget_pers0; - //FIMtasksWidget* fimTasksWidget_pers0; - AMMtasksWidget* ammTasksWidgetCommon; FIMtasksWidget* fimTasksWidgetCommon;