diff --git a/DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-11-01T06-59-50-0429.json b/DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-11-01T15-34-58-0391.json similarity index 100% rename from DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-11-01T06-59-50-0429.json rename to DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-11-01T15-34-58-0391.json diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index 57a857a..7a0de2b 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 94cdbac..acfa1d7 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/DB_IaT/Debug64/.ninja_log @@ -1,99 +1,99 @@ # ninja log v5 -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -846 3294 7521082273829837 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj 639ec716a2902c9f -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -854 3261 7521082273487776 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2e9a885629b6e173 -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -856 3025 7521082271113044 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj 4bd8bab8b1110ba7 -18 61 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -18 61 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -18 61 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -852 2952 7521082270265420 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj 3bdbb777b1ca4f9f -18 61 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -18 61 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -880 2808 7521082268873272 CMakeFiles/InstructorsAndTrainees.dir/instructors/databaseinstructors.cpp.obj 50eb3e676aec3cc5 -904 1164 7521082252426886 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 54d07c59b3f7a2cf +16 52 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +377 1845 7521882090383278 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj 4bd8bab8b1110ba7 +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +57 1647 7522449583762190 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2e9a885629b6e173 +74 1925 7522449586580602 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj b8e3d2e3a65912a8 +32 42 0 clean 9c4b4372737ab8da +393 1902 7521882090955221 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj e02fcfe10480c54f +16 52 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +16 52 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +1002 3232 7521664817765595 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj 3bdbb777b1ca4f9f +16 52 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +16 52 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +16 52 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +65 1747 7522449584792147 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a6ea1bfa14213881 +1012 2854 7521664813846902 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj 7aaac6302b47a301 +13 253 7521784982976196 build.ninja 76aa11f472515be0 +55 1879 7522449586124230 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 8e8beb29ba6ba100 +71 1413 7522449581447380 CMakeFiles/InstructorsAndTrainees.dir/instructors/databaseinstructors.cpp.obj 50eb3e676aec3cc5 +16 52 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +77 1659 7522449583926194 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj d1fea9a96fa095b1 +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +16 52 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +949 996 7521664795567220 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +949 996 7521664795567220 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +8 32 0 CMakeFiles/clean.additional 7155004b3956b606 +62 1506 7522449582370525 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj 99b246ecbf2b6f9b +1951 2311 7522449590411375 libInstructorsAndTrainees.dll.a d721655f2d9255b7 +16 52 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +16 52 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +59 1508 7522449582401689 CMakeFiles/InstructorsAndTrainees.dir/trainees/databasetrainees.cpp.obj b3eab31811ef0e17 +16 52 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +302 1859 7522436505794702 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 544a146272360182 +68 1813 7522449585461950 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 2aa58696f5232c4b +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +52 1951 7522449586845975 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj 639ec716a2902c9f 1012 3479 7520793522676004 CMakeFiles/InstructorsAndTrainees.dir/instructorsAndTrainees.cpp.obj ff3fcdc370580ca2 -888 3276 7521082273638457 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj e02fcfe10480c54f -35 44 0 clean 9c4b4372737ab8da -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -900 3303 7521082273910570 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj 187ec526627f696e -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -78 129 7520881039787393 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -859 2961 7521082270449091 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 544a146272360182 -1193 1552 7521105436065188 libInstructorsAndTrainees.dll.a d721655f2d9255b7 -18 61 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -18 61 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -867 2615 7521082266604887 CMakeFiles/InstructorsAndTrainees.dir/trainees/databasetrainees.cpp.obj b3eab31811ef0e17 -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -18 61 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -18 61 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -18 61 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -1193 1552 7521105436065188 libInstructorsAndTrainees.dll d721655f2d9255b7 -62 1193 7521105432500496 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 2aa58696f5232c4b -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -18 61 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -18 61 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -892 2942 7521082270223781 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f1f85077e88e8c7 -18 61 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -897 3091 7521082271772592 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj d1fea9a96fa095b1 -18 61 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -849 3503 7521082275923951 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 8e8beb29ba6ba100 -873 3127 7521082272135107 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a6ea1bfa14213881 -13 253 7521475903295093 build.ninja 76aa11f472515be0 -863 2017 7521082260897588 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj 7aaac6302b47a301 -12 35 0 CMakeFiles/clean.additional 7155004b3956b606 -870 3060 7521082271470041 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj 99b246ecbf2b6f9b -884 3473 7521082275618934 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj b8e3d2e3a65912a8 -78 129 7520881039787393 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -13 41 0 CMakeFiles/clean.additional 7155004b3956b606 -41 50 0 clean 9c4b4372737ab8da -12 947 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -12 947 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -12 947 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -948 999 7521537199541277 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -948 999 7521537199541277 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -1056 1272 7521537202242020 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 54d07c59b3f7a2cf -1015 2251 7521537211520951 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj 7aaac6302b47a301 -1018 2883 7521537218154408 CMakeFiles/InstructorsAndTrainees.dir/trainees/databasetrainees.cpp.obj b3eab31811ef0e17 -1032 3080 7521537220160053 CMakeFiles/InstructorsAndTrainees.dir/instructors/databaseinstructors.cpp.obj 50eb3e676aec3cc5 -1009 3081 7521537220219889 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj 4bd8bab8b1110ba7 -1004 3083 7521537220339572 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj 3bdbb777b1ca4f9f -1012 3129 7521537220829192 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 544a146272360182 -1043 3155 7521537221090266 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f1f85077e88e8c7 -1025 3258 7521537222125613 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a6ea1bfa14213881 -1047 3308 7521537222621574 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj d1fea9a96fa095b1 -1007 3454 7521537224065584 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2e9a885629b6e173 -999 3498 7521537224525187 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj 639ec716a2902c9f -1002 3546 7521537224999110 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 8e8beb29ba6ba100 -1040 3563 7521537225180629 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj e02fcfe10480c54f -1029 3578 7521537225342134 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 2aa58696f5232c4b -1022 3597 7521537225522789 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj 99b246ecbf2b6f9b -1052 3611 7521537225653525 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj 187ec526627f696e -1036 3617 7521537225723869 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj b8e3d2e3a65912a8 -3617 4000 7521537229536040 libInstructorsAndTrainees.dll d721655f2d9255b7 -3617 4000 7521537229536040 libInstructorsAndTrainees.dll.a d721655f2d9255b7 +1052 1295 7521664798479005 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 54d07c59b3f7a2cf +16 52 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +1951 2311 7522449590411375 libInstructorsAndTrainees.dll d721655f2d9255b7 +16 52 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +81 1679 7522449584107678 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj 187ec526627f696e +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +16 52 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +1040 3227 7521664817775571 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f1f85077e88e8c7 +18 49 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +18 49 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +18 49 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +13 45 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +13 45 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +13 45 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj index 813e40d..27b3f87 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/instructors/databaseinstructors.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/databaseinstructors.cpp.obj index f6f37e3..8ee354e 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/databaseinstructors.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/databaseinstructors.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj index 8cf4742..d7f2d78 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.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 66968ee..7b3aff0 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 17e4a70..07b25a2 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 9fe0529..b54d68f 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 8470511..386c19e 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/tasks/taskswidget.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj index 8246594..d7ab4e7 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/databasetrainees.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/databasetrainees.cpp.obj index 671e940..0459788 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/databasetrainees.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/databasetrainees.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj index d582ee4..90fd04d 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj index 0fc042c..1608a4a 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.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 4781bb0..1131016 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 98907e8..0f8f220 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 477e725..6c8b279 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 ef23e6a..e0256c8 100644 --- a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt +++ b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt @@ -1,38 +1,45 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp - uic:ui_viewertrainees.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp - uic:ui_editortrainees.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h mmc:Q_OBJECT - uic:ui_dialogeditgroup.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp + uic:ui_dialogeditinstructor.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h - mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp - uic:ui_dialogauthorizationinstructor.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp uic:ui_instructorsandtraineeswidget.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp + uic:ui_dialogauthorizationinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp + uic:ui_dialogedittrainee.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h mmc:Q_OBJECT - uic:ui_dialogeditinstructor.h + uic:ui_dialogeditgroup.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp + uic:ui_editortrainees.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h mmc:Q_OBJECT uic:ui_dialogauthorizationinstructor.h D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h + mmc:Q_OBJECT + uic:ui_dialogeditinstructor.h D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h mmc:Q_OBJECT @@ -42,20 +49,13 @@ 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/commonview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp - uic:ui_dialogeditinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.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/viewertrainees.cpp + uic:ui_viewertrainees.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp + uic:ui_viewerinstructors.h D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp uic:ui_taskswidget.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp uic:ui_editorinstructors.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp - uic:ui_viewerinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h index 6bd4738..944c9b3 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h @@ -39,6 +39,9 @@ public: horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); groupBox = new QGroupBox(InstructorsAndTraineesWidget); groupBox->setObjectName(QString::fromUtf8("groupBox")); + QFont font; + font.setPointSize(10); + groupBox->setFont(font); gridLayout_2 = new QGridLayout(groupBox); gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); verticalLayout = new QVBoxLayout(); diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_viewerinstructors.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_viewerinstructors.h index fef4408..bcf66f8 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_viewerinstructors.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_viewerinstructors.h @@ -51,6 +51,9 @@ public: horizontalLayout_1->setObjectName(QString::fromUtf8("horizontalLayout_1")); groupBox = new QGroupBox(ViewerInstructors); groupBox->setObjectName(QString::fromUtf8("groupBox")); + QFont font1; + font1.setPointSize(10); + groupBox->setFont(font1); gridLayout_2 = new QGridLayout(groupBox); gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); horizontalLayout_2 = new QHBoxLayout(); @@ -80,10 +83,10 @@ public: __qtreewidgetitem->setText(0, QString::fromUtf8("1")); treeWidget->setHeaderItem(__qtreewidgetitem); treeWidget->setObjectName(QString::fromUtf8("treeWidget")); - QFont font1; - font1.setFamily(QString::fromUtf8("Tahoma")); - font1.setPointSize(10); - treeWidget->setFont(font1); + QFont font2; + font2.setFamily(QString::fromUtf8("Tahoma")); + font2.setPointSize(10); + treeWidget->setFont(font2); treeWidget->setIconSize(QSize(20, 20)); horizontalLayout_2->addWidget(treeWidget); diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_viewertrainees.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_viewertrainees.h index 7d5174e..b555bef 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_viewertrainees.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_viewertrainees.h @@ -51,6 +51,9 @@ public: horizontalLayout_1->setObjectName(QString::fromUtf8("horizontalLayout_1")); groupBox = new QGroupBox(ViewerTrainees); groupBox->setObjectName(QString::fromUtf8("groupBox")); + QFont font1; + font1.setPointSize(10); + groupBox->setFont(font1); gridLayout_2 = new QGridLayout(groupBox); gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); horizontalLayout_2 = new QHBoxLayout(); @@ -80,10 +83,10 @@ public: __qtreewidgetitem->setText(0, QString::fromUtf8("1")); treeWidget->setHeaderItem(__qtreewidgetitem); treeWidget->setObjectName(QString::fromUtf8("treeWidget")); - QFont font1; - font1.setFamily(QString::fromUtf8("Tahoma")); - font1.setPointSize(10); - treeWidget->setFont(font1); + QFont font2; + font2.setFamily(QString::fromUtf8("Tahoma")); + font2.setPointSize(10); + treeWidget->setFont(font2); treeWidget->setIconSize(QSize(20, 20)); treeWidget->setColumnCount(1); diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll b/DB_IaT/Debug64/libInstructorsAndTrainees.dll index 30cb789..fd8974d 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 291f5b0..2a1e9c8 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 cf97c8e..a9d9396 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/instructors/databaseinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.cpp index 8f631da..566e8e6 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.cpp @@ -33,8 +33,18 @@ bool DataBaseInstructors::AuthorizationInstructor(QString login, QString passwor if(listOfInstructors[i].getLogin() == login && listOfInstructors[i].getPassword() == password) { - listOfInstructors[i].setLoggedIn(true); - return true; + Instructor instructor = listOfInstructors[i]; + instructor.setLoggedIn(true); + + bool result = dbLMS->updateInstructor(instructor); + + if(result) + { + LoadInstructorsPSQL(); + return true; + } + else + return false; } } return false; @@ -45,13 +55,23 @@ bool DataBaseInstructors::deAuthorizationInstructor(QString login) //Инструкторы for(int i = 0; i < listOfInstructors.count(); i++) { - //if(listOfInstructors[i].getArchived()) - //continue; + if(listOfInstructors[i].getArchived()) + continue; if(listOfInstructors[i].getLogin() == login) { - listOfInstructors[i].setLoggedIn(false); - return true; + Instructor instructor = listOfInstructors[i]; + instructor.setLoggedIn(false); + + bool result = dbLMS->updateInstructor(instructor); + + if(result) + { + LoadInstructorsPSQL(); + return true; + } + else + return false; } } return false; @@ -131,46 +151,6 @@ void DataBaseInstructors::deleteInstructor(QString name) } } -void DataBaseInstructors::toArchiveInstructor(QString name) -{ - //Инструкторы - for(int i = 0; i < listOfInstructors.count(); i++) - { - if(listOfInstructors[i].getName() == name) - if(! listOfInstructors[i].getArchived()) - { - Instructor instructor = listOfInstructors[i]; - instructor.setArchived(true); - - bool result = dbLMS->updateInstructor(instructor); - - if(result) - LoadInstructorsPSQL(); - //listOfInstructors[i].setArchived(true); - } - } -} - -void DataBaseInstructors::fromeArchiveInstructor(QString name) -{ - //Инструкторы - for(int i = 0; i < listOfInstructors.count(); i++) - { - if(listOfInstructors[i].getName() == name) - if(listOfInstructors[i].getArchived()) - { - Instructor instructor = listOfInstructors[i]; - instructor.setArchived(false); - - bool result = dbLMS->updateInstructor(instructor); - - if(result) - LoadInstructorsPSQL(); - //listOfInstructors[i].setArchived(false); - } - } -} - bool DataBaseInstructors::editInstructor(QString name, Instructor instructor) { //Инструкторы @@ -181,7 +161,7 @@ bool DataBaseInstructors::editInstructor(QString name, Instructor instructor) if( (!checkExistNameInstructor(instructor.getName()) || instructor.getName() == name) && (!checkExistLoginInstructor(instructor.getLogin()) || instructor.getLogin() == listOfInstructors[i].getLogin()) ) { - instructor.setID(listOfInstructors[i].getID()); + //instructor.setID(listOfInstructors[i].getID()); bool result = dbLMS->updateInstructor(instructor); diff --git a/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.h b/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.h index b0f20d5..bbf33d4 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.h +++ b/DB_IaT/InstructorsAndTrainees/instructors/databaseinstructors.h @@ -32,8 +32,6 @@ public: QString newInstructor(); void deleteInstructor(QString name); - void toArchiveInstructor(QString name); - void fromeArchiveInstructor(QString name); bool editInstructor(QString name, Instructor instructor); bool isAdmin(QString name); diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp b/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp index fc9fb38..083c97d 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp @@ -3,7 +3,8 @@ DialogEditInstructor::DialogEditInstructor(QWidget *parent) : QDialog(parent), - ui(new Ui::DialogEditInstructor) + ui(new Ui::DialogEditInstructor), + instructorInput() { ui->setupUi(this); } @@ -15,9 +16,12 @@ DialogEditInstructor::~DialogEditInstructor() void DialogEditInstructor::setInstructor(Instructor instructor) { + instructorInput = instructor; + ui->editName ->setText(instructor.getName()); ui->editLogin->setText(instructor.getLogin()); ui->editPassword->setText(instructor.getPassword()); + ui->checkIsAdmin->setChecked(instructor.getIsAdmin()); ui->checkArchived->setChecked(instructor.getArchived()); ui->checkLoggedIn->setChecked(instructor.getLoggedIn()); @@ -30,10 +34,12 @@ void DialogEditInstructor::setInstructor(Instructor instructor) Instructor DialogEditInstructor::getInstructor() { - Instructor instructor; + Instructor instructor = instructorInput; + instructor.setName(ui->editName->text()); instructor.setLogin(ui->editLogin->text()); instructor.setPassword(ui->editPassword->text()); + instructor.setIsAdmin(ui->checkIsAdmin->isChecked()); instructor.setArchived(ui->checkArchived->isChecked()); instructor.setLoggedIn(ui->checkLoggedIn->isChecked()); diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h b/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h index 1bd3957..d7de13d 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h +++ b/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h @@ -22,6 +22,8 @@ public: private: Ui::DialogEditInstructor *ui; + + Instructor instructorInput; }; #endif // DIALOGEDITINSTRUCTOR_H diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp index fbe07b8..fddc366 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp @@ -66,18 +66,28 @@ void EditorInstructors::on_btnToOrFromArchive_clicked() QString name = treeItemCurrent->text(0); - if(dbInstructors->isArchived(name)) + Instructor instructor = dbInstructors->getInstructor(name); + + if(instructor.getArchived()) {//Архивный - dbInstructors->fromeArchiveInstructor(name); - loadInstructorsFromDB(); - setCurrentInstructor(name); + instructor.setArchived(false); + if(dbInstructors->editInstructor(name, instructor)) + { + loadInstructorsFromDB(); + setCurrentInstructor(instructor.getName()); + } } else {//Не Архивный - dbInstructors->toArchiveInstructor(name); - loadInstructorsFromDB(); - if(archiveVisible) - setCurrentInstructor(name); + instructor.setArchived(true); + if(dbInstructors->editInstructor(name, instructor)) + { + if(!archiveVisible) + ui->btnArchive->click(); + + loadInstructorsFromDB(); + setCurrentInstructor(instructor.getName()); + } } } } diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h index b4e96e5..3c894d7 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h +++ b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h @@ -10,9 +10,9 @@ namespace Ui { class EditorInstructors; } -//Диалог для просмотра и управления БД Инструкторов +//Виджет для редактирования БД Инструкторов -class EditorInstructors : /*public QDialog,*/ public InstructorsView +class EditorInstructors : public InstructorsView { Q_OBJECT diff --git a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp b/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp index c806572..d417211 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp @@ -20,14 +20,14 @@ void InstructorsView::preparationTreeWidget(QTreeWidget* tree) reSetHeadTreeWidget(); - treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 12pt;")); + treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 10pt;")); - treeWidget->setColumnWidth(0, 200); - treeWidget->setColumnWidth(1, 130); - treeWidget->setColumnWidth(2, 130); - treeWidget->setColumnWidth(3, 130); - treeWidget->setColumnWidth(4, 130); - treeWidget->setColumnWidth(5, 130); + treeWidget->setColumnWidth(0, 250); + treeWidget->setColumnWidth(1, 100); + treeWidget->setColumnWidth(2, 100); + treeWidget->setColumnWidth(3, 100); + treeWidget->setColumnWidth(4, 80); + treeWidget->setColumnWidth(5, 80); if(typeView == TypeView::onlyView) {//onlyView diff --git a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h index 6f25575..8f0df08 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h +++ b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h @@ -12,7 +12,7 @@ class ViewerInstructors; //Виджет только для просмотра БД Инструкторов -class INSTRUCTORSANDTRAINEES_EXPORT ViewerInstructors : /*public QWidget,*/ public InstructorsView +class INSTRUCTORSANDTRAINEES_EXPORT ViewerInstructors : public InstructorsView { Q_OBJECT diff --git a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.ui b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.ui index 382c901..76594ed 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.ui +++ b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.ui @@ -23,6 +23,11 @@ + + + 10 + + Instructors diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index e273884..4617e27 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -6,7 +6,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : QWidget(parent), ui(new Ui::InstructorsAndTraineesWidget), - adminMode(false) + adminMode(false), + loginInstructorLoggedIn(QStringLiteral("")) { ui->setupUi(this); @@ -16,11 +17,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : dataBaseInstructors = new DataBaseInstructors(dbLMS); //Авторизация Инструктора (Администратора) - while(! authorizationInstructor(this)) - { - QMessageBox::warning(this, tr("Instructor authorization"), tr("Invalid login or password!")); - }; - QMessageBox::information(this, tr("Instructor authorization"), tr("Successfully!")); + authorizationInstructorLocal(this); m_viewerTrainees = new ViewerTrainees(dataBaseTrainees, adminMode); m_viewerInstructors = new ViewerInstructors(dataBaseInstructors, adminMode); @@ -28,12 +25,14 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->verticalLayout->addWidget(m_viewerTrainees); ui->verticalLayout->addWidget(m_viewerInstructors); - m_viewerTrainees->setMinimumSize(800, 800); - m_viewerInstructors->setMinimumSize(800, 300); + m_viewerTrainees->setMinimumSize(1000, 800); + m_viewerInstructors->setMinimumSize(1000, 300); } InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget() { + deAuthorizationInstructor(loginInstructorLoggedIn); + delete m_viewerInstructors; delete m_viewerTrainees; delete dataBaseInstructors; @@ -42,35 +41,55 @@ InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget() delete ui; } -bool InstructorsAndTraineesWidget::authorizationInstructor(QWidget* parent) +bool InstructorsAndTraineesWidget::authorizationInstructorLocal(QWidget* parent) { DialogAuthorizationInstructor dlg(parent); dlg.setWindowTitle(tr("Instructor authorithation")); - switch( dlg.exec() ) + do { - case QDialog::Accepted: - { - QString login = dlg.getLogin(); - QString password = dlg.getPassword(); - - if(dataBaseInstructors->AuthorizationInstructor(login, password)) + switch( dlg.exec() ) { - if(login == QStringLiteral("admin")) - adminMode = true; - return true; + case QDialog::Accepted: + { + QString login = dlg.getLogin(); + QString password = dlg.getPassword(); + + if(dataBaseInstructors->AuthorizationInstructor(login, password)) + { + loginInstructorLoggedIn = login; + + if(login == QStringLiteral("admin")) + adminMode = true; + + QMessageBox::information(parent, tr("Instructor authorization"), tr("Successfully!")); + + return true; + } + else + QMessageBox::warning(parent, tr("Instructor authorization"), tr("Invalid login or password!")); + + break; + } + case QDialog::Rejected: + return false; + default: + return false; } - //break; - } - case QDialog::Rejected: - break; - default: - break; } + while(true); return false; } +bool InstructorsAndTraineesWidget::authorizationCompleted() +{ + if(loginInstructorLoggedIn == QStringLiteral("")) + return false; + else + return true; +} + bool InstructorsAndTraineesWidget::authorizationTrainee(QString login, QString password, QString learnClass = QStringLiteral(""), QString computer = QStringLiteral("")) { return dataBaseTrainees->AuthorizationTrainee(login, password, learnClass, computer); @@ -81,7 +100,7 @@ bool InstructorsAndTraineesWidget::deAuthorizationTrainee(QString login) return dataBaseTrainees->deAuthorizationTrainee(login); } -bool InstructorsAndTraineesWidget::authorizationInstructor(QString login, QString password) +bool InstructorsAndTraineesWidget::authorizationInstructorLocal(QString login, QString password) { return dataBaseInstructors->AuthorizationInstructor(login, password); } diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h index 5206a14..08c3bfe 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h @@ -22,14 +22,15 @@ public: public: //Авторизация инструктора локальная - bool authorizationInstructor(QWidget* parent = nullptr); + bool authorizationInstructorLocal(QWidget* parent = nullptr); + bool authorizationCompleted(); //Авторизация обучаемого на клиенте bool authorizationTrainee(QString login, QString password, QString learnClass, QString computer); bool deAuthorizationTrainee(QString login); //Авторизация инструктора на клиенте - bool authorizationInstructor(QString login, QString password); + bool authorizationInstructorLocal(QString login, QString password); bool deAuthorizationInstructor(QString login); private: @@ -44,6 +45,7 @@ private: ViewerInstructors* m_viewerInstructors; bool adminMode; + QString loginInstructorLoggedIn; }; #endif // INSTRUCTORSANDTRAINEESWIDGET_H diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui index a5bd083..8a82d94 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -18,6 +18,11 @@ + + + 10 + + Database LMS diff --git a/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp b/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp index 2c7c9b4..2327319 100644 --- a/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp @@ -29,7 +29,7 @@ void TasksWidget::viewListTasksForTrainee(QString login) { QStringList listTasks; - listTasks = pDbTrainees->getWhatItDoes(login); + listTasks = pDbTrainees->getTasks(login); ui->listWidgetTasks->clear(); ui->listWidgetTasks->addItems(listTasks); diff --git a/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.cpp b/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.cpp index 130f92d..fc2383c 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.cpp @@ -46,10 +46,20 @@ bool DataBaseTrainees::AuthorizationTrainee(QString login, QString password, QSt if(listOfTrainees[i].getLogin() == login && listOfTrainees[i].getPassword() == password) { - listOfTrainees[i].setLoggedIn(true); - listOfTrainees[i].setLearnClass(learnClass); - listOfTrainees[i].setComputer(computer); - return true; + Trainee trainee = listOfTrainees[i]; + trainee.setLoggedIn(true); + trainee.setLearnClass(learnClass); + trainee.setComputer(computer); + + bool result = dbLMS->updateTrainee(trainee); + + if(result) + { + LoadTraineesGroupsPSQL(); + return true; + } + else + return false; } } return false; @@ -60,42 +70,54 @@ bool DataBaseTrainees::deAuthorizationTrainee(QString login) //Обучаемые for(int i = 0; i < listOfTrainees.count(); i++) { - //if(listOfTrainees[i].getArchived()) - //continue; + if(listOfTrainees[i].getArchived()) + continue; if(listOfTrainees[i].getLogin() == login) { - listOfTrainees[i].setLoggedIn(false); - listOfTrainees[i].setLearnClass(QStringLiteral("")); - listOfTrainees[i].setComputer(QStringLiteral("")); - return true; + Trainee trainee = listOfTrainees[i]; + trainee.setLoggedIn(false); + trainee.setLearnClass(QStringLiteral("")); + trainee.setComputer(QStringLiteral("")); + + bool result = dbLMS->updateTrainee(trainee); + + if(result) + { + LoadTraineesGroupsPSQL(); + return true; + } + else + return false; } } return false; } -void DataBaseTrainees::setWhatItDoes(QString login, QString whatItDoes) +void DataBaseTrainees::setTasks(QString login, QStringList tasks) { //Обучаемые for(int i = 0; i < listOfTrainees.count(); i++) { if(listOfTrainees[i].getLogin() == login) - listOfTrainees[i].setWhatItDoes(whatItDoes); + listOfTrainees[i].setTasks(tasks); } } -QStringList DataBaseTrainees::getWhatItDoes(QString login) +QStringList DataBaseTrainees::getTasks(QString login) { - QString whatItDoes = QStringLiteral(""); + QStringList tasks; //Обучаемые for(int i = 0; i < listOfTrainees.count(); i++) { if(listOfTrainees[i].getLogin() == login) - whatItDoes = listOfTrainees[i].getWhatItDoes(); + { + tasks = listOfTrainees[i].getTasks(); + } } - return whatItDoes.split(QStringLiteral(";")); + return tasks; } QString DataBaseTrainees::getNameTraineeOnComputer(QString computer) @@ -230,17 +252,16 @@ bool DataBaseTrainees::deleteGroup(QString name) return true; } -bool DataBaseTrainees::editGroup(QString name, QString newName) +bool DataBaseTrainees::editGroup(QString name, Group group) { //Группы for(int i = 0; i < listOfGroups.count(); i++) { if(listOfGroups[i].getName() == name) { - if(!checkExistNameGroup(newName) || newName == name) + if(!checkExistNameGroup(group.getName()) || group.getName() == name) { - Group group = listOfGroups[i]; - group.setName(newName); + //group.setID(listOfGroups[i].getID()); bool result = dbLMS->updateGroup(group); @@ -280,7 +301,7 @@ QString DataBaseTrainees::newTrainee(QString nameGroup) trainee.setComputer(QStringLiteral("")); trainee.setArchived(false); trainee.setLoggedIn(false); - trainee.setWhatItDoes(QStringLiteral("")); + //trainee.setWhatItDoes(QStringLiteral("")); bool result = dbLMS->insertTrainee(trainee); @@ -314,46 +335,6 @@ void DataBaseTrainees::deleteTrainee(QString name) } } -void DataBaseTrainees::toArchiveTrainee(QString name) -{ - //Обучаемые - for(int i = 0; i < listOfTrainees.count(); i++) - { - if(listOfTrainees[i].getName() == name) - if(! listOfTrainees[i].getArchived()) - { - Trainee trainee = listOfTrainees[i]; - trainee.setArchived(true); - - bool result = dbLMS->updateTrainee(trainee); - - if(result) - LoadTraineesGroupsPSQL(); - //listOfTrainees[i].setArchived(true); - } - } -} - -void DataBaseTrainees::fromeArchiveTrainee(QString name) -{ - //Обучаемые - for(int i = 0; i < listOfTrainees.count(); i++) - { - if(listOfTrainees[i].getName() == name) - if(listOfTrainees[i].getArchived()) - { - Trainee trainee = listOfTrainees[i]; - trainee.setArchived(false); - - bool result = dbLMS->updateTrainee(trainee); - - if(result) - LoadTraineesGroupsPSQL(); - //listOfTrainees[i].setArchived(false); - } - } -} - bool DataBaseTrainees::editTrainee(QString name, Trainee trainee) { //Обучаемые @@ -364,7 +345,7 @@ bool DataBaseTrainees::editTrainee(QString name, Trainee trainee) if( (!checkExistNameTrainee(trainee.getName()) || trainee.getName() == name) && (!checkExistLoginTrainee(trainee.getLogin()) || trainee.getLogin() == listOfTrainees[i].getLogin()) ) { - trainee.setID(listOfTrainees[i].getID()); + //trainee.setID(listOfTrainees[i].getID()); bool result = dbLMS->updateTrainee(trainee); diff --git a/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.h b/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.h index b51ced6..f5fc587 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.h +++ b/DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.h @@ -24,8 +24,8 @@ public: bool AuthorizationTrainee(QString login, QString password, QString learnClass, QString computer); bool deAuthorizationTrainee(QString login); - void setWhatItDoes(QString login, QString whatItDoes); - QStringList getWhatItDoes(QString login); + void setTasks(QString login, QStringList tasks); + QStringList getTasks(QString login); QString getNameTraineeOnComputer(QString computer); Trainee getTraineeOnComputer(QString computer); @@ -43,12 +43,10 @@ public: QString newGroup(); bool deleteGroup(QString name); - bool editGroup(QString name, QString newName); + bool editGroup(QString name, Group group); QString newTrainee(QString nameGroup); void deleteTrainee(QString name); - void toArchiveTrainee(QString name); - void fromeArchiveTrainee(QString name); bool editTrainee(QString name, Trainee trainee); bool isArchived(QString name); diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp b/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp index 1f9ac7b..9de4cf8 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp @@ -3,7 +3,8 @@ DialogEditGroup::DialogEditGroup(QWidget *parent) : QDialog(parent), - ui(new Ui::DialogEditGroup) + ui(new Ui::DialogEditGroup), + groupInput() { ui->setupUi(this); } @@ -12,3 +13,19 @@ DialogEditGroup::~DialogEditGroup() { delete ui; } + +void DialogEditGroup::setGroup(Group group) +{ + groupInput = group; + + ui->editName->setText(group.getName()); +} + +Group DialogEditGroup::getGroup() +{ + Group group = groupInput; + + group.setName(ui->editName->text()); + + return group; +} diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h b/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h index 88d1eb9..606dd97 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h +++ b/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h @@ -4,6 +4,7 @@ #include #include "ui_dialogeditgroup.h" #include "computersLocations.h" +#include "group.h" namespace Ui { class DialogEditGroup; @@ -17,18 +18,13 @@ public: explicit DialogEditGroup(QWidget *parent = nullptr); ~DialogEditGroup(); - void setName(QString name) - { - ui->editName->setText(name); - } - - QString getName() - { - return ui->editName->text(); - } + void setGroup(Group group); + Group getGroup(); private: Ui::DialogEditGroup *ui; + + Group groupInput; }; #endif // DIALOGEDITGROUP_H diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp b/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp index fbe0c99..3460964 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp @@ -4,7 +4,7 @@ DialogEditTrainee::DialogEditTrainee(QWidget *parent) : QDialog(parent), ui(new Ui::DialogEditTrainee), - nameGroup() + traineeInput() { ui->setupUi(this); } @@ -16,29 +16,26 @@ DialogEditTrainee::~DialogEditTrainee() void DialogEditTrainee::setTrainee(Trainee trainee) { + traineeInput = trainee; + ui->editName->setText(trainee.getName()); ui->editLogin->setText(trainee.getLogin()); ui->editPassword->setText(trainee.getPassword()); ui->checkArchived->setChecked(trainee.getArchived()); ui->checkLoggedIn->setChecked(trainee.getLoggedIn()); - - nameGroup = trainee.getGroup(); } Trainee DialogEditTrainee::getTrainee() { - Trainee trainee; + Trainee trainee = traineeInput; + trainee.setName(ui->editName->text()); trainee.setLogin(ui->editLogin->text()); trainee.setPassword(ui->editPassword->text()); - trainee.setLearnClass(QStringLiteral("")); - trainee.setComputer(QStringLiteral("")); + trainee.setArchived(ui->checkArchived->isChecked()); trainee.setLoggedIn(ui->checkLoggedIn->isChecked()); - trainee.setWhatItDoes(QStringLiteral("")); - - trainee.setGroup(nameGroup); return trainee; } diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h b/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h index dee82d6..e8c50db 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h +++ b/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h @@ -22,7 +22,7 @@ public: private: Ui::DialogEditTrainee *ui; - QString nameGroup; + Trainee traineeInput; }; #endif // DIALOGEDITTRAINEE_H diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp index d5662dd..f005047 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp @@ -100,21 +100,28 @@ void EditorTrainees::on_btnToOrFromArchiveTrainee_clicked() QString name = treeItemCurrent->text(0); - if(dbTrainees->isArchived(name)) + Trainee trainee = dbTrainees->getTrainee(name); + + if(trainee.getArchived()) {//Архивный - dbTrainees->fromeArchiveTrainee(name); - loadTraineesFromDB(); - setCurrentTrainee(name); + trainee.setArchived(false); + if(dbTrainees->editTrainee(name, trainee)) + { + loadTraineesFromDB(); + setCurrentTrainee(trainee.getName()); + } } else {//Не Архивный - dbTrainees->toArchiveTrainee(name); + trainee.setArchived(true); + if(dbTrainees->editTrainee(name, trainee)) + { + if(!archiveVisible) + ui->btnArchive->click(); - if(!archiveVisible) - ui->btnArchive->click(); - - loadTraineesFromDB(); - setCurrentTrainee(name); + loadTraineesFromDB(); + setCurrentTrainee(trainee.getName()); + } } } } @@ -134,15 +141,16 @@ void EditorTrainees::on_btnEdit_clicked() QString nameGroup = treeItemCurrent->text(0); DialogEditGroup dlg(this); - dlg.setName(nameGroup); + dlg.setGroup(dbTrainees->getGroup(nameGroup)); + switch( dlg.exec() ) { case QDialog::Accepted: { - if(dbTrainees->editGroup(nameGroup, dlg.getName())) + if(dbTrainees->editGroup(nameGroup, dlg.getGroup())) { loadTraineesFromDB(); - setCurrentGroup(dlg.getName()); + setCurrentGroup(dlg.getGroup().getName()); } else QMessageBox::critical(this, tr("Editing error!"), diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h index 3ab656d..b689c5e 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h +++ b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h @@ -11,7 +11,7 @@ namespace Ui { class EditorTrainees; } -//Диалог для просмотра и управления БД Обучаемых +//Виджет для редактирования БД Обучаемых class EditorTrainees : /*public QDialog,*/ public TraineesView { diff --git a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp index 7f2a773..9a8d3bb 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp @@ -15,31 +15,32 @@ void TraineesView::preparationTreeWidget(QTreeWidget *tree) if(treeWidget == nullptr) return; - treeWidget->setColumnCount(8); + treeWidget->setColumnCount(9); reSetHeadTreeWidget(); - treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 12pt;")); + treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 10pt;")); - treeWidget->setColumnWidth(0, 200); - treeWidget->setColumnWidth(1, 130); - treeWidget->setColumnWidth(2, 130); + treeWidget->setColumnWidth(0, 250); + treeWidget->setColumnWidth(1, 100); + treeWidget->setColumnWidth(2, 100); treeWidget->setColumnWidth(3, 130); treeWidget->setColumnWidth(4, 130); treeWidget->setColumnWidth(5, 130); - treeWidget->setColumnWidth(6, 130); - treeWidget->setColumnWidth(7, 100); + treeWidget->setColumnWidth(6, 80); + treeWidget->setColumnWidth(7, 80); + treeWidget->setColumnWidth(8, 100); if(typeView == TypeView::onlyView) {//onlyView treeWidget->setColumnHidden(1, true); treeWidget->setColumnHidden(2, true); - treeWidget->setColumnHidden(5, true); - treeWidget->setColumnHidden(7, true); + treeWidget->setColumnHidden(6, true); + treeWidget->setColumnHidden(8, true); } else {//control - treeWidget->setColumnHidden(5, true); + treeWidget->setColumnHidden(6, true); } } @@ -74,32 +75,33 @@ void TraineesView::loadTraineesFromDB() ItemTrainee->setText(2, trainee.getPassword()); ItemTrainee->setText(3, trainee.getLearnClass()); ItemTrainee->setText(4, trainee.getComputer()); + ItemTrainee->setText(5, trainee.getIpAddress()); if(trainee.getArchived()) {//Архивный - ItemTrainee->setText(5, tr("yes")); + ItemTrainee->setText(6, tr("yes")); ItemTrainee->setIcon(0, QIcon(QStringLiteral(":/icons/traineeArchive.png"))); setItemColorArchive(ItemTrainee); } else {//Не Архивный - ItemTrainee->setText(5, tr("no")); + ItemTrainee->setText(6, tr("no")); ItemTrainee->setIcon(0, QIcon(QStringLiteral(":/icons/trainee.png"))); setItemColorNoArchive(ItemTrainee); } if(trainee.getLoggedIn()) {//Залогинен - ItemTrainee->setText(6, tr("yes")); - ItemTrainee->setIcon(6, QIcon(QStringLiteral(":/icons/circleGreen.png"))); + ItemTrainee->setText(7, tr("yes")); + ItemTrainee->setIcon(7, QIcon(QStringLiteral(":/icons/circleGreen.png"))); } else {//Не Залогинен - ItemTrainee->setText(6, tr("no")); - ItemTrainee->setIcon(6, QIcon(QStringLiteral(":/icons/circleGray.png"))); + ItemTrainee->setText(7, tr("no")); + ItemTrainee->setIcon(7, QIcon(QStringLiteral(":/icons/circleGray.png"))); } - ItemTrainee->setText(7, trainee.getWhatItDoes()); + ItemTrainee->setText(8, QString(trainee.getTasks().join(QStringLiteral(";")))); ItemGroup->addChild(ItemTrainee); @@ -129,6 +131,6 @@ void TraineesView::loadTraineesFromDB() void TraineesView::reSetHeadTreeWidget() { - QStringList listHeaders = {tr("Trainee"), tr("Login"), tr("Password"), tr("Class"), tr("Computer"), tr("Archived"), tr("Logged"), tr("Tasks")}; + QStringList listHeaders = {tr("Trainee"), tr("Login"), tr("Password"), tr("Class"), tr("Computer"), tr("IP address"), tr("Archived"), tr("Logged"), tr("Tasks")}; treeWidget->setHeaderLabels(listHeaders); } diff --git a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h b/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h index 8afa3a9..4fc3cf3 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h +++ b/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h @@ -14,7 +14,7 @@ class ViewerTrainees; //Виджет только для просмотра БД Обучаемых -class INSTRUCTORSANDTRAINEES_EXPORT ViewerTrainees : /*public QWidget,*/ public TraineesView +class INSTRUCTORSANDTRAINEES_EXPORT ViewerTrainees : public TraineesView { Q_OBJECT diff --git a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.ui b/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.ui index 8df45eb..3134807 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.ui +++ b/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.ui @@ -23,6 +23,11 @@ + + + 10 + + Trainees diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user b/DB_LMS/DataBaseLMS/CMakeLists.txt.user index 65e3777..c340254 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt.user +++ b/DB_LMS/DataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/DB_LMS/DataBaseLMS/databaselms.cpp b/DB_LMS/DataBaseLMS/databaselms.cpp index 94ba7f2..f2e7a87 100644 --- a/DB_LMS/DataBaseLMS/databaselms.cpp +++ b/DB_LMS/DataBaseLMS/databaselms.cpp @@ -47,7 +47,7 @@ QList DataBaseLMS::selectAllInstructors() { QList listInstructors; - QString queryStr = QString("SELECT instructor_id, name, login, password, is_admin, archived " + QString queryStr = QString("SELECT instructor_id, name, login, password, is_admin, archived, logged_in " "FROM public.instructors " "ORDER BY instructor_id ASC"); @@ -67,7 +67,7 @@ QList DataBaseLMS::selectAllInstructors() instructor.setPassword(query.value(3).toString()); instructor.setIsAdmin(query.value(4).toBool()); instructor.setArchived(query.value(5).toBool()); - instructor.setLoggedIn(false); + instructor.setLoggedIn(query.value(6).toBool()); listInstructors.append(instructor); } @@ -80,9 +80,13 @@ QList DataBaseLMS::selectAllTrainees() { QList listTrainees; - QString queryStr = QString("SELECT trainees.trainee_id, trainees.name, trainees.login, trainees.password, trainees.archived, " - "groups_of_trainees.name " + QString queryStr = QString("SELECT trainees.trainee_id, trainees.name, trainees.login, trainees.password, trainees.archived, trainees.logged_in, " + "groups_of_trainees.name, " + "educational_classes.name, " + "computers.name, computers.ip_address " "FROM public.trainees JOIN public.groups_of_trainees ON groups_of_trainees.group_id = trainees.group_trainees " + "LEFT OUTER JOIN public.computers ON computers.computer_id = trainees.computer " + "LEFT OUTER JOIN public.educational_classes ON educational_classes.class_id = computers.class " "ORDER BY groups_of_trainees.name ASC"); QSqlQuery query(*db); @@ -95,16 +99,20 @@ QList DataBaseLMS::selectAllTrainees() while (query.next()) {//Обучаемый Trainee trainee; + trainee.setID(query.value(0).toInt()); trainee.setName(query.value(1).toString()); trainee.setLogin(query.value(2).toString()); trainee.setPassword(query.value(3).toString()); - trainee.setArchived(query.value(4).toBool()); - trainee.setGroup(query.value(5).toString()); - trainee.setWhatItDoes(QStringLiteral("")); - trainee.setLoggedIn(false); - trainee.setLearnClass(QStringLiteral("")); - trainee.setComputer(QStringLiteral("")); + trainee.setArchived(query.value(4).toBool()); + trainee.setLoggedIn(query.value(5).toBool()); + trainee.setGroup(query.value(6).toString()); + + trainee.setLearnClass(query.value(7).toString()); + trainee.setComputer(query.value(8).toString()); + trainee.setIpAddress(query.value(9).toString()); + + trainee.setTasks(selectTasksOfTrainee(trainee.getID())); listTrainees.append(trainee); } @@ -144,13 +152,14 @@ QList DataBaseLMS::selectAllGroups() bool DataBaseLMS::insertInstructor(Instructor instructor) { - QString queryStr = QString("INSERT INTO public.instructors (name, login, password, is_admin, archived) " - "VALUES ('%1', '%2', '%3', %4, %5)").arg( + QString queryStr = QString("INSERT INTO public.instructors (name, login, password, is_admin, archived, logged_in) " + "VALUES ('%1', '%2', '%3', %4, %5, %6)").arg( instructor.getName(), instructor.getLogin(), instructor.getPassword(), instructor.getIsAdmin() ? "true" : "false", - instructor.getArchived() ? "true" : "false"); + instructor.getArchived() ? "true" : "false", + instructor.getLoggedIn() ? "true" : "false"); return queryExec(queryStr); } @@ -165,13 +174,14 @@ bool DataBaseLMS::deleteInstructor(int instructor_id) bool DataBaseLMS::updateInstructor(Instructor instructor) { QString queryStr = QString("UPDATE public.instructors " - "SET name = '%1', login = '%2', password = '%3', is_admin = %4, archived = %5 " - "WHERE instructor_id = %6").arg( + "SET name = '%1', login = '%2', password = '%3', is_admin = %4, archived = %5, logged_in = %6 " + "WHERE instructor_id = %7").arg( instructor.getName(), instructor.getLogin(), instructor.getPassword(), instructor.getIsAdmin() ? "true" : "false", instructor.getArchived() ? "true" : "false", + instructor.getLoggedIn() ? "true" : "false", QString::number(instructor.getID()) ); return queryExec(queryStr); @@ -206,15 +216,18 @@ bool DataBaseLMS::updateGroup(Group group) bool DataBaseLMS::insertTrainee(Trainee trainee) { - QString queryStr = QString("INSERT INTO public.trainees (name, login, password, archived, group_trainees) " - "VALUES ('%1', '%2', '%3', %4, " - "(SELECT group_id FROM public.groups_of_trainees WHERE name = '%5') " + QString queryStr = QString("INSERT INTO public.trainees (name, login, password, archived, logged_in, group_trainees, computer) " + "VALUES ('%1', '%2', '%3', %4, %5, " + "(SELECT group_id FROM public.groups_of_trainees WHERE name = '%6'), " + "(SELECT computer_id FROM public.computers WHERE name = '%7') " ")").arg( trainee.getName(), trainee.getLogin(), trainee.getPassword(), trainee.getArchived() ? "true" : "false", - trainee.getGroup()); + trainee.getLoggedIn() ? "true" : "false", + trainee.getGroup(), + trainee.getComputer()); return queryExec(queryStr); } @@ -229,19 +242,52 @@ bool DataBaseLMS::deleteTrainee(int trainee_id) bool DataBaseLMS::updateTrainee(Trainee trainee) { QString queryStr = QString("UPDATE public.trainees " - "SET name = '%1', login = '%2', password = '%3', archived = %4, group_trainees = " - "(SELECT group_id FROM public.groups_of_trainees WHERE name = '%5') " - "WHERE trainee_id = %6").arg( + "SET name = '%1', login = '%2', password = '%3', archived = %4, logged_in = %5, " + "group_trainees = " + "(SELECT group_id FROM public.groups_of_trainees WHERE name = '%6'), " + "computer = " + "(SELECT computer_id FROM public.computers WHERE name = '%7') " + "WHERE trainee_id = %8").arg( trainee.getName(), trainee.getLogin(), trainee.getPassword(), trainee.getArchived() ? "true" : "false", + trainee.getLoggedIn() ? "true" : "false", trainee.getGroup(), + trainee.getComputer(), QString::number(trainee.getID()) ); return queryExec(queryStr); } +QStringList DataBaseLMS::selectTasksOfTrainee(int trainee_id) +{ + QStringList tasks; + + QString queryStr = QString("SELECT tasks.task_id, tasks.name " + "FROM public.trainees " + "JOIN public.trainee_tasks ON trainee_tasks.trainee_id = trainees.trainee_id " + "JOIN public.tasks ON tasks.task_id = trainee_tasks.task_id " + "WHERE trainees.trainee_id = %1 " + "ORDER BY tasks.name ASC").arg( + trainee_id); + + QSqlQuery query(*db); + if(!query.exec(queryStr)) + { + messageWarningErrorQuery(queryStr); + } + else + { + while (query.next()) + {//Задача + tasks.append(query.value(1).toString()); + } + } + + return tasks; +} + bool DataBaseLMS::queryExec(QString queryStr) { QSqlQuery query(*db); diff --git a/DB_LMS/DataBaseLMS/databaselms.h b/DB_LMS/DataBaseLMS/databaselms.h index 5cb1d7f..f3d09f6 100644 --- a/DB_LMS/DataBaseLMS/databaselms.h +++ b/DB_LMS/DataBaseLMS/databaselms.h @@ -35,6 +35,8 @@ public: bool deleteTrainee(int trainee_id); bool updateTrainee(Trainee trainee); + QStringList selectTasksOfTrainee(int trainee_id); + private: bool queryExec(QString queryStr); void messageWarningErrorQuery(QString queryStr); diff --git a/DB_LMS/DataBaseLMS/trainee.cpp b/DB_LMS/DataBaseLMS/trainee.cpp index a626618..05d8233 100644 --- a/DB_LMS/DataBaseLMS/trainee.cpp +++ b/DB_LMS/DataBaseLMS/trainee.cpp @@ -4,13 +4,13 @@ Trainee::Trainee(): trainee_id(), name(), login(), - password(), + password(), + archived(false), + loggedIn(false), + group(), learnClass(), computer(), - group(), - archived(false), - whatItDoes(), - loggedIn(false) + tasks() { } diff --git a/DB_LMS/DataBaseLMS/trainee.h b/DB_LMS/DataBaseLMS/trainee.h index 743cb5c..770d01e 100644 --- a/DB_LMS/DataBaseLMS/trainee.h +++ b/DB_LMS/DataBaseLMS/trainee.h @@ -2,6 +2,7 @@ #define TRAINEE_H #include +#include #include "DataBaseLMS_global.h" class DATABASELMS_EXPORT Trainee @@ -27,6 +28,9 @@ public: void setComputer(QString computer){this->computer = computer;} QString getComputer(){return computer;} + void setIpAddress(QString ipAddress){this->ipAddress = ipAddress;} + QString getIpAddress(){return ipAddress;} + void setGroup(QString group){this->group = group;} QString getGroup(){return group;} @@ -36,22 +40,23 @@ public: void setLoggedIn(bool loggedIn){this->loggedIn = loggedIn;} bool getLoggedIn(){return loggedIn;} - void setWhatItDoes(QString whatItDoes){this->whatItDoes = whatItDoes;} - QString getWhatItDoes(){return whatItDoes;} + void setTasks(QStringList tasks){this->tasks = tasks;} + QStringList getTasks(){return tasks;} private: int trainee_id; QString name; QString login; - QString password; + QString password; + bool archived; + bool loggedIn; + QString group; + QString learnClass; QString computer; - QString group; - bool archived; + QString ipAddress; - QString whatItDoes; - - bool loggedIn; + QStringList tasks; }; #endif // TRAINEE_H diff --git a/DB_LMS/Debug64/.cmake/api/v1/reply/cache-v2-87ff728da30d5c1b46b4.json b/DB_LMS/Debug64/.cmake/api/v1/reply/cache-v2-8fba00a0d0b5ca55fe65.json similarity index 99% rename from DB_LMS/Debug64/.cmake/api/v1/reply/cache-v2-87ff728da30d5c1b46b4.json rename to DB_LMS/Debug64/.cmake/api/v1/reply/cache-v2-8fba00a0d0b5ca55fe65.json index d576c1d..13e49fd 100644 --- a/DB_LMS/Debug64/.cmake/api/v1/reply/cache-v2-87ff728da30d5c1b46b4.json +++ b/DB_LMS/Debug64/.cmake/api/v1/reply/cache-v2-8fba00a0d0b5ca55fe65.json @@ -175,7 +175,7 @@ }, { "name" : "HELPSTRING", - "value" : "CXX compiler" + "value" : "No help, variable specified on the command line." } ], "type" : "STRING", diff --git a/DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-10-31T06-50-12-0232.json b/DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-11-01T15-34-57-0056.json similarity index 92% rename from DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-10-31T06-50-12-0232.json rename to DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-11-01T15-34-57-0056.json index 6f68139..c514653 100644 --- a/DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-10-31T06-50-12-0232.json +++ b/DB_LMS/Debug64/.cmake/api/v1/reply/index-2024-11-01T15-34-57-0056.json @@ -35,7 +35,7 @@ } }, { - "jsonFile" : "cache-v2-87ff728da30d5c1b46b4.json", + "jsonFile" : "cache-v2-8fba00a0d0b5ca55fe65.json", "kind" : "cache", "version" : { @@ -57,7 +57,7 @@ { "cache-v2" : { - "jsonFile" : "cache-v2-87ff728da30d5c1b46b4.json", + "jsonFile" : "cache-v2-8fba00a0d0b5ca55fe65.json", "kind" : "cache", "version" : { diff --git a/DB_LMS/Debug64/.ninja_deps b/DB_LMS/Debug64/.ninja_deps index 8b4562b..5dff066 100644 Binary files a/DB_LMS/Debug64/.ninja_deps and b/DB_LMS/Debug64/.ninja_deps differ diff --git a/DB_LMS/Debug64/.ninja_log b/DB_LMS/Debug64/.ninja_log index b82b4b4..733882b 100644 --- a/DB_LMS/Debug64/.ninja_log +++ b/DB_LMS/Debug64/.ninja_log @@ -1,38 +1,40 @@ # ninja log v5 -19 65 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 -19 65 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 -19 65 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 -19 65 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 -73 114 7519953979924905 CMakeFiles/DataBaseLMS.dir/DataBaseLMS_autogen/mocs_compilation.cpp.obj d9dc0a262f9d4ccd -76 2021 7519953998963985 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 -81 528 7519953984053864 CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj 4ac35fd8ef58e9f -78 530 7519953984073811 CMakeFiles/DataBaseLMS.dir/instructor.cpp.obj fb68571e9d220198 -83 659 7519953985360369 CMakeFiles/DataBaseLMS.dir/group.cpp.obj 70fefc8893e4cb77 -2022 2151 7519954000271671 libDataBaseLMS.dll ff7ea32bf6d01e45 -2022 2151 7519954000271671 libDataBaseLMS.dll.a ff7ea32bf6d01e45 -13 38 0 CMakeFiles/clean.additional 7155004b3956b606 -38 45 0 clean 9c4b4372737ab8da -11 88 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 -11 88 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 -11 88 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 -11 88 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 -89 131 7520878398625762 CMakeFiles/DataBaseLMS.dir/DataBaseLMS_autogen/mocs_compilation.cpp.obj d9dc0a262f9d4ccd -96 543 7520878402734775 CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj 4ac35fd8ef58e9f -94 543 7520878402734775 CMakeFiles/DataBaseLMS.dir/instructor.cpp.obj fb68571e9d220198 -99 674 7520878404051256 CMakeFiles/DataBaseLMS.dir/group.cpp.obj 70fefc8893e4cb77 -91 2052 7520878417814781 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 -2052 2189 7520878419182806 libDataBaseLMS.dll ff7ea32bf6d01e45 -2052 2189 7520878419182806 libDataBaseLMS.dll.a ff7ea32bf6d01e45 -22 47 0 CMakeFiles/clean.additional 7155004b3956b606 47 55 0 clean 9c4b4372737ab8da -11 94 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 -11 94 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 -11 94 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 -11 94 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 -94 551 7521537133322796 CMakeFiles/DataBaseLMS.dir/DataBaseLMS_autogen/mocs_compilation.cpp.obj d9dc0a262f9d4ccd -101 560 7521537133402973 CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj 4ac35fd8ef58e9f -99 560 7521537133402973 CMakeFiles/DataBaseLMS.dir/instructor.cpp.obj fb68571e9d220198 +1951 2080 7522348242331840 libDataBaseLMS.dll.a ff7ea32bf6d01e45 +1951 2080 7522348242331840 libDataBaseLMS.dll ff7ea32bf6d01e45 +22 47 0 CMakeFiles/clean.additional 7155004b3956b606 104 671 7521537134517871 CMakeFiles/DataBaseLMS.dir/group.cpp.obj 70fefc8893e4cb77 -96 2083 7521537148634640 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 -2084 2362 7521537151402412 libDataBaseLMS.dll ff7ea32bf6d01e45 -2084 2362 7521537151402412 libDataBaseLMS.dll.a ff7ea32bf6d01e45 +99 560 7521537133402973 CMakeFiles/DataBaseLMS.dir/instructor.cpp.obj fb68571e9d220198 +53 590 7522403839711265 CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj 4ac35fd8ef58e9f +50 1951 7522348241036252 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 +94 551 7521537133322796 CMakeFiles/DataBaseLMS.dir/DataBaseLMS_autogen/mocs_compilation.cpp.obj d9dc0a262f9d4ccd +15 50 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +15 50 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +15 50 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +15 50 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +15 48 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +15 48 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +15 48 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +15 48 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +48 1982 7522404428246470 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 +1982 2122 7522404429643912 libDataBaseLMS.dll ff7ea32bf6d01e45 +1982 2122 7522404429643912 libDataBaseLMS.dll.a ff7ea32bf6d01e45 +14 51 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +14 51 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +14 51 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +14 51 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +55 602 7522435661437638 CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj 4ac35fd8ef58e9f +52 2052 7522435675931417 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 +2052 2186 7522435677257822 libDataBaseLMS.dll ff7ea32bf6d01e45 +2052 2186 7522435677257822 libDataBaseLMS.dll.a ff7ea32bf6d01e45 +15 47 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +15 47 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +15 47 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +15 47 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +48 1966 7522449510503097 CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj 202016fcb2dffc59 +1966 2101 7522449511856355 libDataBaseLMS.dll ff7ea32bf6d01e45 +1966 2101 7522449511856355 libDataBaseLMS.dll.a ff7ea32bf6d01e45 +15 48 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +15 48 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +15 48 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +15 48 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 diff --git a/DB_LMS/Debug64/CMakeCache.txt b/DB_LMS/Debug64/CMakeCache.txt index e60f265..bca112f 100644 --- a/DB_LMS/Debug64/CMakeCache.txt +++ b/DB_LMS/Debug64/CMakeCache.txt @@ -34,7 +34,7 @@ CMAKE_CODEBLOCKS_EXECUTABLE:FILEPATH=CMAKE_CODEBLOCKS_EXECUTABLE-NOTFOUND // Enter e.g. -j to get parallel builds CMAKE_CODEBLOCKS_MAKE_ARGUMENTS:STRING= -//CXX compiler +//No help, variable specified on the command line. CMAKE_CXX_COMPILER:STRING=C:/Qt/Qt5.14.2/Tools/mingw730_64/bin/g++.exe //A wrapper around 'ar' adding the appropriate '--plugin' option diff --git a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj index 11aaa70..ec2c0a1 100644 Binary files a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj and b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/databaselms.cpp.obj differ diff --git a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj index 9d0a1ad..5f4cf0c 100644 Binary files a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj and b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/trainee.cpp.obj differ diff --git a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen.dir/ParseCache.txt b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen.dir/ParseCache.txt index 2f2db47..7dd565e 100644 --- a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen.dir/ParseCache.txt +++ b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen.dir/ParseCache.txt @@ -1,10 +1,10 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/DB_LMS/DataBaseLMS/trainee.cpp -D:/LMS/DB_LMS/DataBaseLMS/instructor.cpp -D:/LMS/DB_LMS/DataBaseLMS/group.cpp -D:/LMS/DB_LMS/DataBaseLMS/databaselms.cpp -D:/LMS/DB_LMS/DataBaseLMS/trainee.h -D:/LMS/DB_LMS/DataBaseLMS/instructor.h -D:/LMS/DB_LMS/DataBaseLMS/group.h -D:/LMS/DB_LMS/DataBaseLMS/databaselms.h D:/LMS/DB_LMS/DataBaseLMS/DataBaseLMS_global.h +D:/LMS/DB_LMS/DataBaseLMS/databaselms.h +D:/LMS/DB_LMS/DataBaseLMS/group.h +D:/LMS/DB_LMS/DataBaseLMS/instructor.h +D:/LMS/DB_LMS/DataBaseLMS/trainee.h +D:/LMS/DB_LMS/DataBaseLMS/databaselms.cpp +D:/LMS/DB_LMS/DataBaseLMS/group.cpp +D:/LMS/DB_LMS/DataBaseLMS/instructor.cpp +D:/LMS/DB_LMS/DataBaseLMS/trainee.cpp diff --git a/DB_LMS/Debug64/libDataBaseLMS.dll b/DB_LMS/Debug64/libDataBaseLMS.dll index d57a8c9..b36b563 100644 Binary files a/DB_LMS/Debug64/libDataBaseLMS.dll and b/DB_LMS/Debug64/libDataBaseLMS.dll differ diff --git a/DB_LMS/Debug64/libDataBaseLMS.dll.a b/DB_LMS/Debug64/libDataBaseLMS.dll.a index fb8b30c..c86eb49 100644 Binary files a/DB_LMS/Debug64/libDataBaseLMS.dll.a and b/DB_LMS/Debug64/libDataBaseLMS.dll.a differ diff --git a/testDB/Debug64/.cmake/api/v1/reply/cache-v2-6165eceb20812ad8197a.json b/testDB/Debug64/.cmake/api/v1/reply/cache-v2-e72a4de3928879cfd800.json similarity index 99% rename from testDB/Debug64/.cmake/api/v1/reply/cache-v2-6165eceb20812ad8197a.json rename to testDB/Debug64/.cmake/api/v1/reply/cache-v2-e72a4de3928879cfd800.json index a643c2c..1e2318f 100644 --- a/testDB/Debug64/.cmake/api/v1/reply/cache-v2-6165eceb20812ad8197a.json +++ b/testDB/Debug64/.cmake/api/v1/reply/cache-v2-e72a4de3928879cfd800.json @@ -175,7 +175,7 @@ }, { "name" : "HELPSTRING", - "value" : "CXX compiler" + "value" : "No help, variable specified on the command line." } ], "type" : "STRING", diff --git a/testDB/Debug64/.cmake/api/v1/reply/index-2024-10-31T18-27-34-0569.json b/testDB/Debug64/.cmake/api/v1/reply/index-2024-11-01T08-48-28-0606.json similarity index 92% rename from testDB/Debug64/.cmake/api/v1/reply/index-2024-10-31T18-27-34-0569.json rename to testDB/Debug64/.cmake/api/v1/reply/index-2024-11-01T08-48-28-0606.json index 09a29d7..f58bd27 100644 --- a/testDB/Debug64/.cmake/api/v1/reply/index-2024-10-31T18-27-34-0569.json +++ b/testDB/Debug64/.cmake/api/v1/reply/index-2024-11-01T08-48-28-0606.json @@ -35,7 +35,7 @@ } }, { - "jsonFile" : "cache-v2-6165eceb20812ad8197a.json", + "jsonFile" : "cache-v2-e72a4de3928879cfd800.json", "kind" : "cache", "version" : { @@ -57,7 +57,7 @@ { "cache-v2" : { - "jsonFile" : "cache-v2-6165eceb20812ad8197a.json", + "jsonFile" : "cache-v2-e72a4de3928879cfd800.json", "kind" : "cache", "version" : { diff --git a/testDB/Debug64/.ninja_deps b/testDB/Debug64/.ninja_deps index 3b973bc..da52f41 100644 Binary files a/testDB/Debug64/.ninja_deps and b/testDB/Debug64/.ninja_deps differ diff --git a/testDB/Debug64/.ninja_log b/testDB/Debug64/.ninja_log index d720c52..146c230 100644 --- a/testDB/Debug64/.ninja_log +++ b/testDB/Debug64/.ninja_log @@ -1,55 +1,28 @@ # ninja log v5 -11 42 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -425 1550 7520878618305350 CMakeFiles/testDBpgSQL.dir/main.cpp.obj 7c6bf829703494a2 -428 1609 7520878618883805 CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj a213cdc2d21087f1 -11 42 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -8 33 0 CMakeFiles/clean.additional 7155004b3956b606 -382 422 7520878607015845 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 -1609 1738 7520878620162574 testDBpgSQL.exe 481e73a84a688916 -33 40 0 clean 9c4b4372737ab8da -11 42 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -423 1543 7520878618225564 CMakeFiles/testDBpgSQL.dir/testDBpgSQL_autogen/mocs_compilation.cpp.obj 223f91fdbeaff3f0 -11 42 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -11 42 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -382 422 7520878607015845 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 -430 481 7520878607613933 CMakeFiles/testDBpgSQL.dir/testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj 7ac9b57cd808a15a -11 42 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -15 47 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -15 47 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -15 47 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -15 47 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -15 47 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -15 47 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -11 43 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -11 43 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -11 43 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 11 43 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -11 43 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -11 43 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -20 45 0 CMakeFiles/clean.additional 7155004b3956b606 -45 52 0 clean 9c4b4372737ab8da -11 390 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -11 390 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -11 390 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -11 390 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -11 390 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -11 390 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +48 1206 7522450037737204 CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj a213cdc2d21087f1 390 445 7521537275150898 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 +20 45 0 CMakeFiles/clean.additional 7155004b3956b606 +1206 1337 7522450039022557 testDBpgSQL.exe 481e73a84a688916 +45 52 0 clean 9c4b4372737ab8da +43 1159 7522450037263284 CMakeFiles/testDBpgSQL.dir/testDBpgSQL_autogen/mocs_compilation.cpp.obj 223f91fdbeaff3f0 +11 43 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 +11 43 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 +11 43 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 390 445 7521537275150898 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 +11 43 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 452 502 7521537275743574 CMakeFiles/testDBpgSQL.dir/testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj 7ac9b57cd808a15a -445 1557 7521537286276618 CMakeFiles/testDBpgSQL.dir/testDBpgSQL_autogen/mocs_compilation.cpp.obj 223f91fdbeaff3f0 -448 1560 7521537286306827 CMakeFiles/testDBpgSQL.dir/main.cpp.obj 7c6bf829703494a2 -450 1593 7521537286635932 CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj a213cdc2d21087f1 -1593 1729 7521537287999239 testDBpgSQL.exe 481e73a84a688916 -15 54 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -15 54 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -15 54 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -15 54 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -15 54 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -15 54 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -11 42 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -11 42 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -11 42 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -11 42 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 -11 42 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -11 42 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +11 43 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +45 1201 7522450037666470 CMakeFiles/testDBpgSQL.dir/main.cpp.obj 7c6bf829703494a2 +15 45 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 +15 45 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 +15 45 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +15 45 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 +15 45 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 +15 45 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +12 43 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 +12 43 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 +12 43 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +12 43 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 +12 43 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 +12 43 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 diff --git a/testDB/Debug64/CMakeCache.txt b/testDB/Debug64/CMakeCache.txt index fc2ab8c..eb67157 100644 --- a/testDB/Debug64/CMakeCache.txt +++ b/testDB/Debug64/CMakeCache.txt @@ -34,7 +34,7 @@ CMAKE_CODEBLOCKS_EXECUTABLE:FILEPATH=CMAKE_CODEBLOCKS_EXECUTABLE-NOTFOUND // Enter e.g. -j to get parallel builds CMAKE_CODEBLOCKS_MAKE_ARGUMENTS:STRING= -//CXX compiler +//No help, variable specified on the command line. CMAKE_CXX_COMPILER:STRING=C:/Qt/Qt5.14.2/Tools/mingw730_64/bin/g++.exe //A wrapper around 'ar' adding the appropriate '--plugin' option diff --git a/testDB/Debug64/CMakeFiles/testDBpgSQL.dir/main.cpp.obj b/testDB/Debug64/CMakeFiles/testDBpgSQL.dir/main.cpp.obj index fd97903..bd6a43e 100644 Binary files a/testDB/Debug64/CMakeFiles/testDBpgSQL.dir/main.cpp.obj and b/testDB/Debug64/CMakeFiles/testDBpgSQL.dir/main.cpp.obj differ diff --git a/testDB/Debug64/CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj b/testDB/Debug64/CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj index 5fecd88..f78b1a7 100644 Binary files a/testDB/Debug64/CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj and b/testDB/Debug64/CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj differ diff --git a/testDB/Debug64/libDataBaseLMS.dll b/testDB/Debug64/libDataBaseLMS.dll index d57a8c9..b36b563 100644 Binary files a/testDB/Debug64/libDataBaseLMS.dll and b/testDB/Debug64/libDataBaseLMS.dll differ diff --git a/testDB/Debug64/libInstructorsAndTrainees.dll b/testDB/Debug64/libInstructorsAndTrainees.dll index 30cb789..fd8974d 100644 Binary files a/testDB/Debug64/libInstructorsAndTrainees.dll and b/testDB/Debug64/libInstructorsAndTrainees.dll differ diff --git a/testDB/Debug64/testDBpgSQL.exe b/testDB/Debug64/testDBpgSQL.exe index 2ba9f6f..70ffbbd 100644 Binary files a/testDB/Debug64/testDBpgSQL.exe and b/testDB/Debug64/testDBpgSQL.exe differ diff --git a/testDB/testDBpgSQL/CMakeLists.txt.user b/testDB/testDBpgSQL/CMakeLists.txt.user index 68a8302..1b5845d 100644 --- a/testDB/testDBpgSQL/CMakeLists.txt.user +++ b/testDB/testDBpgSQL/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/testDB/testDBpgSQL/main.cpp b/testDB/testDBpgSQL/main.cpp index e24472c..8c84ab1 100644 --- a/testDB/testDBpgSQL/main.cpp +++ b/testDB/testDBpgSQL/main.cpp @@ -5,7 +5,15 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - MainWindow w; - w.show(); - return a.exec(); + + try + { + MainWindow w; + w.show(); + return a.exec(); + } + catch( const std::exception& e ) + { + return 1; + } } diff --git a/testDB/testDBpgSQL/mainwindow.cpp b/testDB/testDBpgSQL/mainwindow.cpp index 6d4fa05..877d9c5 100644 --- a/testDB/testDBpgSQL/mainwindow.cpp +++ b/testDB/testDBpgSQL/mainwindow.cpp @@ -12,6 +12,13 @@ MainWindow::MainWindow(QWidget *parent) ui->setupUi(this); m_instructorsAndTraineesWidget = new InstructorsAndTraineesWidget(this); + if(! m_instructorsAndTraineesWidget->authorizationCompleted()) + { + delete m_instructorsAndTraineesWidget; + delete ui; + throw(std::exception()); + } + ui->horizontalLayout->addWidget(m_instructorsAndTraineesWidget); this->move(0, 0);