до изменения NEW_GROUP

DB_IaT/Debug64/.ninja_log

@@ -123,3 +123,65 @@
 61	1424	7557876097796780	CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj	d4fbe9d883edc93b
 1424	2156	7557876104551920	libInstructorsAndTrainees.dll	c1e915765a645e23
 1424	2156	7557876104551920	libInstructorsAndTrainees.dll.a	c1e915765a645e23
+9	44	0	CMakeFiles/InstructorsAndTrainees_autogen	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/mocs_compilation.cpp	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h	325fc9931da2ad77
+9	44	0	InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h	325fc9931da2ad77
+9	44	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h	325fc9931da2ad77
+45	1403	7557879937260878	CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj	d4fbe9d883edc93b
+1404	2122	7557879943890732	libInstructorsAndTrainees.dll	c1e915765a645e23
+1404	2122	7557879943890732	libInstructorsAndTrainees.dll.a	c1e915765a645e23
+21	59	0	CMakeFiles/InstructorsAndTrainees_autogen	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/mocs_compilation.cpp	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h	325fc9931da2ad77
+21	59	0	InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h	325fc9931da2ad77
+21	59	0	D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h	325fc9931da2ad77
+60	1069	7557882820382716	CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj	ddd815f2ca650c79
+1069	1789	7557882827022762	libInstructorsAndTrainees.dll	c1e915765a645e23
+1069	1789	7557882827022762	libInstructorsAndTrainees.dll.a	c1e915765a645e23

DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt

@@ -1,84 +1,84 @@
 # Generated by CMake. Changes will be overwritten.
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h
  mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h
- mmc:Q_OBJECT
- uic:ui_dialogeditgroup.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp
- uic:ui_editortrainees.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp
- uic:ui_messangerwidget.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp
- uic:ui_dialogeditinstructor.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp
- uic:ui_dialogedittrainee.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h
- mmc:Q_OBJECT
- uic:ui_dialogauthorizationinstructor.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h
  mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp
 D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp
 D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h
  mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h
+ mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h
+ mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp
 D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h
  mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h
  mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h
+ uic:ui_dialogauthorizationinstructor.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h
+ mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp
+ uic:ui_dialogedittrainee.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h
+ mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp
+ uic:ui_dialogeditinstructor.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
  mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp
- uic:ui_taskswidget.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp
- uic:ui_editorinstructors.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp
 D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h
  mmc:Q_OBJECT
  uic:ui_dialogeditinstructor.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h
+ mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp
+ uic:ui_dialogauthorizationinstructor.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
+ uic:ui_instructorsandtraineeswidget.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h
+ mmc:Q_OBJECT
 D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h
  mmc:Q_OBJECT
 D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h
  mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h
- mmc:Q_OBJECT
-D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
- uic:ui_instructorsandtraineeswidget.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp
- uic:ui_dialogauthorizationinstructor.h
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
-D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h
 D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp
  uic:ui_doctaskswidget.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h
 D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp
  uic:ui_viewerinstructors.h
 D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp
  uic:ui_viewertrainees.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp
+ uic:ui_editortrainees.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp
+ uic:ui_editorinstructors.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp
+ uic:ui_taskswidget.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp
+D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp
+ uic:ui_messangerwidget.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h
+ mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h
+ mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h
+ mmc:Q_OBJECT
+ uic:ui_dialogeditgroup.h
+D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h
+ mmc:Q_OBJECT
+D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h
+ mmc:Q_OBJECT

DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp

@@ -92,7 +92,8 @@ void DataParser::createQueryToDBMessage(ClientQueryToDB *queryToDB, int id, void
 
     if(data)
     {
-        if(queryToDB->typeQuery == TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR)
+        if(queryToDB->typeQuery == TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR ||
+                queryToDB->typeQuery == TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR)
         {
             Instructor* instructor = (Instructor*)data;
             if(instructor)

DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp

@@ -30,15 +30,12 @@ EditorInstructors::~EditorInstructors()
 
 void EditorInstructors::on_btnNewInstructor_clicked()
 {
-    connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR);
-
-    /*
     Instructor instructor;
     Instructor instructor_edit;
 
     if(editInstructor(instructor, &instructor_edit))
        connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR, 0, &instructor_edit);
-*/
+
     return;
 /*
     if(int id_instructor = dbLMS->newInstructor())

GUIdataBaseLMS/Debug64/.ninja_log

@@ -78,3 +78,15 @@
 12	44	0	D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen	c6b82d135913dd0f
 12	44	0	D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp	c6b82d135913dd0f
 12	44	0	D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h	c6b82d135913dd0f
+7	39	0	CMakeFiles/GUIdataBaseLMS_autogen	c6b82d135913dd0f
+7	39	0	GUIdataBaseLMS_autogen/mocs_compilation.cpp	c6b82d135913dd0f
+7	39	0	GUIdataBaseLMS_autogen/include/ui_mainwindow.h	c6b82d135913dd0f
+7	39	0	D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen	c6b82d135913dd0f
+7	39	0	D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp	c6b82d135913dd0f
+7	39	0	D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h	c6b82d135913dd0f
+13	44	0	CMakeFiles/GUIdataBaseLMS_autogen	c6b82d135913dd0f
+13	44	0	GUIdataBaseLMS_autogen/mocs_compilation.cpp	c6b82d135913dd0f
+13	44	0	GUIdataBaseLMS_autogen/include/ui_mainwindow.h	c6b82d135913dd0f
+13	44	0	D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen	c6b82d135913dd0f
+13	44	0	D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp	c6b82d135913dd0f
+13	44	0	D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h	c6b82d135913dd0f

ServerLMS/Debug64/.ninja_log

@@ -56,3 +56,13 @@
 807	4552	7556902324401138	CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj	12010b53b3caa3fc
 4552	5392	7556902332135074	libServerLMS.dll	2f530586cec8163
 4552	5392	7556902332135074	libServerLMS.dll.a	2f530586cec8163
+31	83	0	CMakeFiles/ServerLMS_autogen	a1ba014d73005738
+31	83	0	ServerLMS_autogen/mocs_compilation.cpp	a1ba014d73005738
+31	83	0	ServerLMS_autogen/include/ui_serverlmswidget.h	a1ba014d73005738
+31	83	0	D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen	a1ba014d73005738
+31	83	0	D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp	a1ba014d73005738
+31	83	0	D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h	a1ba014d73005738
+86	2197	7557879858492734	CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj	64946e3309bfc754
+84	2445	7557879860987697	CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj	b273ef6b79a34bf
+2445	3116	7557879867257378	libServerLMS.dll	2f530586cec8163
+2445	3116	7557879867257378	libServerLMS.dll.a	2f530586cec8163

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

@@ -1,4 +1,17 @@
 # Generated by CMake. Changes will be overwritten.
+D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp
+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/Systems/recognizesystem.cpp
+D:/LMS/ServerLMS/ServerLMS/providerdblms.cpp
+D:/LMS/ServerLMS/ServerLMS/Client.h
+D:/LMS/ServerLMS/ServerLMS/multithreadserver.h
+ mmc:Q_OBJECT
+D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h
+ mmc:Q_OBJECT
+D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h
 D:/LMS/ServerLMS/ServerLMS/providerdblms.h
  mmc:Q_OBJECT
 D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp
@@ -19,19 +32,6 @@ D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h
 D:/LMS/ServerLMS/ServerLMS/Systems/tools.h
 D:/LMS/ServerLMS/ServerLMS/clienthandler.h
  mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp
 D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h
  mmc:Q_OBJECT
-D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h
+D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp
-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/Systems/processingsystem.cpp

ServerLMS/ServerLMS/Systems/dataparser.cpp

@@ -95,6 +95,7 @@ void DataParser::xmlParser(ClientHandler *client, QByteArray array)
                     {
                         switch (queryToDB.typeQuery)
                         {
+                        case TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR:
                         case TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR:
                             if(name == "instructor_id")
                                 instructor.setID(value.toInt());
@@ -147,6 +148,7 @@ void DataParser::xmlParser(ClientHandler *client, QByteArray array)
 
                 switch (queryToDB.typeQuery)
                 {
+                case TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR:
                 case TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR:
                     data = &instructor;
                     break;

ServerLMS/ServerLMS/Systems/processingsystem.cpp

@@ -143,7 +143,13 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
         }
         case TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR:
         {
-            providerDBLMS->newInstructor();
+            int id;
+            id = providerDBLMS->newInstructor();
+            if(id)
+            {
+                (*(Instructor*)data).setID(id);
+                providerDBLMS->editInstructor(*(Instructor*)data);
+            }
             emit sigAuthChanged();
             break;
         }

TestServerLMS/Debug64/ListInstructors.xml

@@ -1,13 +1,14 @@
 <?xml version='1.0' encoding='utf-8'?>
 <ListInstructors>
-    <Instructor login="admin" password="admin" name="Администратор" logged_in="0" archived="0" instructor_id="1" is_admin="1"/>
+    <Instructor is_admin="1" password="admin" archived="0" login="admin" instructor_id="1" logged_in="0" name="Администратор"/>
-    <Instructor login="I1" password="1111" name="Горинин Г.Г." logged_in="0" archived="1" instructor_id="2" is_admin="0"/>
+    <Instructor is_admin="0" password="1111" archived="1" login="I1" instructor_id="2" logged_in="0" name="Горинин Г.Г."/>
-    <Instructor login="I4" password="4444" name="Кипелов К.К." logged_in="0" archived="0" instructor_id="4" is_admin="0"/>
+    <Instructor is_admin="0" password="4444" archived="0" login="I4" instructor_id="4" logged_in="0" name="Кипелов К.К."/>
-    <Instructor login="I3" password="333333" name="Карпов К.К." logged_in="0" archived="1" instructor_id="5" is_admin="0"/>
+    <Instructor is_admin="0" password="333333" archived="1" login="I3" instructor_id="5" logged_in="0" name="Карпов К.К."/>
-    <Instructor login="I5" password="5555" name="Мышков" logged_in="0" archived="1" instructor_id="8" is_admin="0"/>
+    <Instructor is_admin="0" password="5555" archived="1" login="I5" instructor_id="8" logged_in="0" name="Мышков"/>
-    <Instructor login="I6" password="6666" name="Abramyan A.A." logged_in="0" archived="0" instructor_id="16" is_admin="0"/>
+    <Instructor is_admin="0" password="6666" archived="0" login="I6" instructor_id="16" logged_in="0" name="Abramyan A.A."/>
-    <Instructor login="I11" password="1111" name="Pavlov" logged_in="0" archived="0" instructor_id="86" is_admin="0"/>
+    <Instructor is_admin="0" password="1111" archived="0" login="I11" instructor_id="86" logged_in="0" name="Pavlov"/>
-    <Instructor login="O18" password="1818" name="Dzagoev A" logged_in="0" archived="1" instructor_id="111" is_admin="0"/>
+    <Instructor is_admin="0" password="1818" archived="1" login="O18" instructor_id="111" logged_in="0" name="Dzagoev A"/>
-    <Instructor login="I20" password="2020" name="Ramin" logged_in="0" archived="0" instructor_id="113" is_admin="0"/>
+    <Instructor is_admin="0" password="2020" archived="0" login="I20" instructor_id="113" logged_in="0" name="Ramin"/>
-    <Instructor login="I12" password="1212" name="Gubin F" logged_in="0" archived="0" instructor_id="120" is_admin="0"/>
+    <Instructor is_admin="0" password="1212" archived="0" login="I12" instructor_id="120" logged_in="0" name="Gubin F"/>
+    <Instructor is_admin="0" password="2424" archived="1" login="I24" instructor_id="122" logged_in="0" name="Gurevich"/>
 </ListInstructors>

TestServerLMS/Debug64/ListTrainees.xml

@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='utf-8'?>
 <ListTrainees>
-    <Trainee trainee_id="90" login="&lt;login>" password="&lt;password>" name="&lt;trainee>" logged_in="0" group_trainee="53" archived="0" computer_trainee="0"/>
+    <Trainee password="&lt;password>" archived="0" login="&lt;login>" logged_in="0" trainee_id="90" name="&lt;trainee>" group_trainee="53" computer_trainee="0"/>
-    <Trainee trainee_id="87" login="O31" password="3131" name="Konyhov" logged_in="0" group_trainee="53" archived="0" computer_trainee="0"/>
+    <Trainee password="3131" archived="0" login="O31" logged_in="0" trainee_id="87" name="Konyhov" group_trainee="53" computer_trainee="0"/>
-    <Trainee trainee_id="5" login="O1" password="1111" name="Иванов И.И." logged_in="0" group_trainee="1" archived="0" computer_trainee="0"/>
+    <Trainee password="1111" archived="0" login="O1" logged_in="0" trainee_id="5" name="Иванов И.И." group_trainee="1" computer_trainee="0"/>
-    <Trainee trainee_id="6" login="O2" password="2222" name="Петров П.П." logged_in="0" group_trainee="1" archived="1" computer_trainee="0"/>
+    <Trainee password="2222" archived="1" login="O2" logged_in="0" trainee_id="6" name="Петров П.П." group_trainee="1" computer_trainee="0"/>
-    <Trainee trainee_id="7" login="O11" password="1111" name="Ручкин А.А." logged_in="0" group_trainee="1" archived="1" computer_trainee="0"/>
+    <Trainee password="1111" archived="1" login="O11" logged_in="0" trainee_id="7" name="Ручкин А.А." group_trainee="1" computer_trainee="0"/>
-    <Trainee trainee_id="9" login="O4" password="4444" name="Зайцев З.З." logged_in="0" group_trainee="2" archived="1" computer_trainee="0"/>
+    <Trainee password="4444" archived="1" login="O4" logged_in="0" trainee_id="9" name="Зайцев З.З." group_trainee="2" computer_trainee="0"/>
-    <Trainee trainee_id="10" login="O5" password="5555" name="Зюзин З.З." logged_in="0" group_trainee="2" archived="1" computer_trainee="0"/>
+    <Trainee password="5555" archived="1" login="O5" logged_in="0" trainee_id="10" name="Зюзин З.З." group_trainee="2" computer_trainee="0"/>
-    <Trainee trainee_id="11" login="O6" password="6666" name="Кондратьев К.К." logged_in="0" group_trainee="2" archived="1" computer_trainee="0"/>
+    <Trainee password="6666" archived="1" login="O6" logged_in="0" trainee_id="11" name="Кондратьев К.К." group_trainee="2" computer_trainee="0"/>
-    <Trainee trainee_id="12" login="O7" password="7777" name="Бобров Б.Б." logged_in="0" group_trainee="3" archived="0" computer_trainee="0"/>
+    <Trainee password="7777" archived="0" login="O7" logged_in="0" trainee_id="12" name="Бобров Б.Б." group_trainee="3" computer_trainee="0"/>
-    <Trainee trainee_id="13" login="O8" password="8888" name="Клочков К.К." logged_in="0" group_trainee="3" archived="1" computer_trainee="0"/>
+    <Trainee password="8888" archived="1" login="O8" logged_in="0" trainee_id="13" name="Клочков К.К." group_trainee="3" computer_trainee="0"/>
-    <Trainee trainee_id="37" login="O15" password="1515" name="Кривошеин А.В." logged_in="0" group_trainee="3" archived="0" computer_trainee="0"/>
+    <Trainee password="1515" archived="0" login="O15" logged_in="0" trainee_id="37" name="Кривошеин А.В." group_trainee="3" computer_trainee="0"/>
-    <Trainee trainee_id="14" login="O9" password="9999" name="Палкин П.П." logged_in="0" group_trainee="3" archived="1" computer_trainee="0"/>
+    <Trainee password="9999" archived="1" login="O9" logged_in="0" trainee_id="14" name="Палкин П.П." group_trainee="3" computer_trainee="0"/>
-    <Trainee trainee_id="15" login="O10" password="1010" name="Пучков П.П." logged_in="0" group_trainee="3" archived="0" computer_trainee="0"/>
+    <Trainee password="1010" archived="0" login="O10" logged_in="0" trainee_id="15" name="Пучков П.П." group_trainee="3" computer_trainee="0"/>
-    <Trainee trainee_id="88" login="O33" password="3333" name="Gagin" logged_in="0" group_trainee="48" archived="0" computer_trainee="0"/>
+    <Trainee password="3333" archived="0" login="O33" logged_in="0" trainee_id="88" name="Gagin" group_trainee="48" computer_trainee="0"/>
-    <Trainee trainee_id="83" login="O19" password="1919" name="Кузин К.К." logged_in="0" group_trainee="48" archived="0" computer_trainee="0"/>
+    <Trainee password="1919" archived="0" login="O19" logged_in="0" trainee_id="83" name="Кузин К.К." group_trainee="48" computer_trainee="0"/>
-    <Trainee trainee_id="89" login="O34" password="3434" name="Kolobkov" logged_in="0" group_trainee="54" archived="0" computer_trainee="0"/>
+    <Trainee password="3434" archived="0" login="O34" logged_in="0" trainee_id="89" name="Kolobkov" group_trainee="54" computer_trainee="0"/>
 </ListTrainees>

TestServerLMS/Debug64/StaticData/save.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ServerNotify Code="END"/>
+<ServerDeAuthorization Result="false" Login=""/>