From e9b571aa819f7e5f2c86c6731a97f0504bee8d4f Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 3 Sep 2025 11:49:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D1=83=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=D1=8E=D1=89=D0=B8=D0=B9=20=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=81=D0=B5=D0=BD=D0=B3=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trainees/personalcardtrainee.cpp | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp index 0f7d8b2..12aabb0 100644 --- a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp +++ b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp @@ -1,7 +1,6 @@ #include "personalcardtrainee.h" #include "ui_personalcardtrainee.h" -//PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent) : PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, AMMtasksWidget* ammTasksWidgetIn, FIMtasksWidget* fimTasksWidgetIn, QWidget *parent) : QWidget(parent), connectorToServer(connectorToServer), @@ -20,9 +19,6 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i 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); @@ -32,34 +28,17 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i 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_common); ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget_common); - //connectorToServer->sendQueryTasksXML("fim"); - //connectorToServer->sendQueryTasksXML("amm"); - // fimTasksWidget->slot_NeedUpdateUI(); - // ammTasksWidget->slot_NeedUpdateUI(); - - + /* Messanger*/ messangerWidget = new MessangerWidget(this); //connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, messangerWidget, &MessangerWidget::slot_traineeSelected); //connect(messangerWidget, &MessangerWidget::signal_tabMessengerChanged, viewerTrainees, &ViewerTrainees::slot_tabMessengerChanged); connect(messangerWidget, &MessangerWidget::signal_sendMessage, connectorToServer, &ConnectorToServer::slot_sendMessage); connect(connectorToServer,&ConnectorToServer::signal_receiveMessage,messangerWidget,&MessangerWidget::slot_showMessage); - ui->verticalLayout_Messenger->addWidget(messangerWidget); + //ui->verticalLayout_Messenger->addWidget(messangerWidget); messangerWidget->initialize(connectorToServer->getServerAuth().Id); @@ -70,18 +49,11 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i ui->groupBox_Messenger->setMaximumWidth(600); ui->groupBox_Messenger->setMinimumWidth(600); + } PersonalCardTrainee::~PersonalCardTrainee() { - //delete ammTasksWidget; - //delete fimTasksWidget; - //ui->verticalLayout_AMMcommon->removeWidget(ammTasksWidget); - //ui->verticalLayout_AMMcommon->removeWidget(fimTasksWidget); - - //ammTasksWidget = nullptr; - //fimTasksWidget = nullptr; - delete ammTasksWidget_personal; delete fimTasksWidget_personal;