Refact common

InstructorsAndTrainees/commonview.cpp

@@ -28,7 +28,6 @@ CommonView::CommonView(ConnectorToServer* connectorToServer, TypeView type, QWid
 
     waitAnimationWidget = new WaitAnimationWidget;
     QMovie *movie = new QMovie(":/resources/icons/762.gif");
-    //waitAnimationWidget->setParent(this);
     waitAnimationWidget->initialize(movie,this);
 }
 

InstructorsAndTrainees/connectorToServer/connectortoserver.cpp

@@ -226,7 +226,8 @@ bool ConnectorToServer::isArchivedInstructor(int id)
     {
         if(instructor.getID() == id)
         {
-            if(instructor.getArchived()) return true; else return false;
+            if(instructor.getArchived()) return true;
+            else return false;
         }
     }
     return false;
@@ -238,7 +239,8 @@ bool ConnectorToServer::isAdminInstructor(int id)
     {
         if(instructor.getID() == id)
         {
-            if(instructor.getIsAdmin()) return true; else return false;
+            if(instructor.getIsAdmin()) return true;
+            else return false;
         }
     }
     return false;
@@ -250,7 +252,8 @@ bool ConnectorToServer::isLoggedInInstructor(int id)
     {
         if(instructor.getID() == id)
         {
-            if(instructor.getLoggedIn()) return true; else return false;
+            if(instructor.getLoggedIn()) return true;
+            else return false;
         }
     }
     return false;
@@ -283,7 +286,8 @@ bool ConnectorToServer::isArchivedTrainee(int id)
     {
         if(trainee.getID() == id)
         {
-            if(trainee.getArchived()) return true; else return false;
+            if(trainee.getArchived()) return true;
+            else return false;
         }
     }
     return false;
@@ -295,7 +299,8 @@ bool ConnectorToServer::isLoggedInTrainee(int id)
     {
         if(trainee.getID() == id)
         {
-            if(trainee.getLoggedIn()) return true; else return false;
+            if(trainee.getLoggedIn()) return true;
+            else return false;
         }
     }
     return false;
@@ -437,15 +442,14 @@ void ConnectorToServer::slot_sendMessage(ClientMessage clientMessage)
      sendMessage(clientMessage);
 }
 
-void ConnectorToServer::showServerList(QList<StreamingVersionData *> *serverList)
+void ConnectorToServer::slot_showServerList(QList<StreamingVersionData *> *serverList)
 {
     versionSelectWidget->fillView(serverList);
 }
 
 void ConnectorToServer::slot_HashReady()
 {
-    //sendQueryTasksXML("fim");
+
-    //sendQueryTasksXML("amm");
 }
 
 void ConnectorToServer::slot_Auth(ServerAuthorization *serverAuth)
@@ -476,7 +480,7 @@ void ConnectorToServer::bindConnection()
     connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::slot_Auth);
     connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult);
     connect(recognizeSystem,&RecognizeSystem::signal_ReceiveMessage,this,&ConnectorToServer::signal_receiveMessage,Qt::AutoConnection);
-    connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::showServerList);
+    connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::slot_showServerList);
     connect (recognizeSystem,&RecognizeSystem::sigSetVersion,versionContainer,&VersionContainer::setServerVersionData);
 
     connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors);

InstructorsAndTrainees/connectorToServer/connectortoserver.h

@@ -88,7 +88,7 @@ public slots:
     void slot_AnswerQueryTasksXML_AMM(QByteArray array);
 
     void slot_sendMessage(ClientMessage clientMessage);
-    void showServerList(QList<StreamingVersionData*> *serverList);
+    void slot_showServerList(QList<StreamingVersionData*> *serverList);
 
     void slot_HashReady();
 

InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h

@@ -29,9 +29,7 @@ public:
 
 private slots:
     void on_btnLogIn_clicked();
-
     void on_btnViewPassword_pressed();
-
     void on_btnViewPassword_released();
 
 private:

InstructorsAndTrainees/instructors/editorinstructors.ui

@@ -30,7 +30,7 @@
        <item>
         <widget class="QToolButton" name="btnNewInstructor">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -68,7 +68,7 @@
        <item>
         <widget class="QToolButton" name="btnDeleteInstructor">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -105,6 +105,12 @@
        </item>
        <item>
         <widget class="QToolButton" name="btnToOrFromArchive">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize">
           <size>
            <width>160</width>
@@ -138,7 +144,7 @@
        <item>
         <widget class="QToolButton" name="btnEdit">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -189,7 +195,7 @@
        <item>
         <widget class="QToolButton" name="btnArchive">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>

InstructorsAndTrainees/instructors/viewerinstructors.h

@@ -26,14 +26,9 @@ public:
 protected:
     void changeEvent(QEvent * event) override;
 
-Q_SIGNALS:
-    //сигнал о блокировке авторизации
-    //void signal_BlockAutorization(bool block);
-
 public Q_SLOTS:
     void on_btnEditorInstructors_clicked();
 
-public slots:
     void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column);
 
 Q_SIGNALS:

InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -49,8 +49,6 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     viewerInstructors = new ViewerInstructors(connectorToServer, this);
     connect(this, &InstructorsAndTraineesWidget::signal_NeedUpdateUI, viewerTrainees, &ViewerTrainees::slot_NeedUpdateUI);
     connect(this, &InstructorsAndTraineesWidget::signal_NeedUpdateUI, viewerInstructors, &ViewerInstructors::slot_NeedUpdateUI);
-    //connect(viewerInstructors, &ViewerInstructors::signal_BlockAutorization, this, &InstructorsAndTraineesWidget::signal_BlockAutorization);
-    //connect(viewerTrainees, &ViewerTrainees::signal_BlockAutorization, this, &InstructorsAndTraineesWidget::signal_BlockAutorization);
 
     connect(connectorToServer, &ConnectorToServer::signal_ConnectedToServer, this, &InstructorsAndTraineesWidget::slot_ConnectedToServer);
 

InstructorsAndTrainees/instructorsandtraineeswidget.h

@@ -59,8 +59,6 @@ Q_SIGNALS:
     void signal_LanguageChanged(QString language);
     //сигнал о необходимости обновления интерфейса
     void signal_NeedUpdateUI(bool treeInstructor, bool treeTrainee);
-    //сигнал о блокировке авторизации
-    //void signal_BlockAutorization(bool block);
 
 private Q_SLOTS:
     void on_btnConnectionToServer_clicked();

InstructorsAndTrainees/specialmessagebox.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_Text">
        <item>
         <widget class="QLabel" name="lbl_icon">
          <property name="minimumSize">
@@ -76,7 +76,7 @@
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QHBoxLayout" name="horizontalLayout_Btn">
        <item>
         <widget class="QPushButton" name="btnYes">
          <property name="sizePolicy">

InstructorsAndTrainees/tasks/ammtaskswidget.ui

@@ -27,7 +27,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>

InstructorsAndTrainees/tasks/fimtaskswidget.ui

@@ -21,7 +21,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>

InstructorsAndTrainees/trainees/dialogeditgroup.ui

@@ -23,7 +23,7 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QHBoxLayout" name="horizontalLayout_Name">
        <item>
         <widget class="QLabel" name="label_2">
          <property name="font">
@@ -61,7 +61,7 @@
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_Btn">
        <item>
         <widget class="QPushButton" name="btnOK">
          <property name="sizePolicy">

InstructorsAndTrainees/trainees/editortrainees.cpp

@@ -58,52 +58,6 @@ void EditorTrainees::on_btnNewGroup_clicked()
     }
 
     return;
-    /*
-    if(int id_group = dbLMS->newGroup())
-    {
-        loadTraineesFromDB();
-        setCurrentGroup(id_group);
-
-        DialogEditGroup dlg(this);
-
-        Group group = dbLMS->getGroup(id_group);
-        if(group.getID() == 0)
-            return;
-
-        dlg.setGroup(group);
-
-        while (true)
-        {
-            switch( dlg.exec() )
-            {
-            case QDialog::Accepted:
-            {
-                Group group_edit = dlg.getGroup();
-
-                if(int id_edit = dbLMS->editGroup(group_edit))
-                {//Отредактировано
-                    loadTraineesFromDB();
-                    setCurrentGroup(id_edit);
-                    return;
-                }
-                else
-                {
-                    dlg.setGroup(group_edit);
-                    continue;
-                }
-
-            }
-            case QDialog::Rejected:
-                dbLMS->delGroup(id_group);
-                loadTraineesFromDB();
-                return;
-            default:
-                dbLMS->delGroup(id_group);
-                loadTraineesFromDB();
-                return;
-            }
-        }
-    }*/
 }
 
 void EditorTrainees::on_btnDeleteGroup_clicked()

InstructorsAndTrainees/trainees/personalcardtrainee.cpp

@@ -19,6 +19,8 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, M
 
     ui->lblName->setObjectName("PersonalCard_lblName");
 
+    ui->lblLoginIn->setVisible(false);
+
     ammTasksWidget_personal = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
     fimTasksWidget_personal = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
 

InstructorsAndTrainees/trainees/personalcardtrainee.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
+      <layout class="QVBoxLayout" name="verticalLayout_TraineeChat">
        <item>
         <widget class="QGroupBox" name="groupBox_Trainee">
          <property name="sizePolicy">
@@ -30,8 +30,29 @@
           <string>Trainee</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
+          <item row="3" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_AssAMM">
+            <item>
+             <widget class="QLabel" name="label_10">
+              <property name="text">
+               <string>Assigned AMM</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="lblCntAMM">
+              <property name="text">
+               <string>0</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
           <item row="1" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_7">
+           <layout class="QHBoxLayout" name="horizontalLayout_Name">
             <item>
              <widget class="QLabel" name="lblName">
               <property name="text">
@@ -60,71 +81,8 @@
             </item>
            </layout>
           </item>
-          <item row="5" column="0">
+          <item row="6" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <layout class="QHBoxLayout" name="horizontalLayout_Simulator">
-            <item>
-             <widget class="QLabel" name="label_13">
-              <property name="text">
-               <string>Last login</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="lblLoginTime">
-              <property name="text">
-               <string>0</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="3" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <item>
-             <widget class="QLabel" name="label_11">
-              <property name="text">
-               <string>Assigned FIM</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="lblCntFIM">
-              <property name="text">
-               <string>0</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="2" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_6">
-            <item>
-             <widget class="QLabel" name="label_10">
-              <property name="text">
-               <string>Assigned AMM</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="lblCntAMM">
-              <property name="text">
-               <string>0</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="4" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
             <item>
              <widget class="QLabel" name="label_12">
               <property name="text">
@@ -144,8 +102,8 @@
             </item>
            </layout>
           </item>
-          <item row="6" column="0">
+          <item row="8" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <layout class="QHBoxLayout" name="horizontalLayout_Exit">
             <item>
              <widget class="QLabel" name="label_14">
               <property name="text">
@@ -165,6 +123,62 @@
             </item>
            </layout>
           </item>
+          <item row="2" column="0">
+           <widget class="Line" name="line_1">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_AssFIM">
+            <item>
+             <widget class="QLabel" name="label_11">
+              <property name="text">
+               <string>Assigned FIM</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="lblCntFIM">
+              <property name="text">
+               <string>0</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="7" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_Login">
+            <item>
+             <widget class="QLabel" name="label_13">
+              <property name="text">
+               <string>Last login</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="lblLoginTime">
+              <property name="text">
+               <string>0</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="5" column="0">
+           <widget class="Line" name="line_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -183,7 +197,7 @@
       </layout>
      </item>
      <item>
-      <widget class="QGroupBox" name="groupBox_2">
+      <widget class="QGroupBox" name="groupBox_Tasks">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
@@ -197,9 +211,9 @@
         <item row="0" column="0">
          <widget class="QTabWidget" name="tabWidget">
           <property name="currentIndex">
-           <number>0</number>
+           <number>1</number>
           </property>
-          <widget class="QWidget" name="tab">
+          <widget class="QWidget" name="tab_AMM">
            <attribute name="title">
             <string>AMM</string>
            </attribute>
@@ -211,7 +225,7 @@
                 <item>
                  <layout class="QVBoxLayout" name="verticalLayout_AMMcommon">
                   <item>
-                   <widget class="QLabel" name="label">
+                   <widget class="QLabel" name="label_1">
                     <property name="text">
                      <string>List</string>
                     </property>
@@ -236,7 +250,7 @@
             </item>
            </layout>
           </widget>
-          <widget class="QWidget" name="tab_2">
+          <widget class="QWidget" name="tab_FIM">
            <attribute name="title">
             <string>FIM</string>
            </attribute>

InstructorsAndTrainees/trainees/traineesview.cpp

@@ -44,8 +44,6 @@ void TraineesView::loadTraineesFromDB()
         ItemGroup->setIcon(ColumnsTreeUsers::clmn_Name, QIcon(QStringLiteral(":/resources/icons/group.png")));
         setItemColor(ItemGroup, QColor(220, 220, 220));
 
-        //ItemGroup->set Property("greenButton", QVariant(true));
-        //((QAbstractItemView*)ItemGroup)->setIconSize(QSize(32, 32));
 
         //Обучаемые
         for(Trainee trainee : listTrainees)

InstructorsAndTrainees/trainees/viewertrainees.h

@@ -30,12 +30,7 @@ public:
 protected:
     void changeEvent(QEvent * event) override;
 
-Q_SIGNALS:
-    //сигнал о блокировке авторизации
-    //void signal_BlockAutorization(bool block);
-
 public Q_SLOTS:
-    //void on_treeWidget_itemClicked(QTreeWidgetItem *item, int column);
     void on_btnEditorTrainees_clicked();
     void on_btnPersonalCard_clicked();
 private Q_SLOTS: