сделал newInstructor

This commit is contained in:
krivoshein
2024-12-11 12:50:52 +03:00
parent 4556c07fc9
commit 0cb03e49b1
89 changed files with 1318 additions and 671 deletions

Binary file not shown.

View File

@@ -1,45 +1,71 @@
# ninja log v5
677 3853 7554562145145887 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58
57 131 7554545608656604 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2
1287 8367 7551893701770796 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 68e3223fc0caab27
661 3491 7554562141472208 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c
20 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
670 3628 7554562142871886 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf
667 3606 7554562142650068 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92
15 42 0 CMakeFiles/clean.additional 7155004b3956b606
91 1201 7554437549810915 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429
3853 4366 7554562150244849 libServerLMS.dll fec6fbb0697e8d71
663 3554 7554562142134874 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2
502 3592 7555451364089188 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8
560 1985 7551946363807047 CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj f56962914220ed2d
654 3656 7554562143124061 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8
512 3490 7555451363061889 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2
2332 2877 7556082950935783 libServerLMS.dll 2f530586cec8163
15 42 0 CMakeFiles/clean.additional 7155004b3956b606
515 3750 7555451365673496 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92
60 2331 7556082945956464 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf
67 1245 7555255334257083 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429
19 60 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
510 3426 7555451362416146 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c
1287 8367 7551893701770796 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 68e3223fc0caab27
58 146 7556063608211066 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2
524 3277 7555451360947906 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58
42 52 0 clean 9c4b4372737ab8da
673 3326 7554562139850549 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754
57 131 7554545608656604 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2
20 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
20 57 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
131 418 7554545611552788 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0
659 3399 7554562140587891 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608
20 57 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
2332 2877 7556082950935783 libServerLMS.dll.a 2f530586cec8163
19 60 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738
19 60 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738
13 278 7556089586291454 build.ninja 80e6aedf30bdcc22
505 3625 7555451364422143 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc
148 208 7556063608859324 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0
1168 3150 7548373207023899 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 8dd57f666ed5ecf4
656 3806 7554562144601131 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc
10 630 7555161399398118 build.ninja 80e6aedf30bdcc22
20 57 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738
20 57 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738
3853 4366 7554562150244849 libServerLMS.dll.a fec6fbb0697e8d71
48 2877 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738
48 2877 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
48 2877 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
48 2877 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738
48 2877 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
48 2877 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
2894 6513 7555186922184255 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754
2896 6514 7555186922184255 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58
2889 6527 7555186922343826 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92
2877 6542 7555186922473480 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8
2882 6544 7555186922493428 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608
2884 6548 7555186922533325 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c
2887 6561 7555186922672947 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2
2879 6570 7555186922762708 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc
2891 6581 7555186922872413 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf
6581 7342 7555186930472205 libServerLMS.dll fec6fbb0697e8d71
6581 7342 7555186930472205 libServerLMS.dll.a fec6fbb0697e8d71
19 60 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
507 3524 7555451363415451 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608
19 60 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
19 60 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
58 146 7556063608211066 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2
521 3477 7555451362940322 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754
15 261 7556089586291454 build.ninja 80e6aedf30bdcc22
25 63 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738
25 63 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
25 63 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
25 63 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738
25 63 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
25 63 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
63 116 7556089587835465 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2
63 116 7556089587835465 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2
118 178 7556089588473760 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0
116 2468 7556089611351349 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf
2468 3013 7556089616356205 libServerLMS.dll 2f530586cec8163
2468 3013 7556089616356205 libServerLMS.dll.a 2f530586cec8163
19 55 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738
19 55 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
19 55 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
19 55 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738
19 55 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
19 55 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
14 348 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738
14 348 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
14 348 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
14 348 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738
14 348 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
14 348 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
374 1624 7556117280871720 CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj f56962914220ed2d
348 3455 7556117299153466 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8
353 3475 7556117299357391 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608
371 3497 7556117299589271 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58
358 3565 7556117300284968 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2
351 3594 7556117300558270 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc
368 3611 7556117300739458 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754
355 3621 7556117300840282 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c
361 3631 7556117300932195 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92
365 3822 7556117302853252 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf
3822 4380 7556117307934398 libServerLMS.dll 2f530586cec8163
3822 4380 7556117307934398 libServerLMS.dll.a 2f530586cec8163
19 55 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738
19 55 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
19 55 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738
19 55 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738
19 55 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738
19 55 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738

View File

@@ -8,8 +8,9 @@
"INCLUDE_DIR" : "D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include",
"INPUTS" :
[
"D:/LMS/ServerLMS/ServerLMS/blankXML/instructors.xml",
"D:/LMS/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml",
"D:/LMS/ServerLMS/ServerLMS/blankXML/ListTrainees.xml",
"D:/LMS/ServerLMS/ServerLMS/blankXML/ListGroups.xml",
"D:/LMS/ServerLMS/ServerLMS/blankXML/ListInstructors.xml",
"D:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png",
"D:/LMS/ServerLMS/ServerLMS/icons/trainee.png",
"D:/LMS/ServerLMS/ServerLMS/icons/switchOff.png",

View File

@@ -1 +1 @@
rcc:bf046fc9861cbeaf107298fd7fe4da86934145f3f69eccf800e3566f05705fa0
rcc:db983daaeb04a78d5d179140c4ee705a97f0f54ef5ef39bdcfd89a791fc8c114

View File

@@ -1,37 +1,37 @@
# Generated by CMake. Changes will be overwritten.
D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp
D:/LMS/ServerLMS/ServerLMS/clienthandler.h
D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp
D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/Systems/tools.h
D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h
D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/logger.h
D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp
uic:ui_serverlmswidget.h
D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h
D:/LMS/ServerLMS/ServerLMS/Systems/logger.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp
D:/LMS/ServerLMS/ServerLMS/providerdblms.h
D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/Client.h
D:/LMS/ServerLMS/ServerLMS/multithreadserver.h
D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp
D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp
D:/LMS/ServerLMS/ServerLMS/providerdblms.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h
D:/LMS/ServerLMS/ServerLMS/Systems/tools.h
D:/LMS/ServerLMS/ServerLMS/clienthandler.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp
D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h
D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h
D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h
D:/LMS/ServerLMS/ServerLMS/multithreadserver.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp
D:/LMS/ServerLMS/ServerLMS/Client.h
D:/LMS/ServerLMS/ServerLMS/providerdblms.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp
D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp
D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp
D:/LMS/ServerLMS/ServerLMS/providerdblms.h
mmc:Q_OBJECT
D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp

View File

@@ -7,26 +7,30 @@
*****************************************************************************/
static const unsigned char qt_resource_data[] = {
// D:/LMS/ServerLMS/ServerLMS/blankXML/instructors.xml
0x0,0x0,0x0,0x4d,
// D:/LMS/ServerLMS/ServerLMS/blankXML/ListTrainees.xml
0x0,0x0,0x0,0x49,
0x3c,
0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x27,0x31,0x2e,
0x30,0x27,0x20,0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x27,0x75,0x74,0x66,
0x2d,0x38,0x27,0x3f,0x3e,0xd,0xa,0x3c,0x61,0x6c,0x6c,0x49,0x6e,0x73,0x74,0x72,
0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,0x3c,0x2f,0x61,0x6c,0x6c,0x49,0x6e,
0x73,0x74,0x72,0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,
// D:/LMS/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml
0x0,0x0,0x0,0x89,
0x2d,0x38,0x27,0x3f,0x3e,0xd,0xa,0x3c,0x4c,0x69,0x73,0x74,0x54,0x72,0x61,0x69,
0x6e,0x65,0x65,0x73,0x3e,0xd,0xa,0x3c,0x2f,0x4c,0x69,0x73,0x74,0x54,0x72,0x61,
0x69,0x6e,0x65,0x65,0x73,0x3e,0xd,0xa,
// D:/LMS/ServerLMS/ServerLMS/blankXML/ListGroups.xml
0x0,0x0,0x0,0x45,
0x3c,
0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x27,0x31,0x2e,
0x30,0x27,0x20,0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x27,0x75,0x74,0x66,
0x2d,0x38,0x27,0x3f,0x3e,0xd,0xa,0x3c,0x41,0x6c,0x6c,0x4c,0x69,0x73,0x74,0x73,
0x3e,0xd,0xa,0x9,0x3c,0x47,0x72,0x6f,0x75,0x70,0x73,0x54,0x72,0x61,0x69,0x6e,
0x65,0x65,0x73,0x3e,0xd,0xa,0x9,0x3c,0x2f,0x47,0x72,0x6f,0x75,0x70,0x73,0x54,
0x72,0x61,0x69,0x6e,0x65,0x65,0x73,0x3e,0xd,0xa,0x9,0x3c,0x49,0x6e,0x73,0x74,
0x72,0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,0x9,0x3c,0x2f,0x49,0x6e,0x73,
0x74,0x72,0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,0x3c,0x2f,0x41,0x6c,0x6c,
0x4c,0x69,0x73,0x74,0x73,0x3e,0xd,0xa,
0x2d,0x38,0x27,0x3f,0x3e,0xd,0xa,0x3c,0x4c,0x69,0x73,0x74,0x47,0x72,0x6f,0x75,
0x70,0x73,0x3e,0xd,0xa,0x3c,0x2f,0x4c,0x69,0x73,0x74,0x47,0x72,0x6f,0x75,0x70,
0x73,0x3e,0xd,0xa,
// D:/LMS/ServerLMS/ServerLMS/blankXML/ListInstructors.xml
0x0,0x0,0x0,0x4f,
0x3c,
0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x27,0x31,0x2e,
0x30,0x27,0x20,0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x27,0x75,0x74,0x66,
0x2d,0x38,0x27,0x3f,0x3e,0xd,0xa,0x3c,0x4c,0x69,0x73,0x74,0x49,0x6e,0x73,0x74,
0x72,0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,0x3c,0x2f,0x4c,0x69,0x73,0x74,
0x49,0x6e,0x73,0x74,0x72,0x75,0x63,0x74,0x6f,0x72,0x73,0x3e,0xd,0xa,
// D:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png
0x0,0x0,0xc,0xc7,
0x89,
@@ -871,17 +875,22 @@ static const unsigned char qt_resource_name[] = {
0x2,0x85,0x0,0x3c,
0x0,0x62,
0x0,0x6c,0x0,0x61,0x0,0x6e,0x0,0x6b,0x0,0x58,0x0,0x4d,0x0,0x4c,
// instructors.xml
0x0,0xf,
0x3,0xe8,0xeb,0x3c,
0x0,0x69,
0x0,0x6e,0x0,0x73,0x0,0x74,0x0,0x72,0x0,0x75,0x0,0x63,0x0,0x74,0x0,0x6f,0x0,0x72,0x0,0x73,0x0,0x2e,0x0,0x78,0x0,0x6d,0x0,0x6c,
// groupsTrainees.xml
0x0,0x12,
0x1,0x13,0xe,0x7c,
0x0,0x67,
0x0,0x72,0x0,0x6f,0x0,0x75,0x0,0x70,0x0,0x73,0x0,0x54,0x0,0x72,0x0,0x61,0x0,0x69,0x0,0x6e,0x0,0x65,0x0,0x65,0x0,0x73,0x0,0x2e,0x0,0x78,0x0,0x6d,
0x0,0x6c,
// ListTrainees.xml
0x0,0x10,
0x8,0xa2,0x1d,0x1c,
0x0,0x4c,
0x0,0x69,0x0,0x73,0x0,0x74,0x0,0x54,0x0,0x72,0x0,0x61,0x0,0x69,0x0,0x6e,0x0,0x65,0x0,0x65,0x0,0x73,0x0,0x2e,0x0,0x78,0x0,0x6d,0x0,0x6c,
// ListGroups.xml
0x0,0xe,
0xd,0x27,0x99,0x3c,
0x0,0x4c,
0x0,0x69,0x0,0x73,0x0,0x74,0x0,0x47,0x0,0x72,0x0,0x6f,0x0,0x75,0x0,0x70,0x0,0x73,0x0,0x2e,0x0,0x78,0x0,0x6d,0x0,0x6c,
// ListInstructors.xml
0x0,0x13,
0xf,0xcf,0x69,0xbc,
0x0,0x4c,
0x0,0x69,0x0,0x73,0x0,0x74,0x0,0x49,0x0,0x6e,0x0,0x73,0x0,0x74,0x0,0x72,0x0,0x75,0x0,0x63,0x0,0x74,0x0,0x6f,0x0,0x72,0x0,0x73,0x0,0x2e,0x0,0x78,
0x0,0x6d,0x0,0x6c,
// instructorAdmin.png
0x0,0x13,
0x8,0x7,0x7d,0x47,
@@ -916,31 +925,34 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/icons
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x5,0x0,0x0,0x0,0x5,
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x5,0x0,0x0,0x0,0x6,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/blankXML
0x0,0x0,0x0,0x10,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x3,
0x0,0x0,0x0,0x10,0x0,0x2,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x3,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/blankXML/groupsTrainees.xml
0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x51,
0x0,0x0,0x1,0x93,0xab,0x9a,0xd3,0x2e,
// :/blankXML/instructors.xml
// :/blankXML/ListTrainees.xml
0x0,0x0,0x0,0x26,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
0x0,0x0,0x1,0x92,0xb8,0x51,0xd,0xb7,
0x0,0x0,0x1,0x93,0xb4,0xad,0xbc,0x5b,
// :/blankXML/ListGroups.xml
0x0,0x0,0x0,0x4c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x4d,
0x0,0x0,0x1,0x93,0xb0,0xf,0xc,0x76,
// :/blankXML/ListInstructors.xml
0x0,0x0,0x0,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x96,
0x0,0x0,0x1,0x93,0xaf,0xe1,0x2d,0xb8,
// :/icons/switchOff.png
0x0,0x0,0x0,0xbc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x16,0x89,
0x0,0x0,0x0,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x16,0x94,
0x0,0x0,0x1,0x93,0x86,0xa5,0x5c,0x99,
// :/icons/instructor.png
0x0,0x0,0x0,0xfa,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x28,0xcd,
0x0,0x0,0x1,0x20,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x28,0xd8,
0x0,0x0,0x1,0x8f,0x37,0xdf,0xf0,0x30,
// :/icons/switchOn.png
0x0,0x0,0x0,0xdc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1f,0xa5,
0x0,0x0,0x1,0x2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1f,0xb0,
0x0,0x0,0x1,0x93,0x86,0xa5,0x5c,0x9d,
// :/icons/trainee.png
0x0,0x0,0x0,0xa0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xd,0xa9,
0x0,0x0,0x0,0xc6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xd,0xb4,
0x0,0x0,0x1,0x8e,0x8a,0x13,0x52,0xd0,
// :/icons/instructorAdmin.png
0x0,0x0,0x0,0x74,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xde,
0x0,0x0,0x0,0x9a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xe9,
0x0,0x0,0x1,0x8f,0x57,0x71,0xc1,0x80,
};

View File

@@ -166,7 +166,7 @@ build libServerLMS.dll libServerLMS.dll.a: CXX_SHARED_LIBRARY_LINKER__ServerLMS_
LINK_LIBRARIES = C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/libQt5Widgets.a C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/libQt5Network.a C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/libQt5Concurrent.a C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/libQt5Sql.a C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/libQt5Xml.a -lDataBaseLMS C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/libQt5Gui.a C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/libQt5Core.a -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32
LINK_PATH = -LD:/LMS/ServerLMS/ServerLMS/../../DB_LMS/Debug64
OBJECT_DIR = CMakeFiles\ServerLMS.dir
POST_BUILD = cd .
POST_BUILD = C:\Windows\system32\cmd.exe /C "cd /D D:\LMS\ServerLMS\Debug64 && C:\msys64\mingw64\bin\cmake.exe -E copy_if_different d:/LMS/ServerLMS/Debug64/libServerLMS.dll d:/LMS/TestServerLMS/Debug64"
PRE_LINK = cd .
RESTAT = 1
TARGET_FILE = libServerLMS.dll
@@ -206,7 +206,7 @@ build ServerLMS_autogen: phony CMakeFiles/ServerLMS_autogen ServerLMS_autogen/mo
#############################################
# Custom command for ServerLMS_autogen\EWIEGA46WW\qrc_resources.cpp
build ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp | ${cmake_ninja_workdir}ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp: CUSTOM_COMMAND D$:/LMS/ServerLMS/ServerLMS/resources.qrc CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json D$:/LMS/ServerLMS/ServerLMS/blankXML/instructors.xml D$:/LMS/ServerLMS/ServerLMS/blankXML/groupsTrainees.xml D$:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png D$:/LMS/ServerLMS/ServerLMS/icons/trainee.png D$:/LMS/ServerLMS/ServerLMS/icons/switchOff.png D$:/LMS/ServerLMS/ServerLMS/icons/switchOn.png D$:/LMS/ServerLMS/ServerLMS/icons/instructor.png C$:/Qt/Qt5.14.2/5.14.2/mingw73_64/bin/rcc.exe || ServerLMS_autogen
build ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp | ${cmake_ninja_workdir}ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp: CUSTOM_COMMAND D$:/LMS/ServerLMS/ServerLMS/resources.qrc CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json D$:/LMS/ServerLMS/ServerLMS/blankXML/ListTrainees.xml D$:/LMS/ServerLMS/ServerLMS/blankXML/ListGroups.xml D$:/LMS/ServerLMS/ServerLMS/blankXML/ListInstructors.xml D$:/LMS/ServerLMS/ServerLMS/icons/instructorAdmin.png D$:/LMS/ServerLMS/ServerLMS/icons/trainee.png D$:/LMS/ServerLMS/ServerLMS/icons/switchOff.png D$:/LMS/ServerLMS/ServerLMS/icons/switchOn.png D$:/LMS/ServerLMS/ServerLMS/icons/instructor.png C$:/Qt/Qt5.14.2/5.14.2/mingw73_64/bin/rcc.exe || ServerLMS_autogen
COMMAND = C:\Windows\system32\cmd.exe /C "cd /D D:\LMS\ServerLMS\Debug64 && C:\msys64\mingw64\bin\cmake.exe -E cmake_autorcc D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/AutoRcc_resources_EWIEGA46WW_Info.json Debug"
DESC = Automatic RCC for resources.qrc
restat = 1

Binary file not shown.

Binary file not shown.

View File

@@ -72,3 +72,10 @@ target_link_libraries(ServerLMS PRIVATE libDataBaseLMS.dll)
target_compile_definitions(ServerLMS PRIVATE SERVERLMS_LIBRARY)
add_custom_command(TARGET ServerLMS
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
d:/LMS/ServerLMS/Debug64/libServerLMS.dll
d:/LMS/TestServerLMS/Debug64)

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2024-12-09T17:51:45. -->
<!-- Written by QtCreator 4.11.1, 2024-12-10T17:52:46. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>

View File

@@ -365,6 +365,134 @@ QByteArray DataParser::xmlAnswer_ClientQueryToDB(bool result, QList<Instructor>*
return groupsTraineesDOM.toByteArray();
}
bool DataParser::loadBlankXML(QString nameFile, QDomDocument *commonDOM)
{
QFile blankFile(":/blankXML/" + nameFile);
if (! blankFile.open(QFile::ReadOnly | QFile::Text)) {
qDebug() << "loadBlankXML: Не удалось считать файл :/blankXML/" + nameFile;
return false;
}
commonDOM->setContent(blankFile.readAll());
blankFile.close();
return true;
}
bool DataParser::saveDOMtoXML(QString nameFile, QDomDocument *commonDOM)
{
QFile xmlOutFile(nameFile);
if (!xmlOutFile.open(QFile::WriteOnly | QFile::Text))
{
qDebug() << "saveDOMtoXML: Не удалось записать файл " + nameFile;
return false;
}
else
{
QTextStream outFile(&xmlOutFile);
commonDOM->save(outFile, 4);
xmlOutFile.close();
}
return true;
}
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListInstructors(bool result, QList<Instructor> *listInstructors)
{
QDomDocument commonDOM;
if(! loadBlankXML("ListInstructors.xml", &commonDOM))
return QByteArray();
QDomNode listNode = commonDOM.namedItem("ListInstructors");
for(Instructor instructor : *listInstructors)
{
//Инструктор
QDomNode instructorNode = commonDOM.createElement("Instructor");
listNode.appendChild(instructorNode);
instructorNode.toElement().setAttribute("instructor_id", QString::number(instructor.getID()));
instructorNode.toElement().setAttribute("name", instructor.getName());
instructorNode.toElement().setAttribute("login", instructor.getLogin());
instructorNode.toElement().setAttribute("password", instructor.getPassword());
instructorNode.toElement().setAttribute("is_admin", instructor.getIsAdmin());
instructorNode.toElement().setAttribute("archived", instructor.getArchived());
instructorNode.toElement().setAttribute("logged_in", instructor.getLoggedIn());
}
saveDOMtoXML("ListInstructors.xml", &commonDOM);
return commonDOM.toByteArray();
}
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListGroups(bool result, QList<Group> *listGroups)
{
QDomDocument commonDOM;
if(! loadBlankXML("ListGroups.xml", &commonDOM))
return QByteArray();
QDomNode listNode = commonDOM.namedItem("ListGroups");
for(Group group : *listGroups)
{
//Группа
QDomNode groupNode = commonDOM.createElement("Group");
listNode.appendChild(groupNode);
groupNode.toElement().setAttribute("group_id", QString::number(group.getID()));
groupNode.toElement().setAttribute("name", group.getName());
}
saveDOMtoXML("ListGroups.xml", &commonDOM);
return commonDOM.toByteArray();
}
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListTrainees(bool result, QList<Trainee> *listTrainees)
{
QDomDocument commonDOM;
if(! loadBlankXML("ListTrainees.xml", &commonDOM))
return QByteArray();
QDomNode listNode = commonDOM.namedItem("ListTrainees");
for(Trainee trainee : *listTrainees)
{
//Обучаемый
QDomNode traineeNode = commonDOM.createElement("Trainee");
listNode.appendChild(traineeNode);
traineeNode.toElement().setAttribute("trainee_id", trainee.getID());
traineeNode.toElement().setAttribute("name", trainee.getName());
traineeNode.toElement().setAttribute("login", trainee.getLogin());
traineeNode.toElement().setAttribute("password", trainee.getPassword());
traineeNode.toElement().setAttribute("archived", trainee.getArchived());
traineeNode.toElement().setAttribute("logged_in", trainee.getLoggedIn());
traineeNode.toElement().setAttribute("group_trainee", trainee.getGroup().getID());
traineeNode.toElement().setAttribute("computer_trainee", trainee.getComputer().getID());
//trainee.setTasks()
}
saveDOMtoXML("ListTrainees.xml", &commonDOM);
return commonDOM.toByteArray();
}
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListComputers(bool result, QList<Computer> *listComputers)
{
//TODO
return QByteArray();
}
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListClassrooms(bool result, QList<Classroom> *listClassrooms)
{
//TODO
return QByteArray();
}
QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListTasks(bool result, QList<Task> *listTasks)
{
//TODO
return QByteArray();
}
QByteArray DataParser::xmlAnswer_message(QString text)
{
QList<SXmlAnswerTag> listTag;

View File

@@ -11,6 +11,7 @@
#include <QByteArray>
#include <QXmlStreamReader>
#include <QDebug>
#include <QDomDocument>
class ProcessingSystem;
class ClientHandler;
@@ -31,6 +32,15 @@ public:
QByteArray xmlAnswer_ClientQueryToDB(bool result, QList<Instructor>* listInstructors = nullptr,
QList<Trainee>* listTrainees = nullptr, QList<Group>* listGroups = nullptr);
bool loadBlankXML(QString nameFile, QDomDocument* commonDOM);
bool saveDOMtoXML(QString nameFile, QDomDocument* commonDOM);
QByteArray xmlAnswer_ClientQueryToDB_ListInstructors(bool result, QList<Instructor>* listInstructors);
QByteArray xmlAnswer_ClientQueryToDB_ListGroups(bool result, QList<Group> *listGroups);
QByteArray xmlAnswer_ClientQueryToDB_ListTrainees(bool result, QList<Trainee> *listTrainees);
QByteArray xmlAnswer_ClientQueryToDB_ListComputers(bool result, QList<Computer> *listComputers);
QByteArray xmlAnswer_ClientQueryToDB_ListClassrooms(bool result, QList<Classroom> *listClassrooms);
QByteArray xmlAnswer_ClientQueryToDB_ListTasks(bool result, QList<Task> *listTasks);
QByteArray xmlAnswer_message(QString text);
QByteArray xmlAnswer_task(QString text);
QByteArray xmlAnswer_notify(QString code);
@@ -41,6 +51,7 @@ public:
QList<FileData> *getDatas() const;
signals:
void sigLogMessage(QString log);

View File

@@ -130,12 +130,26 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
QList<Instructor> listInstructors = providerDBLMS->GetListAllInstructors();
QList<Trainee> listTrainees = providerDBLMS->GetListAllTrainees();
QList<Group> listGroups = providerDBLMS->GetListAllGroups();
arrayAnswer = dataParser->xmlAnswer_ClientQueryToDB(true, &listInstructors, &listTrainees, &listGroups);
arrayAnswer = dataParser->xmlAnswer_ClientQueryToDB_ListInstructors(true, &listInstructors);
client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS);
arrayAnswer = dataParser->xmlAnswer_ClientQueryToDB_ListGroups(true, &listGroups);
client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS);
arrayAnswer = dataParser->xmlAnswer_ClientQueryToDB_ListTrainees(true, &listTrainees);
client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES);
break;
}
case TypeQueryToDB::TYPE_QUERY_NEW_INSTRUCTOR:
{
providerDBLMS->newInstructor();
emit sigAuthChanged();
break;
}
}
client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_ON_QUERY_TO_DB);
//client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB_LIST_INSTRUCTORS);
//QString str = QString(arrayAnswer);
//logger->addTextToLogger("To Client: " + str);

View File

@@ -32,8 +32,13 @@ enum PacketType
TYPE_DISABLE = 11,
TYPE_FILESIZE = 20,
TYPE_GET_LIST_INSTRUCTORS = 100,
TYPE_XMLANSWER_ON_QUERY_TO_DB = 101 //xml-ответ на запрос к БД
//xml-ответы на запросы к БД
TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS = 100,
TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS = 101,
TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES = 102,
TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS = 103,
TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS = 104,
TYPE_XMLANSWER_QUERY_DB__LIST_TASKS = 105
};
Q_DECLARE_METATYPE(PacketType)

View File

@@ -1,3 +1,3 @@
<?xml version='1.0' encoding='utf-8'?>
<allInstructors>
</allInstructors>
<ListGroups>
</ListGroups>

View File

@@ -0,0 +1,3 @@
<?xml version='1.0' encoding='utf-8'?>
<ListInstructors>
</ListInstructors>

View File

@@ -0,0 +1,3 @@
<?xml version='1.0' encoding='utf-8'?>
<ListTrainees>
</ListTrainees>

View File

@@ -1,7 +0,0 @@
<?xml version='1.0' encoding='utf-8'?>
<AllLists>
<GroupsTrainees>
</GroupsTrainees>
<Instructors>
</Instructors>
</AllLists>

View File

@@ -252,3 +252,8 @@ QList<Group> ProviderDBLMS::GetListAllGroups()
mtxAccess.unlock();
return listGroups;
}
int ProviderDBLMS::newInstructor()
{
return dbLMS->newInstructor();
}

View File

@@ -28,6 +28,8 @@ public:
QList<Trainee> GetListAllTrainees();
QList<Group> GetListAllGroups();
int newInstructor();
Q_SIGNALS:
//сигнал о блокировке авторизации
void signal_BlockAutorization(bool block);

View File

@@ -5,7 +5,8 @@
<file>icons/trainee.png</file>
<file>icons/switchOff.png</file>
<file>icons/switchOn.png</file>
<file>blankXML/groupsTrainees.xml</file>
<file>blankXML/instructors.xml</file>
<file>blankXML/ListInstructors.xml</file>
<file>blankXML/ListGroups.xml</file>
<file>blankXML/ListTrainees.xml</file>
</qresource>
</RCC>

View File

@@ -58,7 +58,8 @@ public:
enum TypeQueryToDB{
TYPE_QUERY_GET_LIST_INSTRUCTORS,
TYPE_QUERY_GET_ALL_LISTS
TYPE_QUERY_GET_ALL_LISTS,
TYPE_QUERY_NEW_INSTRUCTOR
};
class ClientQueryToDB{