mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-27 19:45:43 +03:00
Завел контроллер Месанджера
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
#include "personalcardtrainee.h"
|
||||
#include "ui_personalcardtrainee.h"
|
||||
|
||||
PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, AMMtasksWidget* ammTasksWidgetIn, FIMtasksWidget* fimTasksWidgetIn, QWidget *parent) :
|
||||
PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, MessangerController* messangerController, int id_trainee, AMMtasksWidget* ammTasksWidgetIn, FIMtasksWidget* fimTasksWidgetIn, QWidget *parent) :
|
||||
QWidget(parent),
|
||||
connectorToServer(connectorToServer),
|
||||
messangerController(messangerController),
|
||||
id_trainee(id_trainee),
|
||||
ammTasksWidget_personal(nullptr),
|
||||
fimTasksWidget_personal(nullptr),
|
||||
@@ -32,15 +33,9 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i
|
||||
ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget_common);
|
||||
|
||||
/* 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);
|
||||
messangerWidget = messangerController->newWidget(this);
|
||||
|
||||
//ui->verticalLayout_Messenger->addWidget(messangerWidget);
|
||||
|
||||
messangerWidget->initialize(connectorToServer->getServerAuth().Id);
|
||||
ui->verticalLayout_Messenger->addWidget(messangerWidget);
|
||||
|
||||
QList<Trainee> listTrainees;
|
||||
Trainee trainee = connectorToServer->getTrainee(id_trainee);
|
||||
@@ -57,7 +52,8 @@ PersonalCardTrainee::~PersonalCardTrainee()
|
||||
delete ammTasksWidget_personal;
|
||||
delete fimTasksWidget_personal;
|
||||
|
||||
delete messangerWidget;
|
||||
//delete messangerWidget;
|
||||
messangerController->deleteWidget(messangerWidget);
|
||||
|
||||
delete ui;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user