diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index f21af85..fe92a68 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 bda5d93..8200f18 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/DB_IaT/Debug64/.ninja_log @@ -1,186 +1,125 @@ # ninja log v5 -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 -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 -1537 3960 7554403536624811 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 -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 +460 1881 7557855769104873 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +457 1783 7557855768137462 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +21 454 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +2304 3070 7557855780433042 libInstructorsAndTrainees.dll.a c1e915765a645e23 +21 454 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +21 454 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +458 2206 7557006799374861 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de +4398 4745 7554403545178109 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b +1561 4056 7554403538030733 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc +47 59 0 clean 9c4b4372737ab8da +21 454 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +21 454 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +4063 6185 7554403559590571 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 +21 454 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +21 454 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +1400 1526 7554403513026725 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +21 454 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +21 454 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +548 2402 7557738166539410 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +417 2249 7555250085369086 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 +21 454 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +21 454 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +21 454 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +21 454 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 +61 1290 7557839316977059 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 +1537 3960 7554403536624811 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 +21 454 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 1565 4028 7554403537718314 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 16 47 0 CMakeFiles/clean.additional 7155004b3956b606 -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 +550 2391 7557738166439950 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 +2304 3070 7557855780433042 libInstructorsAndTrainees.dll c1e915765a645e23 +21 454 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +21 454 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 1573 4657 7554403543966835 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 -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 +21 454 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +21 454 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +21 454 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +21 454 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +21 454 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 -461 2186 7557107396884858 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b -22 64 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +61 1364 7557827877924527 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +21 454 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 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 +21 454 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +21 454 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 -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 +454 2304 7557855773329033 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +21 454 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 -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 -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 +21 454 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.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 +21 454 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 +423 2444 7556304767863910 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +21 454 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +24 412 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +24 412 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +24 412 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +415 1705 7557862686355639 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +418 1830 7557862687615976 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +413 2059 7557862689887119 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +2059 2785 7557862696615761 libInstructorsAndTrainees.dll c1e915765a645e23 +2059 2785 7557862696615761 libInstructorsAndTrainees.dll.a c1e915765a645e23 +21 60 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +21 60 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +21 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +61 1424 7557876097796780 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +1424 2156 7557876104551920 libInstructorsAndTrainees.dll c1e915765a645e23 +1424 2156 7557876104551920 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 c4dec60..5b52687 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 f0808bf..8b80aea 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/instructors/editorinstructors.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj index 6a3f4ea..0715174 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/trainees/editortrainees.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj index 7acb1ab..6edc5e6 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 63f1f27..8bfa51b 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt index a93a7d0..e22eec9 100644 --- a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt +++ b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt @@ -1,84 +1,84 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/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/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/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/instructors/editorinstructors.cpp - uic:ui_editorinstructors.h -D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp - uic:ui_taskswidget.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/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/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/instructorsAndTrainees_global.h D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h mmc:Q_OBJECT uic:ui_dialogeditgroup.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.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/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/commonview.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp - uic:ui_dialogedittrainee.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp + uic:ui_editortrainees.h +D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp + uic:ui_messangerwidget.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp uic:ui_dialogeditinstructor.h D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp + uic:ui_dialogedittrainee.h +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h + mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h mmc:Q_OBJECT uic:ui_dialogauthorizationinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp + uic:ui_taskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp + uic:ui_editorinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h + mmc:Q_OBJECT + uic:ui_dialogeditinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp + uic:ui_instructorsandtraineeswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp + uic:ui_dialogauthorizationinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp + uic:ui_doctaskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp + uic:ui_viewerinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp + uic:ui_viewertrainees.h diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll b/DB_IaT/Debug64/libInstructorsAndTrainees.dll index 4364a60..20cb757 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 2f1073e..244a972 100644 Binary files a/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a and b/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a differ diff --git a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user index 28035bb..86fb70a 100644 --- a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user +++ b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/DB_IaT/InstructorsAndTrainees/commonview.cpp b/DB_IaT/InstructorsAndTrainees/commonview.cpp index f2dac93..92ad44c 100644 --- a/DB_IaT/InstructorsAndTrainees/commonview.cpp +++ b/DB_IaT/InstructorsAndTrainees/commonview.cpp @@ -25,7 +25,7 @@ CommonView::CommonView(ConnectorToServer* connectorToServer, TypeView type, QWid void CommonView::setItemColorArchive(QTreeWidgetItem *item) { - setItemColor(item,QColor(250, 250, 150)); + setItemColor(item,QColor(240, 240, 240)); } void CommonView::setItemColorNoArchive(QTreeWidgetItem *item) diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp index b9d0cb9..f945934 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp @@ -31,6 +31,14 @@ EditorInstructors::~EditorInstructors() void EditorInstructors::on_btnNewInstructor_clicked() { connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR); + + /* + Instructor instructor; + Instructor instructor_edit; + + if(editInstructor(instructor, &instructor_edit)) + connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR, 0, &instructor_edit); +*/ return; /* if(int id_instructor = dbLMS->newInstructor()) @@ -173,36 +181,18 @@ void EditorInstructors::on_btnEdit_clicked() if(connectorToServer->isLoggedInInstructor(id)) {//Инструктор залогирован! - QMessageBox::critical(this, tr("Error!"), tr("You cannot archive a logged-in instructor.")); + QMessageBox::critical(this, tr("Error!"), tr("You cannot edit a logged-in instructor.")); return; } - DialogEditInstructor dlg(this); - Instructor instructor = connectorToServer->getInstructor(id); if(instructor.getID() == 0) return; - dlg.setInstructor(instructor); + Instructor instructor_edit; - while (true) - { - switch( dlg.exec() ) - { - case QDialog::Accepted: - { - Instructor instructor_edit = dlg.getInstructor(); - connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR, id, &instructor_edit); - return; - } - case QDialog::Rejected: - return; - break; - default: - return; - break; - } - } + if(editInstructor(instructor, &instructor_edit)) + connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_INSTRUCTOR, id, &instructor_edit); } } @@ -268,4 +258,82 @@ void EditorInstructors::on_treeWidget_currentItemChanged(QTreeWidgetItem *curren } } +bool EditorInstructors::verifyInstructor(Instructor instructor) +{ + //Проверка корректности логина, имени, пароля + + if(instructor.getName() == QStringLiteral("")) + {//Имя не корректно! + QMessageBox::critical(this, tr("Editing error!"), + tr("Unacceptable instructor name has been entered.\nThe changes will not be accepted.")); + return false; + } + + if(instructor.getLogin() == QStringLiteral("")) + {//Логин не корректен! + QMessageBox::critical(this, tr("Editing error!"), + tr("Unacceptable instructor login has been entered.\nThe changes will not be accepted.")); + return false; + } + + if(instructor.getPassword() == QStringLiteral("")) + {//Пароль не корректный! + QMessageBox::critical(this, tr("Editing error!"), + tr("Unacceptable instructor password has been entered.\nThe changes will not be accepted.")); + return false; + } + + + QList listInstructors = connectorToServer->getListInstructors(); + + for(Instructor exist_instructor : listInstructors) + { + if(instructor.getName() == exist_instructor.getName() && instructor.getID() != exist_instructor.getID()) + {//Имя уже существует + QMessageBox::critical(this, tr("Editing error!"), + tr("An existing instructor name has been entered.")); + return false; + } + + if(instructor.getLogin() == exist_instructor.getLogin() && instructor.getID() != exist_instructor.getID()) + {//Логин уже существует! + QMessageBox::critical(this, tr("Editing error!"), + tr("An existing instructor login has been entered.\nThe changes will not be accepted.")); + return false; + } + } + + return true; +} + +bool EditorInstructors::editInstructor(Instructor instructor, Instructor* instructor_edit) +{ + DialogEditInstructor dlg(this); + + dlg.setInstructor(instructor); + + while (true) + { + switch( dlg.exec() ) + { + case QDialog::Accepted: + { + *instructor_edit = dlg.getInstructor(); + + if(! verifyInstructor(*instructor_edit)) + { + dlg.setInstructor(*instructor_edit); + continue; + } + + return true; + } + case QDialog::Rejected: + return false; + default: + return false; + } + } +} + diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h index 242a743..63a82d1 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h +++ b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h @@ -29,6 +29,9 @@ private Q_SLOTS: private: //void setCurrentInstructor(int id); + bool verifyInstructor(Instructor instructor); + + bool editInstructor(Instructor instructor, Instructor* instructor_edit); private: Ui::EditorInstructors *ui; diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp index 6f40ffd..d60bf2b 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp @@ -270,22 +270,14 @@ void EditorTrainees::on_btnEdit_clicked() { Group group_edit = dlg.getGroup(); - connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_GROUP, id_group, &group_edit); - return; - /* - if(int id = dbLMS->editGroup(group_edit)) - {//Отредактировано - loadTraineesFromDB(); - setCurrentGroup(id); - return; - } - else + if(! verifyGroup(group_edit)) { dlg.setGroup(group_edit); continue; - }*/ + } - break; + connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_GROUP, id_group, &group_edit); + return; } case QDialog::Rejected: return; @@ -303,7 +295,7 @@ void EditorTrainees::on_btnEdit_clicked() if(connectorToServer->isLoggedInTrainee(id_trainee)) {//Обучаемый залогирован! - QMessageBox::critical(this, tr("Error!"), tr("You cannot archive a logged-in trainee.")); + QMessageBox::critical(this, tr("Error!"), tr("You cannot edit a logged-in trainee.")); return; } @@ -323,22 +315,14 @@ void EditorTrainees::on_btnEdit_clicked() { Trainee trainee_edit = dlg.getTrainee(); - connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_TRAINEE, id_trainee, &trainee_edit); - return; - /* - if(int id = dbLMS->editTrainee(trainee_edit)) - {//Отредактировано - loadTraineesFromDB(); - setCurrentTrainee(id); - return; - } - else + if(! verifyTrainee(trainee_edit)) { dlg.setTrainee(trainee_edit); continue; - }*/ + } - break; + connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_EDIT_TRAINEE, id_trainee, &trainee_edit); + return; } case QDialog::Rejected: return; @@ -457,4 +441,77 @@ void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, } } +bool EditorTrainees::verifyGroup(Group group) +{ + //Проверка корректности имени + + if(group.getName() == QStringLiteral("")) + {//Имя не корректно! + QMessageBox::critical(this, tr("Editing error!"), + tr("Unacceptable group name has been entered.\nThe changes will not be accepted.")); + return false; + } + + QList listGroups = connectorToServer->getListGroups(); + + for(Group exist_group : listGroups) + { + if(group.getName() == exist_group.getName() && group.getID() != exist_group.getID()) + {//Имя уже существует + QMessageBox::critical(this, tr("Editing error!"), + tr("An existing group name has been entered.\nThe changes will not be accepted.")); + return false; + } + } + + return true; +} + +bool EditorTrainees::verifyTrainee(Trainee trainee) +{ + //Проверка корректности логина, имени, пароля + + if(trainee.getName() == QStringLiteral("")) + {//Имя не корректно! + QMessageBox::critical(this, tr("Editing error!"), + tr("Unacceptable trainee name has been entered.\nThe changes will not be accepted.")); + return false; + } + + if(trainee.getLogin() == QStringLiteral("")) + {//Логин не корректен! + QMessageBox::critical(this, tr("Editing error!"), + tr("Unacceptable trainee login has been entered.\nThe changes will not be accepted.")); + return false; + } + + if(trainee.getPassword() == QStringLiteral("")) + {//Пароль не корректный! + QMessageBox::critical(this, tr("Editing error!"), + tr("Unacceptable trainee password has been entered.\nThe changes will not be accepted.")); + return false; + } + + QList listTrainees = connectorToServer->getListTrainees(); + + for(Trainee exist_trainee : listTrainees) + { + if(trainee.getName() == exist_trainee.getName() && trainee.getID() != exist_trainee.getID()) + {//Имя уже существует + QMessageBox::critical(this, tr("Editing error!"), + tr("An existing trainee name has been entered.")); + return false; + } + + if(trainee.getLogin() == exist_trainee.getLogin() && trainee.getID() != exist_trainee.getID()) + {//Логин уже существует! + QMessageBox::critical(this, tr("Editing error!"), + tr("An existing trainee login has been entered.\nThe changes will not be accepted.")); + return false; + } + } + + return true; +} + diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h index 642a6b4..31d9476 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h +++ b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h @@ -33,6 +33,8 @@ private Q_SLOTS: private: //void setCurrentGroup(int id); //void setCurrentTrainee(int id); + bool verifyGroup(Group group); + bool verifyTrainee(Trainee trainee); private: Ui::EditorTrainees *ui; diff --git a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp index 0e315bc..3e4e7b5 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp @@ -107,6 +107,7 @@ void TraineesView::loadTraineesFromDB() listGroups = connectorToServer->getListGroups(); listTrainees = connectorToServer->getListTrainees(); + for(Group group : listGroups) { //Группа @@ -116,6 +117,8 @@ void TraineesView::loadTraineesFromDB() ItemGroup->setText(ColumnsTreeTrainees::clmn_Trainee, group.getName()); ItemGroup->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/group.png"))); setItemColor(ItemGroup, QColor(170, 190, 170)); + + //ItemGroup->set Property("greenButton", QVariant(true)); //((QAbstractItemView*)ItemGroup)->setIconSize(QSize(32, 32)); //Обучаемые @@ -183,8 +186,8 @@ void TraineesView::loadTraineesFromDB() ItemTrainee->setHidden(true); } - if(! archiveVisible && cntChildsNotArchived == 0) - delete ItemGroup; + //if(! archiveVisible && cntChildsNotArchived == 0) + //delete ItemGroup; } treeWidget->expandAll(); diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user b/DB_LMS/DataBaseLMS/CMakeLists.txt.user index f03add0..037a779 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt.user +++ b/DB_LMS/DataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/GUIdataBaseLMS/Debug64/.ninja_log b/GUIdataBaseLMS/Debug64/.ninja_log index de7959d..deba991 100644 --- a/GUIdataBaseLMS/Debug64/.ninja_log +++ b/GUIdataBaseLMS/Debug64/.ninja_log @@ -1,44 +1,80 @@ # ninja log v5 +2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f +32 39 0 clean 9c4b4372737ab8da +13 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +441 482 7549320531460357 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 24 454 0 testDBpgSQL_autogen/mocs_compilation.cpp 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 +13 43 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 +13 43 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 +13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 456 505 7551837947273032 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -18 49 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 43 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 +13 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 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 +1432 1575 7557107443163402 GUIdataBaseLMS.exe dadb916a9424404 +43 1342 7557107440849708 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +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 45 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 45 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 45 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 45 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 45 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 45 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +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 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 +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 +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 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 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 +12 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +12 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +12 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +12 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +12 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +12 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f diff --git a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll index 4364a60..20cb757 100644 Binary files a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll and b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll differ diff --git a/GUIdataBaseLMS/Debug64/styleSheetTreeWidget.css b/GUIdataBaseLMS/Debug64/styleSheetTreeWidget.css index a3ff50a..57d6b10 100644 --- a/GUIdataBaseLMS/Debug64/styleSheetTreeWidget.css +++ b/GUIdataBaseLMS/Debug64/styleSheetTreeWidget.css @@ -35,25 +35,39 @@ QTreeWidget::branch:open:has-children:has-siblings { image: url(branch-open.png); } -/*Выделение Групп при наведении курсора*/ -QTreeWidget::item:has-children:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #88cc88, stop: 1 #88cc88); -} -/*Выделение Обучаемых/Инструкторов при наведении курсора*/ -QTreeWidget::item:!has-children:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1); +QTreeWidget::item:hover, +QTreeWidget::branch:hover { + background: #aee1ff; } -/*Выделение Групп*/ +QTreeWidget::item:selected, +QTreeWidget::branch:selected { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); + color: #ffffff; +} + + + +/*Выделение Групп при наведении курсора +QTreeWidget::item:has-children:hover { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #88cc88, stop: 1 #88cc88); +}*/ +/*Выделение Обучаемых/Инструкторов при наведении курсора +QTreeWidget::item:!has-children:hover { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1); +}*/ + + +/*Выделение Групп QTreeWidget::item:has-children, QTreeWidget::branch:has-children { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #88aa88, stop: 1 #88bb88); } QTreeWidget::item:has-children:selected { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #55aa55, stop: 1 #55bb55); -} +}*/ -/*Выделение Обучаемых/Инструкторов*/ +/*Выделение Обучаемых/Инструкторов QTreeWidget::branch:!has-children { background: transparent; } @@ -64,7 +78,7 @@ QTreeWidget::item:!has-children:selected{ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); color: #ffffff; -} +}*/ /*Разделение ячеек Обучаемых QTreeWidget::item:!has-children:has-siblings { diff --git a/GUIdataBaseLMS/Debug64/vline.png b/GUIdataBaseLMS/Debug64/vline.png new file mode 100644 index 0000000..8f0c336 Binary files /dev/null and b/GUIdataBaseLMS/Debug64/vline.png differ diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user index b4e71f3..947eb39 100644 --- a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user +++ b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user b/ServerLMS/ServerLMS/CMakeLists.txt.user index 3ccdaf1..3c8a571 100644 --- a/ServerLMS/ServerLMS/CMakeLists.txt.user +++ b/ServerLMS/ServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/TestServerLMS/Debug64/ListGroups.xml b/TestServerLMS/Debug64/ListGroups.xml index ef0ceff..ab01e2d 100644 --- a/TestServerLMS/Debug64/ListGroups.xml +++ b/TestServerLMS/Debug64/ListGroups.xml @@ -6,5 +6,5 @@ - + diff --git a/TestServerLMS/Debug64/ListInstructors.xml b/TestServerLMS/Debug64/ListInstructors.xml index 0b350ca..ddf327d 100644 --- a/TestServerLMS/Debug64/ListInstructors.xml +++ b/TestServerLMS/Debug64/ListInstructors.xml @@ -1,13 +1,13 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/TestServerLMS/Debug64/ListTrainees.xml b/TestServerLMS/Debug64/ListTrainees.xml index 3b06354..3ad73b9 100644 --- a/TestServerLMS/Debug64/ListTrainees.xml +++ b/TestServerLMS/Debug64/ListTrainees.xml @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/StaticData/save.xml b/TestServerLMS/Debug64/StaticData/save.xml index 163b3d3..4902929 100644 --- a/TestServerLMS/Debug64/StaticData/save.xml +++ b/TestServerLMS/Debug64/StaticData/save.xml @@ -1,2 +1,2 @@ - + diff --git a/TestServerLMS/Debug64/styleSheetTreeWidget.css b/TestServerLMS/Debug64/styleSheetTreeWidget.css index a3ff50a..78b7752 100644 --- a/TestServerLMS/Debug64/styleSheetTreeWidget.css +++ b/TestServerLMS/Debug64/styleSheetTreeWidget.css @@ -35,6 +35,15 @@ QTreeWidget::branch:open:has-children:has-siblings { image: url(branch-open.png); } +QTreeWidget::branch:top-level:closed { + border-image: none; + image: url(branch-closed.png); +} +QTreeWidget::branch:top-level:open { + border-image: none; + image: url(branch-open.png); +} + /*Выделение Групп при наведении курсора*/ QTreeWidget::item:has-children:hover { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #88cc88, stop: 1 #88cc88); diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt.user b/TestServerLMS/TestServerLMS/CMakeLists.txt.user index 444846d..e297f91 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt.user +++ b/TestServerLMS/TestServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId