diff --git a/DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-12-0179.json b/DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-16-0531.json similarity index 100% rename from DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-12-0179.json rename to DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-16-0531.json diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index 73891c7..37c1e82 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 ae390a6..7ca1667 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/DB_IaT/Debug64/.ninja_log @@ -1,61 +1,190 @@ # ninja log v5 -35 85 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -1359 1409 7550021406882738 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -35 85 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -93 2581 7551749616867468 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 -412 2087 7550925755242679 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 -35 85 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -35 85 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -1459 4747 7550021440156205 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d -91 2242 7551749613486894 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 -3953 5972 7550021452463313 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 -1420 3835 7550021430642049 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 -35 85 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -35 85 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -35 85 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -45 55 0 clean 9c4b4372737ab8da -1442 3952 7550021431885627 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc -111 1895 7551749610041318 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de -2724 3371 7551749624778932 libInstructorsAndTrainees.dll.a 7574a27538bbb995 -3961 4312 7550021435890691 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -35 85 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -35 85 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -102 2284 7551749613931655 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 -105 2382 7551749614859112 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b -1359 1409 7550021406882738 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -1446 3820 7550021430562266 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 -15 45 0 CMakeFiles/clean.additional 7155004b3956b606 -96 2398 7551749615083448 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 -2724 3371 7551749624778932 libInstructorsAndTrainees.dll 7574a27538bbb995 -35 85 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -35 85 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -1453 4558 7550021438351035 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -35 85 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -35 85 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -115 1796 7551749609023397 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 -15 276 7551766520822647 build.ninja 76aa11f472515be0 -99 2383 7551749614869088 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b -35 85 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -1425 2713 7550021419524135 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 -1422 4075 7550021432986564 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f -88 2724 7551749618322350 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -35 85 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -601 2879 7550908810645000 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 -85 2699 7551749618060422 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -122 1671 7551749607613347 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -108 2243 7551749613486894 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -1463 2701 7550021419544278 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 7e450168ba24c81a -35 85 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -118 2112 7551749612196876 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +1400 1526 7554403513026725 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +80 2637 7554437652588987 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +77 2409 7554437650305095 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +2889 3475 7554437660946634 libInstructorsAndTrainees.dll.a 7574a27538bbb995 +19 57 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +87 2127 7554437647472669 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de +4398 4745 7554403545178109 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b +1561 4056 7554403538030733 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc +47 59 0 clean 9c4b4372737ab8da +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +4063 6185 7554403559590571 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +1400 1526 7554403513026725 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +68 2658 7554437652808400 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +91 1928 7554437645497954 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 +19 57 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.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/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +1578 4794 7554403545565259 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d +66 2416 7554437650364936 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 +1537 3960 7554403536624811 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 +19 57 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 +70 2428 7554437650494583 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 +2889 3475 7554437660946634 libInstructorsAndTrainees.dll 7574a27538bbb995 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +1573 4657 7554403543966835 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 +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_viewerinstructors.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +95 1970 7554437645906861 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 +15 276 7551833764505808 build.ninja 76aa11f472515be0 +74 2484 7554437651063067 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +1543 3051 7554403527720657 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 +1540 4063 7554403538030733 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f +63 2889 7554437655122210 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +19 57 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +106 1647 7554437642495976 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 +60 2835 7554437654573679 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +102 1849 7554437644610324 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +84 2486 7554437651083007 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 +19 57 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 +98 2229 7554437648489947 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +30 421 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +30 421 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +30 421 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +455 2069 7554584599457852 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf +447 2241 7554584601164624 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de +426 2320 7554584601959696 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 +440 2348 7554584602242468 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +434 2403 7554584602786614 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +444 2445 7554584603210560 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 +437 2464 7554584603402105 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +431 2499 7554584603773906 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 +429 2539 7554584604116315 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +424 2751 7554584606282767 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +421 2813 7554584606898435 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +19 58 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +19 58 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +19 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +59 1270 7554584831423179 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +1270 1916 7554584837848741 libInstructorsAndTrainees.dll 7574a27538bbb995 +1270 1916 7554584837848741 libInstructorsAndTrainees.dll.a 7574a27538bbb995 +19 59 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +19 59 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +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 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +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_dialogeditinstructor.h 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +60 1683 7554588475661104 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +1683 2277 7554588481561784 libInstructorsAndTrainees.dll 7574a27538bbb995 +1683 2277 7554588481561784 libInstructorsAndTrainees.dll.a 7574a27538bbb995 +31 83 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +31 83 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +31 83 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +31 83 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/EWIEGA46WW/qrc_resources.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj index d2a746a..c33dce1 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj differ 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 3ab24f7..7e98008 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 19aa020..59e4609 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/recognizesystem.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj index e35d7ae..f22d7c4 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.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 c028e18..caecd3d 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/Core/tcpclient.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj index d764015..79e3c8d 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj index 0168fd1..59bb888 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.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 bb8b4d5..152f35a 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/instructorsandtraineeswidget.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj index 8d0d642..c089c73 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 81407d3..e0e4f6e 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.dir/trainees/traineesview.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj index 43b804e..465745c 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.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 e20b5d4..3b3418e 100644 --- a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt +++ b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt @@ -1,12 +1,26 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.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 +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.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/connectorToServer/Core/recognizesystem.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp + uic:ui_editortrainees.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp + uic:ui_editorinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp + uic:ui_taskswidget.h D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp uic:ui_instructorsandtraineeswidget.h @@ -14,71 +28,57 @@ D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.c uic:ui_dialogauthorizationinstructor.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h - mmc:Q_OBJECT - uic:ui_dialogeditinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp - uic:ui_messangerwidget.h + uic:ui_dialogauthorizationinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.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/connectortoserver.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h +D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp + uic:ui_messangerwidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp + uic:ui_viewerinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp + uic:ui_doctaskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp + uic:ui_dialogeditinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp + uic:ui_dialogedittrainee.h D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h mmc:Q_OBJECT uic:ui_dialogeditgroup.h -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp -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/tasks/taskswidget.cpp - uic:ui_taskswidget.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp - uic:ui_editorinstructors.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp - uic:ui_editortrainees.h -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h +D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp - uic:ui_dialogedittrainee.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h + mmc:Q_OBJECT uic:ui_dialogeditinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h - mmc:Q_OBJECT - uic:ui_dialogauthorizationinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h - mmc:Q_OBJECT diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_recognizesystem.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_recognizesystem.cpp index e93de3a..89edd72 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_recognizesystem.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_recognizesystem.cpp @@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_RecognizeSystem_t { - QByteArrayData data[24]; - char stringdata0[341]; + QByteArrayData data[28]; + char stringdata0[395]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -54,9 +54,13 @@ QT_MOC_LITERAL(17, 223, 12), // "serverDeAuth" QT_MOC_LITERAL(18, 236, 18), // "sigAnswerQueryToDB" QT_MOC_LITERAL(19, 255, 18), // "QList*" QT_MOC_LITERAL(20, 274, 15), // "listInstructors" -QT_MOC_LITERAL(21, 290, 25), // "sigSocketWaitForReadyRead" -QT_MOC_LITERAL(22, 316, 8), // "waitTime" -QT_MOC_LITERAL(23, 325, 15) // "sigStartCompare" +QT_MOC_LITERAL(21, 290, 15), // "QList*" +QT_MOC_LITERAL(22, 306, 12), // "listTrainees" +QT_MOC_LITERAL(23, 319, 13), // "QList*" +QT_MOC_LITERAL(24, 333, 10), // "listGroups" +QT_MOC_LITERAL(25, 344, 25), // "sigSocketWaitForReadyRead" +QT_MOC_LITERAL(26, 370, 8), // "waitTime" +QT_MOC_LITERAL(27, 379, 15) // "sigStartCompare" }, "RecognizeSystem\0sigUpdateBytesAvailable\0" @@ -67,8 +71,9 @@ QT_MOC_LITERAL(23, 325, 15) // "sigStartCompare" "sigDeAuth\0ServerDeAuthorization*\0" "serverDeAuth\0sigAnswerQueryToDB\0" "QList*\0listInstructors\0" - "sigSocketWaitForReadyRead\0waitTime\0" - "sigStartCompare" + "QList*\0listTrainees\0QList*\0" + "listGroups\0sigSocketWaitForReadyRead\0" + "waitTime\0sigStartCompare" }; #undef QT_MOC_LITERAL @@ -94,9 +99,9 @@ static const uint qt_meta_data_RecognizeSystem[] = { 11, 0, 82, 2, 0x06 /* Public */, 12, 1, 83, 2, 0x06 /* Public */, 15, 1, 86, 2, 0x06 /* Public */, - 18, 1, 89, 2, 0x06 /* Public */, - 21, 1, 92, 2, 0x06 /* Public */, - 23, 0, 95, 2, 0x06 /* Public */, + 18, 3, 89, 2, 0x06 /* Public */, + 25, 1, 96, 2, 0x06 /* Public */, + 27, 0, 99, 2, 0x06 /* Public */, // signals: parameters QMetaType::Void, @@ -107,8 +112,8 @@ static const uint qt_meta_data_RecognizeSystem[] = { QMetaType::Void, QMetaType::Void, 0x80000000 | 13, 14, QMetaType::Void, 0x80000000 | 16, 17, - QMetaType::Void, 0x80000000 | 19, 20, - QMetaType::Void, QMetaType::Int, 22, + QMetaType::Void, 0x80000000 | 19, 0x80000000 | 21, 0x80000000 | 23, 20, 22, 24, + QMetaType::Void, QMetaType::Int, 26, QMetaType::Void, 0 // eod @@ -128,7 +133,7 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 5: _t->sigServerBlocked(); break; case 6: _t->sigAuth((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break; case 7: _t->sigDeAuth((*reinterpret_cast< ServerDeAuthorization*(*)>(_a[1]))); break; - case 8: _t->sigAnswerQueryToDB((*reinterpret_cast< QList*(*)>(_a[1]))); break; + case 8: _t->sigAnswerQueryToDB((*reinterpret_cast< QList*(*)>(_a[1])),(*reinterpret_cast< QList*(*)>(_a[2])),(*reinterpret_cast< QList*(*)>(_a[3]))); break; case 9: _t->sigSocketWaitForReadyRead((*reinterpret_cast< int(*)>(_a[1]))); break; case 10: _t->sigStartCompare(); break; default: ; @@ -192,7 +197,7 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int } } { - using _t = void (RecognizeSystem::*)(QList * ); + using _t = void (RecognizeSystem::*)(QList * , QList * , QList * ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigAnswerQueryToDB)) { *result = 8; return; @@ -308,9 +313,9 @@ void RecognizeSystem::sigDeAuth(ServerDeAuthorization * _t1) } // SIGNAL 8 -void RecognizeSystem::sigAnswerQueryToDB(QList * _t1) +void RecognizeSystem::sigAnswerQueryToDB(QList * _t1, QList * _t2, QList * _t3) { - void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))), const_cast(reinterpret_cast(std::addressof(_t3))) }; QMetaObject::activate(this, &staticMetaObject, 8, _a); } diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp index 394086f..a056470 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp @@ -24,7 +24,7 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_InstructorsAndTraineesWidget_t { QByteArrayData data[26]; - char stringdata0[506]; + char stringdata0[499]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -58,7 +58,7 @@ QT_MOC_LITERAL(21, 357, 12), // "serverDeAuth" QT_MOC_LITERAL(22, 370, 28), // "on_btnConnectionToDB_clicked" QT_MOC_LITERAL(23, 399, 37), // "on_btnAuthorizationInstructor..." QT_MOC_LITERAL(24, 437, 30), // "on_btnUpdateStyleSheet_clicked" -QT_MOC_LITERAL(25, 468, 37) // "on_btnQueryGetListInstructors..." +QT_MOC_LITERAL(25, 468, 30) // "on_btnQueryGetAllLists_clicked" }, "InstructorsAndTraineesWidget\0" @@ -75,7 +75,7 @@ QT_MOC_LITERAL(25, 468, 37) // "on_btnQueryGetListInstructors..." "on_btnConnectionToDB_clicked\0" "on_btnAuthorizationInstructor_clicked\0" "on_btnUpdateStyleSheet_clicked\0" - "on_btnQueryGetListInstructors_clicked" + "on_btnQueryGetAllLists_clicked" }; #undef QT_MOC_LITERAL @@ -147,7 +147,7 @@ void InstructorsAndTraineesWidget::qt_static_metacall(QObject *_o, QMetaObject:: case 9: _t->on_btnConnectionToDB_clicked(); break; case 10: _t->on_btnAuthorizationInstructor_clicked(); break; case 11: _t->on_btnUpdateStyleSheet_clicked(); break; - case 12: _t->on_btnQueryGetListInstructors_clicked(); break; + case 12: _t->on_btnQueryGetAllLists_clicked(); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp index 0f013d9..279d063 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp @@ -4594,7 +4594,7 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x1,0x8e,0x8a,0x13,0x52,0xd0, // :/icons/sendMsg.png 0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xc,0x77, -0x0,0x0,0x1,0x93,0x90,0xa7,0xa0,0x72, +0x0,0x0,0x1,0x93,0x9b,0x75,0xba,0x3e, // :/icons/instructorFromArchive.png 0x0,0x0,0x1,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x83,0xaf, 0x0,0x0,0x1,0x8f,0x7b,0x72,0x10,0x80, diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp index 3211511..10a4aeb 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[27]; - char stringdata0[414]; + QByteArrayData data[31]; + char stringdata0[468]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -59,7 +59,11 @@ QT_MOC_LITERAL(22, 331, 14), // "treeInstructor" QT_MOC_LITERAL(23, 346, 11), // "treeTrainee" QT_MOC_LITERAL(24, 358, 20), // "slot_AnswerQueryToDB" QT_MOC_LITERAL(25, 379, 18), // "QList*" -QT_MOC_LITERAL(26, 398, 15) // "listInstructors" +QT_MOC_LITERAL(26, 398, 15), // "listInstructors" +QT_MOC_LITERAL(27, 414, 15), // "QList*" +QT_MOC_LITERAL(28, 430, 12), // "listTrainees" +QT_MOC_LITERAL(29, 443, 13), // "QList*" +QT_MOC_LITERAL(30, 457, 10) // "listGroups" }, "ConnectorToServer\0sigSetConnect\0\0" @@ -73,7 +77,8 @@ QT_MOC_LITERAL(26, 398, 15) // "listInstructors" "serverDeAuth\0signal_UpdateDB\0" "treeInstructor\0treeTrainee\0" "slot_AnswerQueryToDB\0QList*\0" - "listInstructors" + "listInstructors\0QList*\0" + "listTrainees\0QList*\0listGroups" }; #undef QT_MOC_LITERAL @@ -101,7 +106,7 @@ static const uint qt_meta_data_ConnectorToServer[] = { 21, 2, 80, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 24, 1, 85, 2, 0x0a /* Public */, + 24, 3, 85, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 4, 6, @@ -114,7 +119,7 @@ static const uint qt_meta_data_ConnectorToServer[] = { QMetaType::Void, QMetaType::Bool, QMetaType::Bool, 22, 23, // slots: parameters - QMetaType::Void, 0x80000000 | 25, 26, + QMetaType::Void, 0x80000000 | 25, 0x80000000 | 27, 0x80000000 | 29, 26, 28, 30, 0 // eod }; @@ -133,7 +138,7 @@ void ConnectorToServer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in 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->slot_AnswerQueryToDB((*reinterpret_cast< QList*(*)>(_a[1]))); break; + case 8: _t->slot_AnswerQueryToDB((*reinterpret_cast< QList*(*)>(_a[1])),(*reinterpret_cast< QList*(*)>(_a[2])),(*reinterpret_cast< QList*(*)>(_a[3]))); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h index dcdf6b0..6c52495 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h @@ -42,7 +42,7 @@ public: QLabel *lblLoggedInInstructor; QSpacerItem *horizontalSpacer; QToolButton *btnUpdateStyleSheet; - QToolButton *btnQueryGetListInstructors; + QToolButton *btnQueryGetAllLists; void setupUi(QWidget *InstructorsAndTraineesWidget) { @@ -145,11 +145,11 @@ public: horizontalLayout_1->addWidget(btnUpdateStyleSheet); - btnQueryGetListInstructors = new QToolButton(groupBox); - btnQueryGetListInstructors->setObjectName(QString::fromUtf8("btnQueryGetListInstructors")); - btnQueryGetListInstructors->setMinimumSize(QSize(58, 58)); + btnQueryGetAllLists = new QToolButton(groupBox); + btnQueryGetAllLists->setObjectName(QString::fromUtf8("btnQueryGetAllLists")); + btnQueryGetAllLists->setMinimumSize(QSize(58, 58)); - horizontalLayout_1->addWidget(btnQueryGetListInstructors); + horizontalLayout_1->addWidget(btnQueryGetAllLists); gridLayout_2->addLayout(horizontalLayout_1, 0, 0, 1, 1); @@ -177,7 +177,7 @@ public: lblLoggedInPrefix->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "Logged in Instructor: ", nullptr)); lblLoggedInInstructor->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "none", nullptr)); btnUpdateStyleSheet->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "Update StyleSheet", nullptr)); - btnQueryGetListInstructors->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "GET_LIST_INSTRUCTORS", nullptr)); + btnQueryGetAllLists->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "GET_ALL_LISTS", nullptr)); } // retranslateUi }; diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll b/DB_IaT/Debug64/libInstructorsAndTrainees.dll index 230f735..15f259a 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 77ed1d9..abe55f3 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 3517d92..d8bf8c0 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/recognizesystem.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index 2fb2630..7884198 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -1,6 +1,7 @@ #include "Core/recognizesystem.h" #include #include +#include #include "instructor.h" @@ -17,6 +18,8 @@ RecognizeSystem::RecognizeSystem(QObject *parent): folderList = new QList; listInstructors = new QList; + listTrainees = new QList; + listGroups = new QList; } RecognizeSystem::~RecognizeSystem() @@ -253,6 +256,20 @@ void RecognizeSystem::recognize(QTcpSocket *socket) packetType = PacketType::TYPE_NONE; } + if(packetType == PacketType::TYPE_XMLANSWER_ON_QUERY_TO_DB){ //ответы формата XML на запросы к БД + QByteArray array; + stream.startTransaction(); + stream >> array; + + if(!stream.commitTransaction()){ + continue; + } + + xmlParserQueryToDB(array); + + packetType = PacketType::TYPE_NONE; + } + packetType = PacketType::TYPE_NONE; } } @@ -355,7 +372,7 @@ void RecognizeSystem::xmlParser(QByteArray array) emit sigDeAuth(serverDeAuth); } - if(xmlReader.name() == "ListInstructors"){ + if(xmlReader.name() == "AllLists"){ xmlReader.readNext(); name = xmlReader.name().toString(); @@ -417,13 +434,108 @@ void RecognizeSystem::xmlParser(QByteArray array) i++; *this->listInstructors = listInstructors; - emit sigAnswerQueryToDB(this->listInstructors); + //emit sigAnswerQueryToDB(this->listInstructors); } xmlReader.readNext(); } } +void RecognizeSystem::xmlParserQueryToDB(QByteArray array) +{ + QDomDocument groupsTraineesDOM; + + /* + QString xmlFileName = appDirPath + "/groupsTrainees.xml"; + QFile xmlInFile(xmlFileName); + if (!xmlInFile.open(QFile::ReadOnly | QFile::Text)) + { + qDebug() << "LoadTraineesGroupsXML: Не удалось открыть файл " + xmlFileName; + return; + } + else*/ + { + QList listInstructors; + QList listTrainees; + QList listGroups; + + listInstructors.clear(); + listTrainees.clear(); + listGroups.clear(); + + groupsTraineesDOM.setContent(array); + + /* + groupsTraineesDOM.setContent(xmlInFile.readAll()); + xmlInFile.close();*/ + + //QDomNode groupsTraineesNode = groupsTraineesDOM.namedItem("groupsTrainees"); + + QDomNode allListsNode = groupsTraineesDOM.namedItem("AllLists"); + + QDomNode groupsTraineesNode = allListsNode.firstChildElement("GroupsTrainees"); + QDomNode allInstructorsNode = allListsNode.firstChildElement("Instructors"); + + for(int i = 0; i < groupsTraineesNode.childNodes().count(); i++) + { + QDomNode groupNode = groupsTraineesNode.childNodes().at(i); + if(groupNode.nodeName().toLower() == "group") + {//Группа + + Group group; + group.setName(groupNode.toElement().attribute("group_id")); + group.setName(groupNode.toElement().attribute("name")); + listGroups.append(group); + + for(int j = 0; j < groupNode.childNodes().count(); j++) + { + QDomNode traineeNode = groupNode.childNodes().at(j); + if(traineeNode.nodeName().toLower() == "trainee") + {//Обучаемый + + Trainee trainee; + + trainee.setID(traineeNode.toElement().attribute("trainee_id").toInt()); + trainee.setName(traineeNode.toElement().attribute("name")); + trainee.setLogin(traineeNode.toElement().attribute("login")); + trainee.setPassword(traineeNode.toElement().attribute("password")); + trainee.setArchived(traineeNode.toElement().attribute("archived") == QStringLiteral("true") ? true : false); + trainee.setArchived(traineeNode.toElement().attribute("logged_in") == QStringLiteral("true") ? true : false); + trainee.setGroup(group); + + listTrainees.append(trainee); + } + } + } + }//for(int i = 0; i < groupsTraineesNode.childNodes().count(); i++) + + for(int i = 0; i < allInstructorsNode.childNodes().count(); i++) + { + QDomNode instructorNode = allInstructorsNode.childNodes().at(i); + if(instructorNode.nodeName().toLower() == "instructor") + {//Инструктор + + Instructor instructor; + instructor.setID(instructorNode.toElement().attribute("instructor_id").toInt()); + instructor.setName(instructorNode.toElement().attribute("name")); + instructor.setLogin(instructorNode.toElement().attribute("login")); + instructor.setPassword(instructorNode.toElement().attribute("password")); + instructor.setIsAdmin(instructorNode.toElement().attribute("is_admin") == QStringLiteral("true") ? true : false); + instructor.setArchived(instructorNode.toElement().attribute("archived") == QStringLiteral("true") ? true : false); + instructor.setLoggedIn(instructorNode.toElement().attribute("logged_in") == QStringLiteral("true") ? true : false); + + listInstructors.append(instructor); + } + }//for(int i = 0; i < allInstructorsNode.childNodes().count(); i++) + + *this->listInstructors = listInstructors; + *this->listTrainees = listTrainees; + *this->listGroups = listGroups; + + emit sigAnswerQueryToDB(this->listInstructors, this->listTrainees, this->listGroups); + } +} + void RecognizeSystem::checkAccessType(QString type) { if(type == "instructor") diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h index 2901002..46cad41 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h @@ -8,6 +8,8 @@ #include #include "dataparser.h" #include "instructor.h" +#include "trainee.h" +#include "group.h" class RecognizeSystem : public QObject @@ -30,7 +32,9 @@ signals: void sigServerBlocked(); void sigAuth(ServerAuthorization *serverAuth); void sigDeAuth(ServerDeAuthorization *serverDeAuth); - void sigAnswerQueryToDB(QList* listInstructors); + void sigAnswerQueryToDB(QList* listInstructors, + QList* listTrainees, + QList* listGroups); void sigSocketWaitForReadyRead(int waitTime); void sigStartCompare(); @@ -48,8 +52,11 @@ private: int countSend; QList* listInstructors; + QList* listTrainees; + QList* listGroups; void xmlParser(QByteArray array); + void xmlParserQueryToDB(QByteArray array); void checkAccessType(QString type); }; diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h index 70874cf..a3d56cb 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h @@ -32,9 +32,12 @@ enum PacketType{ TYPE_QT = 9, TYPE_DISABLE = 11, - TYPE_GET_LIST_INSTRUCTORS = 100 + TYPE_GET_LIST_INSTRUCTORS = 100, + TYPE_XMLANSWER_ON_QUERY_TO_DB = 101 //xml-ответ на запрос к БД }; +Q_DECLARE_METATYPE(PacketType) + class Tools { public: diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h index cedc3cb..af81ff4 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h @@ -43,7 +43,8 @@ public: }; enum TypeQueryToDB{ - TYPE_QUERY_GET_LIST_INSTRUCTORS + TYPE_QUERY_GET_LIST_INSTRUCTORS, + TYPE_QUERY_GET_ALL_LISTS }; class ClientQueryToDB{ diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 321ed86..19448cc 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -46,7 +46,7 @@ bool ConnectorToServer::deAuthorizationInstructorLocal(QString login) return true; } -bool ConnectorToServer::queryGetListInstructors() +bool ConnectorToServer::sendQueryToDB(TypeQueryToDB typeQuery) { if (!client->getIsConnected()) { @@ -54,10 +54,12 @@ bool ConnectorToServer::queryGetListInstructors() } ClientQueryToDB *queryToDB = new ClientQueryToDB; - queryToDB->typeQuery = TypeQueryToDB::TYPE_QUERY_GET_LIST_INSTRUCTORS; + queryToDB->typeQuery = typeQuery; dataParser->createQueryToDBMessage(queryToDB); emit sigSendQueryToDB(); + + return true; } QList ConnectorToServer::getListInstructors() @@ -65,10 +67,24 @@ QList ConnectorToServer::getListInstructors() return listInstructors; } -void ConnectorToServer::slot_AnswerQueryToDB(QList* listInstructors) +QList ConnectorToServer::getListTrainees() +{ + return listTrainees; +} + +QList ConnectorToServer::getListGroups() +{ + return listGroups; +} + +void ConnectorToServer::slot_AnswerQueryToDB(QList* listInstructors, + QList* listTrainees, + QList* listGroups) { this->listInstructors = *listInstructors; - emit signal_UpdateDB(true, false); + this->listTrainees = *listTrainees; + this->listGroups = *listGroups; + emit signal_UpdateDB(true, true); } void ConnectorToServer::initialize() diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h index 155b2cd..a3d8605 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -6,6 +6,9 @@ #include "Core\dataparser.h" #include "Core\sendsystem.h" #include "Core\recognizesystem.h" +#include "instructor.h" +#include "trainee.h" +#include "group.h" class ConnectorToServer : public QObject { @@ -16,12 +19,16 @@ public: bool authorizationInstructorLocal(QString login, QString password); bool deAuthorizationInstructorLocal(QString login); - bool queryGetListInstructors(); + bool sendQueryToDB(TypeQueryToDB typeQuery); QList getListInstructors(); + QList getListTrainees(); + QList getListGroups(); public slots: - void slot_AnswerQueryToDB(QList* listInstructors); + void slot_AnswerQueryToDB(QList* listInstructors, + QList* listTrainees, + QList* listGroups); signals: void sigSetConnect(ServerSettings* serverSettings,QThread *thread); @@ -53,6 +60,8 @@ private: RecognizeSystem *recognizeSystem; QList listInstructors; + QList listTrainees; + QList listGroups; }; #endif // CONNECTORTOSERVER_H diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index c6a1e49..837d505 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -19,6 +19,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : { ui->setupUi(this); + qRegisterMetaType("PacketType"); + connectorToServer = new ConnectorToServer(this); connect(connectorToServer,&ConnectorToServer::sigLoginResult,this,&InstructorsAndTraineesWidget::checkLoginResult); connect(connectorToServer,&ConnectorToServer::sigDeLoginResult,this,&InstructorsAndTraineesWidget::checkDeLoginResult); @@ -36,6 +38,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(this, &InstructorsAndTraineesWidget::signal_tabMessengerChanged, viewerTrainees, &ViewerTrainees::slot_tabMessengerChanged); connect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerInstructors,&ViewerInstructors::slot_NeedUpdateUI); + connect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerTrainees,&ViewerTrainees::slot_NeedUpdateUI); messangerWidget = new MessangerWidget(this); @@ -291,7 +294,7 @@ void InstructorsAndTraineesWidget::on_btnUpdateStyleSheet_clicked() viewerInstructors->updateMyStyleSheet(); } -void InstructorsAndTraineesWidget::on_btnQueryGetListInstructors_clicked() +void InstructorsAndTraineesWidget::on_btnQueryGetAllLists_clicked() { - connectorToServer->queryGetListInstructors(); + connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_GET_ALL_LISTS); } diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h index a171b49..be08eff 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h @@ -53,7 +53,7 @@ private Q_SLOTS: void on_btnAuthorizationInstructor_clicked(); void on_btnUpdateStyleSheet_clicked(); - void on_btnQueryGetListInstructors_clicked(); + void on_btnQueryGetAllLists_clicked(); private: //Авторизация инструктора локальная diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui index 7d18613..f0eb292 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -213,7 +213,7 @@ - + 58 @@ -221,7 +221,7 @@ - GET_LIST_INSTRUCTORS + GET_ALL_LISTS diff --git a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp index 6d2d7ca..ef67eba 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp @@ -108,6 +108,9 @@ void TraineesView::loadTraineesFromDB() //listGroups = dbLMS->getListGroups(); //listTrainees = dbLMS->getListTrainees(); + listGroups = connectorToServer->getListGroups(); + listTrainees = connectorToServer->getListTrainees(); + for(Group group : listGroups) { //Группа diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user b/DB_LMS/DataBaseLMS/CMakeLists.txt.user index 2be398c..046abcc 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt.user +++ b/DB_LMS/DataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-11-0933.json b/DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-14-0712.json similarity index 100% rename from DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-11-0933.json rename to DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-14-0712.json diff --git a/DB_LMS/Debug64/.ninja_log b/DB_LMS/Debug64/.ninja_log index 62efb70..292842f 100644 --- a/DB_LMS/Debug64/.ninja_log +++ b/DB_LMS/Debug64/.ninja_log @@ -1,20 +1,20 @@ # ninja log v5 +2551 2753 7548372846394482 libDataBaseLMS.dll 31a19f1f3436f66b +352 1488 7548372833764680 CMakeFiles/DataBaseLMS.dir/DataBaseLMS_autogen/mocs_compilation.cpp.obj d9dc0a262f9d4ccd +355 2551 7548372844375223 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 +373 1015 7548372829016458 CMakeFiles/DataBaseLMS.dir/computer.cpp.obj 5930684a0b27a14f +357 1570 7548372834575382 CMakeFiles/DataBaseLMS.dir/interfacedatabaselms.cpp.obj d76eac97fda56f5b +10 35 0 CMakeFiles/clean.additional 7155004b3956b606 +62 112 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +359 1006 7548372828926693 CMakeFiles/DataBaseLMS.dir/basicentity.cpp.obj 99b734c728959a94 +365 969 7548372828557079 CMakeFiles/DataBaseLMS.dir/instructor.cpp.obj fb68571e9d220198 +376 935 7548372828213965 CMakeFiles/DataBaseLMS.dir/task.cpp.obj b003a0cb68c6b2bb +62 112 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +2551 2753 7548372846394482 libDataBaseLMS.dll.a 31a19f1f3436f66b 35 42 0 clean 9c4b4372737ab8da -362 962 7548372828495057 CMakeFiles/DataBaseLMS.dir/user.cpp.obj 4ee7a17d2a43f188 62 112 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +362 962 7548372828495057 CMakeFiles/DataBaseLMS.dir/user.cpp.obj 4ee7a17d2a43f188 62 112 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 379 1018 7548372829057639 CMakeFiles/DataBaseLMS.dir/classroom.cpp.obj e9b501dc7cb3286a 367 1136 7548372830244717 CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj 4ac35fd8ef58e9f 370 1041 7548372829285730 CMakeFiles/DataBaseLMS.dir/group.cpp.obj 70fefc8893e4cb77 -10 35 0 CMakeFiles/clean.additional 7155004b3956b606 -357 1570 7548372834575382 CMakeFiles/DataBaseLMS.dir/interfacedatabaselms.cpp.obj d76eac97fda56f5b -373 1015 7548372829016458 CMakeFiles/DataBaseLMS.dir/computer.cpp.obj 5930684a0b27a14f -355 2551 7548372844375223 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 -352 1488 7548372833764680 CMakeFiles/DataBaseLMS.dir/DataBaseLMS_autogen/mocs_compilation.cpp.obj d9dc0a262f9d4ccd -2551 2753 7548372846394482 libDataBaseLMS.dll 31a19f1f3436f66b -2551 2753 7548372846394482 libDataBaseLMS.dll.a 31a19f1f3436f66b -62 112 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 -376 935 7548372828213965 CMakeFiles/DataBaseLMS.dir/task.cpp.obj b003a0cb68c6b2bb -365 969 7548372828557079 CMakeFiles/DataBaseLMS.dir/instructor.cpp.obj fb68571e9d220198 -359 1006 7548372828926693 CMakeFiles/DataBaseLMS.dir/basicentity.cpp.obj 99b734c728959a94 -62 112 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 diff --git a/GUIdataBaseLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-12-0053.json b/GUIdataBaseLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-16-0500.json similarity index 100% rename from GUIdataBaseLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-12-0053.json rename to GUIdataBaseLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-16-0500.json diff --git a/GUIdataBaseLMS/Debug64/.ninja_deps b/GUIdataBaseLMS/Debug64/.ninja_deps index a409ffd..0e3afc4 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 9b7fc0a..957a8f7 100644 --- a/GUIdataBaseLMS/Debug64/.ninja_log +++ b/GUIdataBaseLMS/Debug64/.ninja_log @@ -1,39 +1,105 @@ # ninja log v5 -19 65 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -441 482 7549320531460357 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 -10 32 0 CMakeFiles/clean.additional 7155004b3956b606 -65 1326 7551751307680384 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -1444 1603 7551751310427010 GUIdataBaseLMS.exe dadb916a9424404 -19 65 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f -32 39 0 clean 9c4b4372737ab8da -462 513 7550002299258019 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 +526 578 7551770923492958 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 +17 57 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +521 1799 7551770935689615 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 24 454 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -68 1398 7551751308390711 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -19 65 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -520 570 7550002299856419 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 -70 1444 7551751308857137 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -19 65 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -19 65 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -19 65 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -462 513 7550002299258019 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 -14 461 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -14 461 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -14 461 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -14 461 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -14 461 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -14 461 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 461 519 7551770922869092 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 461 519 7551770922869092 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 -526 578 7551770923492958 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 -519 1775 7551770935445228 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -521 1799 7551770935689615 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -524 1921 7551770936903410 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -1921 2070 7551770938381102 GUIdataBaseLMS.exe dadb916a9424404 -17 57 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -17 57 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -17 57 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -17 57 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 17 57 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 17 57 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +524 1921 7551770936903410 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +17 57 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +17 57 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +441 482 7549320531460357 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 +10 32 0 CMakeFiles/clean.additional 7155004b3956b606 +519 1775 7551770935445228 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +1921 2070 7551770938381102 GUIdataBaseLMS.exe dadb916a9424404 +17 57 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +32 39 0 clean 9c4b4372737ab8da +2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f +15 456 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +15 456 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +15 456 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +15 456 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +15 456 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +15 456 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +456 505 7551837947273032 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 +456 505 7551837947273032 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 +513 565 7551837947891396 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 +505 1771 7551837959934043 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +508 1790 7551837960136066 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +511 1907 7551837961296306 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1907 2051 7551837962721382 GUIdataBaseLMS.exe dadb916a9424404 +19 62 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +19 62 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +19 62 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +19 62 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +19 62 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +19 62 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +44 1309 7551947577788321 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +46 1335 7551947578060701 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +49 1446 7551947579160518 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1446 1589 7551947580589629 GUIdataBaseLMS.exe dadb916a9424404 +18 48 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +18 48 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +18 48 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +18 48 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +18 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +18 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +39 96 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +39 96 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +39 96 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +39 96 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +39 96 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +39 96 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +44 1316 7554390254005801 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +47 1339 7554390254256532 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +49 1444 7554390255295406 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1444 1599 7554390256828019 GUIdataBaseLMS.exe dadb916a9424404 +18 50 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +18 50 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +18 50 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +18 50 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +18 50 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +18 50 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 46 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 46 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 46 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 46 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 46 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 46 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +44 1326 7554500493541664 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +47 1342 7554500493711209 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +50 1435 7554500494638465 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1435 1582 7554500496092315 GUIdataBaseLMS.exe dadb916a9424404 diff --git a/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj b/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj index 3cf9968..9297bc7 100644 Binary files a/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj and b/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj differ diff --git a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe index 6217518..26c17f0 100644 Binary files a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe and b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe differ diff --git a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp index 125994f..bbc7b86 100644 --- a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp +++ b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp @@ -603,10 +603,10 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/resources/DB-instructors.png 0x0,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, -0x0,0x0,0x1,0x93,0x9b,0x11,0x5d,0xda, +0x0,0x0,0x1,0x93,0x9b,0x75,0xba,0xdf, // :/resources/DB-trainees.png 0x0,0x0,0x0,0x42,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x11,0x2f, -0x0,0x0,0x1,0x93,0x9b,0x11,0x5d,0xdb, +0x0,0x0,0x1,0x93,0x9b,0x75,0xba,0xdf, }; diff --git a/GUIdataBaseLMS/Debug64/StaticData/temp.xml b/GUIdataBaseLMS/Debug64/StaticData/temp.xml index 99d7ba1..40e39ea 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 230f735..15f259a 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 332c793..d9d1823 100644 --- a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user +++ b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-11-0840.json b/ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-10T06-42-20-0031.json similarity index 100% rename from ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-11-0840.json rename to ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-10T06-42-20-0031.json diff --git a/ServerLMS/Debug64/.ninja_deps b/ServerLMS/Debug64/.ninja_deps index 2a13cd5..95d8de3 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 154d5ca..b1b3b29 100644 --- a/ServerLMS/Debug64/.ninja_log +++ b/ServerLMS/Debug64/.ninja_log @@ -1,28 +1,45 @@ # ninja log v5 -712 3908 7551749542533080 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 -1226 1269 7548532014896390 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 -33 692 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -33 692 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -697 3952 7551749542966157 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 -33 692 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +677 3853 7554562145145887 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 +57 131 7554545608656604 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +1287 8367 7551893701770796 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 68e3223fc0caab27 +661 3491 7554562141472208 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +20 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +670 3628 7554562142871886 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +667 3606 7554562142650068 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +15 42 0 CMakeFiles/clean.additional 7155004b3956b606 +91 1201 7554437549810915 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429 +3853 4366 7554562150244849 libServerLMS.dll fec6fbb0697e8d71 +663 3554 7554562142134874 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +560 1985 7551946363807047 CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj f56962914220ed2d +654 3656 7554562143124061 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +42 52 0 clean 9c4b4372737ab8da +673 3326 7554562139850549 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +57 131 7554545608656604 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +20 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +20 57 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +131 418 7554545611552788 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0 +659 3399 7554562140587891 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +20 57 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 1168 3150 7548373207023899 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 8dd57f666ed5ecf4 -1305 1392 7548532016129887 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0 -695 3966 7551749543026196 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc -3 3270 7551766517531456 build.ninja 80e6aedf30bdcc22 -33 692 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -33 692 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -3966 4694 7551749550370154 libServerLMS.dll.a fec6fbb0697e8d71 -37 46 0 clean 9c4b4372737ab8da -692 3929 7551749542724936 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 -690 1824 7550974838970562 CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj f56962914220ed2d -702 3934 7551749542785445 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 -3966 4694 7551749550370154 libServerLMS.dll fec6fbb0697e8d71 -107 1361 7550931469244759 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429 -15 37 0 CMakeFiles/clean.additional 7155004b3956b606 -705 3942 7551749542875211 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 -709 3941 7551749542845286 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf -33 692 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -700 3928 7551749542724936 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c -1284 2596 7548532028126673 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 68e3223fc0caab27 -1226 1269 7548532014896390 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 -715 3935 7551749542805410 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 +656 3806 7554562144601131 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +10 630 7555161399398118 build.ninja 80e6aedf30bdcc22 +20 57 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +20 57 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +3853 4366 7554562150244849 libServerLMS.dll.a fec6fbb0697e8d71 +48 2877 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +48 2877 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +48 2877 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +48 2877 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +48 2877 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +48 2877 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +2894 6513 7555186922184255 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +2896 6514 7555186922184255 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 +2889 6527 7555186922343826 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +2877 6542 7555186922473480 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +2882 6544 7555186922493428 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +2884 6548 7555186922533325 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +2887 6561 7555186922672947 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +2879 6570 7555186922762708 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +2891 6581 7555186922872413 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +6581 7342 7555186930472205 libServerLMS.dll fec6fbb0697e8d71 +6581 7342 7555186930472205 libServerLMS.dll.a fec6fbb0697e8d71 diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj index c9a52a8..ff40243 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj differ 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 cbb75c1..87817ba 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 3076883..885879a 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 42208e0..c4a7810 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 810a4cb..f363a13 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/Systems/sendsystem.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj index 48066dc..6344410 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj index 5149122..26d9411 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj index 115cf5b..cf8debb 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj index 806db3c..4483838 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj index 251f9a7..5d5f924 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/providerdblms.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj index 5f7ca90..4eb0431 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj index 9f6abe9..bd7d2d9 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/AutoRcc_resources_EWIEGA46WW_Info.json b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json index c3d2e9f..5ae2843 100644 --- a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json +++ b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json @@ -8,6 +8,8 @@ "INCLUDE_DIR" : "D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include", "INPUTS" : [ + "D:/LMS/ServerLMS/ServerLMS/blankXML/instructors.xml", + "D:/LMS/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml", "D:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png", "D:/LMS/ServerLMS/ServerLMS/icons/trainee.png", "D:/LMS/ServerLMS/ServerLMS/icons/switchOff.png", diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Used.txt b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Used.txt index 0c828db..8b5e2a5 100644 --- a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Used.txt +++ b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Used.txt @@ -1 +1 @@ -rcc:6ef57208d7e0f32ea4360e789d49343e4a7855cef3d335537ad5aa29bbd1a12b +rcc:bf046fc9861cbeaf107298fd7fe4da86934145f3f69eccf800e3566f05705fa0 diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt index f4f6cf6..b8cff73 100644 --- a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt +++ b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt @@ -1,37 +1,37 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/ServerLMS/ServerLMS/providerdblms.h +D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp +D:/LMS/ServerLMS/ServerLMS/clienthandler.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp - uic:ui_serverlmswidget.h -D:/LMS/ServerLMS/ServerLMS/Systems/logger.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h +D:/LMS/ServerLMS/ServerLMS/Systems/tools.h +D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h +D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h +D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h -D:/LMS/ServerLMS/ServerLMS/Systems/tools.h -D:/LMS/ServerLMS/ServerLMS/clienthandler.h +D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/logger.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp -D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h +D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp + uic:ui_serverlmswidget.h +D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h -D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/multithreadserver.h +D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp +D:/LMS/ServerLMS/ServerLMS/providerdblms.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Client.h +D:/LMS/ServerLMS/ServerLMS/multithreadserver.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp +D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp D:/LMS/ServerLMS/ServerLMS/providerdblms.cpp D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp -D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h +D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp diff --git a/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_clienthandler.cpp b/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_clienthandler.cpp index e601189..f613e75 100644 --- a/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_clienthandler.cpp +++ b/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_clienthandler.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_ClientHandler_t { - QByteArrayData data[35]; - char stringdata0[418]; + QByteArrayData data[37]; + char stringdata0[440]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -36,50 +36,53 @@ QT_MOC_LITERAL(0, 0, 13), // "ClientHandler" QT_MOC_LITERAL(1, 14, 16), // "sigSendXmlAnswer" QT_MOC_LITERAL(2, 31, 0), // "" QT_MOC_LITERAL(3, 32, 5), // "array" -QT_MOC_LITERAL(4, 38, 13), // "sigInitSender" -QT_MOC_LITERAL(5, 52, 11), // "DataParser*" -QT_MOC_LITERAL(6, 64, 9), // "dataParse" -QT_MOC_LITERAL(7, 74, 7), // "Logger*" -QT_MOC_LITERAL(8, 82, 6), // "logger" -QT_MOC_LITERAL(9, 89, 14), // "sigFolderBlock" -QT_MOC_LITERAL(10, 104, 4), // "path" -QT_MOC_LITERAL(11, 109, 12), // "sigFileBlock" -QT_MOC_LITERAL(12, 122, 19), // "sigGetIsSendStopped" -QT_MOC_LITERAL(13, 142, 18), // "sigSendDeleteBlock" -QT_MOC_LITERAL(14, 161, 13), // "sigSendFinish" -QT_MOC_LITERAL(15, 175, 19), // "sigSendMessageBlock" -QT_MOC_LITERAL(16, 195, 4), // "text" -QT_MOC_LITERAL(17, 200, 13), // "sigNeedUpdate" -QT_MOC_LITERAL(18, 214, 4), // "flag" -QT_MOC_LITERAL(19, 219, 4), // "size" -QT_MOC_LITERAL(20, 224, 9), // "fileCount" -QT_MOC_LITERAL(21, 234, 21), // "sigClientDisconnected" -QT_MOC_LITERAL(22, 256, 7), // "address" -QT_MOC_LITERAL(23, 264, 4), // "port" -QT_MOC_LITERAL(24, 269, 11), // "sigSendHash" -QT_MOC_LITERAL(25, 281, 12), // "sigRecognize" -QT_MOC_LITERAL(26, 294, 14), // "ClientHandler*" -QT_MOC_LITERAL(27, 309, 7), // "handler" -QT_MOC_LITERAL(28, 317, 13), // "sigSendNotify" -QT_MOC_LITERAL(29, 331, 6), // "notify" -QT_MOC_LITERAL(30, 338, 26), // "sigSendFileBlockWithRename" -QT_MOC_LITERAL(31, 365, 7), // "newName" -QT_MOC_LITERAL(32, 373, 14), // "sigSocketWrite" -QT_MOC_LITERAL(33, 388, 14), // "sigSocketClose" -QT_MOC_LITERAL(34, 403, 14) // "sigSocketFlush" +QT_MOC_LITERAL(4, 38, 10), // "PacketType" +QT_MOC_LITERAL(5, 49, 10), // "packetType" +QT_MOC_LITERAL(6, 60, 13), // "sigInitSender" +QT_MOC_LITERAL(7, 74, 11), // "DataParser*" +QT_MOC_LITERAL(8, 86, 9), // "dataParse" +QT_MOC_LITERAL(9, 96, 7), // "Logger*" +QT_MOC_LITERAL(10, 104, 6), // "logger" +QT_MOC_LITERAL(11, 111, 14), // "sigFolderBlock" +QT_MOC_LITERAL(12, 126, 4), // "path" +QT_MOC_LITERAL(13, 131, 12), // "sigFileBlock" +QT_MOC_LITERAL(14, 144, 19), // "sigGetIsSendStopped" +QT_MOC_LITERAL(15, 164, 18), // "sigSendDeleteBlock" +QT_MOC_LITERAL(16, 183, 13), // "sigSendFinish" +QT_MOC_LITERAL(17, 197, 19), // "sigSendMessageBlock" +QT_MOC_LITERAL(18, 217, 4), // "text" +QT_MOC_LITERAL(19, 222, 13), // "sigNeedUpdate" +QT_MOC_LITERAL(20, 236, 4), // "flag" +QT_MOC_LITERAL(21, 241, 4), // "size" +QT_MOC_LITERAL(22, 246, 9), // "fileCount" +QT_MOC_LITERAL(23, 256, 21), // "sigClientDisconnected" +QT_MOC_LITERAL(24, 278, 7), // "address" +QT_MOC_LITERAL(25, 286, 4), // "port" +QT_MOC_LITERAL(26, 291, 11), // "sigSendHash" +QT_MOC_LITERAL(27, 303, 12), // "sigRecognize" +QT_MOC_LITERAL(28, 316, 14), // "ClientHandler*" +QT_MOC_LITERAL(29, 331, 7), // "handler" +QT_MOC_LITERAL(30, 339, 13), // "sigSendNotify" +QT_MOC_LITERAL(31, 353, 6), // "notify" +QT_MOC_LITERAL(32, 360, 26), // "sigSendFileBlockWithRename" +QT_MOC_LITERAL(33, 387, 7), // "newName" +QT_MOC_LITERAL(34, 395, 14), // "sigSocketWrite" +QT_MOC_LITERAL(35, 410, 14), // "sigSocketClose" +QT_MOC_LITERAL(36, 425, 14) // "sigSocketFlush" }, "ClientHandler\0sigSendXmlAnswer\0\0array\0" - "sigInitSender\0DataParser*\0dataParse\0" - "Logger*\0logger\0sigFolderBlock\0path\0" - "sigFileBlock\0sigGetIsSendStopped\0" - "sigSendDeleteBlock\0sigSendFinish\0" - "sigSendMessageBlock\0text\0sigNeedUpdate\0" - "flag\0size\0fileCount\0sigClientDisconnected\0" - "address\0port\0sigSendHash\0sigRecognize\0" - "ClientHandler*\0handler\0sigSendNotify\0" - "notify\0sigSendFileBlockWithRename\0" - "newName\0sigSocketWrite\0sigSocketClose\0" + "PacketType\0packetType\0sigInitSender\0" + "DataParser*\0dataParse\0Logger*\0logger\0" + "sigFolderBlock\0path\0sigFileBlock\0" + "sigGetIsSendStopped\0sigSendDeleteBlock\0" + "sigSendFinish\0sigSendMessageBlock\0" + "text\0sigNeedUpdate\0flag\0size\0fileCount\0" + "sigClientDisconnected\0address\0port\0" + "sigSendHash\0sigRecognize\0ClientHandler*\0" + "handler\0sigSendNotify\0notify\0" + "sigSendFileBlockWithRename\0newName\0" + "sigSocketWrite\0sigSocketClose\0" "sigSocketFlush" }; #undef QT_MOC_LITERAL @@ -98,39 +101,39 @@ static const uint qt_meta_data_ClientHandler[] = { 17, // signalCount // signals: name, argc, parameters, tag, flags - 1, 1, 99, 2, 0x06 /* Public */, - 4, 2, 102, 2, 0x06 /* Public */, - 9, 1, 107, 2, 0x06 /* Public */, - 11, 1, 110, 2, 0x06 /* Public */, - 12, 0, 113, 2, 0x06 /* Public */, - 13, 1, 114, 2, 0x06 /* Public */, - 14, 0, 117, 2, 0x06 /* Public */, - 15, 1, 118, 2, 0x06 /* Public */, - 17, 3, 121, 2, 0x06 /* Public */, - 21, 2, 128, 2, 0x06 /* Public */, - 24, 0, 133, 2, 0x06 /* Public */, - 25, 1, 134, 2, 0x06 /* Public */, - 28, 1, 137, 2, 0x06 /* Public */, - 30, 2, 140, 2, 0x06 /* Public */, - 32, 1, 145, 2, 0x06 /* Public */, - 33, 0, 148, 2, 0x06 /* Public */, - 34, 0, 149, 2, 0x06 /* Public */, + 1, 2, 99, 2, 0x06 /* Public */, + 6, 2, 104, 2, 0x06 /* Public */, + 11, 1, 109, 2, 0x06 /* Public */, + 13, 1, 112, 2, 0x06 /* Public */, + 14, 0, 115, 2, 0x06 /* Public */, + 15, 1, 116, 2, 0x06 /* Public */, + 16, 0, 119, 2, 0x06 /* Public */, + 17, 1, 120, 2, 0x06 /* Public */, + 19, 3, 123, 2, 0x06 /* Public */, + 23, 2, 130, 2, 0x06 /* Public */, + 26, 0, 135, 2, 0x06 /* Public */, + 27, 1, 136, 2, 0x06 /* Public */, + 30, 1, 139, 2, 0x06 /* Public */, + 32, 2, 142, 2, 0x06 /* Public */, + 34, 1, 147, 2, 0x06 /* Public */, + 35, 0, 150, 2, 0x06 /* Public */, + 36, 0, 151, 2, 0x06 /* Public */, // signals: parameters - QMetaType::Void, QMetaType::QByteArray, 3, - QMetaType::Void, 0x80000000 | 5, 0x80000000 | 7, 6, 8, - QMetaType::Void, QMetaType::QString, 10, - QMetaType::Void, QMetaType::QString, 10, + QMetaType::Void, QMetaType::QByteArray, 0x80000000 | 4, 3, 5, + QMetaType::Void, 0x80000000 | 7, 0x80000000 | 9, 8, 10, + QMetaType::Void, QMetaType::QString, 12, + QMetaType::Void, QMetaType::QString, 12, QMetaType::Bool, - QMetaType::Void, QMetaType::QString, 10, + QMetaType::Void, QMetaType::QString, 12, QMetaType::Void, - QMetaType::Void, QMetaType::QString, 16, - QMetaType::Void, QMetaType::Bool, QMetaType::ULongLong, QMetaType::ULongLong, 18, 19, 20, - QMetaType::Void, QMetaType::QString, QMetaType::QString, 22, 23, + QMetaType::Void, QMetaType::QString, 18, + QMetaType::Void, QMetaType::Bool, QMetaType::ULongLong, QMetaType::ULongLong, 20, 21, 22, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 24, 25, QMetaType::Void, - QMetaType::Void, 0x80000000 | 26, 27, - QMetaType::Void, QMetaType::QString, 29, - QMetaType::Void, QMetaType::QString, QMetaType::QString, 10, 31, + QMetaType::Void, 0x80000000 | 28, 29, + QMetaType::Void, QMetaType::QString, 31, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 12, 33, QMetaType::Void, QMetaType::QByteArray, 3, QMetaType::Void, QMetaType::Bool, @@ -144,7 +147,7 @@ void ClientHandler::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { - case 0: _t->sigSendXmlAnswer((*reinterpret_cast< QByteArray(*)>(_a[1]))); break; + case 0: _t->sigSendXmlAnswer((*reinterpret_cast< QByteArray(*)>(_a[1])),(*reinterpret_cast< PacketType(*)>(_a[2]))); break; case 1: _t->sigInitSender((*reinterpret_cast< DataParser*(*)>(_a[1])),(*reinterpret_cast< Logger*(*)>(_a[2]))); break; case 2: _t->sigFolderBlock((*reinterpret_cast< QString(*)>(_a[1]))); break; case 3: _t->sigFileBlock((*reinterpret_cast< QString(*)>(_a[1]))); break; @@ -188,7 +191,7 @@ void ClientHandler::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - using _t = void (ClientHandler::*)(QByteArray ); + using _t = void (ClientHandler::*)(QByteArray , PacketType ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ClientHandler::sigSendXmlAnswer)) { *result = 0; return; @@ -350,9 +353,9 @@ int ClientHandler::qt_metacall(QMetaObject::Call _c, int _id, void **_a) } // SIGNAL 0 -void ClientHandler::sigSendXmlAnswer(QByteArray _t1) +void ClientHandler::sigSendXmlAnswer(QByteArray _t1, PacketType _t2) { - void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 0, _a); } diff --git a/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp b/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp index 9a7b568..93b1a92 100644 --- a/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp +++ b/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp @@ -7,7 +7,27 @@ *****************************************************************************/ static const unsigned char qt_resource_data[] = { - // D:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png + // D:/LMS/ServerLMS/ServerLMS/blankXML/instructors.xml + 0x0,0x0,0x0,0x4d, + 0x3c, + 0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x27,0x31,0x2e, + 0x30,0x27,0x20,0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x27,0x75,0x74,0x66, + 0x2d,0x38,0x27,0x3f,0x3e,0xd,0xa,0x3c,0x61,0x6c,0x6c,0x49,0x6e,0x73,0x74,0x72, + 0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,0x3c,0x2f,0x61,0x6c,0x6c,0x49,0x6e, + 0x73,0x74,0x72,0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa, + // D:/LMS/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml + 0x0,0x0,0x0,0x89, + 0x3c, + 0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x27,0x31,0x2e, + 0x30,0x27,0x20,0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x27,0x75,0x74,0x66, + 0x2d,0x38,0x27,0x3f,0x3e,0xd,0xa,0x3c,0x41,0x6c,0x6c,0x4c,0x69,0x73,0x74,0x73, + 0x3e,0xd,0xa,0x9,0x3c,0x47,0x72,0x6f,0x75,0x70,0x73,0x54,0x72,0x61,0x69,0x6e, + 0x65,0x65,0x73,0x3e,0xd,0xa,0x9,0x3c,0x2f,0x47,0x72,0x6f,0x75,0x70,0x73,0x54, + 0x72,0x61,0x69,0x6e,0x65,0x65,0x73,0x3e,0xd,0xa,0x9,0x3c,0x49,0x6e,0x73,0x74, + 0x72,0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,0x9,0x3c,0x2f,0x49,0x6e,0x73, + 0x74,0x72,0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,0x3c,0x2f,0x41,0x6c,0x6c, + 0x4c,0x69,0x73,0x74,0x73,0x3e,0xd,0xa, + // D:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png 0x0,0x0,0xc,0xc7, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -846,6 +866,22 @@ static const unsigned char qt_resource_name[] = { 0x0,0x6f,0xa6,0x53, 0x0,0x69, 0x0,0x63,0x0,0x6f,0x0,0x6e,0x0,0x73, + // blankXML + 0x0,0x8, + 0x2,0x85,0x0,0x3c, + 0x0,0x62, + 0x0,0x6c,0x0,0x61,0x0,0x6e,0x0,0x6b,0x0,0x58,0x0,0x4d,0x0,0x4c, + // instructors.xml + 0x0,0xf, + 0x3,0xe8,0xeb,0x3c, + 0x0,0x69, + 0x0,0x6e,0x0,0x73,0x0,0x74,0x0,0x72,0x0,0x75,0x0,0x63,0x0,0x74,0x0,0x6f,0x0,0x72,0x0,0x73,0x0,0x2e,0x0,0x78,0x0,0x6d,0x0,0x6c, + // groupsTrainees.xml + 0x0,0x12, + 0x1,0x13,0xe,0x7c, + 0x0,0x67, + 0x0,0x72,0x0,0x6f,0x0,0x75,0x0,0x70,0x0,0x73,0x0,0x54,0x0,0x72,0x0,0x61,0x0,0x69,0x0,0x6e,0x0,0x65,0x0,0x65,0x0,0x73,0x0,0x2e,0x0,0x78,0x0,0x6d, + 0x0,0x6c, // instructorAdmin.png 0x0,0x13, 0x8,0x7,0x7d,0x47, @@ -877,25 +913,34 @@ static const unsigned char qt_resource_name[] = { static const unsigned char qt_resource_struct[] = { // : - 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1, + 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/icons - 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x5,0x0,0x0,0x0,0x2, + 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x5,0x0,0x0,0x0,0x5, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, + // :/blankXML + 0x0,0x0,0x0,0x10,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x3, +0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, + // :/blankXML/groupsTrainees.xml + 0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x51, +0x0,0x0,0x1,0x93,0xab,0x9a,0xd3,0x2e, + // :/blankXML/instructors.xml + 0x0,0x0,0x0,0x26,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, +0x0,0x0,0x1,0x92,0xb8,0x51,0xd,0xb7, // :/icons/switchOff.png - 0x0,0x0,0x0,0x58,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x15,0xab, + 0x0,0x0,0x0,0xbc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x16,0x89, 0x0,0x0,0x1,0x93,0x86,0xa5,0x5c,0x99, // :/icons/instructor.png - 0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x27,0xef, + 0x0,0x0,0x0,0xfa,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x28,0xcd, 0x0,0x0,0x1,0x8f,0x37,0xdf,0xf0,0x30, // :/icons/switchOn.png - 0x0,0x0,0x0,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1e,0xc7, + 0x0,0x0,0x0,0xdc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1f,0xa5, 0x0,0x0,0x1,0x93,0x86,0xa5,0x5c,0x9d, // :/icons/trainee.png - 0x0,0x0,0x0,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xc,0xcb, + 0x0,0x0,0x0,0xa0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xd,0xa9, 0x0,0x0,0x1,0x8e,0x8a,0x13,0x52,0xd0, // :/icons/instructorAdmin.png - 0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, + 0x0,0x0,0x0,0x74,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xde, 0x0,0x0,0x1,0x8f,0x57,0x71,0xc1,0x80, }; diff --git a/ServerLMS/Debug64/build.ninja b/ServerLMS/Debug64/build.ninja index 1848481..a59fdb1 100644 --- a/ServerLMS/Debug64/build.ninja +++ b/ServerLMS/Debug64/build.ninja @@ -206,7 +206,7 @@ build ServerLMS_autogen: phony CMakeFiles/ServerLMS_autogen ServerLMS_autogen/mo ############################################# # Custom command for ServerLMS_autogen\EWIEGA46WW\qrc_resources.cpp -build ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp | ${cmake_ninja_workdir}ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp: CUSTOM_COMMAND D$:/LMS/ServerLMS/ServerLMS/resources.qrc CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json D$:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png D$:/LMS/ServerLMS/ServerLMS/icons/trainee.png D$:/LMS/ServerLMS/ServerLMS/icons/switchOff.png D$:/LMS/ServerLMS/ServerLMS/icons/switchOn.png D$:/LMS/ServerLMS/ServerLMS/icons/instructor.png C$:/Qt/Qt5.14.2/5.14.2/mingw73_64/bin/rcc.exe || ServerLMS_autogen +build ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp | ${cmake_ninja_workdir}ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp: CUSTOM_COMMAND D$:/LMS/ServerLMS/ServerLMS/resources.qrc CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json D$:/LMS/ServerLMS/ServerLMS/blankXML/instructors.xml D$:/LMS/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml D$:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png D$:/LMS/ServerLMS/ServerLMS/icons/trainee.png D$:/LMS/ServerLMS/ServerLMS/icons/switchOff.png D$:/LMS/ServerLMS/ServerLMS/icons/switchOn.png D$:/LMS/ServerLMS/ServerLMS/icons/instructor.png C$:/Qt/Qt5.14.2/5.14.2/mingw73_64/bin/rcc.exe || ServerLMS_autogen COMMAND = C:\Windows\system32\cmd.exe /C "cd /D D:\LMS\ServerLMS\Debug64 && C:\msys64\mingw64\bin\cmake.exe -E cmake_autorcc D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json Debug" DESC = Automatic RCC for resources.qrc restat = 1 diff --git a/ServerLMS/Debug64/libServerLMS.dll b/ServerLMS/Debug64/libServerLMS.dll index 719673b..6d6fb4f 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 49720a3..e97d23c 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 a47e2f8..13c13ab 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 e4c2952..09e6a5b 100644 --- a/ServerLMS/ServerLMS/Systems/dataparser.cpp +++ b/ServerLMS/ServerLMS/Systems/dataparser.cpp @@ -1,6 +1,7 @@ #include "dataparser.h" #include +#include DataParser::DataParser(ProcessingSystem *processingSystem,QObject *parent) : QObject(parent) @@ -290,26 +291,78 @@ QByteArray DataParser::xmlAnswer_deAuthorization(bool result, QString login) return xmlAnswer(listTag); } -QByteArray DataParser::xmlAnswer_ClientQueryToDB(bool result, QList listInstructors) +QByteArray DataParser::xmlAnswer_ClientQueryToDB(bool result, QList* listInstructors, + QList* listTrainees, QList* listGroups) { - QList listTag; + QDomDocument groupsTraineesDOM; + QFile blankFile(":/blankXML/groupsTrainees.xml"); - for(Instructor instructor : listInstructors) - { - SAttribute attribute1 = {"instructor_id", QString::number(instructor.getID())}; - SAttribute attribute2 = {"name", instructor.getName()}; - SAttribute attribute3 = {"login", instructor.getLogin()}; - SAttribute attribute4 = {"password", instructor.getPassword()}; - SAttribute attribute5 = {"is_admin", instructor.getIsAdmin() ? "true" : "false"}; - SAttribute attribute6 = {"archived", instructor.getArchived() ? "true" : "false"}; - SAttribute attribute7 = {"logged_in", instructor.getLoggedIn() ? "true" : "false"}; - QList listAttr = {attribute1, attribute2, attribute3, attribute4, attribute5, attribute6, attribute7}; - SXmlAnswerTag tag = {"Instructor", listAttr}; - - listTag.append(tag); + if (! blankFile.open(QFile::ReadOnly | QFile::Text)) { + qDebug() << "SaveTraineesGroupsXML: Не удалось считать файл :/blankXML/groupsTrainees.xml"; + return QByteArray(); } - return xmlAnswer(listTag, "ListInstructors"); + 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(); } QByteArray DataParser::xmlAnswer_message(QString text) diff --git a/ServerLMS/ServerLMS/Systems/dataparser.h b/ServerLMS/ServerLMS/Systems/dataparser.h index fe26e73..5e505ec 100644 --- a/ServerLMS/ServerLMS/Systems/dataparser.h +++ b/ServerLMS/ServerLMS/Systems/dataparser.h @@ -28,7 +28,8 @@ 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); + QByteArray xmlAnswer_ClientQueryToDB(bool result, QList* listInstructors = nullptr, + QList* listTrainees = nullptr, QList* listGroups = nullptr); QByteArray xmlAnswer_message(QString text); QByteArray xmlAnswer_task(QString text); diff --git a/ServerLMS/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/ServerLMS/Systems/processingsystem.cpp index edd1e35..341be1f 100644 --- a/ServerLMS/ServerLMS/Systems/processingsystem.cpp +++ b/ServerLMS/ServerLMS/Systems/processingsystem.cpp @@ -119,13 +119,23 @@ 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_LIST_INSTRUCTORS: + { + QList listInstructors = providerDBLMS->GetListAllInstructors(); + arrayAnswer = dataParser->xmlAnswer_ClientQueryToDB(true, &listInstructors); + break; + } + case TypeQueryToDB::TYPE_QUERY_GET_ALL_LISTS: + { + QList listInstructors = providerDBLMS->GetListAllInstructors(); + QList listTrainees = providerDBLMS->GetListAllTrainees(); + QList listGroups = providerDBLMS->GetListAllGroups(); + arrayAnswer = dataParser->xmlAnswer_ClientQueryToDB(true, &listInstructors, &listTrainees, &listGroups); + break; + } } - client->sendXmlAnswer(arrayAnswer); + client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_ON_QUERY_TO_DB); //QString str = QString(arrayAnswer); //logger->addTextToLogger("To Client: " + str); diff --git a/ServerLMS/ServerLMS/Systems/sendsystem.cpp b/ServerLMS/ServerLMS/Systems/sendsystem.cpp index 0913d08..b1f8908 100644 --- a/ServerLMS/ServerLMS/Systems/sendsystem.cpp +++ b/ServerLMS/ServerLMS/Systems/sendsystem.cpp @@ -182,7 +182,7 @@ void SendSystem::sendNotify(QString notify) sendXmlAnswer(answer); } -void SendSystem::sendXmlAnswer(QByteArray array) +void SendSystem::sendXmlAnswer(QByteArray array, PacketType packetType) { qDebug() << "SendSystemThread: " << QThread::currentThreadId(); if(!client->getIsUnity()) @@ -190,7 +190,7 @@ void SendSystem::sendXmlAnswer(QByteArray array) QDataStream stream(socket); stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); - stream << PacketType::TYPE_XMLANSWER; + stream << /*PacketType::TYPE_XMLANSWER*/packetType; stream << array; } else diff --git a/ServerLMS/ServerLMS/Systems/sendsystem.h b/ServerLMS/ServerLMS/Systems/sendsystem.h index f76adbc..e9c803e 100644 --- a/ServerLMS/ServerLMS/Systems/sendsystem.h +++ b/ServerLMS/ServerLMS/Systems/sendsystem.h @@ -28,7 +28,7 @@ public: void sendFinish(); void sendNotify(QString notify); void sendStop(); - void sendXmlAnswer(QByteArray array); + void sendXmlAnswer(QByteArray array, PacketType packetType = PacketType::TYPE_XMLANSWER); void sendNeedUpdate(bool flag,quint64 size,quint64 fileCount); void updateFiles(QList fileSendList, QList clientDataList); bool getIsSendStopped() const; diff --git a/ServerLMS/ServerLMS/Systems/tools.h b/ServerLMS/ServerLMS/Systems/tools.h index d3e8683..d815cdf 100644 --- a/ServerLMS/ServerLMS/Systems/tools.h +++ b/ServerLMS/ServerLMS/Systems/tools.h @@ -32,9 +32,12 @@ enum PacketType TYPE_DISABLE = 11, TYPE_FILESIZE = 20, - TYPE_GET_LIST_INSTRUCTORS = 100 + TYPE_GET_LIST_INSTRUCTORS = 100, + TYPE_XMLANSWER_ON_QUERY_TO_DB = 101 //xml-ответ на запрос к БД }; +Q_DECLARE_METATYPE(PacketType) + class Tools { public: static void printTime(); diff --git a/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml b/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml new file mode 100644 index 0000000..ec468d3 --- /dev/null +++ b/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ServerLMS/ServerLMS/blankXML/instructors.xml b/ServerLMS/ServerLMS/blankXML/instructors.xml new file mode 100644 index 0000000..2fda750 --- /dev/null +++ b/ServerLMS/ServerLMS/blankXML/instructors.xml @@ -0,0 +1,3 @@ + + + diff --git a/ServerLMS/ServerLMS/clienthandler.cpp b/ServerLMS/ServerLMS/clienthandler.cpp index 7360c40..34a1813 100644 --- a/ServerLMS/ServerLMS/clienthandler.cpp +++ b/ServerLMS/ServerLMS/clienthandler.cpp @@ -69,9 +69,9 @@ void ClientHandler::sendHash() //emit sigSendNotify("HASHSENDCOMPLETE"); } -void ClientHandler::sendXmlAnswer(QByteArray array) +void ClientHandler::sendXmlAnswer(QByteArray array, PacketType packetType) { - emit sigSendXmlAnswer(array); + emit sigSendXmlAnswer(array, packetType); } void ClientHandler::sendFolderBlock(QString path) @@ -110,11 +110,10 @@ void ClientHandler::sendNeedUpdate(bool flag, quint64 size, quint64 fileCount) } void ClientHandler::sendDisable() -{ +{ thread->exit(); thread->wait(); emit sigClientDisconnected(client->getAddress(),client->getPort()); - } Client *ClientHandler::getClient() const diff --git a/ServerLMS/ServerLMS/clienthandler.h b/ServerLMS/ServerLMS/clienthandler.h index d36883c..f28cfce 100644 --- a/ServerLMS/ServerLMS/clienthandler.h +++ b/ServerLMS/ServerLMS/clienthandler.h @@ -6,6 +6,7 @@ #include "Client.h" #include #include +#include "Systems/tools.h" class SendSystem; class DataParser; @@ -21,7 +22,7 @@ class ClientHandler : public QObject public: ClientHandler(QObject* parent = nullptr); void initSender(DataParser *dataParser,Logger *logger); - void sendXmlAnswer(QByteArray array); + void sendXmlAnswer(QByteArray array, PacketType packetType = PacketType::TYPE_XMLANSWER); void sendFolderBlock(QString path); void sendFileBlock(QString path); bool getIsSendStopped(); @@ -41,7 +42,7 @@ public: QTcpSocket *getSocket() const; signals: - void sigSendXmlAnswer(QByteArray array); + void sigSendXmlAnswer(QByteArray array, PacketType packetType); void sigInitSender (DataParser *dataParse,Logger *logger); void sigFolderBlock(QString path); void sigFileBlock(QString path); diff --git a/ServerLMS/ServerLMS/multithreadserver.cpp b/ServerLMS/ServerLMS/multithreadserver.cpp index 41e9f08..1ac463d 100644 --- a/ServerLMS/ServerLMS/multithreadserver.cpp +++ b/ServerLMS/ServerLMS/multithreadserver.cpp @@ -40,6 +40,11 @@ void MultiThreadServer::slotDisconnectClient(QString peerAddress, QString peerPo if(client->getClient()->getAddress() == peerAddress && client->getClient()->getPort() == peerPort) { login = client->getClient()->getLogin(); + + ClientDeAutorization clientDeAutorization; + clientDeAutorization.Login = login; + serverLmsWidget->getProcessingSystem()->processingClientDeAutorization(client, clientDeAutorization); + serverLmsWidget->removeClient(idSocket); delete client; continue; diff --git a/ServerLMS/ServerLMS/providerdblms.cpp b/ServerLMS/ServerLMS/providerdblms.cpp index 56c73d8..17a6dea 100644 --- a/ServerLMS/ServerLMS/providerdblms.cpp +++ b/ServerLMS/ServerLMS/providerdblms.cpp @@ -216,3 +216,39 @@ QList ProviderDBLMS::GetListAllInstructors() mtxAccess.unlock(); return listInstructors; } + +QList ProviderDBLMS::GetListAllTrainees() +{ + QList listTrainees; + + mtxAccess.lock(); + + if(! dbLMS->DBisConnected()) + { + mtxAccess.unlock(); + return listTrainees; + } + + listTrainees = dbLMS->getListTrainees(); + + mtxAccess.unlock(); + return listTrainees; +} + +QList ProviderDBLMS::GetListAllGroups() +{ + QList listGroups; + + mtxAccess.lock(); + + if(! dbLMS->DBisConnected()) + { + mtxAccess.unlock(); + return listGroups; + } + + listGroups = dbLMS->getListGroups(); + + mtxAccess.unlock(); + return listGroups; +} diff --git a/ServerLMS/ServerLMS/providerdblms.h b/ServerLMS/ServerLMS/providerdblms.h index d8f9158..8e37be1 100644 --- a/ServerLMS/ServerLMS/providerdblms.h +++ b/ServerLMS/ServerLMS/providerdblms.h @@ -24,7 +24,9 @@ public: QString getNameInstructorByLogin(QString login); // - QList GetListAllInstructors(); + QList GetListAllInstructors(); + QList GetListAllTrainees(); + QList GetListAllGroups(); Q_SIGNALS: //сигнал о блокировке авторизации diff --git a/ServerLMS/ServerLMS/resources.qrc b/ServerLMS/ServerLMS/resources.qrc index 823a674..4ebbef1 100644 --- a/ServerLMS/ServerLMS/resources.qrc +++ b/ServerLMS/ServerLMS/resources.qrc @@ -5,5 +5,7 @@ icons/trainee.png icons/switchOff.png icons/switchOn.png + blankXML/groupsTrainees.xml + blankXML/instructors.xml diff --git a/ServerLMS/ServerLMS/serverlmswidget.cpp b/ServerLMS/ServerLMS/serverlmswidget.cpp index 9766712..5acd8b8 100644 --- a/ServerLMS/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/ServerLMS/serverlmswidget.cpp @@ -25,6 +25,8 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) : { ui->setupUi(this); + qRegisterMetaType("PacketType"); + ui->comboTasks->addItem("Задача 1"); ui->comboTasks->addItem("Задача 2"); ui->comboTasks->addItem("Задача 3"); @@ -200,7 +202,7 @@ void ServerLMSWidget::slot_AuthChanged() if(clientsMap[idSocket]->getClient()->getTypeClient() == TypeClientAutorization::TYPE_GUI) {//Отправляем этому клиенту обновление списков ClientQueryToDB queryToDB; - queryToDB.typeQuery = TypeQueryToDB::TYPE_QUERY_GET_LIST_INSTRUCTORS; + queryToDB.typeQuery = TypeQueryToDB::TYPE_QUERY_GET_ALL_LISTS; processingSystem->processingClientQueryToDB(clientsMap[idSocket], queryToDB); } } diff --git a/ServerLMS/ServerLMS/serverlmswidget.h b/ServerLMS/ServerLMS/serverlmswidget.h index 9e6b494..65b7096 100644 --- a/ServerLMS/ServerLMS/serverlmswidget.h +++ b/ServerLMS/ServerLMS/serverlmswidget.h @@ -82,6 +82,11 @@ public: return stateBlockAutorization; } + ProcessingSystem* getProcessingSystem() + { + return processingSystem; + } + QMap getClientsMap() const; private slots: diff --git a/ServerLMS/ServerLMS/typesDataServerClient.h b/ServerLMS/ServerLMS/typesDataServerClient.h index 9a7dca7..b61df80 100644 --- a/ServerLMS/ServerLMS/typesDataServerClient.h +++ b/ServerLMS/ServerLMS/typesDataServerClient.h @@ -57,7 +57,8 @@ public: }; enum TypeQueryToDB{ - TYPE_QUERY_GET_LIST_INSTRUCTORS + TYPE_QUERY_GET_LIST_INSTRUCTORS, + TYPE_QUERY_GET_ALL_LISTS }; class ClientQueryToDB{ diff --git a/TestServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-11-0736.json b/TestServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-15-0576.json similarity index 100% rename from TestServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T08-24-11-0736.json rename to TestServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-15-0576.json diff --git a/TestServerLMS/Debug64/.ninja_deps b/TestServerLMS/Debug64/.ninja_deps index ae8d269..d6f2d45 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 7a44f79..8bfdbf5 100644 --- a/TestServerLMS/Debug64/.ninja_log +++ b/TestServerLMS/Debug64/.ninja_log @@ -1,50 +1,35 @@ # ninja log v5 -540 586 7549097816029845 TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 -593 631 7549097816492511 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp.obj 243f7b95850f8289 -14 44 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -68 2250 7549125684971766 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 -14 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -14 44 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -40 47 0 clean 9c4b4372737ab8da -13 40 0 CMakeFiles/clean.additional 7155004b3956b606 -2412 2579 7549125688238392 TestServerLMS.exe 68113cd959b50515 -14 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -540 586 7549097816029845 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 -71 2290 7549125685370698 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed -12 229 7551766516424412 build.ninja ac221dfe1922250d -14 44 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -14 44 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -73 2412 7549125686574666 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d -15 545 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -15 545 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -15 545 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -15 545 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -15 545 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -15 545 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -10 35 0 CMakeFiles/clean.additional 7155004b3956b606 -35 42 0 clean 9c4b4372737ab8da -14 531 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -14 531 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -14 531 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -14 531 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -14 531 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -14 531 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 531 577 7551768470787617 TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 -531 577 7551768470787617 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 584 624 7551768471280319 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp.obj 243f7b95850f8289 -18 501 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -18 501 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -18 501 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -18 501 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -18 501 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -18 501 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -501 2594 7551768739086281 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 -504 2652 7551768739665076 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed -507 2752 7551768740650176 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d -2752 2915 7551768742275542 TestServerLMS.exe 68113cd959b50515 -17 54 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -17 54 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -17 54 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -17 54 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -17 54 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -17 54 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +13 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +49 2179 7554502564474115 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 +13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +35 42 0 clean 9c4b4372737ab8da +10 35 0 CMakeFiles/clean.additional 7155004b3956b606 +2336 2491 7554502567590004 TestServerLMS.exe 68113cd959b50515 +13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +531 577 7551768470787617 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 +51 2185 7554502564534951 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed +54 2336 7554502566050563 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d +13 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +12 229 7551833755120909 build.ninja ac221dfe1922250d +14 46 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +14 46 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +14 46 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +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 +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 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 diff --git a/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen.dir/ParseCache.txt b/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen.dir/ParseCache.txt index 2ae75f4..025cb1f 100644 --- a/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen.dir/ParseCache.txt +++ b/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen.dir/ParseCache.txt @@ -1,6 +1,6 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/TestServerLMS/TestServerLMS/mainwindow.h - mmc:Q_OBJECT -D:/LMS/TestServerLMS/TestServerLMS/main.cpp D:/LMS/TestServerLMS/TestServerLMS/mainwindow.cpp uic:./ui_mainwindow.h +D:/LMS/TestServerLMS/TestServerLMS/main.cpp +D:/LMS/TestServerLMS/TestServerLMS/mainwindow.h + mmc:Q_OBJECT diff --git a/TestServerLMS/Debug64/GroupsTrainees.xml b/TestServerLMS/Debug64/GroupsTrainees.xml new file mode 100644 index 0000000..f7e4d1e --- /dev/null +++ b/TestServerLMS/Debug64/GroupsTrainees.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/TestServerLMS.exe b/TestServerLMS/Debug64/TestServerLMS.exe index 2d70ece..92e736e 100644 Binary files a/TestServerLMS/Debug64/TestServerLMS.exe and b/TestServerLMS/Debug64/TestServerLMS.exe differ diff --git a/TestServerLMS/Debug64/blankXML/groupsTrainees.xml b/TestServerLMS/Debug64/blankXML/groupsTrainees.xml new file mode 100644 index 0000000..ec468d3 --- /dev/null +++ b/TestServerLMS/Debug64/blankXML/groupsTrainees.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/TestServerLMS/Debug64/blankXML/instructors.xml b/TestServerLMS/Debug64/blankXML/instructors.xml new file mode 100644 index 0000000..2fda750 --- /dev/null +++ b/TestServerLMS/Debug64/blankXML/instructors.xml @@ -0,0 +1,3 @@ + + + diff --git a/TestServerLMS/Debug64/libServerLMS.dll b/TestServerLMS/Debug64/libServerLMS.dll index 719673b..6d6fb4f 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 d80de6a..76964b0 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt.user +++ b/TestServerLMS/TestServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId