mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
внедрение мессенджера
This commit is contained in:
@@ -8,8 +8,9 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i
|
||||
id_trainee(id_trainee),
|
||||
ammTasksWidget_personal(nullptr),
|
||||
fimTasksWidget_personal(nullptr),
|
||||
ammTasksWidget(ammTasksWidgetIn),
|
||||
fimTasksWidget(fimTasksWidgetIn),
|
||||
ammTasksWidget_common(ammTasksWidgetIn),
|
||||
fimTasksWidget_common(fimTasksWidgetIn),
|
||||
messangerWidget(nullptr),
|
||||
ui(new Ui::PersonalCardTrainee)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
@@ -43,13 +44,32 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i
|
||||
// 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);
|
||||
ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget_common);
|
||||
ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget_common);
|
||||
|
||||
//connectorToServer->sendQueryTasksXML("fim");
|
||||
//connectorToServer->sendQueryTasksXML("amm");
|
||||
// fimTasksWidget->slot_NeedUpdateUI();
|
||||
// ammTasksWidget->slot_NeedUpdateUI();
|
||||
|
||||
|
||||
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);
|
||||
|
||||
messangerWidget->initialize(connectorToServer->getServerAuth().Id);
|
||||
|
||||
QList<Trainee> listTrainees;
|
||||
Trainee trainee = connectorToServer->getTrainee(id_trainee);
|
||||
listTrainees.append(trainee);
|
||||
messangerWidget->slot_InitMessanger(listTrainees);
|
||||
|
||||
ui->groupBox_Messenger->setMaximumWidth(600);
|
||||
ui->groupBox_Messenger->setMinimumWidth(600);
|
||||
}
|
||||
|
||||
PersonalCardTrainee::~PersonalCardTrainee()
|
||||
@@ -65,6 +85,8 @@ PersonalCardTrainee::~PersonalCardTrainee()
|
||||
delete ammTasksWidget_personal;
|
||||
delete fimTasksWidget_personal;
|
||||
|
||||
delete messangerWidget;
|
||||
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user