Рефакт1 Интерфейса

DataBaseLMS/instructor.cpp

@@ -4,5 +4,5 @@ Instructor::Instructor():
     User(),
     isAdmin()
 {
-
+    TypeUserDB = User::TypeUserDBInstructor;
 }

DataBaseLMS/trainee.cpp

@@ -6,7 +6,7 @@ Trainee::Trainee():
     computer(),
     timing(0)
 {
-
+    TypeUserDB = User::TypeUserDBTrainee;
 }
 
 void Trainee::setTiming(TimingOfTrainee timing)

DataBaseLMS/user.cpp

@@ -1,11 +1,15 @@
 #include "user.h"
 
+const QString User::TypeUserDBInstructor = "instructor";
+const QString User::TypeUserDBTrainee = "trainee";
+
 User::User():
     BasicEntity(),
     login(),
     password(),
     archived(),
-    loggedIn()
+    loggedIn(),
+    TypeUserDB()
 {
 
 }

DataBaseLMS/user.h

@@ -5,6 +5,9 @@
 
 class DATABASELMS_EXPORT User: public BasicEntity
 {
+public:
+    static const QString TypeUserDBInstructor;
+    static const QString TypeUserDBTrainee;
 public:
     User();
 
@@ -20,11 +23,15 @@ public:
     void setLoggedIn(bool loggedIn){this->loggedIn = loggedIn;}
     bool getLoggedIn(){return loggedIn;}
 
+    QString getTypeUserDB(){return TypeUserDB;}
+
 private:
     QString login;
     QString password;
     bool archived;
     bool loggedIn;
+protected:
+    QString TypeUserDB;
 };
 
 #endif // USER_H

InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -276,7 +276,7 @@ void InstructorsAndTraineesWidget::slot_instructorSelected(QString login)
 
     /* Messanger*/
     messangerController->deleteWidget(messangerWidget);
-    if(login != "")
+    if(login != "" && login != loginInstructorLoggedInLocal)
     {
         Instructor instructor = connectorToServer->getInstructor(connectorToServer->getIdInstructorByLogin(login));
         if(instructor.getID())

InstructorsAndTrainees/messanger/messangerwidget.cpp

@@ -19,6 +19,7 @@ MessangerWidget::MessangerWidget(QWidget *parent) :
     ui->tabWidget->removeTab(0);
 
     ui->btnSend->setObjectName("btnSend");
+    ui->editMsg->setObjectName("editMsg");
 }
 
 MessangerWidget::~MessangerWidget()
@@ -75,7 +76,12 @@ void MessangerWidget::addTabDialogMessenger(User user)
         tabDialogMessenger = new TabDialogMessenger(user.getLogin(), QString::number(user.getID()), this);
 
         //Добавляем новую вкладку диалога
-        int index = ui->tabWidget->addTab(tabDialogMessenger, tr("User") + ": " + user.getName() + " (" + user.getLogin() + ")");
+        QString typeUserStr = "";
+        if(user.getTypeUserDB() == User::TypeUserDBTrainee)
+            typeUserStr = tr("Trainee");
+        else if(user.getTypeUserDB() == User::TypeUserDBInstructor)
+            typeUserStr = tr("Instructor");
+        int index = ui->tabWidget->addTab(tabDialogMessenger, typeUserStr + ": " + user.getName() + " (" + user.getLogin() + ")");
 
         //Обновляем статус залогинивания
         updateLoggedIn(user.getLoggedIn());

InstructorsAndTrainees/messanger/messangerwidget.ui

@@ -66,7 +66,7 @@
        <item>
         <widget class="QTextEdit" name="editMsg">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -74,13 +74,13 @@
          <property name="minimumSize">
           <size>
            <width>0</width>
-           <height>50</height>
+           <height>54</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>16777215</width>
-           <height>1000</height>
+           <height>54</height>
           </size>
          </property>
         </widget>
@@ -90,7 +90,7 @@
          <item>
           <widget class="QToolButton" name="btnSend">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+            <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -98,13 +98,13 @@
            <property name="minimumSize">
             <size>
              <width>65</width>
-             <height>58</height>
+             <height>54</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>1000</width>
-             <height>1000</height>
+             <height>54</height>
             </size>
            </property>
            <property name="text">

InstructorsAndTrainees/tasks/ammtaskswidget.cpp

@@ -257,7 +257,7 @@ void AMMtasksWidget::reSetHeadTreeWidget()
     if(type == TypeListTreeAMMFIM::listForTrainee)
         listHeaders = QStringList{tr("Task AMM"), tr("DM code"), tr("ID"), tr("Status")};
     else
-        listHeaders = QStringList{tr("PM/DM"), tr("Code"), tr("ID"), tr("Status")};
+        listHeaders = QStringList{tr("Task AMM"), tr("DM code"), tr("ID"), tr("Status")};
 
 
     treeWidget->setHeaderLabels(listHeaders);

InstructorsAndTrainees/tasks/fimtaskswidget.cpp

@@ -288,7 +288,7 @@ void FIMtasksWidget::reSetHeadTreeWidget()
     if(type == TypeListTreeAMMFIM::listForTrainee)
         listHeaders = QStringList{tr("Task FIM"), tr("ID"), tr("Status")};
     else
-        listHeaders = QStringList{tr("Title"), tr("ID"), tr("Status")};
+        listHeaders = QStringList{tr("Task FIM"), tr("ID"), tr("Status")};
 
     treeWidget->setHeaderLabels(listHeaders);
 }

InstructorsAndTrainees/trainees/personalcardtrainee.ui

@@ -169,7 +169,13 @@
          </property>
          <layout class="QGridLayout" name="gridLayout_6">
           <item row="0" column="0">
-           <layout class="QVBoxLayout" name="verticalLayout_Messenger"/>
+           <widget class="QWidget" name="widget_Messenger" native="true">
+            <layout class="QGridLayout" name="gridLayout_7">
+             <item row="0" column="0">
+              <layout class="QVBoxLayout" name="verticalLayout_Messenger"/>
+             </item>
+            </layout>
+           </widget>
           </item>
          </layout>
         </widget>