Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Полуработающий мессенгер

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-03 11:49:48 +03:00
parent 179026d4ca
commit e9b571aa81
1 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
InstructorsAndTrainees/trainees/personalcardtrainee.cpp
View File

@@ -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;