diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index fe92a68..57bc79d 100644 Binary files a/DB_IaT/Debug64/.ninja_deps and b/DB_IaT/Debug64/.ninja_deps differ diff --git a/DB_IaT/Debug64/.ninja_log b/DB_IaT/Debug64/.ninja_log index 8200f18..af163f7 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/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 diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj index 47bde1d..0fdfa96 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj index 0715174..b5a47c2 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt index e22eec9..7de8d2c 100644 --- a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt +++ b/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 - 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 +D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.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/tasks/taskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp +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 - 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/instructorsAndTrainees_global.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 diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll b/DB_IaT/Debug64/libInstructorsAndTrainees.dll index 20cb757..d3f4c97 100644 Binary files a/DB_IaT/Debug64/libInstructorsAndTrainees.dll and b/DB_IaT/Debug64/libInstructorsAndTrainees.dll differ diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a b/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a index 244a972..87d4979 100644 Binary files a/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a and b/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a differ diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp index c6704f9..40a4afa 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +++ b/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) diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp index f945934..d3a9988 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp +++ b/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()) diff --git a/GUIdataBaseLMS/Debug64/.ninja_log b/GUIdataBaseLMS/Debug64/.ninja_log index deba991..befe6a6 100644 --- a/GUIdataBaseLMS/Debug64/.ninja_log +++ b/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 diff --git a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll index 20cb757..d3f4c97 100644 Binary files a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll and b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll differ diff --git a/ServerLMS/Debug64/.ninja_deps b/ServerLMS/Debug64/.ninja_deps index ff68047..ddb7514 100644 Binary files a/ServerLMS/Debug64/.ninja_deps and b/ServerLMS/Debug64/.ninja_deps differ diff --git a/ServerLMS/Debug64/.ninja_log b/ServerLMS/Debug64/.ninja_log index a97ca27..2f1ad1d 100644 --- a/ServerLMS/Debug64/.ninja_log +++ b/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 diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj index b863b36..8d68872 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj index 883b7af..380e5e3 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt index f4f6cf6..bee93b5 100644 --- a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt +++ b/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/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 +D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp diff --git a/ServerLMS/Debug64/libServerLMS.dll b/ServerLMS/Debug64/libServerLMS.dll index faae91d..4c5769d 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll and b/ServerLMS/Debug64/libServerLMS.dll differ diff --git a/ServerLMS/Debug64/libServerLMS.dll.a b/ServerLMS/Debug64/libServerLMS.dll.a index 3aeac82..0937d25 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll.a and b/ServerLMS/Debug64/libServerLMS.dll.a differ diff --git a/ServerLMS/ServerLMS/Systems/dataparser.cpp b/ServerLMS/ServerLMS/Systems/dataparser.cpp index bb92d91..7c0017a 100644 --- a/ServerLMS/ServerLMS/Systems/dataparser.cpp +++ b/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; diff --git a/ServerLMS/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/ServerLMS/Systems/processingsystem.cpp index d41d849..f976623 100644 --- a/ServerLMS/ServerLMS/Systems/processingsystem.cpp +++ b/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; } diff --git a/TestServerLMS/Debug64/ListInstructors.xml b/TestServerLMS/Debug64/ListInstructors.xml index ddf327d..ae7ffb8 100644 --- a/TestServerLMS/Debug64/ListInstructors.xml +++ b/TestServerLMS/Debug64/ListInstructors.xml @@ -1,13 +1,14 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/ListTrainees.xml b/TestServerLMS/Debug64/ListTrainees.xml index 3ad73b9..47fe473 100644 --- a/TestServerLMS/Debug64/ListTrainees.xml +++ b/TestServerLMS/Debug64/ListTrainees.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/StaticData/save.xml b/TestServerLMS/Debug64/StaticData/save.xml index 4902929..163b3d3 100644 --- a/TestServerLMS/Debug64/StaticData/save.xml +++ b/TestServerLMS/Debug64/StaticData/save.xml @@ -1,2 +1,2 @@ - + diff --git a/TestServerLMS/Debug64/libServerLMS.dll b/TestServerLMS/Debug64/libServerLMS.dll index faae91d..4c5769d 100644 Binary files a/TestServerLMS/Debug64/libServerLMS.dll and b/TestServerLMS/Debug64/libServerLMS.dll differ