сделал delInstructor

ServerLMS/Debug64/.ninja_log

@@ -69,3 +69,30 @@
 19	55	0	D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen	a1ba014d73005738
 19	55	0	D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp	a1ba014d73005738
 19	55	0	D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h	a1ba014d73005738
+8	627	0	CMakeFiles/ServerLMS_autogen	a1ba014d73005738
+8	627	0	ServerLMS_autogen/mocs_compilation.cpp	a1ba014d73005738
+8	627	0	ServerLMS_autogen/include/ui_serverlmswidget.h	a1ba014d73005738
+8	627	0	D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen	a1ba014d73005738
+8	627	0	D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp	a1ba014d73005738
+8	627	0	D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h	a1ba014d73005738
+653	1949	7556152162572786	CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj	f56962914220ed2d
+634	3473	7556152177777192	CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj	8ac2c4a8e2ef203c
+632	3515	7556152178210155	CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj	6c16bf194fe85608
+627	3695	7556152180009904	CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj	40e4c8c7d98890e8
+649	3760	7556152180666787	CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj	d73c57350f364b58
+639	3770	7556152180767929	CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj	c4c12bda48d8fa92
+643	3831	7556152181372013	CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj	b273ef6b79a34bf
+646	3831	7556152181391959	CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj	64946e3309bfc754
+637	3879	7556152181873581	CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj	f698d155fbad3bd2
+630	3887	7556152181943396	CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj	12010b53b3caa3fc
+3887	4444	7556152187062463	libServerLMS.dll	2f530586cec8163
+3887	4444	7556152187062463	libServerLMS.dll.a	2f530586cec8163
+19	57	0	CMakeFiles/ServerLMS_autogen	a1ba014d73005738
+19	57	0	ServerLMS_autogen/mocs_compilation.cpp	a1ba014d73005738
+19	57	0	ServerLMS_autogen/include/ui_serverlmswidget.h	a1ba014d73005738
+19	57	0	D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen	a1ba014d73005738
+19	57	0	D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp	a1ba014d73005738
+19	57	0	D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h	a1ba014d73005738
+57	2318	7556157270446781	CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj	b273ef6b79a34bf
+2318	2867	7556157275441514	libServerLMS.dll	2f530586cec8163
+2318	2867	7556157275441514	libServerLMS.dll.a	2f530586cec8163

ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt

@@ -1,37 +1,37 @@
 # Generated by CMake. Changes will be overwritten.
-D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp
-D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h
+D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp
+D:/LMS/ServerLMS/ServerLMS/clienthandler.h
  mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h
- mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp
- uic:ui_serverlmswidget.h
-D:/LMS/ServerLMS/ServerLMS/Systems/logger.h
- mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp
-D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h
+D:/LMS/ServerLMS/ServerLMS/Systems/tools.h
+D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h
+D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h
  mmc:Q_OBJECT
 D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.h
  mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h
+D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h
  mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h
-D:/LMS/ServerLMS/ServerLMS/Systems/tools.h
-D:/LMS/ServerLMS/ServerLMS/clienthandler.h
+D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp
+D:/LMS/ServerLMS/ServerLMS/Systems/logger.h
  mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp
-D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h
-D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h
- mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/multithreadserver.h
- mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/Client.h
-D:/LMS/ServerLMS/ServerLMS/providerdblms.cpp
-D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp
-D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp
-D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp
-D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp
-D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp
-D:/LMS/ServerLMS/ServerLMS/providerdblms.h
+D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp
+ uic:ui_serverlmswidget.h
+D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h
  mmc:Q_OBJECT
 D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp
+D:/LMS/ServerLMS/ServerLMS/providerdblms.h
+ mmc:Q_OBJECT
+D:/LMS/ServerLMS/ServerLMS/Client.h
+D:/LMS/ServerLMS/ServerLMS/multithreadserver.h
+ mmc:Q_OBJECT
+D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp
+D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp
+D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp
+D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp
+D:/LMS/ServerLMS/ServerLMS/providerdblms.cpp
+D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp
+D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h
+ mmc:Q_OBJECT
+D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h
+D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h
+ mmc:Q_OBJECT
+D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp

ServerLMS/ServerLMS/Systems/dataparser.cpp

@@ -74,6 +74,7 @@ void DataParser::xmlParser(ClientHandler *client, QByteArray array)
             {//Запрос к базе данных от клиента
 
                 ClientQueryToDB queryToDB;
+                int id = 0;
 
                 /*Перебираем все атрибуты тега*/
                 foreach(const QXmlStreamAttribute &attr, xmlReader.attributes())
@@ -84,9 +85,11 @@ void DataParser::xmlParser(ClientHandler *client, QByteArray array)
 
                     if(name == "TypeQuery")
                         queryToDB.typeQuery = (TypeQueryToDB)value.toInt();
+                    else if(name == "id")
+                        id = value.toInt();
                 }
 
-                processingSystem->processingClientQueryToDB(client, queryToDB);
+                processingSystem->processingClientQueryToDB(client, queryToDB, id);
             }
             else if(xmlReader.name() == "ClientMessage")
             {//Сообщение от клиента

ServerLMS/ServerLMS/Systems/processingsystem.cpp

@@ -113,7 +113,7 @@ void ProcessingSystem::processingClientDeAutorization(ClientHandler *client, Cli
     emit sigAuthChanged();
 }
 
-void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB)
+void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB, int id)
 {
     QByteArray arrayAnswer;
 
@@ -147,6 +147,12 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
             emit sigAuthChanged();
             break;
         }
+    case TypeQueryToDB::TYPE_QUERY_DEL_INSTRUCTOR:
+    {
+        providerDBLMS->delInstructor(id);
+        emit sigAuthChanged();
+        break;
+    }
     }
 
     //client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB_LIST_INSTRUCTORS);

ServerLMS/ServerLMS/Systems/processingsystem.h

@@ -25,7 +25,7 @@ public:
     void initialize(DataParser* dataParser,ServerLMSWidget *server);
     void processingClientAutorization(ClientHandler *client, ClientAutorization clientAutorization);
     void processingClientDeAutorization(ClientHandler *client, ClientDeAutorization clientDeAutorization);
-    void processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB);
+    void processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB, int id = 0);
     void processingClientMessage(ClientHandler *client, ClientMessage clientMessage);
     void processingClientNotify(ClientHandler *client, ClientNotify clientNotify);
 

ServerLMS/ServerLMS/providerdblms.cpp

@@ -257,3 +257,8 @@ int ProviderDBLMS::newInstructor()
 {
     return dbLMS->newInstructor();
 }
+
+int ProviderDBLMS::delInstructor(int id)
+{
+    return dbLMS->delInstructor(id);
+}

ServerLMS/ServerLMS/providerdblms.h

@@ -29,6 +29,7 @@ public:
     QList<Group> GetListAllGroups();
 
     int newInstructor();
+    int delInstructor(int id);
 
 Q_SIGNALS:
     //сигнал о блокировке авторизации

ServerLMS/ServerLMS/typesDataServerClient.h

@@ -59,7 +59,8 @@ public:
 enum TypeQueryToDB{
     TYPE_QUERY_GET_LIST_INSTRUCTORS,
     TYPE_QUERY_GET_ALL_LISTS,
-    TYPE_QUERY_NEW_INSTRUCTOR
+    TYPE_QUERY_NEW_INSTRUCTOR,
+    TYPE_QUERY_DEL_INSTRUCTOR
 };
 
 class ClientQueryToDB{