Рефакт users 1

DataBaseLMS/interfacedatabaselms.h

@@ -8,12 +8,12 @@
 #include "DataBaseLMS_global.h"
 #include "databaselms.h"
 
-class DATABASELMS_EXPORT InterfaceDataBaseLMS : public /*QObject*/QWidget,  DataBaseLMS
+class DATABASELMS_EXPORT InterfaceDataBaseLMS : public QObject,  DataBaseLMS
 {
     Q_OBJECT
 
 public:
-    InterfaceDataBaseLMS(QWidget* parent = nullptr);
+    InterfaceDataBaseLMS(QWidget *ownerWidget, QObject *parent = nullptr);
 
 public Q_SLOTS:
     void slot_LanguageChanged(QString language);
@@ -24,6 +24,7 @@ public:
     bool DisConnectionFromDB();
     bool DBisConnected();
 
+
     //Инструкторы
 
     bool AuthorizationInstructor(QString login, QString password);
@@ -55,9 +56,6 @@ public:
     int entryTraineeOnSimulator(int id_trainee);
     int exitTraineeFromSimulator(int id_trainee);
 
-
-    //void setTasks(QString login, QStringList tasks);
-
     QString getNameTraineeOnComputer(QString computer_name);
     Trainee getTraineeOnComputer(QString computer_name);
 
@@ -67,10 +65,19 @@ public:
     QList<Trainee> getListTraineesInGroup(int id);
     QList<Group> getListGroups();
     QList<Trainee> getListTrainees();
-
     Trainee getTrainee(int id);
-    Group getGroup(int group_id);
 
+    int newTrainee(int id_group);
+    int delTrainee(int id);
+    int editTrainee(Trainee trainee);
+
+    bool isArchivedTrainee(int id);
+    bool isLoggedInTrainee(int id);
+
+
+    //Группы
+
+    Group getGroup(int group_id);
     int newGroup();
     int delGroup(int id);
     int editGroup(Group group);
@@ -79,6 +86,9 @@ public:
     int delTaskAMM(int id);
     int editTaskAMM(TaskAmmFim task);
 
+
+    //Задачи
+
     QList<TaskAmmFim> getListTasksAMMofTrainee(int id_trainee);
     QList<TaskAmmFim> getListTasksFIMofTrainee(int id_trainee);
 
@@ -92,15 +102,9 @@ public:
     int changeStatusTaskFIM(int id_task, QString status);
     int changeStatusTaskAMM(int id_task, QString status);
 
-    int newTrainee(int id_group);
-    int delTrainee(int id);
-    int editTrainee(Trainee trainee);
-
-    bool isArchivedTrainee(int id);
-    bool isLoggedInTrainee(int id);
-
 private:
     QTranslator qtLanguageTranslator;
+    QWidget* ownerWidget;
 };
 
 #endif // INTERFACEDATABASELMS_H