Рефакт users 1

DataBaseLMS/databaselms.h

@@ -3,6 +3,7 @@
 
 #include <QSqlDatabase>
 #include <QMutex>
+#include <QWidget>
 
 #include "instructor.h"
 #include "trainee.h"
@@ -25,9 +26,13 @@ public:
 class DataBaseLMS
 {
 public:
-    DataBaseLMS();
+    DataBaseLMS(QWidget *ownerWidget);
     ~DataBaseLMS();
 
+public:
+    const QString TypeUserDBInstructor = "instructor";
+    const QString TypeUserDBTrainee = "trainee";
+
 protected:
     //Подключение
     bool createConnection();
@@ -38,12 +43,8 @@ protected:
     bool transactionBegin();
     bool transactionEnd();
 
-    //Списки
-    QList<Instructor> selectAllInstructors();
-    QList<Trainee> selectAllTrainees();
-    QList<Group> selectAllGroups();
-
     //Инструктор
+    QList<Instructor> selectAllInstructors();
     Instructor selectInstructor(int id_instructor);
     int selectInstructorID(QString login, QString password = QStringLiteral(""));
     QString selectInstructorNameByLogin(QString login);
@@ -53,19 +54,42 @@ protected:
     int updateInstructorLoggedIn(int id_instructor, bool loggedIn);
     bool updateAllInstructorsLoggedIn(bool loggedIn);
     int updateInstructorArchived(int id_instructor, bool archived);
-
     int insertInstructor();
     int insertInstructor(Instructor instructor);
     int deleteInstructor(int id_instructor);
     int updateInstructor(Instructor instructor);
 
     //Группа
+    QList<Group> selectAllGroups();
     Group selectGroup(int id_group);
     int insertGroup();
     int insertGroup(Group group);
     int deleteGroup(int id_group);
     int updateGroup(Group group);
 
+    //Обучаемый
+    QList<Trainee> selectAllTrainees();
+    Trainee selectTrainee(int id_trainee);
+    QList<Trainee> selectAllTraineesInGroup(int id_group);
+    int selectTraineeID(QString login, QString password = QStringLiteral(""));
+    QString selectTraineeNameByLogin(QString login);
+    QString selectTraineeNameOnComputer(QString computer_name);
+    Trainee selectTraineeOnComputer(QString computer_name);
+    bool selectTraineeArchived(int id_trainee);
+    bool selectTraineeLoggedIn(int id_trainee);
+    int updateTraineeLoggedIn(int id_trainee, bool loggedIn);
+    bool updateAllTraineesLoggedIn(bool loggedIn);
+    int updateTraineeArchived(int id_trainee, bool archived);
+    int insertTrainee(int id_group);
+    int insertTrainee(Trainee trainee);
+    int deleteTrainee(int id_trainee);
+    int updateTrainee(Trainee trainee);
+
+    //Тайминг
+    int insertTimingTrainee(int id_trainee);
+    int updateTimingTrainee(int id_trainee, TimingOfTrainee timing);
+    TimingOfTrainee selectTimingTrainee(int id_trainee);
+
     //Задача AMM
     int insertTaskAMM(TaskAmmFim task, int id_trainee);
     int updateTaskAMM(TaskAmmFim task);
@@ -80,33 +104,9 @@ protected:
     int deleteTaskFIM(int id_task);
     QList<TaskAmmFim> selectTasksFIMofTrainee(int id_trainee);
     TaskAmmFim selectTaskFIMbyID(int id_task);
-
     int deleteReportFIM(int task_id);
     int insertReportFIM(TaskAmmFim task);
 
-    //Обучаемый
-    Trainee selectTrainee(int id_trainee);
-    QList<Trainee> selectAllTraineesInGroup(int id_group);
-    int selectTraineeID(QString login, QString password = QStringLiteral(""));
-    QString selectTraineeNameByLogin(QString login);
-    QString selectTraineeNameOnComputer(QString computer_name);
-    Trainee selectTraineeOnComputer(QString computer_name);
-    bool selectTraineeArchived(int id_trainee);
-    bool selectTraineeLoggedIn(int id_trainee);
-    int updateTraineeLoggedIn(int id_trainee, bool loggedIn);
-    bool updateAllTraineesLoggedIn(bool loggedIn);
-    int updateTraineeArchived(int id_trainee, bool archived);
-
-    int insertTrainee(int id_group);
-    int insertTrainee(Trainee trainee);
-    int deleteTrainee(int id_trainee);
-    int updateTrainee(Trainee trainee);
-
-    //Тайминг
-    int insertTimingTrainee(int id_trainee);
-    int updateTimingTrainee(int id_trainee, TimingOfTrainee timing);
-    TimingOfTrainee selectTimingTrainee(int id_trainee);
-
 private:
     DataBaseSettings getDataBaseSettings();
     int queryExecInt(QString queryStr);
@@ -122,6 +122,7 @@ protected:
 private:
     bool transactionBegined;
     QMutex mtxAccess;
+    QWidget* ownerWidget;
 };
 
 #endif // DATABASELMS_H