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

Завел контроллер Месанджера

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-03 17:24:36 +03:00
parent e9b571aa81
commit 5e834b582f
11 changed files with 178 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
InstructorsAndTrainees/trainees/personalcardtrainee.cpp
View File

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

4
InstructorsAndTrainees/trainees/personalcardtrainee.h
View File

@@ -5,6 +5,7 @@
#include "ammtaskswidget.h"
#include "fimtaskswidget.h"
#include "messangerwidget.h"
#include "messangercontroller.h"
#include <QWidget>
namespace Ui {
@@ -17,7 +18,7 @@ class PersonalCardTrainee : public QWidget
public:
//explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent = nullptr);
explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, QWidget *parent = nullptr);
explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, MessangerController* messangerController, int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, QWidget *parent = nullptr);
~PersonalCardTrainee();
private:
@@ -25,6 +26,7 @@ private:
private:
ConnectorToServer* connectorToServer;
MessangerController* messangerController;
int id_trainee;
AMMtasksWidget* ammTasksWidget_personal;

5
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -3,12 +3,13 @@
#include "personalcardtrainee.h"
#include "ui_viewertrainees.h"
ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent) :
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),
ui(new Ui::ViewerTrainees)
{
ui->setupUi(this);
@@ -197,7 +198,7 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
int id_trainee = connectorToServer->getIdTraineeByLogin(login);
PersonalCardTrainee cardTrainee(connectorToServer, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
PersonalCardTrainee cardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
QDialog* dialog = new QDialog(this);
QHBoxLayout *layout = new QHBoxLayout(dialog);

5
InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -4,6 +4,7 @@
#include "traineesview.h"
#include "ammtaskswidget.h"
#include "fimtaskswidget.h"
#include "messangercontroller.h"
namespace Ui {
class ViewerTrainees;
@@ -16,7 +17,7 @@ class ViewerTrainees : public TraineesView
Q_OBJECT
public:
explicit ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
explicit ViewerTrainees(ConnectorToServer* connectorToServer, MessangerController* messangerController, QWidget *parent = nullptr);
~ViewerTrainees();
public:
@@ -59,6 +60,8 @@ private:
AMMtasksWidget* ammTasksWidgetCommon;
FIMtasksWidget* fimTasksWidgetCommon;
MessangerController* messangerController;
private:
Ui::ViewerTrainees *ui;
};