Рефакт

GUIdataBaseLMS/CMakeLists.txt

@@ -7,7 +7,7 @@ main.cpp
 mainwindow.cpp
 mainwindow.h
 mainwindow.ui
-testDBpgSQL.qrc
+GUIdataBaseLMS.qrc
 )
 
 target_link_libraries(GUIdataBaseLMS PRIVATE Qt5::Widgets)

GUIdataBaseLMS/StaticData/authData.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AuthData Login="admin" Password="admin" InstructorName="Администратор" ClientName="Администратор" AccessType="instructor"/>

GUIdataBaseLMS/StaticData/settings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ServerSettingsContainer>
-    <ServerSettings Address="192.168.100.87" Port="6000" Language="RUS" AutoStart="0"/>
-</ServerSettingsContainer>

GUIdataBaseLMS/StaticData/temp.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ClientDeAutorization Login="admin"/>

GUIdataBaseLMS/mainwindow.cpp

@@ -14,7 +14,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     instructorsAndTraineesWidget = new InstructorsAndTraineesWidget(this);
 
-    connect(instructorsAndTraineesWidget,&InstructorsAndTraineesWidget::signal_LanguageChanged,this,&MainWindow::slot_LanguageChanged);
+    connect(instructorsAndTraineesWidget, &InstructorsAndTraineesWidget::signal_LanguageChanged, this, &MainWindow::slot_LanguageChanged);
 
     ui->horizontalLayout->addWidget(instructorsAndTraineesWidget);
 
@@ -22,16 +22,8 @@ MainWindow::MainWindow(QWidget *parent)
     this->showNormal();
     //this->showMaximized();
 
-    if(instructorsAndTraineesWidget->getLanguage() == "ENG")
+    qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + instructorsAndTraineesWidget->getLanguage(), ".");
-    {
-        qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + "en_EN", ".");
     qApp->installTranslator(&qtLanguageTranslator);
-    }
-    else
-    {
-        qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + "ru_RU", ".");
-        qApp->installTranslator(&qtLanguageTranslator);
-    }
 }
 
 MainWindow::~MainWindow()

GUIdataBaseLMS/mainwindow.ui

@@ -10,11 +10,16 @@
     <height>600</height>
    </rect>
   </property>
+  <property name="font">
+   <font>
+    <family>Tahoma</family>
+   </font>
+  </property>
   <property name="windowTitle">
    <string>Learning management system (LMS)</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="testDBpgSQL.qrc">
+   <iconset resource="GUIdataBaseLMS.qrc">
     <normaloff>:/resources/lms.png</normaloff>:/resources/lms.png</iconset>
   </property>
   <property name="toolButtonStyle">
@@ -42,7 +47,7 @@
   </widget>
  </widget>
  <resources>
-  <include location="testDBpgSQL.qrc"/>
+  <include location="GUIdataBaseLMS.qrc"/>
  </resources>
  <connections/>
 </ui>

GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.ts

@@ -4,7 +4,7 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="14"/>
+        <location filename="../mainwindow.ui" line="19"/>
         <source>Learning management system (LMS)</source>
         <translation>Система управления обучением (СУО)</translation>
     </message>

InstructorsAndTrainees/CMakeLists.txt

@@ -93,8 +93,6 @@ add_library(InstructorsAndTrainees SHARED
   tasks/dialogchecktask.cpp
   tasks/dialogchecktask.h
   tasks/dialogchecktask.ui
-  #tasks/tasksAmmFim.cpp
-  #tasks/tasksAmmFim.h
   widgets/newversionwidget.cpp
   widgets/newversionwidget.h
   widgets/newversionwidget.ui

InstructorsAndTrainees/dialogsettings.cpp

@@ -58,12 +58,6 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru
     if(connectorToServer)
         if(connectorToServer->getIsConnected())
         {
-            /*
-            ui->editAddress->setEnabled(false);
-            ui->editPort->setEnabled(false);
-            ui->checkAutoStart->setEnabled(false);
-            */
-
             if(instructorIsLogged)
                 ui->btnSetVersion->setEnabled(true);
         }
@@ -73,14 +67,6 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru
 
     ui->btnSave->setEnabled(false);
     flSettingsServerChanged = false;
-
-    /*
-    if(settings->Language == "ENG")
-        qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + "en_EN", ".");
-    else
-        qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + "ru_RU", ".");
-    qApp->installTranslator(&qtLanguageTranslator);
-    */
 }
 
 DialogSettings::~DialogSettings()
@@ -103,11 +89,6 @@ void DialogSettings::changeEvent(QEvent *event)
     }
 }
 
-void DialogSettings::on_cmbLanguage_currentIndexChanged(const QString &arg1)
-{
-
-}
-
 void DialogSettings::on_btnUpdateStyle_clicked()
 {
     emit signal_UpdateStyleSheet();
@@ -207,22 +188,9 @@ void DialogSettings::on_btnSave_clicked()
 
     saveSettings();
 
-    /*
-    QString language;
-
-    if(settings->Language == "ENG")
-        language = QString("en_EN");
-    else
-        language = QString("ru_RU");
-
-    emit signal_LanguageChanged(language);
-    */
-
     this->accept();
 }
 
-
-
 void DialogSettings::on_btnSetVersion_clicked()
 {
     if(connectorToServer)
@@ -247,11 +215,6 @@ void DialogSettings::on_editPort_textChanged(const QString &arg1)
     flSettingsServerChanged = true;
 }
 
-void DialogSettings::on_DialogSettings_rejected()
-{
-
-}
-
 void DialogSettings::on_DialogSettings_accepted()
 {
     QString language;

InstructorsAndTrainees/dialogsettings.h

@@ -35,21 +35,12 @@ signals:
     void signal_UpdateStyleSheet();
 
 private slots:
-    void on_cmbLanguage_currentIndexChanged(const QString &arg1);
     void on_btnUpdateStyle_clicked();
-
     void on_btnSave_clicked();
-
-    void on_DialogSettings_rejected();
-
     void on_btnSetVersion_clicked();
-
     void on_cmbLanguage_currentIndexChanged(int index);
-
     void on_editAddress_textChanged(const QString &arg1);
-
     void on_editPort_textChanged(const QString &arg1);
-
     void on_DialogSettings_accepted();
 
 private:    

InstructorsAndTrainees/dialogsettings.ui

@@ -46,7 +46,7 @@
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_Language">
             <item>
-             <widget class="QLabel" name="label">
+             <widget class="QLabel" name="label_Language">
               <property name="text">
                <string>Language</string>
               </property>

InstructorsAndTrainees/instructors/editorinstructors.cpp

@@ -9,6 +9,10 @@ EditorInstructors::EditorInstructors(ConnectorToServer* connectorToServer, bool
 {
     ui->setupUi(this);
 
+    ui->btnDeleteInstructor->setEnabled(false);
+    ui->btnToOrFromArchive->setEnabled(false);
+    ui->btnEdit->setEnabled(false);
+
     connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorInstructors::on_treeWidget_currentItemChanged);
 
     ui->verticalLayout_1->addWidget(treeWidget);

InstructorsAndTrainees/instructors/viewerinstructors.cpp

@@ -88,7 +88,7 @@ void ViewerInstructors::on_treeWidget_itemClicked(QTreeWidgetItem *item, int col
 
             lastCurrentID = newCurrentID;
 
-            Q_EMIT signal_instructorSelected(login);
+            Q_EMIT signal_instructorSelected(newCurrentID);
         }
     }
 }

InstructorsAndTrainees/instructors/viewerinstructors.h

@@ -37,7 +37,7 @@ public slots:
 
 Q_SIGNALS:
     //сигнал о выборе инструктора
-    void signal_instructorSelected(QString login);
+    void signal_instructorSelected(int id_instructor);
 
 private:
     void updateButtons() override;

InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -5,6 +5,11 @@
 #include "dialogauthorizationinstructor.h"
 #include "dialogsettings.h"
 
+
+const QString InstructorsAndTraineesWidget::languageENG = "en_EN";
+const QString InstructorsAndTraineesWidget::languageRUS = "ru_RU";
+
+
 InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     QWidget(parent),    
     connectorToServer(nullptr),
@@ -15,18 +20,13 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     adminMode(false),
     loginInstructorLoggedInLocal(QStringLiteral("")),
     nameInstructorLoggedInLocal(QStringLiteral("")),
-    language("ENG"),
+    idInstructorLoggedInLocal("0"),
+    language(languageENG),
     ui(new Ui::InstructorsAndTraineesWidget)
 {
     ui->setupUi(this);
 
-    ui->btnSettings->setObjectName("btnSettings");
+    ui->widget_Control->setObjectName("widgetControl");
-    ui->widget_Control->setObjectName("widgetTop");
-    ui->groupBox_Trainees->setObjectName("groupBox_Trainees");
-
-    #ifndef PROJECT_TYPE_DEBUG
-        //ui->btnUpdateStyleSheet->setVisible(false);
-    #endif
 
     registerMetaType();
 
@@ -37,8 +37,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     setLanguageInterfase();
 
     connectorToServer = new ConnectorToServer(this);
-    connect(connectorToServer,&ConnectorToServer::sigLoginResult,this,&InstructorsAndTraineesWidget::slot_checkLoginResult);
+    connect(connectorToServer, &ConnectorToServer::sigLoginResult, this, &InstructorsAndTraineesWidget::slot_checkLoginResult);
-    connect(connectorToServer,&ConnectorToServer::sigDeLoginResult,this,&InstructorsAndTraineesWidget::slot_checkDeLoginResult);
+    connect(connectorToServer, &ConnectorToServer::sigDeLoginResult, this, &InstructorsAndTraineesWidget::slot_checkDeLoginResult);
 
     messangerController = new MessangerController(connectorToServer, this);
 
@@ -49,12 +49,11 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     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);
+    connect(connectorToServer, &ConnectorToServer::signal_ConnectedToServer, this, &InstructorsAndTraineesWidget::slot_ConnectedToServer);
 
     connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, this, &InstructorsAndTraineesWidget::slot_traineeSelected);
     connect(viewerInstructors, &ViewerInstructors::signal_instructorSelected, this, &InstructorsAndTraineesWidget::slot_instructorSelected);
 
-
     viewerTrainees->clearSelection();
     viewerInstructors->clearSelection();
 
@@ -62,7 +61,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     ui->verticalLayout_Trainees->addWidget(viewerTrainees);
     ui->verticalLayout_Instructors->addWidget(viewerInstructors);
 
-    ui->groupBox_Messenger->setMinimumHeight(500);
+    ui->groupBox_Messenger->setMinimumHeight(900);
 
     ui->groupBox_Messenger->setMaximumWidth(500);
     ui->groupBox_Messenger->setMinimumWidth(500);
@@ -94,6 +93,11 @@ InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()
     delete ui;
 }
 
+QString InstructorsAndTraineesWidget::getLanguage()
+{
+    return language;
+}
+
 void InstructorsAndTraineesWidget::changeEvent(QEvent *event)
 {
     // В случае получения события изменения языка приложения
@@ -114,11 +118,6 @@ void InstructorsAndTraineesWidget::updateMyStyleSheet()
     this->setStyleSheet(styleSheet);
 }
 
-QString InstructorsAndTraineesWidget::getLanguage()
-{
-    return language;
-}
-
 QString InstructorsAndTraineesWidget::loadStyleSheet()
 {
     QString fileName = "./resources/css/styleSheetMain.css";
@@ -177,6 +176,7 @@ void InstructorsAndTraineesWidget::slot_checkLoginResult(ServerAuthorization *se
 
         updateLabelLoggedInInstructor(serverAuth->Login, serverAuth->ClientName);
         connectorToServer->setLoginName(nameInstructorLoggedInLocal);
+
         messangerController->setGUIclientId(serverAuth->Id);
 
         connectorToServer->sendQueryTasksXML("fim");
@@ -252,33 +252,33 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
         updateLabelLoggedInInstructor(loginInstructorLoggedInLocal, nameInstructorLoggedInLocal);
         updateLabelServer();
 
-        QMessageBox::warning(this, tr("Warning!"), tr("The server is disabled"));
+        QMessageBox::warning(this, tr("Warning!"), tr("The server is not available"));
     }
 }
 
-void InstructorsAndTraineesWidget::slot_traineeSelected(QString login)
+void InstructorsAndTraineesWidget::slot_traineeSelected(int id_trainee)
 {
     viewerInstructors->clearSelection();
 
-    /* Messanger*/
+    /*Messanger*/
     messangerController->deleteWidget(messangerWidget);
-    if(login != "")
+    if(id_trainee)
     {
-        Trainee trainee = connectorToServer->getTrainee(connectorToServer->getIdTraineeByLogin(login));
+        Trainee trainee = connectorToServer->getTrainee(id_trainee);
         if(trainee.getID())
             messangerWidget = messangerController->newWidget(this, &trainee, ui->verticalLayout_Messenger);
     }
 }
 
-void InstructorsAndTraineesWidget::slot_instructorSelected(QString login)
+void InstructorsAndTraineesWidget::slot_instructorSelected(int id_instructor)
 {
     viewerTrainees->clearSelection();
 
-    /* Messanger*/
+    /*Messanger*/
     messangerController->deleteWidget(messangerWidget);
-    if(login != "" && login != loginInstructorLoggedInLocal)
+    if(id_instructor && id_instructor != idInstructorLoggedInLocal.toInt())
     {
-        Instructor instructor = connectorToServer->getInstructor(connectorToServer->getIdInstructorByLogin(login));
+        Instructor instructor = connectorToServer->getInstructor(id_instructor);
         if(instructor.getID())
             messangerWidget = messangerController->newWidget(this, &instructor, ui->verticalLayout_Messenger);
     }
@@ -407,13 +407,13 @@ void InstructorsAndTraineesWidget::setLanguageInterfase()
 
     if(settings.Language == "ENG")
     {
-        qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + "en_EN", ".");
+        qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + languageENG, ".");
-        language = "en_EN";
+        language = languageENG;
     }
     else
     {
-        qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + "ru_RU", ".");
+        qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + languageRUS, ".");
-        language = "ru_RU";
+        language = languageRUS;
     }
 
     qApp->installTranslator(&qtLanguageTranslator);

InstructorsAndTrainees/instructorsandtraineeswidget.h

@@ -24,14 +24,18 @@ public:
     explicit InstructorsAndTraineesWidget(QWidget *parent = nullptr);
     ~InstructorsAndTraineesWidget();
 
-private:
+public:
-    void changeEvent(QEvent * event) override;
+    static const QString languageENG;
+    static const QString languageRUS;
 
 public:
-    void updateMyStyleSheet();
     QString getLanguage();
 
 private:
+    void changeEvent(QEvent * event) override;
+
+private:
+    void updateMyStyleSheet();
     QString loadStyleSheet();
 
 public Q_SLOTS:
@@ -40,7 +44,6 @@ public Q_SLOTS:
     //Слот обработки смены стиля
     void slot_UpdateStyleSheet();
 
-
     //Слот обработки результата авторизации
     void slot_checkLoginResult(ServerAuthorization * serverAuth);
     //Слот обработки результата деавторизации
@@ -48,8 +51,8 @@ public Q_SLOTS:
     //Слот обработки результата подключения к серверу
     void slot_ConnectedToServer(bool state);
 
-    void slot_traineeSelected(QString login);
+    void slot_traineeSelected(int id_trainee);
-    void slot_instructorSelected(QString login);
+    void slot_instructorSelected(int id_instructor);
 
 Q_SIGNALS:
     //сигнал смены языка

InstructorsAndTrainees/instructorsandtraineeswidget.ui

@@ -108,7 +108,7 @@
                </size>
               </property>
               <property name="text">
-               <string>Editor Trainees</string>
+               <string>Trainee editor</string>
               </property>
               <property name="icon">
                <iconset resource="resources.qrc">
@@ -134,7 +134,7 @@
                </size>
               </property>
               <property name="text">
-               <string>Editor Instructors</string>
+               <string>Instructor editor</string>
               </property>
               <property name="icon">
                <iconset resource="resources.qrc">
@@ -258,7 +258,7 @@
                 </sizepolicy>
                </property>
                <property name="title">
-                <string>Messenger</string>
+                <string>Chat</string>
                </property>
                <layout class="QGridLayout" name="gridLayout_7">
                 <item row="0" column="0">

InstructorsAndTrainees/messanger/messangerwidget.ui

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

InstructorsAndTrainees/resources.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>resources/css/styleSheetMain.css</file>
         <file>resources/icons/addInstructor.png</file>
         <file>resources/icons/addTrainee.png</file>
         <file>resources/icons/admin.png</file>
@@ -27,7 +26,6 @@
         <file>resources/icons/instructorArchive.png</file>
         <file>resources/icons/instructorFromArchive.png</file>
         <file>resources/icons/login-user.png</file>
-        <file>resources/icons/messengerPrint.png</file>
         <file>resources/icons/newGroup.png</file>
         <file>resources/icons/rectGray.png</file>
         <file>resources/icons/rectGreen.png</file>
@@ -37,7 +35,6 @@
         <file>resources/icons/traineeFromArchive.png</file>
         <file>resources/icons/vline.png</file>
         <file>resources/icons/sign.png</file>
-        <file>resources/icons/task.png</file>
         <file>resources/icons/procedure.png</file>
         <file>resources/icons/malfunction.png</file>
         <file>resources/icons/762.gif</file>