Блокировка доработал

DOCS/Андрей/Board.md

@@ -11,6 +11,7 @@ kanban-plugin: board
 
 ## Complete
 
+- [ ] Блокировка авторизации не работает при входе в редакторы И/О
 - [ ] Добавить текущий статус задачи в "Проверке задачи" (AMM, FIM)
 - [ ] выдавать trainee_id при авторизации и вытащить передачу Trainee ID из тасок
 - [ ] Подсчет учебного времени -  дельта между включением и выключением
@@ -60,12 +61,6 @@ kanban-plugin: board
 - [ ] Сделать отправку сообщения на Enter
 
 
-## ConnectorToServer
-
-- [ ] MutexAccess
-- [ ] Запрос AMM и FIM xml продумать
-
-
 ## Интерфейс
 
 - [ ] Унифицировать терминологию
@@ -74,7 +69,6 @@ kanban-plugin: board
 ## GUI общие
 
 - [ ] Введение логина только латиницей
-- [ ] Блокировка авторизации не работает при входе в редакторы И/О
 
 
 ## Замечания Кирилл
@@ -88,6 +82,6 @@ kanban-plugin: board
 
 %% kanban:settings
 ```
-{"kanban-plugin":"board","list-collapse":[false,false,false,false,false,false,false,false,false]}
+{"kanban-plugin":"board","list-collapse":[false,false,false,false,false,false,false,false]}
 ```
 %%

InstructorsAndTrainees/connectorToServer/connectortoserver.cpp

@@ -471,15 +471,13 @@ void ConnectorToServer::bindConnection()
     connect(this,&ConnectorToServer::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection);
     connect(this,&ConnectorToServer::sigStopConnect,client,&TCPClient::setDisconnect,Qt::AutoConnection);
 
-    //Sconnect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer);
     connect(this,&ConnectorToServer::sigSendAnswerToServer,sendSystem,&SendSystem::sendXMLAnswer,Qt::AutoConnection);
 
-    connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::slot_Auth); // ::sigLoginResult);
+    connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::slot_Auth);
     connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult);
     connect(recognizeSystem,&RecognizeSystem::signal_ReceiveMessage,this,&ConnectorToServer::signal_receiveMessage,Qt::AutoConnection);
     connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::showServerList);
     connect (recognizeSystem,&RecognizeSystem::sigSetVersion,versionContainer,&VersionContainer::setServerVersionData);
-    //connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB,this,&ConnectorToServer::slot_AnswerQueryToDB);
 
     connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors);
     connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListGroups,this,&ConnectorToServer::slot_AnswerQueryToDB_ListGroups);

InstructorsAndTrainees/connectorToServer/connectortoserver.h

@@ -101,8 +101,6 @@ signals:
                             SendSystem *sendSystem,
                             QThread *thread);    
 
-    //void signal_sendXMLmsgGUItoServer(QByteArray array);
-
     void sigLoginResult(ServerAuthorization * serverAuth);
     void sigDeLoginResult(ServerDeAuthorization * serverDeAuth);
 

ServerLMS/providerdblms.cpp

@@ -64,11 +64,11 @@ bool ProviderDBLMS::authorizationTrainee(QString login, QString password, QStrin
         return false;
     }
 
-    Q_EMIT signal_BlockAutorization(true);
+    //Q_EMIT signal_BlockAutorization(true);
 
     bool res = dbLMS->authorizationTrainee(login, password, classroom_name, computer_name);
 
-    Q_EMIT signal_BlockAutorization(false);
+    //Q_EMIT signal_BlockAutorization(false);
 
      mtxAccess.unlock();
      return res;
@@ -84,11 +84,11 @@ bool ProviderDBLMS::deAuthorizationTrainee(QString login)
         return false;
     }
 
-    Q_EMIT signal_BlockAutorization(true);
+    //Q_EMIT signal_BlockAutorization(true);
 
     bool res = dbLMS->deAuthorizationTrainee(login);
 
-    Q_EMIT signal_BlockAutorization(false);
+    //Q_EMIT signal_BlockAutorization(false);
 
     mtxAccess.unlock();
     return res;
@@ -120,11 +120,11 @@ bool ProviderDBLMS::authorizationInstructor(QString login, QString password)
         return false;
     }
 
-    Q_EMIT signal_BlockAutorization(true);
+    //Q_EMIT signal_BlockAutorization(true);
 
     bool res = dbLMS->authorizationInstructor(login, password);
 
-    Q_EMIT signal_BlockAutorization(false);
+    //Q_EMIT signal_BlockAutorization(false);
 
     mtxAccess.unlock();
     return res;
@@ -140,11 +140,11 @@ bool ProviderDBLMS::deAuthorizationInstructor(QString login)
         return false;
     }
 
-    Q_EMIT signal_BlockAutorization(true);
+    //Q_EMIT signal_BlockAutorization(true);
 
     bool res = dbLMS->deAuthorizationInstructor(login);
 
-    Q_EMIT signal_BlockAutorization(false);
+    //Q_EMIT signal_BlockAutorization(false);
 
     mtxAccess.unlock();
     return res;

ServerLMS/resources.qrc

@@ -7,5 +7,10 @@
         <file>resources/icons/switchOn.png</file>
         <file>resources/blankXML/ListTasksAMM.xml</file>
         <file>resources/blankXML/ListTasksFIM.xml</file>
+        <file>resources/icons/circleGreen.png</file>
+        <file>resources/icons/circleRed.png</file>
+        <file>resources/icons/lock.png</file>
+        <file>resources/icons/unlock.png</file>
+        <file>resources/icons/open.png</file>
     </qresource>
 </RCC>

ServerLMS/serverlmswidget.cpp

@@ -122,9 +122,15 @@ void ServerLMSWidget::addToLog(QString message)
 void ServerLMSWidget::slot_BlockAutorization(bool block)
 {
     if(block)
+    {
         server->blockAutorization();
+        ui->lblBlockAuth->setPixmap(QPixmap(QStringLiteral(":/resources/icons/lock.png")));
+    }
     else
+    {
         server->unBlockAutorization();
+        ui->lblBlockAuth->setPixmap(QPixmap(QStringLiteral(":/resources/icons/open.png")));
+    }
 }
 
 void ServerLMSWidget::slot_LanguageChanged(QString language)
@@ -153,6 +159,7 @@ void ServerLMSWidget::on_btnStopServer_clicked()
         ui->btnStopServer->setEnabled(false);
         ui->btnStartServer->setEnabled(true);
         ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/resources/icons/switchOff.png")));
+        slot_BlockAutorization(false);
     }
 }
 

ServerLMS/serverlmswidget.ui

@@ -85,38 +85,6 @@
         </item>
         <item row="4" column="0">
          <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QLabel" name="lblOnOff">
-            <property name="maximumSize">
-             <size>
-              <width>40</width>
-              <height>40</height>
-             </size>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="resources.qrc">:/resources/icons/switchOff.png</pixmap>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item>
            <widget class="QToolButton" name="btnStartServer">
             <property name="minimumSize">
@@ -173,6 +141,80 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="lblOnOff">
+            <property name="maximumSize">
+             <size>
+              <width>40</width>
+              <height>40</height>
+             </size>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="pixmap">
+             <pixmap resource="resources.qrc">:/resources/icons/switchOff.png</pixmap>
+            </property>
+            <property name="scaledContents">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Block Authorization</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="lblBlockAuth">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="resources.qrc">:/resources/icons/open.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </item>
        </layout>