diff --git a/InstructorsAndTrainees/messanger/messangerwidget.cpp b/InstructorsAndTrainees/messanger/messangerwidget.cpp index ca4409e..7e838ce 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.cpp +++ b/InstructorsAndTrainees/messanger/messangerwidget.cpp @@ -73,7 +73,7 @@ void MessangerWidget::addTabDialogMessenger(User user) if(!oneDialogMessenger) {//Диалога еще не существует - oneDialogMessenger = new OneDialogMessenger(QString::number(user.getID()), user.getTypeUserDB(), this); + oneDialogMessenger = new OneDialogMessenger(user, this); ui->verticalLayout_ListMsg->addWidget(oneDialogMessenger); diff --git a/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp b/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp index a10bb88..24afdf3 100644 --- a/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp +++ b/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp @@ -2,15 +2,13 @@ #include "tabdialogmessenger.h" #include "msgwidget.h" #include "user.h" +#include "instructor.h" -OneDialogMessenger::OneDialogMessenger(QString userId, QString typeUserDB, QWidget *parent): - QListWidget(parent), - userId(""), - typeUserDB("") +OneDialogMessenger::OneDialogMessenger(User user, QWidget *parent): + QListWidget(parent) { - this->userId = userId; - this->typeUserDB = typeUserDB; + this->user = user; setWordWrap(true); setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn); @@ -38,7 +36,6 @@ void OneDialogMessenger::addMsgWidget(QString text, QString timeStr, MsgWidget:: QString avatar = ""; MsgWidget::AligneAvatar aligneAvatar = MsgWidget::AligneAvatar::Left; - //TODO уточнить аватарки! if(direction == MsgWidget::DirectionMsg::Outgoing) {//Исходящее avatar = ":/resources/icons/instructor.png"; @@ -46,10 +43,15 @@ void OneDialogMessenger::addMsgWidget(QString text, QString timeStr, MsgWidget:: } else {//Входящее - if(typeUserDB == User::TypeUserDBTrainee) + if(user.getTypeUserDB() == User::TypeUserDBTrainee) avatar = ":/resources/icons/trainee.png"; else - avatar = ":/resources/icons/instructor.png"; + { + if(static_cast(&user)->getIsAdmin()) + avatar = ":/resources/icons/admin.png"; + else + avatar = ":/resources/icons/instructor.png"; + } aligneAvatar = MsgWidget::AligneAvatar::Right; } diff --git a/InstructorsAndTrainees/messanger/tabdialogmessenger.h b/InstructorsAndTrainees/messanger/tabdialogmessenger.h index 2c80c50..3c5199a 100644 --- a/InstructorsAndTrainees/messanger/tabdialogmessenger.h +++ b/InstructorsAndTrainees/messanger/tabdialogmessenger.h @@ -3,16 +3,17 @@ #include #include "msgwidget.h" +#include "user.h" class OneDialogMessenger : public QListWidget { Q_OBJECT public: - OneDialogMessenger(QString userId, QString typeUserDB, QWidget *parent = nullptr); + OneDialogMessenger(User user, QWidget *parent = nullptr); ~OneDialogMessenger(); - QString getUserId() {return userId;} + int getUserId() {return user.getID();} void addMsgWidgetLocal(QString text, QString timeStr = ""); void addMsgWidgetRemote(QString text, QString timeStr = ""); @@ -21,8 +22,7 @@ private: void addMsgWidget(QString text, QString timeStr, MsgWidget::DirectionMsg direction); private: - QString userId; - QString typeUserDB; + User user; }; #endif // TABDIALOGMESSENGER_H