Рефакт

InstructorsAndTrainees/connectorToServer/connectortoserver.h

@@ -26,19 +26,6 @@ public:
     ~ConnectorToServer();
 
 public:
-    bool authorizationInstructorLocal(QString login, QString password);
-    bool deAuthorizationInstructorLocal(QString login);
-
-    bool sendQueryToDB(TypeQueryToDB typeQuery, int id = 0, void* data = nullptr);
-    bool sendMessage(ClientMessage clientMessage);
-
-    bool sendQueryTasksXML(QString type);
-    bool sendQueryBlockAuth(bool block);
-
-    void showVersionSelect();
-    void setLoginName(QString name);
-    bool sendClientNotify(QString command);
-
     ServerSettings getServerSettings();
     bool getIsConnected();
 
@@ -48,8 +35,24 @@ public:
     void SetConnectToServer();
     void StopConnectToServer();
 
+    void setLoginName(QString name);
+
 public:
-    //Запросы к БД (локальной)
+    //Send
+    bool sendAuthorizationInstructorLocal(QString login, QString password);
+    bool sendDeAuthorizationInstructorLocal(QString login);
+
+    bool sendQueryToDB(TypeQueryToDB typeQuery, int id = 0, void* data = nullptr);
+    bool sendMessage(ClientMessage clientMessage);
+
+    bool sendQueryTasksXML(QString type);
+    bool sendQueryBlockAuth(bool block);
+
+    void sendShowVersionSelect();
+    bool sendClientNotify(QString command);
+
+public:
+    //LocalModelDB
     QByteArray getListTaskFimArray();
     QByteArray getListTaskAmmArray();
 
@@ -82,7 +85,7 @@ private:
     void clearListModelDB();
 
 public slots:
-    //Ответы на запросы к Серверу
+    //AnswerQueryToDB
     void slot_AnswerQueryToDB_ListInstructors(QList<Instructor> listInstructors);
     void slot_AnswerQueryToDB_ListGroups(QList<Group> listGroups);
     void slot_AnswerQueryToDB_ListTrainees(QList<Trainee> listTrainees);
@@ -90,16 +93,13 @@ public slots:
     void slot_AnswerQueryToDB_ListClassrooms(QList<Classroom> listClassrooms);
     void slot_AnswerQueryToDB_ListTasksAMMforTrainee(QList<TaskAmmFim> listTasks, int trainee_id);
     void slot_AnswerQueryToDB_ListTasksFIMforTrainee(QList<TaskAmmFim> listTasks, int trainee_id);
-
     void slot_AnswerQueryTasksXML_FIM(QByteArray array);
     void slot_AnswerQueryTasksXML_AMM(QByteArray array);
 
+public slots:
     void slot_sendMessage(ClientMessage clientMessage);
-
     void slot_showServerList(QList<StreamingVersionData*> *serverList);
-
     void slot_HashReady();
-
     void slot_Auth(ServerAuthorization * serverAuth);
 
 signals:
@@ -144,6 +144,7 @@ private:
     NotifyController *notifyController;
 
     //Списочная модель БД СУО
+    QMutex mtxAccess;
     QList<Instructor> listInstructors;    
     QList<Group> listGroups;
     QList<Trainee> listTrainees;
@@ -157,9 +158,7 @@ private:
     ServerSettings serverSettings;
     ServerAuthorization serverAuth;
 
-    bool fl_GetedOfflineMessages;
-
-    QMutex mtxAccess;
+    bool fl_GetedOfflineMessages;    
 };
 
 #endif // CONNECTORTOSERVER_H