diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index d047759..2dd71b9 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 7d3149b..a5c3f6e 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/DB_IaT/Debug64/.ninja_log @@ -1,124 +1,89 @@ # ninja log v5 -1578 4794 7554403545565259 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d -363 2041 7560395908384981 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -365 2362 7560395911605252 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 -19 59 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -417 2249 7555250085369086 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 -19 59 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -1400 1526 7554403513026725 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -4063 6185 7554403559590571 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 1400 1526 7554403513026725 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -377 2333 7560395911300526 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b -384 2133 7560395909293673 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de -374 1491 7558001940578855 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc -374 2282 7560395910807236 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 -19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -59 789 7560407008089049 libInstructorsAndTrainees.dll.a c1e915765a645e23 +83 2371 7560612368844534 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +80 2215 7560612367304363 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +21 63 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +2683 3428 7560612378874436 libInstructorsAndTrainees.dll.a c1e915765a645e23 +21 63 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +90 2120 7560612366345595 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de 4398 4745 7554403545178109 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b -19 59 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +374 1491 7558001940578855 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc 47 59 0 clean 9c4b4372737ab8da -19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +21 63 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +21 63 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +4063 6185 7554403559590571 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 +21 63 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +1400 1526 7554403513026725 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +21 63 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +72 2392 7560612369105271 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +417 2216 7560471257446302 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 +21 63 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +21 63 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +1578 4794 7554403545565259 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d +69 2074 7560612365897921 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 489 2055 7560378913951554 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 -19 59 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +21 63 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 1565 4028 7554403537718314 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 16 47 0 CMakeFiles/clean.additional 7155004b3956b606 -368 2292 7560395910917894 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 -59 789 7560407008089049 libInstructorsAndTrainees.dll c1e915765a645e23 -19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +74 2111 7560612366245861 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 +2683 3428 7560612378874436 libInstructorsAndTrainees.dll c1e915765a645e23 +21 63 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +21 63 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 1573 4657 7554403543966835 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -63 1103 7557955991039090 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +21 63 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +21 63 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +94 1839 7560612363554957 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 15 276 7560367350521828 build.ninja 76aa11f472515be0 -371 2186 7560395909839359 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b -19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +77 2234 7560612367514596 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +21 63 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 1543 3051 7554403527720657 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 491 2059 7560378913981469 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f -60 1744 7560406737982321 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -19 59 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +66 2682 7560612371974262 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +21 63 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 431 2002 7555250082834355 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 -358 2646 7560395914408650 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -60 999 7557022709262915 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -380 2187 7560395909849335 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +64 2552 7560612370693881 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +101 1677 7560612361930750 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +87 2216 7560612367304363 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 1582 2944 7554403526627168 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 7e450168ba24c81a -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -423 2444 7556304767863910 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d -15 49 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -15 49 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -15 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -49 1715 7560409043307614 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -1715 2436 7560409050015834 libInstructorsAndTrainees.dll c1e915765a645e23 -1715 2436 7560409050015834 libInstructorsAndTrainees.dll.a c1e915765a645e23 -19 408 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 408 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 408 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -408 2025 7560411190913306 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de -411 2108 7560411191755906 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -2108 2858 7560411198712649 libInstructorsAndTrainees.dll c1e915765a645e23 -2108 2858 7560411198712649 libInstructorsAndTrainees.dll.a c1e915765a645e23 +97 2148 7560612366593743 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 57 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj index c584604..0731fc2 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj differ 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 c951c24..6798430 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/connectorToServer/Core/sendsystem.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj index fa5b505..c33eb05 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj index c9b1874..5a29c36 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.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 b5a47c2..eeb3fcb 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.dir/instructorsandtraineeswidget.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj index fc62474..9583f8a 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj index 811e701..5c26f3f 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.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 c149733..7f07ecd 100644 --- a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt +++ b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt @@ -1,72 +1,52 @@ # Generated by CMake. Changes will be overwritten. +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h + mmc:Q_OBJECT +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/messanger/messangerwidget.cpp + uic:ui_messangerwidget.h +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/instructors/dialogauthorizationinstructor.h + mmc:Q_OBJECT + uic:ui_dialogauthorizationinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.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/connectorToServer/Core/dataparser.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h +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/messanger/messangerwidget.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.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/viewerinstructors.cpp - uic:ui_viewerinstructors.h -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/messanger/messangerwidget.cpp - uic:ui_messangerwidget.h -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 -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.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/instructors/dialogeditinstructor.h - mmc:Q_OBJECT - uic:ui_dialogeditinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp - uic:ui_viewertrainees.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp -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/docTasks/doctaskswidget.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.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/viewertrainees.h +D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h mmc:Q_OBJECT -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/trainees/computersLocations.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp uic:ui_taskswidget.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp @@ -74,11 +54,31 @@ D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.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/dialogeditinstructor.cpp - uic:ui_dialogeditinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.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/instructorsandtraineeswidget.cpp + uic:ui_instructorsandtraineeswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h + mmc:Q_OBJECT + uic:ui_dialogeditinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp + uic:ui_viewertrainees.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.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/instructors/viewerinstructors.cpp + uic:ui_viewerinstructors.h diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp index 440bafe..abaabff 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp @@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_ConnectorToServer_t { - QByteArrayData data[45]; - char stringdata0[785]; + QByteArrayData data[46]; + char stringdata0[788]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -45,53 +45,53 @@ QT_MOC_LITERAL(8, 100, 16), // "RecognizeSystem*" QT_MOC_LITERAL(9, 117, 15), // "recognizeSystem" QT_MOC_LITERAL(10, 133, 11), // "SendSystem*" QT_MOC_LITERAL(11, 145, 10), // "sendSystem" -QT_MOC_LITERAL(12, 156, 19), // "sigSendAutorization" -QT_MOC_LITERAL(13, 176, 21), // "sigSendDeAutorization" -QT_MOC_LITERAL(14, 198, 16), // "sigSendQueryToDB" -QT_MOC_LITERAL(15, 215, 14), // "sigLoginResult" -QT_MOC_LITERAL(16, 230, 20), // "ServerAuthorization*" -QT_MOC_LITERAL(17, 251, 10), // "serverAuth" -QT_MOC_LITERAL(18, 262, 16), // "sigDeLoginResult" -QT_MOC_LITERAL(19, 279, 22), // "ServerDeAuthorization*" -QT_MOC_LITERAL(20, 302, 12), // "serverDeAuth" -QT_MOC_LITERAL(21, 315, 15), // "signal_UpdateDB" -QT_MOC_LITERAL(22, 331, 14), // "treeInstructor" -QT_MOC_LITERAL(23, 346, 11), // "treeTrainee" -QT_MOC_LITERAL(24, 358, 24), // "signal_ConnectedToServer" -QT_MOC_LITERAL(25, 383, 5), // "state" -QT_MOC_LITERAL(26, 389, 20), // "signal_InitMessanger" -QT_MOC_LITERAL(27, 410, 14), // "QList" -QT_MOC_LITERAL(28, 425, 12), // "listTrainees" -QT_MOC_LITERAL(29, 438, 36), // "slot_AnswerQueryToDB_ListInst..." -QT_MOC_LITERAL(30, 475, 17), // "QList" -QT_MOC_LITERAL(31, 493, 15), // "listInstructors" -QT_MOC_LITERAL(32, 509, 31), // "slot_AnswerQueryToDB_ListGroups" -QT_MOC_LITERAL(33, 541, 12), // "QList" -QT_MOC_LITERAL(34, 554, 10), // "listGroups" -QT_MOC_LITERAL(35, 565, 33), // "slot_AnswerQueryToDB_ListTrai..." -QT_MOC_LITERAL(36, 599, 34), // "slot_AnswerQueryToDB_ListComp..." -QT_MOC_LITERAL(37, 634, 15), // "QList" -QT_MOC_LITERAL(38, 650, 13), // "listComputers" -QT_MOC_LITERAL(39, 664, 35), // "slot_AnswerQueryToDB_ListClas..." -QT_MOC_LITERAL(40, 700, 16), // "QList" -QT_MOC_LITERAL(41, 717, 14), // "listClassrooms" -QT_MOC_LITERAL(42, 732, 30), // "slot_AnswerQueryToDB_ListTasks" -QT_MOC_LITERAL(43, 763, 11), // "QList" -QT_MOC_LITERAL(44, 775, 9) // "listTasks" +QT_MOC_LITERAL(12, 156, 28), // "signal_sendXMLmsgGUItoServer" +QT_MOC_LITERAL(13, 185, 14), // "sigLoginResult" +QT_MOC_LITERAL(14, 200, 20), // "ServerAuthorization*" +QT_MOC_LITERAL(15, 221, 10), // "serverAuth" +QT_MOC_LITERAL(16, 232, 16), // "sigDeLoginResult" +QT_MOC_LITERAL(17, 249, 22), // "ServerDeAuthorization*" +QT_MOC_LITERAL(18, 272, 12), // "serverDeAuth" +QT_MOC_LITERAL(19, 285, 15), // "signal_UpdateDB" +QT_MOC_LITERAL(20, 301, 14), // "treeInstructor" +QT_MOC_LITERAL(21, 316, 11), // "treeTrainee" +QT_MOC_LITERAL(22, 328, 24), // "signal_ConnectedToServer" +QT_MOC_LITERAL(23, 353, 5), // "state" +QT_MOC_LITERAL(24, 359, 20), // "signal_InitMessanger" +QT_MOC_LITERAL(25, 380, 14), // "QList" +QT_MOC_LITERAL(26, 395, 12), // "listTrainees" +QT_MOC_LITERAL(27, 408, 36), // "slot_AnswerQueryToDB_ListInst..." +QT_MOC_LITERAL(28, 445, 17), // "QList" +QT_MOC_LITERAL(29, 463, 15), // "listInstructors" +QT_MOC_LITERAL(30, 479, 31), // "slot_AnswerQueryToDB_ListGroups" +QT_MOC_LITERAL(31, 511, 12), // "QList" +QT_MOC_LITERAL(32, 524, 10), // "listGroups" +QT_MOC_LITERAL(33, 535, 33), // "slot_AnswerQueryToDB_ListTrai..." +QT_MOC_LITERAL(34, 569, 34), // "slot_AnswerQueryToDB_ListComp..." +QT_MOC_LITERAL(35, 604, 15), // "QList" +QT_MOC_LITERAL(36, 620, 13), // "listComputers" +QT_MOC_LITERAL(37, 634, 35), // "slot_AnswerQueryToDB_ListClas..." +QT_MOC_LITERAL(38, 670, 16), // "QList" +QT_MOC_LITERAL(39, 687, 14), // "listClassrooms" +QT_MOC_LITERAL(40, 702, 30), // "slot_AnswerQueryToDB_ListTasks" +QT_MOC_LITERAL(41, 733, 11), // "QList" +QT_MOC_LITERAL(42, 745, 9), // "listTasks" +QT_MOC_LITERAL(43, 755, 21), // "slot_msgToClientReady" +QT_MOC_LITERAL(44, 777, 5), // "login" +QT_MOC_LITERAL(45, 783, 4) // "text" }, "ConnectorToServer\0sigSetConnect\0\0" "ServerSettings*\0serverSettings\0QThread*\0" "thread\0sigInitializeClient\0RecognizeSystem*\0" "recognizeSystem\0SendSystem*\0sendSystem\0" - "sigSendAutorization\0sigSendDeAutorization\0" - "sigSendQueryToDB\0sigLoginResult\0" - "ServerAuthorization*\0serverAuth\0" - "sigDeLoginResult\0ServerDeAuthorization*\0" - "serverDeAuth\0signal_UpdateDB\0" - "treeInstructor\0treeTrainee\0" - "signal_ConnectedToServer\0state\0" - "signal_InitMessanger\0QList\0" + "signal_sendXMLmsgGUItoServer\0" + "sigLoginResult\0ServerAuthorization*\0" + "serverAuth\0sigDeLoginResult\0" + "ServerDeAuthorization*\0serverDeAuth\0" + "signal_UpdateDB\0treeInstructor\0" + "treeTrainee\0signal_ConnectedToServer\0" + "state\0signal_InitMessanger\0QList\0" "listTrainees\0slot_AnswerQueryToDB_ListInstructors\0" "QList\0listInstructors\0" "slot_AnswerQueryToDB_ListGroups\0" @@ -102,7 +102,8 @@ QT_MOC_LITERAL(44, 775, 9) // "listTasks" "slot_AnswerQueryToDB_ListClassrooms\0" "QList\0listClassrooms\0" "slot_AnswerQueryToDB_ListTasks\0" - "QList\0listTasks" + "QList\0listTasks\0slot_msgToClientReady\0" + "login\0text" }; #undef QT_MOC_LITERAL @@ -112,52 +113,50 @@ static const uint qt_meta_data_ConnectorToServer[] = { 8, // revision 0, // classname 0, 0, // classinfo - 16, 14, // methods + 15, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 10, // signalCount + 8, // signalCount // signals: name, argc, parameters, tag, flags - 1, 2, 94, 2, 0x06 /* Public */, - 7, 3, 99, 2, 0x06 /* Public */, - 12, 0, 106, 2, 0x06 /* Public */, - 13, 0, 107, 2, 0x06 /* Public */, - 14, 0, 108, 2, 0x06 /* Public */, - 15, 1, 109, 2, 0x06 /* Public */, - 18, 1, 112, 2, 0x06 /* Public */, - 21, 2, 115, 2, 0x06 /* Public */, - 24, 1, 120, 2, 0x06 /* Public */, - 26, 1, 123, 2, 0x06 /* Public */, + 1, 2, 89, 2, 0x06 /* Public */, + 7, 3, 94, 2, 0x06 /* Public */, + 12, 0, 101, 2, 0x06 /* Public */, + 13, 1, 102, 2, 0x06 /* Public */, + 16, 1, 105, 2, 0x06 /* Public */, + 19, 2, 108, 2, 0x06 /* Public */, + 22, 1, 113, 2, 0x06 /* Public */, + 24, 1, 116, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 29, 1, 126, 2, 0x0a /* Public */, - 32, 1, 129, 2, 0x0a /* Public */, - 35, 1, 132, 2, 0x0a /* Public */, - 36, 1, 135, 2, 0x0a /* Public */, - 39, 1, 138, 2, 0x0a /* Public */, - 42, 1, 141, 2, 0x0a /* Public */, + 27, 1, 119, 2, 0x0a /* Public */, + 30, 1, 122, 2, 0x0a /* Public */, + 33, 1, 125, 2, 0x0a /* Public */, + 34, 1, 128, 2, 0x0a /* Public */, + 37, 1, 131, 2, 0x0a /* Public */, + 40, 1, 134, 2, 0x0a /* Public */, + 43, 2, 137, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 4, 6, QMetaType::Void, 0x80000000 | 8, 0x80000000 | 10, 0x80000000 | 5, 9, 11, 6, QMetaType::Void, - QMetaType::Void, - QMetaType::Void, - QMetaType::Void, 0x80000000 | 16, 17, - QMetaType::Void, 0x80000000 | 19, 20, - QMetaType::Void, QMetaType::Bool, QMetaType::Bool, 22, 23, - QMetaType::Void, QMetaType::Bool, 25, - QMetaType::Void, 0x80000000 | 27, 28, + QMetaType::Void, 0x80000000 | 14, 15, + QMetaType::Void, 0x80000000 | 17, 18, + QMetaType::Void, QMetaType::Bool, QMetaType::Bool, 20, 21, + QMetaType::Void, QMetaType::Bool, 23, + QMetaType::Void, 0x80000000 | 25, 26, // slots: parameters - QMetaType::Void, 0x80000000 | 30, 31, - QMetaType::Void, 0x80000000 | 33, 34, - QMetaType::Void, 0x80000000 | 27, 28, - QMetaType::Void, 0x80000000 | 37, 38, - QMetaType::Void, 0x80000000 | 40, 41, - QMetaType::Void, 0x80000000 | 43, 44, + QMetaType::Void, 0x80000000 | 28, 29, + QMetaType::Void, 0x80000000 | 31, 32, + QMetaType::Void, 0x80000000 | 25, 26, + QMetaType::Void, 0x80000000 | 35, 36, + QMetaType::Void, 0x80000000 | 38, 39, + QMetaType::Void, 0x80000000 | 41, 42, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 44, 45, 0 // eod }; @@ -170,20 +169,19 @@ void ConnectorToServer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in switch (_id) { case 0: _t->sigSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1])),(*reinterpret_cast< QThread*(*)>(_a[2]))); break; case 1: _t->sigInitializeClient((*reinterpret_cast< RecognizeSystem*(*)>(_a[1])),(*reinterpret_cast< SendSystem*(*)>(_a[2])),(*reinterpret_cast< QThread*(*)>(_a[3]))); break; - case 2: _t->sigSendAutorization(); break; - case 3: _t->sigSendDeAutorization(); break; - case 4: _t->sigSendQueryToDB(); break; - case 5: _t->sigLoginResult((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break; - case 6: _t->sigDeLoginResult((*reinterpret_cast< ServerDeAuthorization*(*)>(_a[1]))); break; - case 7: _t->signal_UpdateDB((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< bool(*)>(_a[2]))); break; - case 8: _t->signal_ConnectedToServer((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 9: _t->signal_InitMessanger((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 10: _t->slot_AnswerQueryToDB_ListInstructors((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 11: _t->slot_AnswerQueryToDB_ListGroups((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 12: _t->slot_AnswerQueryToDB_ListTrainees((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 13: _t->slot_AnswerQueryToDB_ListComputers((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 14: _t->slot_AnswerQueryToDB_ListClassrooms((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 15: _t->slot_AnswerQueryToDB_ListTasks((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 2: _t->signal_sendXMLmsgGUItoServer(); break; + case 3: _t->sigLoginResult((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break; + case 4: _t->sigDeLoginResult((*reinterpret_cast< ServerDeAuthorization*(*)>(_a[1]))); break; + case 5: _t->signal_UpdateDB((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< bool(*)>(_a[2]))); break; + case 6: _t->signal_ConnectedToServer((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 7: _t->signal_InitMessanger((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 8: _t->slot_AnswerQueryToDB_ListInstructors((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 9: _t->slot_AnswerQueryToDB_ListGroups((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 10: _t->slot_AnswerQueryToDB_ListTrainees((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 11: _t->slot_AnswerQueryToDB_ListComputers((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 12: _t->slot_AnswerQueryToDB_ListClassrooms((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 13: _t->slot_AnswerQueryToDB_ListTasks((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 14: _t->slot_msgToClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { @@ -217,57 +215,43 @@ void ConnectorToServer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in } { using _t = void (ConnectorToServer::*)(); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::sigSendAutorization)) { + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::signal_sendXMLmsgGUItoServer)) { *result = 2; return; } } - { - using _t = void (ConnectorToServer::*)(); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::sigSendDeAutorization)) { - *result = 3; - return; - } - } - { - using _t = void (ConnectorToServer::*)(); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::sigSendQueryToDB)) { - *result = 4; - return; - } - } { using _t = void (ConnectorToServer::*)(ServerAuthorization * ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::sigLoginResult)) { - *result = 5; + *result = 3; return; } } { using _t = void (ConnectorToServer::*)(ServerDeAuthorization * ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::sigDeLoginResult)) { - *result = 6; + *result = 4; return; } } { using _t = void (ConnectorToServer::*)(bool , bool ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::signal_UpdateDB)) { - *result = 7; + *result = 5; return; } } { using _t = void (ConnectorToServer::*)(bool ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::signal_ConnectedToServer)) { - *result = 8; + *result = 6; return; } } { using _t = void (ConnectorToServer::*)(QList ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::signal_InitMessanger)) { - *result = 9; + *result = 7; return; } } @@ -303,13 +287,13 @@ int ConnectorToServer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 16) + if (_id < 15) qt_static_metacall(this, _c, _id, _a); - _id -= 16; + _id -= 15; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 16) + if (_id < 15) qt_static_metacall(this, _c, _id, _a); - _id -= 16; + _id -= 15; } return _id; } @@ -329,56 +313,44 @@ void ConnectorToServer::sigInitializeClient(RecognizeSystem * _t1, SendSystem * } // SIGNAL 2 -void ConnectorToServer::sigSendAutorization() +void ConnectorToServer::signal_sendXMLmsgGUItoServer() { QMetaObject::activate(this, &staticMetaObject, 2, nullptr); } // SIGNAL 3 -void ConnectorToServer::sigSendDeAutorization() -{ - QMetaObject::activate(this, &staticMetaObject, 3, nullptr); -} - -// SIGNAL 4 -void ConnectorToServer::sigSendQueryToDB() -{ - QMetaObject::activate(this, &staticMetaObject, 4, nullptr); -} - -// SIGNAL 5 void ConnectorToServer::sigLoginResult(ServerAuthorization * _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 3, _a); +} + +// SIGNAL 4 +void ConnectorToServer::sigDeLoginResult(ServerDeAuthorization * _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 4, _a); +} + +// SIGNAL 5 +void ConnectorToServer::signal_UpdateDB(bool _t1, bool _t2) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 5, _a); } // SIGNAL 6 -void ConnectorToServer::sigDeLoginResult(ServerDeAuthorization * _t1) +void ConnectorToServer::signal_ConnectedToServer(bool _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 6, _a); } // SIGNAL 7 -void ConnectorToServer::signal_UpdateDB(bool _t1, bool _t2) -{ - void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; - QMetaObject::activate(this, &staticMetaObject, 7, _a); -} - -// SIGNAL 8 -void ConnectorToServer::signal_ConnectedToServer(bool _t1) -{ - void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; - QMetaObject::activate(this, &staticMetaObject, 8, _a); -} - -// SIGNAL 9 void ConnectorToServer::signal_InitMessanger(QList _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; - QMetaObject::activate(this, &staticMetaObject, 9, _a); + QMetaObject::activate(this, &staticMetaObject, 7, _a); } QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll b/DB_IaT/Debug64/libInstructorsAndTrainees.dll index bc9c78f..c7fa1cc 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 7ff969e..71254d3 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/CMakeLists.txt.user b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user index e2f8f42..aba755b 100644 --- a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user +++ b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp index b375137..70cbbdb 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp @@ -75,6 +75,29 @@ void DataParser::createAuthMessage(ClientAutorization *auth) file.close(); } +void DataParser::createToClientMessage(ToClientMessage *toClientMessage) +{ + QFile file(tempName); + file.open(QIODevice::WriteOnly); + QXmlStreamWriter xmlWriter(&file); + + xmlWriter.setAutoFormatting(true); + xmlWriter.writeStartDocument(); + xmlWriter.writeStartElement("ToClientMessage"); + + xmlWriter.writeAttribute("id", QString::number(toClientMessage->id)); + xmlWriter.writeAttribute("Login", toClientMessage->Login); + xmlWriter.writeAttribute("Text", toClientMessage->Text); + + xmlWriter.writeEndElement(); + xmlWriter.writeEndElement(); + xmlWriter.writeEndDocument(); + + file.close(); +} + + + void DataParser::createQueryToDBMessage(ClientQueryToDB *queryToDB, int id, void* data) { QFile file(tempName); diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h index 7be64a4..d041e85 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h @@ -22,6 +22,7 @@ public: void saveClientSettrings(QString language,bool isAutoStart); void createFileDataList(QList fileDataList,QString filename); void createAuthMessage(ClientAutorization *auth); + void createToClientMessage(ToClientMessage *toClientMessage); void createQueryToDBMessage(ClientQueryToDB *queryToDB, int id = 0, void* data = nullptr); void createDeAuthMessage(ClientDeAutorization *deAuth); void createAuthData(ServerAuthorization *serverAuth); diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp index def336b..051dbf2 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp @@ -31,7 +31,7 @@ void SendSystem::sendDisable() socket->waitForBytesWritten(); } -void SendSystem::sendClientAutorization() +void SendSystem::sendXMLmsgGUItoServer() { QDataStream stream(socket); stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); @@ -129,23 +129,6 @@ void SendSystem::sendFinish() socket->waitForReadyRead(100); } -void SendSystem::sendClientQueryToDB() -{ - QDataStream stream(socket); - stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); - - QFile file(tempName); - file.open(QIODevice::ReadOnly); - - QByteArray array = file.readAll(); - - stream << PacketType::TYPE_XMLANSWER; - stream << array; - socket->waitForBytesWritten(); - - file.close(); -} - SendSystem::~SendSystem() { diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h index 44325ee..b260776 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h @@ -11,7 +11,7 @@ class SendSystem :public QObject public: explicit SendSystem(QObject* parent = nullptr); void setSocket(QTcpSocket *socket); - void sendClientAutorization(); + void sendXMLmsgGUItoServer(); void sendDisable(); void sendFileBlock(QString path); void sendFolderBlock(QString path); @@ -20,7 +20,6 @@ public: ~SendSystem(); void sendFinish(); - void sendClientQueryToDB(); signals: void sigSend(); QByteArray sigGetXmlAnswer(QString); diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h index b6afd28..5a34aa3 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h @@ -43,7 +43,6 @@ public: }; enum TypeQueryToDB{ - TYPE_QUERY_GET_LIST_INSTRUCTORS, TYPE_QUERY_GET_ALL_LISTS, TYPE_QUERY_NEW_INSTRUCTOR, TYPE_QUERY_DEL_INSTRUCTOR, @@ -73,6 +72,14 @@ public: QString Text; }; +class ToClientMessage +{ +public: + int id; + QString Login; + QString Text; +}; + class ServerTask { public: diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index aea4d8e..61ebc1c 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -25,7 +25,7 @@ bool ConnectorToServer::authorizationInstructorLocal(QString login, QString pass autorization->TypeClient = TypeClientAutorization::TYPE_GUI; dataParser->createAuthMessage(autorization); - emit sigSendAutorization(); + emit signal_sendXMLmsgGUItoServer(); return true; } @@ -41,7 +41,7 @@ bool ConnectorToServer::deAuthorizationInstructorLocal(QString login) deAutorization->Login = login; dataParser->createDeAuthMessage(deAutorization); - emit sigSendDeAutorization(); + emit signal_sendXMLmsgGUItoServer(); return true; } @@ -57,7 +57,25 @@ bool ConnectorToServer::sendQueryToDB(TypeQueryToDB typeQuery, int id, void* dat queryToDB->typeQuery = typeQuery; dataParser->createQueryToDBMessage(queryToDB, id, data); - emit sigSendQueryToDB(); + emit signal_sendXMLmsgGUItoServer(); + + return true; +} + +bool ConnectorToServer::sendMessageForClient(int id, QString login, QString text) +{ + if (!client->getIsConnected()) + { + return false; + } + + ToClientMessage *toClientMessage = new ToClientMessage; + toClientMessage->id = id; + toClientMessage->Login = login; + toClientMessage->Text = text; + + dataParser->createToClientMessage(toClientMessage); + emit signal_sendXMLmsgGUItoServer(); return true; } @@ -198,6 +216,16 @@ Group ConnectorToServer::getGroup(int id) return Group(); } +int ConnectorToServer::getIdTraineeByLogin(QString login) +{ + for(Trainee trainee : listTrainees) + { + if(trainee.getLogin() == login) + return trainee.getID(); + } + return 0; +} + /* void ConnectorToServer::slot_AnswerQueryToDB(QList* listInstructors, QList* listTrainees, @@ -246,6 +274,13 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListTasks(QList listTasks) //emit signal_UpdateDB(false, true); } +void ConnectorToServer::slot_msgToClientReady(QString login, QString text) +{ + int id = getIdTraineeByLogin(login); + if(id) + sendMessageForClient(id, login, text); +} + void ConnectorToServer::initialize() @@ -263,10 +298,7 @@ void ConnectorToServer::bindConnection() { connect(this,&ConnectorToServer::sigInitializeClient,client,&TCPClient::initialize,Qt::AutoConnection); connect(this,&ConnectorToServer::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection); - connect(this,&ConnectorToServer::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization); - connect(this,&ConnectorToServer::sigSendDeAutorization,sendSystem,&SendSystem::sendClientAutorization); - - connect(this,&ConnectorToServer::sigSendQueryToDB,sendSystem,&SendSystem::sendClientQueryToDB); + connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer); connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::sigLoginResult); connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult); diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h index e4cb85c..bd3b9ec 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -23,6 +23,7 @@ public: bool deAuthorizationInstructorLocal(QString login); bool sendQueryToDB(TypeQueryToDB typeQuery, int id = 0, void* data = nullptr); + bool sendMessageForClient(int id, QString login, QString text); void SetConnectToServer(); @@ -46,6 +47,8 @@ public: Trainee getTrainee(int id); Group getGroup(int id); + int getIdTraineeByLogin(QString login); + public slots: /*void slot_AnswerQueryToDB(QList* listInstructors, QList* listTrainees, @@ -58,16 +61,15 @@ public slots: void slot_AnswerQueryToDB_ListClassrooms(QList listClassrooms); void slot_AnswerQueryToDB_ListTasks(QList listTasks); + void slot_msgToClientReady(QString login, QString text); + signals: void sigSetConnect(ServerSettings* serverSettings,QThread *thread); void sigInitializeClient(RecognizeSystem *recognizeSystem, SendSystem *sendSystem, - QThread *thread); - void sigSendAutorization(); - void sigSendDeAutorization(); - - void sigSendQueryToDB(); + QThread *thread); + void signal_sendXMLmsgGUItoServer(); void sigLoginResult(ServerAuthorization * serverAuth); void sigDeLoginResult(ServerDeAuthorization * serverDeAuth); diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 39badf1..a9b433b 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -47,6 +47,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger); connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, messangerWidget, &MessangerWidget::slot_traineeSelected); connect(messangerWidget, &MessangerWidget::signal_tabMessengerChanged, viewerTrainees, &ViewerTrainees::slot_tabMessengerChanged); + connect(messangerWidget, &MessangerWidget::signal_msgToClientReady, connectorToServer, &ConnectorToServer::slot_msgToClientReady); + docTasksWidget = new DocTasksWidget(this); diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user b/DB_LMS/DataBaseLMS/CMakeLists.txt.user index b8f038e..c660169 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt.user +++ b/DB_LMS/DataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/GUIdataBaseLMS/Debug64/.ninja_deps b/GUIdataBaseLMS/Debug64/.ninja_deps index e388429..df85e24 100644 Binary files a/GUIdataBaseLMS/Debug64/.ninja_deps and b/GUIdataBaseLMS/Debug64/.ninja_deps differ diff --git a/GUIdataBaseLMS/Debug64/.ninja_log b/GUIdataBaseLMS/Debug64/.ninja_log index 4b4c8f3..150227f 100644 --- a/GUIdataBaseLMS/Debug64/.ninja_log +++ b/GUIdataBaseLMS/Debug64/.ninja_log @@ -76,3 +76,19 @@ 12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +8 39 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +8 39 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +8 39 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +8 39 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +8 39 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +8 39 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +40 1340 7560516203393501 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +42 1359 7560516203584944 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +45 1462 7560516204608000 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1462 1612 7560516206097136 GUIdataBaseLMS.exe dadb916a9424404 +17 48 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +17 48 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +17 48 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f diff --git a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe index 2a352c0..82642df 100644 Binary files a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe and b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe differ diff --git a/GUIdataBaseLMS/Debug64/StaticData/temp.xml b/GUIdataBaseLMS/Debug64/StaticData/temp.xml index 40e39ea..84a89f3 100644 --- a/GUIdataBaseLMS/Debug64/StaticData/temp.xml +++ b/GUIdataBaseLMS/Debug64/StaticData/temp.xml @@ -1,2 +1,2 @@ - + diff --git a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll index bc9c78f..c7fa1cc 100644 Binary files a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll and b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll differ diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user index 0a912d5..90326ce 100644 --- a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user +++ b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ServerLMS/Debug64/.ninja_deps b/ServerLMS/Debug64/.ninja_deps index 18ffb8b..4dca3c9 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 9086289..3f80e29 100644 --- a/ServerLMS/Debug64/.ninja_log +++ b/ServerLMS/Debug64/.ninja_log @@ -26,3 +26,85 @@ 15 46 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 63 116 7556089587835465 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 62 2260 7557935707531126 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +21 654 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +21 654 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +21 654 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +21 654 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +21 654 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +21 654 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +665 3465 7560481992544048 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +674 3466 7560481992554019 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +667 3622 7560481994109874 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +654 3632 7560481994211215 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +677 3662 7560481994495096 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 +659 3798 7560481995865263 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +671 3818 7560481996067921 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +657 3895 7560481996852847 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +662 3977 7560481997674492 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +3977 4574 7560482003193366 libServerLMS.dll 2f530586cec8163 +3977 4574 7560482003193366 libServerLMS.dll.a 2f530586cec8163 +18 56 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 56 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 56 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 56 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +15 48 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +15 48 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +15 48 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +15 48 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +15 48 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +15 48 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +49 2134 7560539041796990 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +2134 2694 7560539046914827 libServerLMS.dll 2f530586cec8163 +2134 2694 7560539046914827 libServerLMS.dll.a 2f530586cec8163 +18 61 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 61 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 61 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 61 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 61 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 61 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +13 488 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +13 488 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +13 488 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +13 488 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +13 488 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +13 488 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +495 3264 7560568013544626 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +508 3344 7560568014395597 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +502 3508 7560568016005634 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +512 3545 7560568016325066 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 +488 3562 7560568016572622 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +498 3587 7560568016825885 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +491 3732 7560568018275537 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +493 3887 7560568019826793 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +505 3909 7560568020035964 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +3909 4468 7560568025168840 libServerLMS.dll 2f530586cec8163 +3909 4468 7560568025168840 libServerLMS.dll.a 2f530586cec8163 +18 568 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 568 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 568 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 568 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 568 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 568 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +574 3228 7560612478085555 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +578 3474 7560612480554593 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +582 3493 7560612480724118 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +569 3525 7560612481064279 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +588 3590 7560612481654427 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +576 3706 7560612482874853 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +591 3764 7560612483399129 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 +571 3829 7560612484097423 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +585 3893 7560612484744294 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +3893 4453 7560612489895728 libServerLMS.dll 2f530586cec8163 +3893 4453 7560612489895728 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 +60 2225 7560635986964049 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +57 2392 7560635988624358 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +2392 2950 7560635993714374 libServerLMS.dll 2f530586cec8163 +2392 2950 7560635993714374 libServerLMS.dll.a 2f530586cec8163 diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj index 0dc80d9..5b77686 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj index 32023fa..3837bf1 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 88eecb7..9f5cef5 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.dir/Systems/recognizesystem.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj index 4043f4e..5189695 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj index 5d5f924..f5c735f 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj index f520be6..075a85d 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt index 6be312b..3093ae6 100644 --- a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt +++ b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt @@ -1,5 +1,22 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp +D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp +D:/LMS/ServerLMS/ServerLMS/providerdblms.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/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/Systems/dataparser.cpp +D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h + mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp @@ -17,21 +34,4 @@ 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/clienthandler.cpp -D:/LMS/ServerLMS/ServerLMS/providerdblms.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/multithreadserver.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Client.h -D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.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/serverlmswidget.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp diff --git a/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_serverlmswidget.cpp b/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_serverlmswidget.cpp index faaa570..7d7d7f2 100644 --- a/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_serverlmswidget.cpp +++ b/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_serverlmswidget.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_ServerLMSWidget_t { - QByteArrayData data[26]; - char stringdata0[338]; + QByteArrayData data[27]; + char stringdata0[364]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -50,14 +50,15 @@ QT_MOC_LITERAL(14, 147, 21), // "slotUpdateListClients" QT_MOC_LITERAL(15, 169, 22), // "slot_BlockAutorization" QT_MOC_LITERAL(16, 192, 5), // "block" QT_MOC_LITERAL(17, 198, 16), // "slot_AuthChanged" -QT_MOC_LITERAL(18, 215, 21), // "slot_msgToClientReady" -QT_MOC_LITERAL(19, 237, 5), // "login" -QT_MOC_LITERAL(20, 243, 4), // "text" -QT_MOC_LITERAL(21, 248, 12), // "slotAddToLog" -QT_MOC_LITERAL(22, 261, 3), // "msg" -QT_MOC_LITERAL(23, 265, 25), // "on_btnStartServer_clicked" -QT_MOC_LITERAL(24, 291, 24), // "on_btnStopServer_clicked" -QT_MOC_LITERAL(25, 316, 21) // "on_btnTaskSet_clicked" +QT_MOC_LITERAL(18, 215, 23), // "slot_msgToClientFromGUI" +QT_MOC_LITERAL(19, 239, 5), // "login" +QT_MOC_LITERAL(20, 245, 4), // "text" +QT_MOC_LITERAL(21, 250, 23), // "slot_msgToGUIfromClient" +QT_MOC_LITERAL(22, 274, 12), // "slotAddToLog" +QT_MOC_LITERAL(23, 287, 3), // "msg" +QT_MOC_LITERAL(24, 291, 25), // "on_btnStartServer_clicked" +QT_MOC_LITERAL(25, 317, 24), // "on_btnStopServer_clicked" +QT_MOC_LITERAL(26, 342, 21) // "on_btnTaskSet_clicked" }, "ServerLMSWidget\0sigRecognize\0\0" @@ -66,9 +67,9 @@ QT_MOC_LITERAL(25, 316, 21) // "on_btnTaskSet_clicked" "qintptr\0descriptor\0ClientHandler*\0" "client\0slotUpdateListClients\0" "slot_BlockAutorization\0block\0" - "slot_AuthChanged\0slot_msgToClientReady\0" - "login\0text\0slotAddToLog\0msg\0" - "on_btnStartServer_clicked\0" + "slot_AuthChanged\0slot_msgToClientFromGUI\0" + "login\0text\0slot_msgToGUIfromClient\0" + "slotAddToLog\0msg\0on_btnStartServer_clicked\0" "on_btnStopServer_clicked\0on_btnTaskSet_clicked" }; #undef QT_MOC_LITERAL @@ -79,7 +80,7 @@ static const uint qt_meta_data_ServerLMSWidget[] = { 8, // revision 0, // classname 0, 0, // classinfo - 13, 14, // methods + 14, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -87,21 +88,22 @@ static const uint qt_meta_data_ServerLMSWidget[] = { 3, // signalCount // signals: name, argc, parameters, tag, flags - 1, 0, 79, 2, 0x06 /* Public */, - 3, 0, 80, 2, 0x06 /* Public */, - 5, 1, 81, 2, 0x06 /* Public */, + 1, 0, 84, 2, 0x06 /* Public */, + 3, 0, 85, 2, 0x06 /* Public */, + 5, 1, 86, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 7, 1, 84, 2, 0x0a /* Public */, - 9, 2, 87, 2, 0x0a /* Public */, - 14, 0, 92, 2, 0x0a /* Public */, - 15, 1, 93, 2, 0x0a /* Public */, - 17, 0, 96, 2, 0x0a /* Public */, - 18, 2, 97, 2, 0x08 /* Private */, - 21, 1, 102, 2, 0x08 /* Private */, - 23, 0, 105, 2, 0x08 /* Private */, - 24, 0, 106, 2, 0x08 /* Private */, - 25, 0, 107, 2, 0x08 /* Private */, + 7, 1, 89, 2, 0x0a /* Public */, + 9, 2, 92, 2, 0x0a /* Public */, + 14, 0, 97, 2, 0x0a /* Public */, + 15, 1, 98, 2, 0x0a /* Public */, + 17, 0, 101, 2, 0x0a /* Public */, + 18, 2, 102, 2, 0x08 /* Private */, + 21, 2, 107, 2, 0x08 /* Private */, + 22, 1, 112, 2, 0x08 /* Private */, + 24, 0, 115, 2, 0x08 /* Private */, + 25, 0, 116, 2, 0x08 /* Private */, + 26, 0, 117, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, @@ -115,7 +117,8 @@ static const uint qt_meta_data_ServerLMSWidget[] = { QMetaType::Void, QMetaType::Bool, 16, QMetaType::Void, QMetaType::Void, QMetaType::QString, QMetaType::QString, 19, 20, - QMetaType::Void, QMetaType::QString, 22, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 19, 20, + QMetaType::Void, QMetaType::QString, 23, QMetaType::Void, QMetaType::Void, QMetaType::Void, @@ -138,11 +141,12 @@ void ServerLMSWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 5: _t->slotUpdateListClients(); break; case 6: _t->slot_BlockAutorization((*reinterpret_cast< bool(*)>(_a[1]))); break; case 7: _t->slot_AuthChanged(); break; - case 8: _t->slot_msgToClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; - case 9: _t->slotAddToLog((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 10: _t->on_btnStartServer_clicked(); break; - case 11: _t->on_btnStopServer_clicked(); break; - case 12: _t->on_btnTaskSet_clicked(); break; + case 8: _t->slot_msgToClientFromGUI((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 9: _t->slot_msgToGUIfromClient((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 10: _t->slotAddToLog((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 11: _t->on_btnStartServer_clicked(); break; + case 12: _t->on_btnStopServer_clicked(); break; + case 13: _t->on_btnTaskSet_clicked(); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { @@ -211,13 +215,13 @@ int ServerLMSWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 13) + if (_id < 14) qt_static_metacall(this, _c, _id, _a); - _id -= 13; + _id -= 14; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 13) + if (_id < 14) qt_static_metacall(this, _c, _id, _a); - _id -= 13; + _id -= 14; } return _id; } diff --git a/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_processingsystem.cpp b/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_processingsystem.cpp index 997bc78..1b4f1c1 100644 --- a/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_processingsystem.cpp +++ b/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_processingsystem.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_ProcessingSystem_t { - QByteArrayData data[9]; - char stringdata0[101]; + QByteArrayData data[10]; + char stringdata0[125]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -40,12 +40,14 @@ QT_MOC_LITERAL(4, 54, 13), // "sigLogMessage" QT_MOC_LITERAL(5, 68, 3), // "log" QT_MOC_LITERAL(6, 72, 17), // "sigAddToMessanger" QT_MOC_LITERAL(7, 90, 5), // "login" -QT_MOC_LITERAL(8, 96, 4) // "text" +QT_MOC_LITERAL(8, 96, 4), // "text" +QT_MOC_LITERAL(9, 101, 23) // "signal_msgToClientReady" }, "ProcessingSystem\0sigUpdateListClients\0" "\0sigAuthChanged\0sigLogMessage\0log\0" - "sigAddToMessanger\0login\0text" + "sigAddToMessanger\0login\0text\0" + "signal_msgToClientReady" }; #undef QT_MOC_LITERAL @@ -55,23 +57,25 @@ static const uint qt_meta_data_ProcessingSystem[] = { 8, // revision 0, // classname 0, 0, // classinfo - 4, 14, // methods + 5, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 4, // signalCount + 5, // signalCount // signals: name, argc, parameters, tag, flags - 1, 0, 34, 2, 0x06 /* Public */, - 3, 0, 35, 2, 0x06 /* Public */, - 4, 1, 36, 2, 0x06 /* Public */, - 6, 2, 39, 2, 0x06 /* Public */, + 1, 0, 39, 2, 0x06 /* Public */, + 3, 0, 40, 2, 0x06 /* Public */, + 4, 1, 41, 2, 0x06 /* Public */, + 6, 2, 44, 2, 0x06 /* Public */, + 9, 2, 49, 2, 0x06 /* Public */, // signals: parameters QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::QString, 5, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 7, 8, QMetaType::Void, QMetaType::QString, QMetaType::QString, 7, 8, 0 // eod @@ -87,6 +91,7 @@ void ProcessingSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 1: _t->sigAuthChanged(); break; case 2: _t->sigLogMessage((*reinterpret_cast< QString(*)>(_a[1]))); break; case 3: _t->sigAddToMessanger((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 4: _t->signal_msgToClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -119,6 +124,13 @@ void ProcessingSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int return; } } + { + using _t = void (ProcessingSystem::*)(QString , QString ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ProcessingSystem::signal_msgToClientReady)) { + *result = 4; + return; + } + } } } @@ -151,13 +163,13 @@ int ProcessingSystem::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) + if (_id < 5) qt_static_metacall(this, _c, _id, _a); - _id -= 4; + _id -= 5; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 4) + if (_id < 5) *reinterpret_cast(_a[0]) = -1; - _id -= 4; + _id -= 5; } return _id; } @@ -187,5 +199,12 @@ void ProcessingSystem::sigAddToMessanger(QString _t1, QString _t2) void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 3, _a); } + +// SIGNAL 4 +void ProcessingSystem::signal_msgToClientReady(QString _t1, QString _t2) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; + QMetaObject::activate(this, &staticMetaObject, 4, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/ServerLMS/Debug64/libServerLMS.dll b/ServerLMS/Debug64/libServerLMS.dll index 4eb56b2..b86ef50 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 a904317..efcc624 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll.a and b/ServerLMS/Debug64/libServerLMS.dll.a differ diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user b/ServerLMS/ServerLMS/CMakeLists.txt.user index 4d0a1ac..f35e160 100644 --- a/ServerLMS/ServerLMS/CMakeLists.txt.user +++ b/ServerLMS/ServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ServerLMS/ServerLMS/Systems/dataparser.cpp b/ServerLMS/ServerLMS/Systems/dataparser.cpp index 2e22d26..f5fe0d7 100644 --- a/ServerLMS/ServerLMS/Systems/dataparser.cpp +++ b/ServerLMS/ServerLMS/Systems/dataparser.cpp @@ -70,6 +70,28 @@ void DataParser::xmlParser(ClientHandler *client, QByteArray array) processingSystem->processingClientDeAutorization(client, clientDeAutorization); } + else if(xmlReader.name() == "ToClientMessage") + {//Отправка сообщения Клиенту + + ToClientMessage toClientMessage; + + /*Перебираем все атрибуты тега*/ + foreach(const QXmlStreamAttribute &attr, xmlReader.attributes()) + { + QString name = attr.name().toString(); + QString value = attr.value().toString(); + //addTextToLogger(name + ": " + value); + + if(name == "id") + toClientMessage.id = value.toInt(); + else if(name == "Text") + toClientMessage.Text = value; + else if(name == "Login") + toClientMessage.Login = value; + } + + processingSystem->processingToClientMessage(client, toClientMessage); + } else if(xmlReader.name() == "QueryToDB") {//Запрос к базе данных от клиента @@ -182,7 +204,7 @@ void DataParser::xmlParser(ClientHandler *client, QByteArray array) clientMessage.Text = value; } - processingSystem->processingClientMessage(client, clientMessage); + processingSystem->processingFromClientMessage(client, clientMessage); } else if(xmlReader.name() == "ClientNotify") {//Уведомление от клиента @@ -369,80 +391,6 @@ QByteArray DataParser::xmlAnswer_deAuthorization(bool result, QString login) return xmlAnswer(listTag); } -QByteArray DataParser::xmlAnswer_ClientQueryToDB(bool result, QList* listInstructors, - QList* listTrainees, QList* listGroups) -{ - QDomDocument groupsTraineesDOM; - QFile blankFile(":/blankXML/groupsTrainees.xml"); - - if (! blankFile.open(QFile::ReadOnly | QFile::Text)) { - qDebug() << "SaveTraineesGroupsXML: Не удалось считать файл :/blankXML/groupsTrainees.xml"; - return QByteArray(); - } - - groupsTraineesDOM.setContent(blankFile.readAll()); - blankFile.close(); - - QDomNode allListsNode = groupsTraineesDOM.namedItem("AllLists"); - - QDomNode groupsTraineesNode = allListsNode.firstChildElement("GroupsTrainees"); - QDomNode allInstructorsNode = allListsNode.firstChildElement("Instructors"); - - for(Group group : *listGroups) - { - //Группа - QDomNode groupNode = groupsTraineesDOM.createElement("group"); - groupsTraineesNode.appendChild(groupNode); - groupNode.toElement().setAttribute("group_id", group.getID()); - groupNode.toElement().setAttribute("name", group.getName()); - - //Обучаемые - for(Trainee trainee : *listTrainees) - { - if(group.getID() != trainee.getGroup().getID()) - continue; - - QDomNode traineeNode = groupsTraineesDOM.createElement("trainee"); - groupNode.appendChild(traineeNode); - traineeNode.toElement().setAttribute("trainee_id", QString::number(trainee.getID())); - traineeNode.toElement().setAttribute("name", trainee.getName()); - traineeNode.toElement().setAttribute("login", trainee.getLogin()); - traineeNode.toElement().setAttribute("password", trainee.getPassword()); - traineeNode.toElement().setAttribute("archived", trainee.getArchived() ? QStringLiteral("true") : QStringLiteral("false")); - traineeNode.toElement().setAttribute("logged_in", trainee.getLoggedIn() ? QStringLiteral("true") : QStringLiteral("false")); - traineeNode.toElement().setAttribute("group_trainee", QString::number(trainee.getGroup().getID())); - traineeNode.toElement().setAttribute("computer_trainee", QString::number(trainee.getComputer().getID())); - } - } - - for(Instructor instructor : *listInstructors) - { - //Инструктор - QDomNode instructorNode = groupsTraineesDOM.createElement("instructor"); - allInstructorsNode.appendChild(instructorNode); - instructorNode.toElement().setAttribute("instructor_id", QString::number(instructor.getID())); - instructorNode.toElement().setAttribute("name", instructor.getName()); - instructorNode.toElement().setAttribute("login", instructor.getLogin()); - instructorNode.toElement().setAttribute("password", instructor.getPassword()); - instructorNode.toElement().setAttribute("is_admin", instructor.getIsAdmin() ? QStringLiteral("true") : QStringLiteral("false")); - instructorNode.toElement().setAttribute("archived", instructor.getArchived() ? QStringLiteral("true") : QStringLiteral("false")); - instructorNode.toElement().setAttribute("logged_in", instructor.getLoggedIn() ? QStringLiteral("true") : QStringLiteral("false")); - } - - QString xmlFileName = /*appDirPath +*/ "GroupsTrainees.xml"; - QFile xmlOutFile(xmlFileName); - if (!xmlOutFile.open(QFile::WriteOnly | QFile::Text)) - { - qDebug() << "SaveTraineesGroupsXML: Не удалось записать файл " + xmlFileName; - return QByteArray(); - } - QTextStream outFile(&xmlOutFile); - groupsTraineesDOM.save(outFile, 4); - xmlOutFile.close(); - - return groupsTraineesDOM.toByteArray(); -} - bool DataParser::loadBlankXML(QString nameFile, QDomDocument *commonDOM) { QFile blankFile(":/blankXML/" + nameFile); diff --git a/ServerLMS/ServerLMS/Systems/dataparser.h b/ServerLMS/ServerLMS/Systems/dataparser.h index f144843..8a16d98 100644 --- a/ServerLMS/ServerLMS/Systems/dataparser.h +++ b/ServerLMS/ServerLMS/Systems/dataparser.h @@ -29,9 +29,6 @@ public: QByteArray xmlAnswer_authorization(bool result, QString instructorName, QString clientName, QString accessType, QString login); QByteArray xmlAnswer_deAuthorization(bool result, QString login); - QByteArray xmlAnswer_ClientQueryToDB(bool result, QList* listInstructors = nullptr, - QList* listTrainees = nullptr, QList* listGroups = nullptr); - bool loadBlankXML(QString nameFile, QDomDocument* commonDOM); bool saveDOMtoXML(QString nameFile, QDomDocument* commonDOM); QByteArray xmlAnswer_ClientQueryToDB_ListInstructors(bool result, QList* listInstructors); diff --git a/ServerLMS/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/ServerLMS/Systems/processingsystem.cpp index 304dd21..6b29b62 100644 --- a/ServerLMS/ServerLMS/Systems/processingsystem.cpp +++ b/ServerLMS/ServerLMS/Systems/processingsystem.cpp @@ -119,12 +119,6 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu switch (clientQueryToDB.typeQuery) { - case TypeQueryToDB::TYPE_QUERY_GET_LIST_INSTRUCTORS: - { - QList listInstructors = providerDBLMS->GetListAllInstructors(); - arrayAnswer = dataParser->xmlAnswer_ClientQueryToDB(true, &listInstructors); - break; - } case TypeQueryToDB::TYPE_QUERY_GET_ALL_LISTS: { QList listInstructors = providerDBLMS->GetListAllInstructors(); @@ -223,7 +217,12 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu //logger->addTextToLogger("To Client: " + str); } -void ProcessingSystem::processingClientMessage(ClientHandler *client, ClientMessage clientMessage) +void ProcessingSystem::processingToClientMessage(ClientHandler *client, ToClientMessage toClientMessage) +{ + signal_msgToClientReady(toClientMessage.Login, toClientMessage.Text); +} + +void ProcessingSystem::processingFromClientMessage(ClientHandler *client, ClientMessage clientMessage) { QString peerAddress = client->getSocket()->peerAddress().toString(); QString peerPort = QString::number(client->getSocket()->peerPort()); @@ -231,7 +230,9 @@ void ProcessingSystem::processingClientMessage(ClientHandler *client, ClientMess QString str = "Msg From Client [" + peerAddress + ":" + peerPort + "] : " + clientMessage.Text; emit sigLogMessage(str); - emit sigAddToMessanger(client->getClient()->getLogin(), clientMessage.Text); + + //Здесь нужно оттранслировать на ГУИ! + //emit sigAddToMessanger(client->getClient()->getLogin(), clientMessage.Text); } void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotify clientNotify) diff --git a/ServerLMS/ServerLMS/Systems/processingsystem.h b/ServerLMS/ServerLMS/Systems/processingsystem.h index 4fdce86..67f98be 100644 --- a/ServerLMS/ServerLMS/Systems/processingsystem.h +++ b/ServerLMS/ServerLMS/Systems/processingsystem.h @@ -26,7 +26,9 @@ public: void processingClientAutorization(ClientHandler *client, ClientAutorization clientAutorization); void processingClientDeAutorization(ClientHandler *client, ClientDeAutorization clientDeAutorization); void processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB, int id = 0, void* data = nullptr); - void processingClientMessage(ClientHandler *client, ClientMessage clientMessage); + void processingToClientMessage(ClientHandler *client, ToClientMessage toClientMessage); + + void processingFromClientMessage(ClientHandler *client, ClientMessage clientMessage); void processingClientNotify(ClientHandler *client, ClientNotify clientNotify); signals: @@ -34,6 +36,7 @@ signals: void sigAuthChanged(); void sigLogMessage(QString log); void sigAddToMessanger(QString login,QString text); + void signal_msgToClientReady(QString login, QString text); private: ServerLMSWidget *server; diff --git a/ServerLMS/ServerLMS/serverlmswidget.cpp b/ServerLMS/ServerLMS/serverlmswidget.cpp index 5acd8b8..a91ec5a 100644 --- a/ServerLMS/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/ServerLMS/serverlmswidget.cpp @@ -72,6 +72,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) : connect(this,&ServerLMSWidget::sigLog,logger,&Logger::addTextToLogger); connect(processingSystem,&ProcessingSystem::sigAuthChanged,this, &ServerLMSWidget::slot_AuthChanged); + connect(processingSystem,&ProcessingSystem::signal_msgToClientReady,this, &ServerLMSWidget::slot_msgToClientFromGUI); on_btnStartServer_clicked(); @@ -227,7 +228,7 @@ void ServerLMSWidget::slot_LanguageChanged(QString language) } -void ServerLMSWidget::slot_msgToClientReady(QString login, QString text) +void ServerLMSWidget::slot_msgToClientFromGUI(QString login, QString text) { QString textMsg = text; @@ -253,6 +254,32 @@ void ServerLMSWidget::slot_msgToClientReady(QString login, QString text) } } +void ServerLMSWidget::slot_msgToGUIfromClient(QString login, QString text) +{ + QString textMsg = text; + + QByteArray byteArrayMsg = dataParser->xmlAnswer_message(textMsg); + + //Проходим все открытые сокеты, ищем нужный + foreach(int idSocket, clientsMap.keys()) + { + ClientHandler *handler = clientsMap[idSocket]; + if(handler->getClient()->getTypeClient() == TypeClientAutorization::TYPE_GUI) + {//Отправляем GUI-клиенту для отображения в Мессенджере + + handler->sendXmlAnswer(byteArrayMsg); + + QString peerAddress = clientsMap[idSocket]->getSocket()->peerAddress().toString(); + QString peerPort = QString::number(clientsMap[idSocket]->getSocket()->peerPort()); + + QString str = "Msg From Client [" + peerAddress + ":" + peerPort + "] : " + textMsg; + + logger->addTextToLogger(str); + break; + } + } +} + void ServerLMSWidget::slotAddToLog(QString msg) { ui->listWidgetLogger->addItem(msg); diff --git a/ServerLMS/ServerLMS/serverlmswidget.h b/ServerLMS/ServerLMS/serverlmswidget.h index 65b7096..af1090d 100644 --- a/ServerLMS/ServerLMS/serverlmswidget.h +++ b/ServerLMS/ServerLMS/serverlmswidget.h @@ -63,7 +63,8 @@ public slots: private slots: //слот обработки сигнала о готовности нового сообщения на отправку клиенту от мессенджера - void slot_msgToClientReady(QString login, QString text); + void slot_msgToClientFromGUI(QString login, QString text); + void slot_msgToGUIfromClient(QString login, QString text); void slotAddToLog(QString msg); public: diff --git a/ServerLMS/ServerLMS/typesDataServerClient.h b/ServerLMS/ServerLMS/typesDataServerClient.h index 03af5bb..5df49a4 100644 --- a/ServerLMS/ServerLMS/typesDataServerClient.h +++ b/ServerLMS/ServerLMS/typesDataServerClient.h @@ -57,7 +57,6 @@ public: }; enum TypeQueryToDB{ - TYPE_QUERY_GET_LIST_INSTRUCTORS, TYPE_QUERY_GET_ALL_LISTS, TYPE_QUERY_NEW_INSTRUCTOR, TYPE_QUERY_DEL_INSTRUCTOR, @@ -87,6 +86,14 @@ public: QString Text; }; +class ToClientMessage +{ +public: + int id; + QString Login; + QString Text; +}; + class ServerTask { public: diff --git a/TestServerLMS/Debug64/.ninja_deps b/TestServerLMS/Debug64/.ninja_deps index c1a6fd6..ebff1bc 100644 Binary files a/TestServerLMS/Debug64/.ninja_deps and b/TestServerLMS/Debug64/.ninja_deps differ diff --git a/TestServerLMS/Debug64/.ninja_log b/TestServerLMS/Debug64/.ninja_log index a72b063..a5fc92a 100644 --- a/TestServerLMS/Debug64/.ninja_log +++ b/TestServerLMS/Debug64/.ninja_log @@ -21,3 +21,41 @@ 14 46 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 14 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 14 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +28 74 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +28 74 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +28 74 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +28 74 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +28 74 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +28 74 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +76 2192 7560482432625375 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed +74 2237 7560482433070297 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 +78 2306 7560482433769990 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d +2306 2466 7560482435351275 TestServerLMS.exe 68113cd959b50515 +18 55 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +18 55 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +18 55 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +18 55 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +18 55 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +18 55 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +13 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +13 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +13 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +13 44 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +13 44 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 44 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +13 44 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +13 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +13 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +13 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +13 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +48 2163 7560568746804377 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed +45 2185 7560568747003841 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 +50 2335 7560568748525266 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d +2335 2489 7560568750044910 TestServerLMS.exe 68113cd959b50515 diff --git a/TestServerLMS/Debug64/ListGroups.xml b/TestServerLMS/Debug64/ListGroups.xml index 03078a6..b9b9321 100644 --- a/TestServerLMS/Debug64/ListGroups.xml +++ b/TestServerLMS/Debug64/ListGroups.xml @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + diff --git a/TestServerLMS/Debug64/ListInstructors.xml b/TestServerLMS/Debug64/ListInstructors.xml index 045e694..0d512b5 100644 --- a/TestServerLMS/Debug64/ListInstructors.xml +++ b/TestServerLMS/Debug64/ListInstructors.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/ListTrainees.xml b/TestServerLMS/Debug64/ListTrainees.xml index 48a6fcf..8570e5b 100644 --- a/TestServerLMS/Debug64/ListTrainees.xml +++ b/TestServerLMS/Debug64/ListTrainees.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/StaticData/clientHash.xml b/TestServerLMS/Debug64/StaticData/clientHash.xml index 9e6e087..4a311ce 100644 --- a/TestServerLMS/Debug64/StaticData/clientHash.xml +++ b/TestServerLMS/Debug64/StaticData/clientHash.xml @@ -1,4 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/StaticData/save.xml b/TestServerLMS/Debug64/StaticData/save.xml index 163b3d3..4902929 100644 --- a/TestServerLMS/Debug64/StaticData/save.xml +++ b/TestServerLMS/Debug64/StaticData/save.xml @@ -1,2 +1,2 @@ - + diff --git a/TestServerLMS/Debug64/TestServerLMS.exe b/TestServerLMS/Debug64/TestServerLMS.exe index 81118d6..4ecf97e 100644 Binary files a/TestServerLMS/Debug64/TestServerLMS.exe and b/TestServerLMS/Debug64/TestServerLMS.exe differ diff --git a/TestServerLMS/Debug64/libServerLMS.dll b/TestServerLMS/Debug64/libServerLMS.dll index 4eb56b2..b86ef50 100644 Binary files a/TestServerLMS/Debug64/libServerLMS.dll and b/TestServerLMS/Debug64/libServerLMS.dll differ diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt.user b/TestServerLMS/TestServerLMS/CMakeLists.txt.user index d011e6c..c9b6f34 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt.user +++ b/TestServerLMS/TestServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId