diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index b9ed11f..f21af85 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 a5be2d5..bda5d93 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/DB_IaT/Debug64/.ninja_log @@ -1,163 +1,186 @@ # ninja log v5 -1578 4794 7554403545565259 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d -395 2417 7556304767604609 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -15 389 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -68 2383 7556204064999029 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 -15 389 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -417 2249 7555250085369086 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 -15 389 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 1400 1526 7554403513026725 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -15 389 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +65 1465 7557135128551277 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +417 2249 7555250085369086 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 +22 64 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +22 64 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 +453 2113 7557107396166994 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 4063 6185 7554403559590571 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 -1400 1526 7554403513026725 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -410 2636 7556304769807621 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b -417 2413 7556304767542926 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de -1561 4056 7554403538030733 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc -406 2475 7556304768176488 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 -15 389 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -1409 2127 7556242926987736 libInstructorsAndTrainees.dll.a c1e915765a645e23 -4398 4745 7554403545178109 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b -15 389 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -47 59 0 clean 9c4b4372737ab8da -15 389 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -15 389 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 1537 3960 7554403536624811 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 -15 389 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +47 59 0 clean 9c4b4372737ab8da +1561 4056 7554403538030733 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc +458 2206 7557006799374861 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de +1465 2184 7557135135138219 libInstructorsAndTrainees.dll.a c1e915765a645e23 +4398 4745 7554403545178109 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +22 64 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +464 2118 7557107396217434 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +67 1443 7557135128327032 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +1400 1526 7554403513026725 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c 1565 4028 7554403537718314 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 16 47 0 CMakeFiles/clean.additional 7155004b3956b606 -400 2474 7556304768176488 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 -1409 2127 7556242926987736 libInstructorsAndTrainees.dll c1e915765a645e23 -15 389 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -15 389 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +458 2201 7557107397058472 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 +1465 2184 7557135135138219 libInstructorsAndTrainees.dll c1e915765a645e23 +22 64 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 1573 4657 7554403543966835 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -15 389 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -15 389 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -420 2080 7556304764226998 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +98 1111 7556902395333508 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 15 276 7556047205672548 build.ninja 76aa11f472515be0 -402 2565 7556304769012728 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b -15 389 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +461 2186 7557107396884858 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +22 64 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 -392 2960 7556304773034959 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -15 389 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +451 2666 7557107401706977 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +22 64 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 431 2002 7555250082834355 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 -390 2825 7556304771691036 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -427 2007 7556304763507672 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -413 2500 7556304768437545 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +448 2664 7557107401645773 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +60 999 7557022709262915 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +470 2066 7557107395691831 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 +22 64 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 -15 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 423 2444 7556304767863910 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d -20 62 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -20 62 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -20 62 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -63 1431 7556305101418614 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 -1431 2176 7556305108317813 libInstructorsAndTrainees.dll c1e915765a645e23 -1431 2176 7556305108317813 libInstructorsAndTrainees.dll.a c1e915765a645e23 -19 367 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 367 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 367 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -383 1909 7556310324164090 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 -389 1977 7556310324848966 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 -393 2022 7556310325303419 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de -386 2043 7556310325534537 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b -375 2240 7556310327477010 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 -378 2255 7556310327628213 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 -373 2320 7556310328296109 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 -380 2446 7556310329551196 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b -370 2466 7556310329753992 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -368 2600 7556310331084671 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de -2600 3334 7556310337714487 libInstructorsAndTrainees.dll c1e915765a645e23 -2600 3334 7556310337714487 libInstructorsAndTrainees.dll.a c1e915765a645e23 -43 98 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -43 98 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -43 98 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -98 1111 7556902395333508 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 -1111 2013 7556902403605370 libInstructorsAndTrainees.dll c1e915765a645e23 -1111 2013 7556902403605370 libInstructorsAndTrainees.dll.a c1e915765a645e23 +22 64 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +22 64 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +22 64 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +67 1431 7557138442162399 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +64 1457 7557138442427192 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +1457 2200 7557138449308380 libInstructorsAndTrainees.dll c1e915765a645e23 +1457 2200 7557138449308380 libInstructorsAndTrainees.dll.a c1e915765a645e23 +20 61 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 61 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +62 1357 7557141027492146 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +1357 2068 7557141033997840 libInstructorsAndTrainees.dll c1e915765a645e23 +1357 2068 7557141033997840 libInstructorsAndTrainees.dll.a c1e915765a645e23 +20 59 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 59 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +60 1302 7557150713021494 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 +1302 2006 7557150719534910 libInstructorsAndTrainees.dll c1e915765a645e23 +1302 2006 7557150719534910 libInstructorsAndTrainees.dll.a c1e915765a645e23 +20 60 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 60 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +60 1354 7557152869976837 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +1354 2071 7557152876549223 libInstructorsAndTrainees.dll c1e915765a645e23 +1354 2071 7557152876549223 libInstructorsAndTrainees.dll.a c1e915765a645e23 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 780ea94..c4dec60 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/commonview.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj index 5c32a7c..f0808bf 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/commonview.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 4aafefe..f41096c 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/connectortoserver.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj index 664708b..3dd9af6 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj index 2b1b5ea..6a3f4ea 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj index b696f53..51bf029 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj index c510eb4..940cd59 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.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 8bce9bf..9b1e537 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 fecdbe2..7acb1ab 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 ae36203..63f1f27 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.dir/trainees/viewertrainees.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj index 971d449..fd42dab 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.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 cae4ecd..a93a7d0 100644 --- a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt +++ b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt @@ -1,84 +1,84 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h - mmc:Q_OBJECT 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 +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h mmc:Q_OBJECT -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/Core/sendsystem.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/instructorsandtraineeswidget.cpp - uic:ui_instructorsandtraineeswidget.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp - uic:ui_dialogauthorizationinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h - mmc:Q_OBJECT - uic:ui_dialogauthorizationinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp - uic:ui_messangerwidget.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h - mmc:Q_OBJECT - uic:ui_dialogeditgroup.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h - mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp + uic:ui_editortrainees.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h mmc:Q_OBJECT uic:ui_dialogeditinstructor.h -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/messanger/messangerwidget.cpp + uic:ui_messangerwidget.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/commonview.cpp +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/connectorToServer/connectortoserver.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h + mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp uic:ui_doctaskswidget.h D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp uic:ui_viewerinstructors.h -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h - mmc:Q_OBJECT +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/Core/recognizesystem.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp + uic:ui_instructorsandtraineeswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp + uic:ui_dialogauthorizationinstructor.h D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.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/docTasks/module.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp uic:ui_dialogedittrainee.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp + uic:ui_dialogeditinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h + mmc:Q_OBJECT + uic:ui_dialogauthorizationinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_tcpclient.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_tcpclient.cpp index 994d2e1..55518b2 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_tcpclient.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_tcpclient.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_TCPClient_t { - QByteArrayData data[14]; - char stringdata0[172]; + QByteArrayData data[16]; + char stringdata0[203]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -43,16 +43,19 @@ QT_MOC_LITERAL(7, 67, 19), // "sigServerDisconnect" QT_MOC_LITERAL(8, 87, 18), // "sigConnectionState" QT_MOC_LITERAL(9, 106, 4), // "flag" QT_MOC_LITERAL(10, 111, 12), // "sigSetSocket" -QT_MOC_LITERAL(11, 124, 15), // "slotSendCommand" -QT_MOC_LITERAL(12, 140, 17), // "slotConnectNotify" -QT_MOC_LITERAL(13, 158, 13) // "slotReadyRead" +QT_MOC_LITERAL(11, 124, 24), // "signal_ConnectedToServer" +QT_MOC_LITERAL(12, 149, 5), // "state" +QT_MOC_LITERAL(13, 155, 15), // "slotSendCommand" +QT_MOC_LITERAL(14, 171, 17), // "slotConnectNotify" +QT_MOC_LITERAL(15, 189, 13) // "slotReadyRead" }, "TCPClient\0sigSendDebugLog\0\0message\0" "sigRecognize\0QTcpSocket*\0socket\0" "sigServerDisconnect\0sigConnectionState\0" - "flag\0sigSetSocket\0slotSendCommand\0" - "slotConnectNotify\0slotReadyRead" + "flag\0sigSetSocket\0signal_ConnectedToServer\0" + "state\0slotSendCommand\0slotConnectNotify\0" + "slotReadyRead" }; #undef QT_MOC_LITERAL @@ -62,24 +65,25 @@ static const uint qt_meta_data_TCPClient[] = { 8, // revision 0, // classname 0, 0, // classinfo - 8, 14, // methods + 9, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 5, // signalCount + 6, // signalCount // signals: name, argc, parameters, tag, flags - 1, 1, 54, 2, 0x06 /* Public */, - 4, 1, 57, 2, 0x06 /* Public */, - 7, 0, 60, 2, 0x06 /* Public */, - 8, 1, 61, 2, 0x06 /* Public */, - 10, 1, 64, 2, 0x06 /* Public */, + 1, 1, 59, 2, 0x06 /* Public */, + 4, 1, 62, 2, 0x06 /* Public */, + 7, 0, 65, 2, 0x06 /* Public */, + 8, 1, 66, 2, 0x06 /* Public */, + 10, 1, 69, 2, 0x06 /* Public */, + 11, 1, 72, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 11, 1, 67, 2, 0x0a /* Public */, - 12, 0, 70, 2, 0x0a /* Public */, - 13, 0, 71, 2, 0x08 /* Private */, + 13, 1, 75, 2, 0x0a /* Public */, + 14, 0, 78, 2, 0x0a /* Public */, + 15, 0, 79, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, QMetaType::QString, 3, @@ -87,6 +91,7 @@ static const uint qt_meta_data_TCPClient[] = { QMetaType::Void, QMetaType::Void, QMetaType::Bool, 9, QMetaType::Void, 0x80000000 | 5, 6, + QMetaType::Void, QMetaType::Bool, 12, // slots: parameters QMetaType::Void, QMetaType::QString, 3, @@ -107,9 +112,10 @@ void TCPClient::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v case 2: _t->sigServerDisconnect(); break; case 3: _t->sigConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break; case 4: _t->sigSetSocket((*reinterpret_cast< QTcpSocket*(*)>(_a[1]))); break; - case 5: _t->slotSendCommand((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 6: _t->slotConnectNotify(); break; - case 7: _t->slotReadyRead(); break; + case 5: _t->signal_ConnectedToServer((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 6: _t->slotSendCommand((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 7: _t->slotConnectNotify(); break; + case 8: _t->slotReadyRead(); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { @@ -167,6 +173,13 @@ void TCPClient::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v return; } } + { + using _t = void (TCPClient::*)(bool ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&TCPClient::signal_ConnectedToServer)) { + *result = 5; + return; + } + } } } @@ -199,13 +212,13 @@ int TCPClient::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 8) + if (_id < 9) qt_static_metacall(this, _c, _id, _a); - _id -= 8; + _id -= 9; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 8) + if (_id < 9) qt_static_metacall(this, _c, _id, _a); - _id -= 8; + _id -= 9; } return _id; } @@ -243,5 +256,12 @@ void TCPClient::sigSetSocket(QTcpSocket * _t1) void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 4, _a); } + +// SIGNAL 5 +void TCPClient::signal_ConnectedToServer(bool _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 5, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp index e4e812b..eac43a2 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp @@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_InstructorsAndTraineesWidget_t { - QByteArrayData data[26]; - char stringdata0[499]; + QByteArrayData data[27]; + char stringdata0[501]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -55,10 +55,11 @@ QT_MOC_LITERAL(18, 304, 10), // "serverAuth" QT_MOC_LITERAL(19, 315, 18), // "checkDeLoginResult" QT_MOC_LITERAL(20, 334, 22), // "ServerDeAuthorization*" 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, 30) // "on_btnQueryGetAllLists_clicked" +QT_MOC_LITERAL(22, 370, 22), // "slot_ConnectedToServer" +QT_MOC_LITERAL(23, 393, 5), // "state" +QT_MOC_LITERAL(24, 399, 32), // "on_btnConnectionToServer_clicked" +QT_MOC_LITERAL(25, 432, 37), // "on_btnAuthorizationInstructor..." +QT_MOC_LITERAL(26, 470, 30) // "on_btnUpdateStyleSheet_clicked" }, "InstructorsAndTraineesWidget\0" @@ -72,10 +73,10 @@ QT_MOC_LITERAL(25, 468, 30) // "on_btnQueryGetAllLists_clicked" "checkLoginResult\0ServerAuthorization*\0" "serverAuth\0checkDeLoginResult\0" "ServerDeAuthorization*\0serverDeAuth\0" - "on_btnConnectionToDB_clicked\0" + "slot_ConnectedToServer\0state\0" + "on_btnConnectionToServer_clicked\0" "on_btnAuthorizationInstructor_clicked\0" - "on_btnUpdateStyleSheet_clicked\0" - "on_btnQueryGetAllLists_clicked" + "on_btnUpdateStyleSheet_clicked" }; #undef QT_MOC_LITERAL @@ -104,10 +105,10 @@ static const uint qt_meta_data_InstructorsAndTraineesWidget[] = { 15, 1, 99, 2, 0x0a /* Public */, 16, 1, 102, 2, 0x0a /* Public */, 19, 1, 105, 2, 0x0a /* Public */, - 22, 0, 108, 2, 0x08 /* Private */, - 23, 0, 109, 2, 0x08 /* Private */, - 24, 0, 110, 2, 0x08 /* Private */, - 25, 0, 111, 2, 0x08 /* Private */, + 22, 1, 108, 2, 0x0a /* Public */, + 24, 0, 111, 2, 0x08 /* Private */, + 25, 0, 112, 2, 0x08 /* Private */, + 26, 0, 113, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, QMetaType::QString, 3, @@ -121,7 +122,7 @@ static const uint qt_meta_data_InstructorsAndTraineesWidget[] = { QMetaType::Void, QMetaType::QString, 3, QMetaType::Void, 0x80000000 | 17, 18, QMetaType::Void, 0x80000000 | 20, 21, - QMetaType::Void, + QMetaType::Void, QMetaType::Bool, 23, QMetaType::Void, QMetaType::Void, QMetaType::Void, @@ -144,10 +145,10 @@ void InstructorsAndTraineesWidget::qt_static_metacall(QObject *_o, QMetaObject:: case 6: _t->slot_LanguageChanged((*reinterpret_cast< QString(*)>(_a[1]))); break; case 7: _t->checkLoginResult((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break; case 8: _t->checkDeLoginResult((*reinterpret_cast< ServerDeAuthorization*(*)>(_a[1]))); break; - 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_btnQueryGetAllLists_clicked(); break; + case 9: _t->slot_ConnectedToServer((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 10: _t->on_btnConnectionToServer_clicked(); break; + case 11: _t->on_btnAuthorizationInstructor_clicked(); break; + case 12: _t->on_btnUpdateStyleSheet_clicked(); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp index 59d9b58..d967adc 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[46]; - char stringdata0[803]; + QByteArrayData data[44]; + char stringdata0[764]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -57,28 +57,26 @@ QT_MOC_LITERAL(20, 302, 12), // "serverDeAuth" QT_MOC_LITERAL(21, 315, 15), // "signal_UpdateDB" QT_MOC_LITERAL(22, 331, 14), // "treeInstructor" QT_MOC_LITERAL(23, 346, 11), // "treeTrainee" -QT_MOC_LITERAL(24, 358, 20), // "slot_AnswerQueryToDB" -QT_MOC_LITERAL(25, 379, 18), // "QList*" -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" -QT_MOC_LITERAL(31, 468, 36), // "slot_AnswerQueryToDB_ListInst..." -QT_MOC_LITERAL(32, 505, 17), // "QList" -QT_MOC_LITERAL(33, 523, 31), // "slot_AnswerQueryToDB_ListGroups" -QT_MOC_LITERAL(34, 555, 12), // "QList" -QT_MOC_LITERAL(35, 568, 33), // "slot_AnswerQueryToDB_ListTrai..." -QT_MOC_LITERAL(36, 602, 14), // "QList" -QT_MOC_LITERAL(37, 617, 34), // "slot_AnswerQueryToDB_ListComp..." -QT_MOC_LITERAL(38, 652, 15), // "QList" -QT_MOC_LITERAL(39, 668, 13), // "listComputers" -QT_MOC_LITERAL(40, 682, 35), // "slot_AnswerQueryToDB_ListClas..." -QT_MOC_LITERAL(41, 718, 16), // "QList" -QT_MOC_LITERAL(42, 735, 14), // "listClassrooms" -QT_MOC_LITERAL(43, 750, 30), // "slot_AnswerQueryToDB_ListTasks" -QT_MOC_LITERAL(44, 781, 11), // "QList" -QT_MOC_LITERAL(45, 793, 9) // "listTasks" +QT_MOC_LITERAL(24, 358, 24), // "signal_ConnectedToServer" +QT_MOC_LITERAL(25, 383, 5), // "state" +QT_MOC_LITERAL(26, 389, 36), // "slot_AnswerQueryToDB_ListInst..." +QT_MOC_LITERAL(27, 426, 17), // "QList" +QT_MOC_LITERAL(28, 444, 15), // "listInstructors" +QT_MOC_LITERAL(29, 460, 31), // "slot_AnswerQueryToDB_ListGroups" +QT_MOC_LITERAL(30, 492, 12), // "QList" +QT_MOC_LITERAL(31, 505, 10), // "listGroups" +QT_MOC_LITERAL(32, 516, 33), // "slot_AnswerQueryToDB_ListTrai..." +QT_MOC_LITERAL(33, 550, 14), // "QList" +QT_MOC_LITERAL(34, 565, 12), // "listTrainees" +QT_MOC_LITERAL(35, 578, 34), // "slot_AnswerQueryToDB_ListComp..." +QT_MOC_LITERAL(36, 613, 15), // "QList" +QT_MOC_LITERAL(37, 629, 13), // "listComputers" +QT_MOC_LITERAL(38, 643, 35), // "slot_AnswerQueryToDB_ListClas..." +QT_MOC_LITERAL(39, 679, 16), // "QList" +QT_MOC_LITERAL(40, 696, 14), // "listClassrooms" +QT_MOC_LITERAL(41, 711, 30), // "slot_AnswerQueryToDB_ListTasks" +QT_MOC_LITERAL(42, 742, 11), // "QList" +QT_MOC_LITERAL(43, 754, 9) // "listTasks" }, "ConnectorToServer\0sigSetConnect\0\0" @@ -91,13 +89,14 @@ QT_MOC_LITERAL(45, 793, 9) // "listTasks" "sigDeLoginResult\0ServerDeAuthorization*\0" "serverDeAuth\0signal_UpdateDB\0" "treeInstructor\0treeTrainee\0" - "slot_AnswerQueryToDB\0QList*\0" - "listInstructors\0QList*\0" - "listTrainees\0QList*\0listGroups\0" + "signal_ConnectedToServer\0state\0" "slot_AnswerQueryToDB_ListInstructors\0" - "QList\0slot_AnswerQueryToDB_ListGroups\0" - "QList\0slot_AnswerQueryToDB_ListTrainees\0" - "QList\0slot_AnswerQueryToDB_ListComputers\0" + "QList\0listInstructors\0" + "slot_AnswerQueryToDB_ListGroups\0" + "QList\0listGroups\0" + "slot_AnswerQueryToDB_ListTrainees\0" + "QList\0listTrainees\0" + "slot_AnswerQueryToDB_ListComputers\0" "QList\0listComputers\0" "slot_AnswerQueryToDB_ListClassrooms\0" "QList\0listClassrooms\0" @@ -117,7 +116,7 @@ static const uint qt_meta_data_ConnectorToServer[] = { 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 8, // signalCount + 9, // signalCount // signals: name, argc, parameters, tag, flags 1, 2, 89, 2, 0x06 /* Public */, @@ -128,15 +127,15 @@ static const uint qt_meta_data_ConnectorToServer[] = { 15, 1, 104, 2, 0x06 /* Public */, 18, 1, 107, 2, 0x06 /* Public */, 21, 2, 110, 2, 0x06 /* Public */, + 24, 1, 115, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 24, 3, 115, 2, 0x0a /* Public */, - 31, 1, 122, 2, 0x0a /* Public */, - 33, 1, 125, 2, 0x0a /* Public */, - 35, 1, 128, 2, 0x0a /* Public */, - 37, 1, 131, 2, 0x0a /* Public */, - 40, 1, 134, 2, 0x0a /* Public */, - 43, 1, 137, 2, 0x0a /* Public */, + 26, 1, 118, 2, 0x0a /* Public */, + 29, 1, 121, 2, 0x0a /* Public */, + 32, 1, 124, 2, 0x0a /* Public */, + 35, 1, 127, 2, 0x0a /* Public */, + 38, 1, 130, 2, 0x0a /* Public */, + 41, 1, 133, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 4, 6, @@ -147,15 +146,15 @@ static const uint qt_meta_data_ConnectorToServer[] = { QMetaType::Void, 0x80000000 | 16, 17, QMetaType::Void, 0x80000000 | 19, 20, QMetaType::Void, QMetaType::Bool, QMetaType::Bool, 22, 23, + QMetaType::Void, QMetaType::Bool, 25, // slots: parameters - QMetaType::Void, 0x80000000 | 25, 0x80000000 | 27, 0x80000000 | 29, 26, 28, 30, - QMetaType::Void, 0x80000000 | 32, 26, - QMetaType::Void, 0x80000000 | 34, 30, - QMetaType::Void, 0x80000000 | 36, 28, - QMetaType::Void, 0x80000000 | 38, 39, - QMetaType::Void, 0x80000000 | 41, 42, - QMetaType::Void, 0x80000000 | 44, 45, + QMetaType::Void, 0x80000000 | 27, 28, + QMetaType::Void, 0x80000000 | 30, 31, + QMetaType::Void, 0x80000000 | 33, 34, + QMetaType::Void, 0x80000000 | 36, 37, + QMetaType::Void, 0x80000000 | 39, 40, + QMetaType::Void, 0x80000000 | 42, 43, 0 // eod }; @@ -174,7 +173,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])),(*reinterpret_cast< QList*(*)>(_a[2])),(*reinterpret_cast< QList*(*)>(_a[3]))); break; + case 8: _t->signal_ConnectedToServer((*reinterpret_cast< bool(*)>(_a[1]))); break; case 9: _t->slot_AnswerQueryToDB_ListInstructors((*reinterpret_cast< QList(*)>(_a[1]))); break; case 10: _t->slot_AnswerQueryToDB_ListGroups((*reinterpret_cast< QList(*)>(_a[1]))); break; case 11: _t->slot_AnswerQueryToDB_ListTrainees((*reinterpret_cast< QList(*)>(_a[1]))); break; @@ -254,6 +253,13 @@ void ConnectorToServer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in return; } } + { + using _t = void (ConnectorToServer::*)(bool ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::signal_ConnectedToServer)) { + *result = 8; + return; + } + } } } @@ -349,5 +355,12 @@ void ConnectorToServer::signal_UpdateDB(bool _t1, bool _t2) void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 7, _a); } + +// SIGNAL 8 +void ConnectorToServer::signal_ConnectedToServer(bool _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 8, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h index 6c52495..b397201 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h @@ -34,7 +34,7 @@ public: QVBoxLayout *verticalLayout_1; QVBoxLayout *verticalLayout_2; QHBoxLayout *horizontalLayout_1; - QToolButton *btnConnectionToDB; + QToolButton *btnConnectionToServer; QLabel *lblDBisConnected; QToolButton *btnAuthorizationInstructor; QLabel *lblLoggedIn; @@ -42,7 +42,6 @@ public: QLabel *lblLoggedInInstructor; QSpacerItem *horizontalSpacer; QToolButton *btnUpdateStyleSheet; - QToolButton *btnQueryGetAllLists; void setupUi(QWidget *InstructorsAndTraineesWidget) { @@ -79,17 +78,17 @@ public: horizontalLayout_1 = new QHBoxLayout(); horizontalLayout_1->setObjectName(QString::fromUtf8("horizontalLayout_1")); - btnConnectionToDB = new QToolButton(groupBox); - btnConnectionToDB->setObjectName(QString::fromUtf8("btnConnectionToDB")); - btnConnectionToDB->setMinimumSize(QSize(130, 58)); + btnConnectionToServer = new QToolButton(groupBox); + btnConnectionToServer->setObjectName(QString::fromUtf8("btnConnectionToServer")); + btnConnectionToServer->setMinimumSize(QSize(130, 58)); QIcon icon; icon.addFile(QString::fromUtf8(":/icons/connectDB.png"), QSize(), QIcon::Normal, QIcon::Off); - btnConnectionToDB->setIcon(icon); - btnConnectionToDB->setIconSize(QSize(32, 32)); - btnConnectionToDB->setCheckable(true); - btnConnectionToDB->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + btnConnectionToServer->setIcon(icon); + btnConnectionToServer->setIconSize(QSize(32, 32)); + btnConnectionToServer->setCheckable(false); + btnConnectionToServer->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); - horizontalLayout_1->addWidget(btnConnectionToDB); + horizontalLayout_1->addWidget(btnConnectionToServer); lblDBisConnected = new QLabel(groupBox); lblDBisConnected->setObjectName(QString::fromUtf8("lblDBisConnected")); @@ -145,12 +144,6 @@ public: horizontalLayout_1->addWidget(btnUpdateStyleSheet); - btnQueryGetAllLists = new QToolButton(groupBox); - btnQueryGetAllLists->setObjectName(QString::fromUtf8("btnQueryGetAllLists")); - btnQueryGetAllLists->setMinimumSize(QSize(58, 58)); - - horizontalLayout_1->addWidget(btnQueryGetAllLists); - gridLayout_2->addLayout(horizontalLayout_1, 0, 0, 1, 1); @@ -170,14 +163,13 @@ public: { InstructorsAndTraineesWidget->setWindowTitle(QCoreApplication::translate("InstructorsAndTraineesWidget", "Form", nullptr)); groupBox->setTitle(QCoreApplication::translate("InstructorsAndTraineesWidget", "Database LMS", nullptr)); - btnConnectionToDB->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "Connection to DB", nullptr)); + btnConnectionToServer->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "Connection to Server", nullptr)); lblDBisConnected->setText(QString()); btnAuthorizationInstructor->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "Authorization Instructor", nullptr)); lblLoggedIn->setText(QString()); lblLoggedInPrefix->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "Logged in Instructor: ", nullptr)); lblLoggedInInstructor->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "none", nullptr)); btnUpdateStyleSheet->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "Update StyleSheet", 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 bfda307..4364a60 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 b380b0a..2f1073e 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/commonview.cpp b/DB_IaT/InstructorsAndTrainees/commonview.cpp index 53f1211..f2dac93 100644 --- a/DB_IaT/InstructorsAndTrainees/commonview.cpp +++ b/DB_IaT/InstructorsAndTrainees/commonview.cpp @@ -5,45 +5,21 @@ CommonView::CommonView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent): QWidget(parent), - dbLMS(nullptr), //TODO connectorToServer(connectorToServer), treeWidget(nullptr), typeView(type), archiveVisible(false), notLoggedInVisible(false), adminMode(false), - authComplited(false) + authComplited(false), + lastCurrentID(0), + typeObject(TypeObject::objInstructor) { treeWidget = new QTreeWidget(); - //QString name = treeWidget->objectName(); - //treeWidget->setObjectName("onlyView"); - //treeWidget->setAccessibleName("onlyView"); - - //treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 10pt;")); - //treeWidget->setStyleSheet(QStringLiteral("font-size: 10pt;" - // "font-family: Tahoma;")); - treeWidget->setIconSize(QSize(20, 20)); treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus); - /* - treeWidget->setStyleSheet("QTreeWidget {font-size: 10pt; font-family: Tahoma;}" - "QTreeWidget::item:selected {" - "background-color: #ddffdd; " - "border-style: solid solid solid solid; " - "color: #000000;}" - "QTreeWidgetItem::item:selected {" - "background-color: #ddaadd; " - "border-style: solid solid solid solid; " - "color: #000000;}"); - - treeWidget->setStyleSheet("QTreeWidget {font-size: 10pt; font-family: Tahoma;}" - "QTreeWidget::item:selected {" - "background-color: #ddffdd; " - "border-style: solid solid solid solid; " - "color: #000000;}");*/ - updateMyStyleSheet(); } @@ -59,8 +35,6 @@ void CommonView::setItemColorNoArchive(QTreeWidgetItem *item) void CommonView::setItemColor(QTreeWidgetItem *item, QColor color) { - //int columnCount = treeWidget->columnCount(); - for (int i = 0; i < item->columnCount(); i++) item->setBackground(i, color); } diff --git a/DB_IaT/InstructorsAndTrainees/commonview.h b/DB_IaT/InstructorsAndTrainees/commonview.h index bc5c6ec..f5b215f 100644 --- a/DB_IaT/InstructorsAndTrainees/commonview.h +++ b/DB_IaT/InstructorsAndTrainees/commonview.h @@ -5,7 +5,6 @@ #include #include #include "instructorsAndTrainees_global.h" -#include "interfacedatabaselms.h" #include "connectortoserver.h" //Родительский класс представления БД Инструкторов/Обучаемых (самого верхнего уровня) @@ -21,6 +20,13 @@ public: control }; + enum TypeObject + { + objInstructor, + objTrainee, + objGroup + }; + public: CommonView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent = nullptr); @@ -56,7 +62,6 @@ private: QString loadStyleSheet(); protected: - InterfaceDataBaseLMS* dbLMS; ConnectorToServer* connectorToServer; QTreeWidget* treeWidget; QMutex mtxTreeWidget; @@ -65,6 +70,8 @@ protected: bool notLoggedInVisible; bool adminMode; bool authComplited; + int lastCurrentID; + TypeObject typeObject; }; #endif // COMMONVIEW_H diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp index c7f745e..c6fcde2 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp @@ -31,7 +31,7 @@ void TCPClient::setConnect(ServerSettings *serverSettings) emit sigSendDebugLog("Try connect..."); isConnected = true; - if (socket->waitForConnected(2000)) + if (socket->waitForConnected(5)) { connect(socket,&QTcpSocket::readyRead,this,&TCPClient::slotReadyRead,Qt::DirectConnection); connect(socket,&QTcpSocket::disconnected,this,&TCPClient::setDisconnect); @@ -42,6 +42,8 @@ void TCPClient::setConnect(ServerSettings *serverSettings) emit sigSetSocket(socket); slotConnectNotify(); + + emit signal_ConnectedToServer(true); } else { @@ -56,6 +58,8 @@ void TCPClient::setDisconnect() isConnected = false; emit sigServerDisconnect(); emit sigSendDebugLog("Server disabled"); + + emit signal_ConnectedToServer(false); } diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h index 63bd2d9..12cb766 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h @@ -40,6 +40,8 @@ signals: void sigConnectionState(bool flag); void sigSetSocket(QTcpSocket *socket); + void signal_ConnectedToServer(bool state); + public slots: void slotSendCommand(QString message); void slotConnectNotify(); diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 365e4c9..8274b1c 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -62,6 +62,11 @@ bool ConnectorToServer::sendQueryToDB(TypeQueryToDB typeQuery, int id, void* dat return true; } +void ConnectorToServer::SetConnectToServer() +{ + emit sigSetConnect(dataParser->getServerSettings(),connectionThread); +} + QList ConnectorToServer::getListInstructors() { return listInstructors; @@ -193,6 +198,7 @@ Group ConnectorToServer::getGroup(int id) return Group(); } +/* void ConnectorToServer::slot_AnswerQueryToDB(QList* listInstructors, QList* listTrainees, QList* listGroups) @@ -201,7 +207,7 @@ void ConnectorToServer::slot_AnswerQueryToDB(QList* listInstructors, this->listTrainees = *listTrainees; this->listGroups = *listGroups; emit signal_UpdateDB(true, true); -} +}*/ void ConnectorToServer::slot_AnswerQueryToDB_ListInstructors(QList listInstructors) { @@ -263,7 +269,7 @@ void ConnectorToServer::bindConnection() connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::sigLoginResult); connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult); - connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB,this,&ConnectorToServer::slot_AnswerQueryToDB); + //connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB,this,&ConnectorToServer::slot_AnswerQueryToDB); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListGroups,this,&ConnectorToServer::slot_AnswerQueryToDB_ListGroups); @@ -271,6 +277,8 @@ void ConnectorToServer::bindConnection() connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListComputers,this,&ConnectorToServer::slot_AnswerQueryToDB_ListComputers); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListClassrooms,this,&ConnectorToServer::slot_AnswerQueryToDB_ListClassrooms); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListTasks,this,&ConnectorToServer::slot_AnswerQueryToDB_ListTasks); + + connect(client,&TCPClient::signal_ConnectedToServer,this,&ConnectorToServer::signal_ConnectedToServer); } void ConnectorToServer::createObjects() diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h index b9199ad..12c7297 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -22,9 +22,10 @@ public: bool authorizationInstructorLocal(QString login, QString password); bool deAuthorizationInstructorLocal(QString login); - //bool sendQueryToDB(TypeQueryToDB typeQuery, int id = 0, Instructor* instructor = nullptr); bool sendQueryToDB(TypeQueryToDB typeQuery, int id = 0, void* data = nullptr); + void SetConnectToServer(); + public: //Запросы к БД (локальной) QList getListInstructors(); @@ -46,9 +47,9 @@ public: Group getGroup(int id); public slots: - void slot_AnswerQueryToDB(QList* listInstructors, + /*void slot_AnswerQueryToDB(QList* listInstructors, QList* listTrainees, - QList* listGroups); + QList* listGroups);*/ void slot_AnswerQueryToDB_ListInstructors(QList listInstructors); void slot_AnswerQueryToDB_ListGroups(QList listGroups); @@ -73,6 +74,8 @@ signals: void signal_UpdateDB(bool treeInstructor, bool treeTrainee); + void signal_ConnectedToServer(bool state); + private: void initialize(); diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp index b493d8f..b9d0cb9 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp @@ -15,7 +15,7 @@ EditorInstructors::EditorInstructors(ConnectorToServer* connectorToServer, bool this->adminMode = adminMode; - preparationTreeWidget(/*ui->treeWidget*/); + preparationTreeWidget(); //setNotLoggedInVisible(true); loadInstructorsFromDB(); @@ -107,8 +107,6 @@ void EditorInstructors::on_btnDeleteInstructor_clicked() if(QMessageBox::warning(this, tr("Attention!"), tr("The deletion will be irrevocable.\nDelete it anyway?"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) { connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_DEL_INSTRUCTOR, id); - //if(dbLMS->delInstructor(id)) - //loadInstructorsFromDB(); } } } @@ -130,15 +128,10 @@ void EditorInstructors::on_btnToOrFromArchive_clicked() if(instructor.getID() == 0) return; - if(connectorToServer->isArchivedInstructor(id)/* instructor.getArchived()*/) + if(connectorToServer->isArchivedInstructor(id)) {//Архивный instructor.setArchived(false); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR, id, &instructor); - /*if(int id_edit = dbLMS->editInstructor(instructor)) - { - loadInstructorsFromDB(); - setCurrentInstructor(id_edit); - }*/ } else {//Не Архивный @@ -150,6 +143,8 @@ void EditorInstructors::on_btnToOrFromArchive_clicked() instructor.setArchived(true); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR, id, &instructor); + if(!archiveVisible) + ui->btnArchive->click(); /*if(int id_edit = dbLMS->editInstructor(instructor)) { if(!archiveVisible) @@ -197,25 +192,8 @@ void EditorInstructors::on_btnEdit_clicked() case QDialog::Accepted: { Instructor instructor_edit = dlg.getInstructor(); - connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR, id, &instructor_edit); - return; - /* - if(int id_edit = connectorToServer->editInstructor(instructor_edit)) - {//Отредактировано - loadInstructorsFromDB(); - setCurrentInstructor(id_edit); - return; - } - else - { - dlg.setInstructor(instructor_edit); - continue; - } - */ - - break; } case QDialog::Rejected: return; @@ -232,6 +210,10 @@ void EditorInstructors::on_btnArchive_clicked() { bool state = ui->btnArchive->isChecked(); setArchiveVisible(state); + if(!state) + { + lastCurrentID = 0; + } loadInstructorsFromDB(); } @@ -248,6 +230,8 @@ void EditorInstructors::on_treeWidget_currentItemChanged(QTreeWidgetItem *curren int id = current->text(ColumnsTreeInsructors::clmn_ID).toInt(); + lastCurrentID = id; + if(connectorToServer->isArchivedInstructor(id)) {//Архивный ui->btnToOrFromArchive->setText(tr("From archive")); @@ -284,16 +268,4 @@ void EditorInstructors::on_treeWidget_currentItemChanged(QTreeWidgetItem *curren } } -void EditorInstructors::setCurrentInstructor(int id) -{ - for(int i = 0; i < treeWidget->topLevelItemCount(); i++) - { - QTreeWidgetItem * item = treeWidget->topLevelItem(i); - if(item != nullptr) - if(item->text(ColumnsTreeInsructors::clmn_ID).toInt() == id) - { - treeWidget->setCurrentItem(item); - break; - } - } -} + diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h index b048480..242a743 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h +++ b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h @@ -28,7 +28,7 @@ private Q_SLOTS: void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); private: - void setCurrentInstructor(int id); + //void setCurrentInstructor(int id); private: Ui::EditorInstructors *ui; diff --git a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp b/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp index b932643..937ba73 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp @@ -5,7 +5,7 @@ InstructorsView::InstructorsView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent): CommonView(connectorToServer, type, parent) { - + typeObject = TypeObject::objInstructor; } void InstructorsView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) @@ -39,7 +39,7 @@ void InstructorsView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) loadInstructorsFromDB(); } -void InstructorsView::preparationTreeWidget(/*QTreeWidget* tree*/) +void InstructorsView::preparationTreeWidget() { mtxTreeWidget.lock(); @@ -101,9 +101,6 @@ void InstructorsView::loadInstructorsFromDB() //Инструкторы QList listInstructors; - //TODO - //listInstructors = dbLMS->getListInstructors(); - //sendSystem->getListInstructors(); listInstructors = connectorToServer->getListInstructors(); @@ -123,7 +120,7 @@ void InstructorsView::loadInstructorsFromDB() if(instructor.getArchived()) {//Архивный ItemInstructor->setText(ColumnsTreeInsructors::clmn_Archived, tr("yes")); - ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/icons/instructorArchive.png"))); + ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/icons/archive.png"))); setItemColorArchive(ItemInstructor); } else @@ -167,12 +164,15 @@ void InstructorsView::loadInstructorsFromDB() treeWidget->expandAll(); + /* //if(typeView == TypeView::control) { QTreeWidgetItem * item = treeWidget->topLevelItem(0); if(item != nullptr) treeWidget->setCurrentItem(item); - } + }*/ + + setCurrentInstructor(lastCurrentID); mtxTreeWidget.unlock(); } @@ -183,3 +183,21 @@ void InstructorsView::reSetHeadTreeWidget() treeWidget->setHeaderLabels(listHeaders); } +void InstructorsView::setCurrentInstructor(int id) +{ + for(int i = 0; i < treeWidget->topLevelItemCount(); i++) + { + QTreeWidgetItem * item = treeWidget->topLevelItem(i); + if(item != nullptr) + if(item->text(ColumnsTreeInsructors::clmn_ID).toInt() == id) + { + treeWidget->setCurrentItem(item); + return; + } + } + + QTreeWidgetItem * item = treeWidget->topLevelItem(0); + if(item != nullptr) + treeWidget->setCurrentItem(item); +} + diff --git a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h b/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h index 38ce9e0..0411ea6 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h +++ b/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h @@ -30,10 +30,12 @@ public Q_SLOTS: protected: virtual void updateButtons(){}; - void preparationTreeWidget(/*QTreeWidget* tree*/); + void preparationTreeWidget(); void loadInstructorsFromDB(); void reSetHeadTreeWidget(); + + void setCurrentInstructor(int id); }; #endif // INSTRUCTORSVIEW_H diff --git a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp index 9a8ef29..e4ce535 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -13,7 +13,7 @@ ViewerInstructors::ViewerInstructors(ConnectorToServer* connectorToServer, QWidg treeWidget->setSelectionMode(QAbstractItemView::NoSelection); - preparationTreeWidget(/*ui->treeWidget*/); + preparationTreeWidget(); setNotLoggedInVisible(true); } diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index eda1019..50b99de 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -8,7 +8,6 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : QWidget(parent), ui(new Ui::InstructorsAndTraineesWidget), connectorToServer(nullptr), - dbLMS(nullptr), viewerTrainees(nullptr), viewerInstructors(nullptr), messangerWidget(nullptr), @@ -31,9 +30,6 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(connectorToServer,&ConnectorToServer::sigLoginResult,this,&InstructorsAndTraineesWidget::checkLoginResult); connect(connectorToServer,&ConnectorToServer::sigDeLoginResult,this,&InstructorsAndTraineesWidget::checkDeLoginResult); - dbLMS = new InterfaceDataBaseLMS(this); - connect(this, &InstructorsAndTraineesWidget::signal_LanguageChanged, dbLMS, &InterfaceDataBaseLMS::slot_LanguageChanged); - viewerTrainees = new ViewerTrainees(connectorToServer, this); viewerInstructors = new ViewerInstructors(connectorToServer, this); connect(this, &InstructorsAndTraineesWidget::signal_NeedUpdateUI, viewerTrainees, &ViewerTrainees::slot_NeedUpdateUI); @@ -46,6 +42,9 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerInstructors,&ViewerInstructors::slot_NeedUpdateUI); connect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerTrainees,&ViewerTrainees::slot_NeedUpdateUI); + connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer); + + messangerWidget = new MessangerWidget(this); docTasksWidget = new DocTasksWidget(this); @@ -57,6 +56,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : viewerTrainees->setMinimumSize(1600, 600); viewerInstructors->setMinimumSize(1600, 300); + + ui->btnAuthorizationInstructor->setEnabled(false); } InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget() @@ -68,7 +69,6 @@ InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget() delete messangerWidget; delete viewerInstructors; delete viewerTrainees; - delete dbLMS; delete connectorToServer; delete ui; } @@ -85,10 +85,12 @@ void InstructorsAndTraineesWidget::changeEvent(QEvent *event) else ui->btnAuthorizationInstructor->setText(tr("Authorization Instructor")); + /* if(ui->btnConnectionToDB->isChecked()) ui->btnConnectionToDB->setText(tr("Disconnection DB")); else ui->btnConnectionToDB->setText(tr("Connection DB")); + */ updateLabelLoggedInInstructor(loginInstructorLoggedInLocal, nameInstructorLoggedInLocal); } @@ -162,6 +164,28 @@ void InstructorsAndTraineesWidget::checkDeLoginResult(ServerDeAuthorization *ser } } +void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state) +{ + if(state) + {//Сервер подключен + + //ui->btnConnectionToDB->setText(tr("Disconnection DB")); + ui->btnConnectionToServer->setEnabled(false); + ui->btnAuthorizationInstructor->setEnabled(true); + + ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/icons/circleGreen.png"))); + } + else + {//Сервер отключен + + //ui->btnConnectionToDB->setText(tr("Connection DB")); + ui->btnConnectionToServer->setEnabled(true); + ui->btnAuthorizationInstructor->setEnabled(false); + + ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/icons/circleGray.png"))); + } +} + bool InstructorsAndTraineesWidget::authorizationInstructorDialog(QWidget* parent) { DialogAuthorizationInstructor dlg(parent); @@ -205,12 +229,15 @@ bool InstructorsAndTraineesWidget::authorizationIsCompleted() return true; } -void InstructorsAndTraineesWidget::on_btnConnectionToDB_clicked() +void InstructorsAndTraineesWidget::on_btnConnectionToServer_clicked() { - bool stateIsChecked = ui->btnConnectionToDB->isChecked(); + connectorToServer->SetConnectToServer(); - if(stateIsChecked) + if(true) {//Подключение к БД +/* + connectorToServer->SetConnectToServer(); + if(! dbLMS->DBisConnected()) { @@ -227,10 +254,11 @@ void InstructorsAndTraineesWidget::on_btnConnectionToDB_clicked() Q_EMIT signal_InitMessanger(dbLMS->getListTrainees()); } - } + }*/ } else {//Отключение от БД + /* bool stateIsCheckedAuthorization = ui->btnAuthorizationInstructor->isChecked(); if(stateIsCheckedAuthorization) ui->btnAuthorizationInstructor->click(); @@ -247,7 +275,7 @@ void InstructorsAndTraineesWidget::on_btnConnectionToDB_clicked() ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/icons/circleGray.png"))); Q_EMIT signal_NeedUpdateUI(true, true); - } + }*/ } } @@ -299,8 +327,3 @@ void InstructorsAndTraineesWidget::on_btnUpdateStyleSheet_clicked() viewerTrainees->updateMyStyleSheet(); viewerInstructors->updateMyStyleSheet(); } - -void InstructorsAndTraineesWidget::on_btnQueryGetAllLists_clicked() -{ - connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_GET_ALL_LISTS); -} diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h index 6ce9825..309d496 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h @@ -8,7 +8,6 @@ #include "viewerinstructors.h" #include "messangerwidget.h" #include "doctaskswidget.h" -#include "interfacedatabaselms.h" #include "connectortoserver.h" Q_DECLARE_METATYPE(QList) @@ -41,6 +40,8 @@ public Q_SLOTS: //Слот обработки результата деавторизации void checkDeLoginResult(ServerDeAuthorization * serverDeAuth); + void slot_ConnectedToServer(bool state); + Q_SIGNALS: //сигнал об изменении языка интерфейса void signal_LanguageChanged(QString language); @@ -55,13 +56,13 @@ Q_SIGNALS: //сигнал об инициализации мессенджера void signal_InitMessanger(QList listTrainees); + + private Q_SLOTS: - void on_btnConnectionToDB_clicked(); + void on_btnConnectionToServer_clicked(); void on_btnAuthorizationInstructor_clicked(); void on_btnUpdateStyleSheet_clicked(); - void on_btnQueryGetAllLists_clicked(); - private: //Авторизация инструктора локальная bool authorizationInstructorDialog(QWidget* parent = nullptr); @@ -74,8 +75,6 @@ private: ConnectorToServer* connectorToServer; - InterfaceDataBaseLMS* dbLMS; - ViewerTrainees* viewerTrainees; ViewerInstructors* viewerInstructors; MessangerWidget* messangerWidget; diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui index f0eb292..31b8ffe 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -47,7 +47,7 @@ - + 130 @@ -55,7 +55,7 @@ - Connection to DB + Connection to Server @@ -68,7 +68,7 @@ - true + false Qt::ToolButtonTextUnderIcon @@ -212,19 +212,6 @@ - - - - - 58 - 58 - - - - GET_ALL_LISTS - - - diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp index 3d8c72a..6f40ffd 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp @@ -16,7 +16,7 @@ EditorTrainees::EditorTrainees(ConnectorToServer* connectorToServer, bool adminM this->adminMode = adminMode; - preparationTreeWidget(/*ui->treeWidget*/); + preparationTreeWidget(); //setNotLoggedInVisible(true); loadTraineesFromDB(); @@ -102,15 +102,6 @@ void EditorTrainees::on_btnDeleteGroup_clicked() if(QMessageBox::warning(this, tr("Attention!"), tr("The deletion will be irrevocable.\nDelete anyway?"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) { connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_DEL_GROUP, id_group); - /* - if(int id = dbLMS->delGroup(id_group)) - {//Удалено - loadTraineesFromDB(); - } - else - { - //Ошибка удаления - }*/ } } } @@ -207,16 +198,6 @@ void EditorTrainees::on_btnDeleteTrainee_clicked() if(QMessageBox::warning(this, tr("Attention!"), tr("The deletion will be irrevocable.\nDelete anyway?"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) { connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_DEL_TRAINEE, id_trainee); - /* - if(int id = dbLMS->delTrainee(id_trainee)) - {//Удалено - loadTraineesFromDB(); - setCurrentGroup(id_group); - } - else - { - //Ошибка удаления - }*/ } } } @@ -238,20 +219,10 @@ void EditorTrainees::on_btnToOrFromArchiveTrainee_clicked() if(trainee.getID() == 0) return; - if(connectorToServer->isArchivedTrainee(id_trainee) /*trainee.getArchived()*/) + if(connectorToServer->isArchivedTrainee(id_trainee)) {//Архивный trainee.setArchived(false); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_TRAINEE, id_trainee, &trainee); - /* - if(int id = dbLMS->editTrainee(trainee)) - {//Отредактировано - loadTraineesFromDB(); - setCurrentTrainee(id); - } - else - { - //Ошибка редактирования - }*/ } else {//Не Архивный @@ -263,19 +234,8 @@ void EditorTrainees::on_btnToOrFromArchiveTrainee_clicked() trainee.setArchived(true); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_TRAINEE, id_trainee, &trainee); - /* - if(int id = dbLMS->editTrainee(trainee)) - {//Отредактировано - if(!archiveVisible) - ui->btnArchive->click(); - - loadTraineesFromDB(); - setCurrentTrainee(id); - } - else - { - //Ошибка редактирования - }*/ + if(!archiveVisible) + ui->btnArchive->click(); } } } @@ -395,6 +355,11 @@ void EditorTrainees::on_btnArchive_clicked() { bool state = ui->btnArchive->isChecked(); setArchiveVisible(state); + if(!state) + { + lastCurrentID = 0; + typeObject = TypeObject::objGroup; + } loadTraineesFromDB(); } @@ -410,6 +375,9 @@ void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, {//Выбрана группа int id_group = current->text(ColumnsTreeTrainees::clmn_ID).toInt(); + lastCurrentID = id_group; + typeObject = TypeObject::objGroup; + if(adminMode) { ui->btnNewGroup->setEnabled(true); @@ -442,6 +410,9 @@ void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, {//Выбран обучаемый int id_trainee = current->text(ColumnsTreeTrainees::clmn_ID).toInt(); + lastCurrentID = id_trainee; + typeObject = TypeObject::objTrainee; + ui->btnNewGroup->setEnabled(false); ui->btnDeleteGroup->setEnabled(false); ui->btnNewTrainee->setEnabled(false); @@ -486,37 +457,4 @@ void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, } } -void EditorTrainees::setCurrentGroup(int id) -{ - for(int i = 0; i < treeWidget->topLevelItemCount(); i++) - { - QTreeWidgetItem * item = treeWidget->topLevelItem(i); - if(item != nullptr) - if(item->text(ColumnsTreeTrainees::clmn_ID).toInt() == id) - { - treeWidget->setCurrentItem(item); - break; - } - } -} -void EditorTrainees::setCurrentTrainee(int id) -{ - for(int i = 0; i < treeWidget->topLevelItemCount(); i++) - { - QTreeWidgetItem * item = treeWidget->topLevelItem(i); - if(item != nullptr) - { - for (int j = 0; j < item->childCount(); j++) - { - QTreeWidgetItem * itemChild = item->child(j); - if(itemChild != nullptr) - if(itemChild->text(ColumnsTreeTrainees::clmn_ID).toInt() == id) - { - treeWidget->setCurrentItem(itemChild); - break; - } - }//for (int j = 0; j < item->childCount(); j++) - } - }//for(int i = 0; i < treeWidget->topLevelItemCount(); i++) -} diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h index 48c24bb..642a6b4 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h +++ b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h @@ -31,8 +31,8 @@ private Q_SLOTS: void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); private: - void setCurrentGroup(int id); - void setCurrentTrainee(int id); + //void setCurrentGroup(int id); + //void setCurrentTrainee(int id); private: Ui::EditorTrainees *ui; diff --git a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp index d4d1bf2..0e315bc 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp @@ -4,7 +4,7 @@ TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent): CommonView(connectorToServer, type, parent) { - + typeObject = TypeObject::objGroup; } void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) @@ -38,7 +38,7 @@ void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) loadTraineesFromDB(); } -void TraineesView::preparationTreeWidget(/*QTreeWidget *tree*/) +void TraineesView::preparationTreeWidget() { mtxTreeWidget.lock(); @@ -104,10 +104,6 @@ void TraineesView::loadTraineesFromDB() QList listGroups; QList listTrainees; - //TODO - //listGroups = dbLMS->getListGroups(); - //listTrainees = dbLMS->getListTrainees(); - listGroups = connectorToServer->getListGroups(); listTrainees = connectorToServer->getListTrainees(); @@ -145,7 +141,7 @@ void TraineesView::loadTraineesFromDB() if(trainee.getArchived()) {//Архивный ItemTrainee->setText(ColumnsTreeTrainees::clmn_Archived, tr("yes")); - ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/traineeArchive.png"))); + ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/archive.png"))); setItemColorArchive(ItemTrainee); } else @@ -187,12 +183,13 @@ void TraineesView::loadTraineesFromDB() ItemTrainee->setHidden(true); } - //if(! archiveVisible && cntChildsNotArchived == 0) - //delete ItemGroup; + if(! archiveVisible && cntChildsNotArchived == 0) + delete ItemGroup; } treeWidget->expandAll(); + /* //if(typeView == TypeView::control) { QTreeWidgetItem * item = treeWidget->topLevelItem(0); @@ -202,7 +199,12 @@ void TraineesView::loadTraineesFromDB() if(itemChild != nullptr) treeWidget->setCurrentItem(itemChild); } - } + }*/ + + if(typeObject == TypeObject::objGroup) + setCurrentGroup(lastCurrentID); + else + setCurrentTrainee(lastCurrentID); mtxTreeWidget.unlock(); } @@ -212,3 +214,50 @@ void TraineesView::reSetHeadTreeWidget() QStringList listHeaders = {tr("Trainee"), tr("Login"), tr("Password"), tr("Class"), tr("Computer"), tr("IP address"), tr("Archived"), tr("Logged"), tr("Tasks"), tr("ID")}; treeWidget->setHeaderLabels(listHeaders); } + +void TraineesView::setCurrentGroup(int id) +{ + typeObject = TypeObject::objGroup; + + for(int i = 0; i < treeWidget->topLevelItemCount(); i++) + { + QTreeWidgetItem * item = treeWidget->topLevelItem(i); + if(item != nullptr) + if(item->text(ColumnsTreeTrainees::clmn_ID).toInt() == id) + { + treeWidget->setCurrentItem(item); + return; + } + } + + QTreeWidgetItem * item = treeWidget->topLevelItem(0); + if(item != nullptr) + treeWidget->setCurrentItem(item); +} + +void TraineesView::setCurrentTrainee(int id) +{ + typeObject = TypeObject::objTrainee; + + for(int i = 0; i < treeWidget->topLevelItemCount(); i++) + { + QTreeWidgetItem * item = treeWidget->topLevelItem(i); + if(item != nullptr) + { + for (int j = 0; j < item->childCount(); j++) + { + QTreeWidgetItem * itemChild = item->child(j); + if(itemChild != nullptr) + if(itemChild->text(ColumnsTreeTrainees::clmn_ID).toInt() == id) + { + treeWidget->setCurrentItem(itemChild); + return; + } + }//for (int j = 0; j < item->childCount(); j++) + } + }//for(int i = 0; i < treeWidget->topLevelItemCount(); i++) + + QTreeWidgetItem * item = treeWidget->topLevelItem(0); + if(item != nullptr) + treeWidget->setCurrentItem(item); +} diff --git a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h index 81b88f6..f37f7cd 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h +++ b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h @@ -33,10 +33,13 @@ public Q_SLOTS: protected: virtual void updateButtons(){}; - void preparationTreeWidget(/*QTreeWidget* tree*/); + void preparationTreeWidget(); void loadTraineesFromDB(); void reSetHeadTreeWidget(); + + void setCurrentGroup(int id); + void setCurrentTrainee(int id); }; #endif // TRAINEESVIEW_H diff --git a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp b/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp index 1a0ee44..242e031 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -12,7 +12,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa ui->horizontalLayout_1->addWidget(treeWidget); - preparationTreeWidget(/*ui->treeWidget*/); + preparationTreeWidget(); setNotLoggedInVisible(true); } diff --git a/GUIdataBaseLMS/Debug64/.ninja_deps b/GUIdataBaseLMS/Debug64/.ninja_deps index 8fe50fd..b8b0341 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 a0c459c..de7959d 100644 --- a/GUIdataBaseLMS/Debug64/.ninja_log +++ b/GUIdataBaseLMS/Debug64/.ninja_log @@ -1,52 +1,44 @@ # ninja log v5 -38 1328 7556152401642874 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -1446 1589 7556152404238928 GUIdataBaseLMS.exe dadb916a9424404 -10 32 0 CMakeFiles/clean.additional 7155004b3956b606 -2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f -32 39 0 clean 9c4b4372737ab8da -7 38 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -456 505 7551837947273032 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 -7 38 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -40 1352 7556152401890499 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -7 38 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -513 565 7551837947891396 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 24 454 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -441 482 7549320531460357 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 -7 38 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -43 1446 7556152402826599 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -7 38 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +513 565 7551837947891396 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 +18 49 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +46 1366 7557107441082894 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +18 49 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +456 505 7551837947273032 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 +18 49 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 456 505 7551837947273032 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 -7 38 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -7 38 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -7 38 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -7 38 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -7 38 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -7 38 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -7 38 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -38 1338 7556243167557523 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -41 1370 7556243167880109 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -43 1438 7556243168558239 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -1438 1582 7556243169985781 GUIdataBaseLMS.exe dadb916a9424404 -17 48 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -17 48 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -17 48 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -30 79 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -30 79 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -30 79 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -30 79 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -30 79 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -30 79 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -79 1436 7556902899849310 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -82 1459 7556902900092019 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -84 1600 7556902901489747 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -1600 1758 7556902903063907 GUIdataBaseLMS.exe dadb916a9424404 -19 50 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -19 50 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -19 50 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -19 50 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -19 50 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -19 50 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +18 49 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +48 1432 7557107441742981 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +18 49 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +43 1342 7557107440849708 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +1432 1575 7557107443163402 GUIdataBaseLMS.exe dadb916a9424404 +10 32 0 CMakeFiles/clean.additional 7155004b3956b606 +441 482 7549320531460357 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 +18 49 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +32 39 0 clean 9c4b4372737ab8da +2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f +14 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +14 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +14 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +14 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +14 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +14 44 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 +14 46 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +14 46 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +14 46 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +14 46 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +14 46 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +14 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 diff --git a/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj b/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj index ce2a82e..76cbf8c 100644 Binary files a/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj and b/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj differ diff --git a/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj b/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj index b4ca199..c13892f 100644 Binary files a/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj and b/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj differ diff --git a/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj b/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj index 6f6b3aa..773c344 100644 Binary files a/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj and b/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj differ diff --git a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe index 731a682..0320c65 100644 Binary files a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe and b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe differ diff --git a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll index bfda307..4364a60 100644 Binary files a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll and b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll differ diff --git a/TestServerLMS/Debug64/ListGroups.xml b/TestServerLMS/Debug64/ListGroups.xml index 8395a0b..ef0ceff 100644 --- a/TestServerLMS/Debug64/ListGroups.xml +++ b/TestServerLMS/Debug64/ListGroups.xml @@ -4,7 +4,6 @@ - diff --git a/TestServerLMS/Debug64/ListInstructors.xml b/TestServerLMS/Debug64/ListInstructors.xml index 596974e..0b350ca 100644 --- a/TestServerLMS/Debug64/ListInstructors.xml +++ b/TestServerLMS/Debug64/ListInstructors.xml @@ -1,17 +1,13 @@ - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/TestServerLMS/Debug64/ListTrainees.xml b/TestServerLMS/Debug64/ListTrainees.xml index d6579d5..3b06354 100644 --- a/TestServerLMS/Debug64/ListTrainees.xml +++ b/TestServerLMS/Debug64/ListTrainees.xml @@ -1,22 +1,18 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/StaticData/clientHash.xml b/TestServerLMS/Debug64/StaticData/clientHash.xml index 4a311ce..9e6e087 100644 --- a/TestServerLMS/Debug64/StaticData/clientHash.xml +++ b/TestServerLMS/Debug64/StaticData/clientHash.xml @@ -1,201 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/TestServerLMS/Debug64/StaticData/save.xml b/TestServerLMS/Debug64/StaticData/save.xml index 7148250..163b3d3 100644 --- a/TestServerLMS/Debug64/StaticData/save.xml +++ b/TestServerLMS/Debug64/StaticData/save.xml @@ -1,2 +1,2 @@ - +