Блокировка Авторизации при Редактировании в ГУИ

InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp

@@ -263,6 +263,24 @@ QByteArray DataParser::createDeAuthMessage(ClientDeAutorization *deAuth)
     return array;
 }
 
+QByteArray DataParser::createQueryBlockAuth(bool block)
+{
+    QByteArray array;
+    QXmlStreamWriter xmlWriter(&array);
+
+    xmlWriter.setAutoFormatting(true);
+    xmlWriter.writeStartDocument();
+    xmlWriter.writeStartElement("BlockAuth");
+
+    xmlWriter.writeAttribute("Block", block ? "1" : "0");
+
+    xmlWriter.writeEndElement();
+    xmlWriter.writeEndElement();
+    xmlWriter.writeEndDocument();
+
+    return array;
+}
+
 
 
 void DataParser::createServerSettings(QString address, QString port)

InstructorsAndTrainees/connectorToServer/Core/dataparser.h

@@ -28,6 +28,8 @@ public:
     QByteArray createQueryTasksXMLMessage(QString type);
     QByteArray createDeAuthMessage(ClientDeAutorization *deAuth);
 
+    QByteArray createQueryBlockAuth(bool block);
+
     void createAuthData(ServerAuthorization *serverAuth);
     void createAuthDataOffline(QString username,QString pass);
     void addRunData(QList<int> displays);

InstructorsAndTrainees/connectorToServer/connectortoserver.cpp

@@ -113,6 +113,19 @@ bool ConnectorToServer::sendQueryTasksXML(QString type)
     return true;
 }
 
+bool ConnectorToServer::sendQueryBlockAuth(bool block)
+{
+    if (!client->getIsConnected())
+    {
+        return false;
+    }
+
+    QByteArray array = dataParser->createQueryBlockAuth(block);
+    emit sigSendAnswerToServer(array);
+
+    return true;
+}
+
 void ConnectorToServer::setLoginName(QString name)
 {
     versionSelectWidget->setAuthor(name);

InstructorsAndTrainees/connectorToServer/connectortoserver.h

@@ -30,6 +30,7 @@ public:
     bool sendMessage(ClientMessage clientMessage);
 
     bool sendQueryTasksXML(QString type);
+    bool sendQueryBlockAuth(bool block);
 
     void SetConnectToServer();
     void StopConnectToServer();

InstructorsAndTrainees/instructors/viewerinstructors.cpp

@@ -58,7 +58,7 @@ void ViewerInstructors::changeEvent(QEvent *event)
 
 void ViewerInstructors::on_btnEditorInstructors_clicked()
 {
-    Q_EMIT signal_BlockAutorization(true);
+    connectorToServer->sendQueryBlockAuth(true);
 
     dlgRedactor = new DialogRedactorInstructors(connectorToServer, adminMode, this);
     dlgRedactor->exec();
@@ -72,7 +72,7 @@ void ViewerInstructors::on_btnEditorInstructors_clicked()
     if(authComplited)
         loadInstructorsFromDB();
 
-    Q_EMIT signal_BlockAutorization(false);
+    connectorToServer->sendQueryBlockAuth(false);
 }
 
 void ViewerInstructors::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)

InstructorsAndTrainees/instructors/viewerinstructors.h

@@ -28,7 +28,7 @@ protected:
 
 Q_SIGNALS:
     //сигнал о блокировке авторизации
-    void signal_BlockAutorization(bool block);
+    //void signal_BlockAutorization(bool block);
 
 public Q_SLOTS:
     void on_btnEditorInstructors_clicked();

InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -48,8 +48,8 @@ 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(viewerInstructors, &ViewerInstructors::signal_BlockAutorization, this, &InstructorsAndTraineesWidget::signal_BlockAutorization);
-    connect(viewerTrainees, &ViewerTrainees::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

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

InstructorsAndTrainees/trainees/viewertrainees.cpp

@@ -92,7 +92,7 @@ void ViewerTrainees::changeEvent(QEvent *event)
 
 void ViewerTrainees::on_btnEditorTrainees_clicked()
 {
-    Q_EMIT signal_BlockAutorization(true);
+    connectorToServer->sendQueryBlockAuth(true);
 
     dlgRedactor = new DialogRedactorTrainees(connectorToServer, adminMode, this);
     dlgRedactor->exec();
@@ -106,7 +106,7 @@ void ViewerTrainees::on_btnEditorTrainees_clicked()
     if(authComplited)
         loadTraineesFromDB();
 
-    Q_EMIT signal_BlockAutorization(false);
+    connectorToServer->sendQueryBlockAuth(false);
 }
 
 void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)

InstructorsAndTrainees/trainees/viewertrainees.h

@@ -32,7 +32,7 @@ protected:
 
 Q_SIGNALS:
     //сигнал о блокировке авторизации
-    void signal_BlockAutorization(bool block);
+    //void signal_BlockAutorization(bool block);
 
 public Q_SLOTS:
     //void on_treeWidget_itemClicked(QTreeWidgetItem *item, int column);

ServerLMS/Systems/Parsers/processparser.cpp

@@ -72,6 +72,11 @@ void ProcessParser::slot_read(ClientHandler *client, QByteArray array)
                     clientUnityTaskFIMreport(xmlReader,client, array);
                 }
             }
+            else if(xmlReader.name() == "BlockAuth")
+            {//Запрос Блокировки Авторизации от клиента ГУИ
+
+                clientBlockAuth(xmlReader,client);
+            }
             else
             {
                 emit sigLogMessage("XmlParser: unrecognized tag");
@@ -334,6 +339,24 @@ void ProcessParser::clientDeAuth(QXmlStreamReader &xmlReader,ClientHandler *clie
     processingSystem->processingClientDeAutorization(client, clientDeAutorization);
 }
 
+void ProcessParser::clientBlockAuth(QXmlStreamReader &xmlReader, ClientHandler *client)
+{
+    bool block = false;
+
+    /*Перебираем все атрибуты тега*/
+    foreach(const QXmlStreamAttribute &attr, xmlReader.attributes())
+    {
+        QString name = attr.name().toString();
+        QString value = attr.value().toString();
+        //addTextToLogger(name + ": " + value);
+
+        if(name == "Block")
+            block = (value == "1") ? true : false;
+    }
+
+    processingSystem->processingClientBlockAuth(client, block);
+}
+
 void ProcessParser::queryToDb(QXmlStreamReader &xmlReader,ClientHandler *client, QByteArray array)
 {
     ClientQueryToDB queryToDB;

ServerLMS/Systems/Parsers/processparser.h

@@ -25,6 +25,7 @@ private:
     ProcessingSystem *processingSystem;
     void clientAuth(QXmlStreamReader &xmlReader,ClientHandler *client);
     void clientDeAuth(QXmlStreamReader &xmlReader,ClientHandler *client);
+    void clientBlockAuth(QXmlStreamReader &xmlReader,ClientHandler *client);
     void toClientMessage(QXmlStreamReader &xmlReader,ClientHandler *client);
     void queryToDb(QXmlStreamReader &xmlReader,ClientHandler *client, QByteArray array = QByteArray());
     void queryTasksXML(QXmlStreamReader &xmlReader,ClientHandler *client);

ServerLMS/Systems/processingsystem.cpp

@@ -101,6 +101,7 @@ void ProcessingSystem::processingClientAutorization(ClientHandler *client, Clien
 
 void ProcessingSystem::processingClientDeAutorization(ClientHandler *client, ClientDeAutorization clientDeAutorization)
 {
+    /*
     if(server->getStateBlockAutorization() == blocked)
     {
         QByteArray arrayAnswer = dataParser->ClientAnswer()->notify(NOTIFY_SERVER_BLOCKED);
@@ -111,6 +112,7 @@ void ProcessingSystem::processingClientDeAutorization(ClientHandler *client, Cli
 
         return;
     }
+    */
 
     //Попытка ДеАвторизации клиента (проверка по БД)
     QByteArray arrayAnswer;
@@ -148,6 +150,11 @@ void ProcessingSystem::processingClientDeAutorization(ClientHandler *client, Cli
     emit sigListsInstructorsTraineesChanged();
 }
 
+void ProcessingSystem::processingClientBlockAuth(ClientHandler *client, bool block)
+{
+    emit providerDBLMS->signal_BlockAutorization(block);
+}
+
 //упращенная деавторизация при выключении сервера
 void ProcessingSystem::processingClientDeAutorization(QString login)
 {

ServerLMS/Systems/processingsystem.h

@@ -34,6 +34,7 @@ public:
 
     void processingClientAutorization(ClientHandler *client, ClientAutorization clientAutorization);
     void processingClientDeAutorization(ClientHandler *client, ClientDeAutorization clientDeAutorization);
+    void processingClientBlockAuth(ClientHandler *client, bool block);
     void processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB, int id = 0, void* data = nullptr);
     void processingClientQueryTasksXML(ClientHandler *client, ClientQueryTasksXML clientQueryTasksXML);