diff --git a/DataBaseLMS/instructor.cpp b/DataBaseLMS/instructor.cpp index 35545b6..78d1952 100644 --- a/DataBaseLMS/instructor.cpp +++ b/DataBaseLMS/instructor.cpp @@ -1,8 +1,8 @@ #include "instructor.h" Instructor::Instructor(): - User(), - isAdmin() + User()//, + //isAdmin() { TypeUserDB = User::TypeUserDBInstructor; } diff --git a/DataBaseLMS/instructor.h b/DataBaseLMS/instructor.h index bf66806..551aaa5 100644 --- a/DataBaseLMS/instructor.h +++ b/DataBaseLMS/instructor.h @@ -12,7 +12,7 @@ public: bool getIsAdmin(){return isAdmin;} private: - bool isAdmin; + //bool isAdmin; }; #endif // INSTRUCTOR_H diff --git a/DataBaseLMS/user.cpp b/DataBaseLMS/user.cpp index b1cae78..abe8ea1 100644 --- a/DataBaseLMS/user.cpp +++ b/DataBaseLMS/user.cpp @@ -9,7 +9,8 @@ User::User(): password(), archived(), loggedIn(), - TypeUserDB() + TypeUserDB(), + isAdmin(false) { } diff --git a/DataBaseLMS/user.h b/DataBaseLMS/user.h index bf980f3..2c697e5 100644 --- a/DataBaseLMS/user.h +++ b/DataBaseLMS/user.h @@ -32,6 +32,8 @@ private: bool loggedIn; protected: QString TypeUserDB; + + bool isAdmin; }; #endif // USER_H diff --git a/InstructorsAndTrainees/messanger/messangerwidget.cpp b/InstructorsAndTrainees/messanger/messangerwidget.cpp index 4222735..ca4409e 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.cpp +++ b/InstructorsAndTrainees/messanger/messangerwidget.cpp @@ -3,6 +3,7 @@ #include #include #include +#include "instructor.h" #include "messangerwidget.h" #include "ui_messangerwidget.h" @@ -74,14 +75,6 @@ void MessangerWidget::addTabDialogMessenger(User user) oneDialogMessenger = new OneDialogMessenger(QString::number(user.getID()), user.getTypeUserDB(), this); - //Добавляем новую вкладку диалога - QString typeUserStr = ""; - if(user.getTypeUserDB() == User::TypeUserDBTrainee) - typeUserStr = tr("Trainee"); - else if(user.getTypeUserDB() == User::TypeUserDBInstructor) - typeUserStr = tr("Instructor"); - //int index = ui->tabWidget->addTab(oneDialogMessenger, typeUserStr + ": " + user.getName() + " (" + user.getLogin() + ")"); - ui->verticalLayout_ListMsg->addWidget(oneDialogMessenger); //Обновляем заголовок @@ -103,25 +96,30 @@ void MessangerWidget::updateHeader(User user) { //Обновляем статус залогинивания if(user.getLoggedIn()) - { - //ui->tabWidget->setTabIcon(0, QIcon(":/resources/icons/circleGreen.png")); - ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGreen.png"))); + else + ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png"))); + + + QString typeUserStr = ""; + + if(user.getTypeUserDB() == User::TypeUserDBTrainee) + { + ui->lblAvatar->setPixmap(QPixmap(QStringLiteral(":/resources/icons/trainee.png"))); + + typeUserStr = tr("Trainee"); } else { - //ui->tabWidget->setTabIcon(0, QIcon(":/resources/icons/circleGray.png")); + if(static_cast(&user)->getIsAdmin()) + ui->lblAvatar->setPixmap(QPixmap(QStringLiteral(":/resources/icons/admin.png"))); + else + ui->lblAvatar->setPixmap(QPixmap(QStringLiteral(":/resources/icons/instructor.png"))); - ui->lblLoggedIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png"))); + typeUserStr = tr("Instructor"); } - QString typeUserStr = ""; - if(user.getTypeUserDB() == User::TypeUserDBTrainee) - typeUserStr = tr("Trainee"); - else if(user.getTypeUserDB() == User::TypeUserDBInstructor) - typeUserStr = tr("Instructor"); QString fullName = typeUserStr + ": " + user.getName() + " (" + user.getLogin() + ")"; - ui->lblUser->setText(fullName); } diff --git a/InstructorsAndTrainees/messanger/messangerwidget.ui b/InstructorsAndTrainees/messanger/messangerwidget.ui index d42b54b..88234f4 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.ui +++ b/InstructorsAndTrainees/messanger/messangerwidget.ui @@ -29,6 +29,38 @@ + + + + + 0 + 0 + + + + + 32 + 32 + + + + + 32 + 32 + + + + TextLabel + + + + + + + TextLabel + + + @@ -57,13 +89,6 @@ - - - - TextLabel - - -