diff --git a/InstructorsAndTrainees/resources/icons/DB-instructors.png b/InstructorsAndTrainees/resources/icons/DB-instructors.png index c1cdab5..9b7481f 100644 Binary files a/InstructorsAndTrainees/resources/icons/DB-instructors.png and b/InstructorsAndTrainees/resources/icons/DB-instructors.png differ diff --git a/InstructorsAndTrainees/resources/icons/DB-trainees.png b/InstructorsAndTrainees/resources/icons/DB-trainees.png index 9688ebf..76284db 100644 Binary files a/InstructorsAndTrainees/resources/icons/DB-trainees.png and b/InstructorsAndTrainees/resources/icons/DB-trainees.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/DB-instructors.png b/InstructorsAndTrainees/resources/icons/PNG/DB-instructors.png new file mode 100644 index 0000000..c1cdab5 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/DB-instructors.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/DB-trainees.png b/InstructorsAndTrainees/resources/icons/PNG/DB-trainees.png new file mode 100644 index 0000000..9688ebf Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/DB-trainees.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/addInstructor.png b/InstructorsAndTrainees/resources/icons/PNG/addInstructor.png new file mode 100644 index 0000000..9436c63 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/addInstructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/addTrainee.png b/InstructorsAndTrainees/resources/icons/PNG/addTrainee.png new file mode 100644 index 0000000..7693478 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/addTrainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/admin.png b/InstructorsAndTrainees/resources/icons/PNG/admin.png new file mode 100644 index 0000000..66959ba Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/admin.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/archive.png b/InstructorsAndTrainees/resources/icons/PNG/archive.png new file mode 100644 index 0000000..0b98e02 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/archive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/assignTask.png b/InstructorsAndTrainees/resources/icons/PNG/assignTask.png new file mode 100644 index 0000000..cd87789 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/assignTask.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/check.png b/InstructorsAndTrainees/resources/icons/PNG/check.png new file mode 100644 index 0000000..3163b36 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/check.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/chekNo.png b/InstructorsAndTrainees/resources/icons/PNG/chekNo.png new file mode 100644 index 0000000..85940d2 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/chekNo.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/chekYes.png b/InstructorsAndTrainees/resources/icons/PNG/chekYes.png new file mode 100644 index 0000000..05c86d1 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/chekYes.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/circleGray.png b/InstructorsAndTrainees/resources/icons/PNG/circleGray.png new file mode 100644 index 0000000..c2cf426 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/circleGray.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/circleGreen.png b/InstructorsAndTrainees/resources/icons/PNG/circleGreen.png new file mode 100644 index 0000000..bcbce3d Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/circleGreen.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/circleRed.png b/InstructorsAndTrainees/resources/icons/PNG/circleRed.png new file mode 100644 index 0000000..9be2b42 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/circleRed.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/circleYellow.png b/InstructorsAndTrainees/resources/icons/PNG/circleYellow.png new file mode 100644 index 0000000..3ad6b3b Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/circleYellow.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/connectDB.png b/InstructorsAndTrainees/resources/icons/PNG/connectDB.png new file mode 100644 index 0000000..76f8737 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/connectDB.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/delete.png b/InstructorsAndTrainees/resources/icons/PNG/delete.png new file mode 100644 index 0000000..1abb5de Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/delete.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/deleteGroup.png b/InstructorsAndTrainees/resources/icons/PNG/deleteGroup.png new file mode 100644 index 0000000..a8cb2b9 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/deleteGroup.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png b/InstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png new file mode 100644 index 0000000..99c6196 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png b/InstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png new file mode 100644 index 0000000..fd2c6dd Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/docTasks.png b/InstructorsAndTrainees/resources/icons/PNG/docTasks.png new file mode 100644 index 0000000..6c9248d Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/docTasks.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/edit.png b/InstructorsAndTrainees/resources/icons/PNG/edit.png new file mode 100644 index 0000000..bc05807 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/edit.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/editorDB.png b/InstructorsAndTrainees/resources/icons/PNG/editorDB.png new file mode 100644 index 0000000..c701ab6 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/editorDB.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/filter.png b/InstructorsAndTrainees/resources/icons/PNG/filter.png new file mode 100644 index 0000000..7f4e679 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/filter.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/group.png b/InstructorsAndTrainees/resources/icons/PNG/group.png new file mode 100644 index 0000000..01e0d9e Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/group.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/instructor.png b/InstructorsAndTrainees/resources/icons/PNG/instructor.png new file mode 100644 index 0000000..cc448f2 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/instructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png b/InstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png new file mode 100644 index 0000000..c9d18ff Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/instructorArchive.png b/InstructorsAndTrainees/resources/icons/PNG/instructorArchive.png new file mode 100644 index 0000000..3f0cb65 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/instructorArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png b/InstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png new file mode 100644 index 0000000..f861ebf Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/lms.png b/InstructorsAndTrainees/resources/icons/PNG/lms.png new file mode 100644 index 0000000..c3c244e Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/lms.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/login-user.png b/InstructorsAndTrainees/resources/icons/PNG/login-user.png new file mode 100644 index 0000000..68b3674 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/login-user.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/malfunction.png b/InstructorsAndTrainees/resources/icons/PNG/malfunction.png new file mode 100644 index 0000000..616daec Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/malfunction.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/newGroup.png b/InstructorsAndTrainees/resources/icons/PNG/newGroup.png new file mode 100644 index 0000000..9fa9a5a Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/newGroup.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/rectGray.png b/InstructorsAndTrainees/resources/icons/PNG/rectGray.png new file mode 100644 index 0000000..85940d2 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/rectGray.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/rectGreen.png b/InstructorsAndTrainees/resources/icons/PNG/rectGreen.png new file mode 100644 index 0000000..ad00eb8 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/rectGreen.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/sendMsg.png b/InstructorsAndTrainees/resources/icons/PNG/sendMsg.png new file mode 100644 index 0000000..783f67b Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/sendMsg.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/settings.png b/InstructorsAndTrainees/resources/icons/PNG/settings.png new file mode 100644 index 0000000..91dfee9 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/settings.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/sign.png b/InstructorsAndTrainees/resources/icons/PNG/sign.png new file mode 100644 index 0000000..842ee2d Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/sign.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/style.png b/InstructorsAndTrainees/resources/icons/PNG/style.png new file mode 100644 index 0000000..05e9621 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/style.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/task.png b/InstructorsAndTrainees/resources/icons/PNG/task.png new file mode 100644 index 0000000..5a4ae16 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/task.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/trainee.png b/InstructorsAndTrainees/resources/icons/PNG/trainee.png new file mode 100644 index 0000000..18d434e Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/trainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/traineeArchive.png b/InstructorsAndTrainees/resources/icons/PNG/traineeArchive.png new file mode 100644 index 0000000..91ffb87 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/traineeArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png b/InstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png new file mode 100644 index 0000000..9ce07dd Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG/updateVersion.png b/InstructorsAndTrainees/resources/icons/PNG/updateVersion.png new file mode 100644 index 0000000..f6c46fb Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG/updateVersion.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png b/InstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png new file mode 100644 index 0000000..9b7481f Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png b/InstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png new file mode 100644 index 0000000..76284db Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/addInstructor.png b/InstructorsAndTrainees/resources/icons/PNG24/addInstructor.png new file mode 100644 index 0000000..53f2b67 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/addInstructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/addTrainee.png b/InstructorsAndTrainees/resources/icons/PNG24/addTrainee.png new file mode 100644 index 0000000..5a278a2 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/addTrainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/admin.png b/InstructorsAndTrainees/resources/icons/PNG24/admin.png new file mode 100644 index 0000000..96a363d Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/admin.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/archive.png b/InstructorsAndTrainees/resources/icons/PNG24/archive.png new file mode 100644 index 0000000..b912746 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/archive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/assignTask.png b/InstructorsAndTrainees/resources/icons/PNG24/assignTask.png new file mode 100644 index 0000000..ca5226a Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/assignTask.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/check.png b/InstructorsAndTrainees/resources/icons/PNG24/check.png new file mode 100644 index 0000000..11530d6 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/check.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/chekNo.png b/InstructorsAndTrainees/resources/icons/PNG24/chekNo.png new file mode 100644 index 0000000..0ca5bd0 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/chekNo.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/chekYes.png b/InstructorsAndTrainees/resources/icons/PNG24/chekYes.png new file mode 100644 index 0000000..fbf0d35 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/chekYes.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/circleGray.png b/InstructorsAndTrainees/resources/icons/PNG24/circleGray.png new file mode 100644 index 0000000..68c308b Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/circleGray.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/circleGreen.png b/InstructorsAndTrainees/resources/icons/PNG24/circleGreen.png new file mode 100644 index 0000000..dca05d5 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/circleGreen.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/circleRed.png b/InstructorsAndTrainees/resources/icons/PNG24/circleRed.png new file mode 100644 index 0000000..894892d Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/circleRed.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/circleYellow.png b/InstructorsAndTrainees/resources/icons/PNG24/circleYellow.png new file mode 100644 index 0000000..0c43260 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/circleYellow.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/connectDB.png b/InstructorsAndTrainees/resources/icons/PNG24/connectDB.png new file mode 100644 index 0000000..d660cb3 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/connectDB.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/delete.png b/InstructorsAndTrainees/resources/icons/PNG24/delete.png new file mode 100644 index 0000000..9792337 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/delete.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png b/InstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png new file mode 100644 index 0000000..cf18230 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png b/InstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png new file mode 100644 index 0000000..b904805 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png b/InstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png new file mode 100644 index 0000000..d077828 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/docTasks.png b/InstructorsAndTrainees/resources/icons/PNG24/docTasks.png new file mode 100644 index 0000000..3e46edb Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/docTasks.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/edit.png b/InstructorsAndTrainees/resources/icons/PNG24/edit.png new file mode 100644 index 0000000..da953fe Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/edit.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/editorDB.png b/InstructorsAndTrainees/resources/icons/PNG24/editorDB.png new file mode 100644 index 0000000..b33e91b Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/editorDB.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/filter.png b/InstructorsAndTrainees/resources/icons/PNG24/filter.png new file mode 100644 index 0000000..438fd8c Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/filter.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/group.png b/InstructorsAndTrainees/resources/icons/PNG24/group.png new file mode 100644 index 0000000..f22de93 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/group.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/instructor.png b/InstructorsAndTrainees/resources/icons/PNG24/instructor.png new file mode 100644 index 0000000..08e235b Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/instructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png b/InstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png new file mode 100644 index 0000000..f5f697d Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png b/InstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png new file mode 100644 index 0000000..fab8033 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png b/InstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png new file mode 100644 index 0000000..d465d0c Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/lms.png b/InstructorsAndTrainees/resources/icons/PNG24/lms.png new file mode 100644 index 0000000..5f4aed5 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/lms.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/login-user.png b/InstructorsAndTrainees/resources/icons/PNG24/login-user.png new file mode 100644 index 0000000..66f8f28 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/login-user.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/malfunction.png b/InstructorsAndTrainees/resources/icons/PNG24/malfunction.png new file mode 100644 index 0000000..fd99a60 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/malfunction.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/newGroup.png b/InstructorsAndTrainees/resources/icons/PNG24/newGroup.png new file mode 100644 index 0000000..f1592d4 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/newGroup.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/rectGray.png b/InstructorsAndTrainees/resources/icons/PNG24/rectGray.png new file mode 100644 index 0000000..afd6a45 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/rectGray.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/rectGreen.png b/InstructorsAndTrainees/resources/icons/PNG24/rectGreen.png new file mode 100644 index 0000000..2f5f234 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/rectGreen.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/sendMsg.png b/InstructorsAndTrainees/resources/icons/PNG24/sendMsg.png new file mode 100644 index 0000000..eb866f5 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/sendMsg.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/settings.png b/InstructorsAndTrainees/resources/icons/PNG24/settings.png new file mode 100644 index 0000000..49340c5 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/settings.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/sign.png b/InstructorsAndTrainees/resources/icons/PNG24/sign.png new file mode 100644 index 0000000..3346779 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/sign.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/style.png b/InstructorsAndTrainees/resources/icons/PNG24/style.png new file mode 100644 index 0000000..8c1a0b3 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/style.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/task.png b/InstructorsAndTrainees/resources/icons/PNG24/task.png new file mode 100644 index 0000000..f93e649 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/task.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/trainee.png b/InstructorsAndTrainees/resources/icons/PNG24/trainee.png new file mode 100644 index 0000000..bc30f37 Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/trainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png b/InstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png new file mode 100644 index 0000000..f5b616d Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png b/InstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png new file mode 100644 index 0000000..4df6d7f Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/PNG24/updateVersion.png b/InstructorsAndTrainees/resources/icons/PNG24/updateVersion.png new file mode 100644 index 0000000..91bf38a Binary files /dev/null and b/InstructorsAndTrainees/resources/icons/PNG24/updateVersion.png differ diff --git a/InstructorsAndTrainees/resources/icons/addInstructor.png b/InstructorsAndTrainees/resources/icons/addInstructor.png index 9436c63..53f2b67 100644 Binary files a/InstructorsAndTrainees/resources/icons/addInstructor.png and b/InstructorsAndTrainees/resources/icons/addInstructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/addTrainee.png b/InstructorsAndTrainees/resources/icons/addTrainee.png index 7693478..5a278a2 100644 Binary files a/InstructorsAndTrainees/resources/icons/addTrainee.png and b/InstructorsAndTrainees/resources/icons/addTrainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/admin.png b/InstructorsAndTrainees/resources/icons/admin.png index 66959ba..96a363d 100644 Binary files a/InstructorsAndTrainees/resources/icons/admin.png and b/InstructorsAndTrainees/resources/icons/admin.png differ diff --git a/InstructorsAndTrainees/resources/icons/archive.png b/InstructorsAndTrainees/resources/icons/archive.png index 0b98e02..b912746 100644 Binary files a/InstructorsAndTrainees/resources/icons/archive.png and b/InstructorsAndTrainees/resources/icons/archive.png differ diff --git a/InstructorsAndTrainees/resources/icons/assignTask.png b/InstructorsAndTrainees/resources/icons/assignTask.png index cd87789..ca5226a 100644 Binary files a/InstructorsAndTrainees/resources/icons/assignTask.png and b/InstructorsAndTrainees/resources/icons/assignTask.png differ diff --git a/InstructorsAndTrainees/resources/icons/check.png b/InstructorsAndTrainees/resources/icons/check.png index 3163b36..11530d6 100644 Binary files a/InstructorsAndTrainees/resources/icons/check.png and b/InstructorsAndTrainees/resources/icons/check.png differ diff --git a/InstructorsAndTrainees/resources/icons/chekNo.png b/InstructorsAndTrainees/resources/icons/chekNo.png index 85940d2..0ca5bd0 100644 Binary files a/InstructorsAndTrainees/resources/icons/chekNo.png and b/InstructorsAndTrainees/resources/icons/chekNo.png differ diff --git a/InstructorsAndTrainees/resources/icons/chekYes.png b/InstructorsAndTrainees/resources/icons/chekYes.png index 05c86d1..fbf0d35 100644 Binary files a/InstructorsAndTrainees/resources/icons/chekYes.png and b/InstructorsAndTrainees/resources/icons/chekYes.png differ diff --git a/InstructorsAndTrainees/resources/icons/circleGray.png b/InstructorsAndTrainees/resources/icons/circleGray.png index c2cf426..68c308b 100644 Binary files a/InstructorsAndTrainees/resources/icons/circleGray.png and b/InstructorsAndTrainees/resources/icons/circleGray.png differ diff --git a/InstructorsAndTrainees/resources/icons/circleGreen.png b/InstructorsAndTrainees/resources/icons/circleGreen.png index bcbce3d..dca05d5 100644 Binary files a/InstructorsAndTrainees/resources/icons/circleGreen.png and b/InstructorsAndTrainees/resources/icons/circleGreen.png differ diff --git a/InstructorsAndTrainees/resources/icons/circleRed.png b/InstructorsAndTrainees/resources/icons/circleRed.png index 9be2b42..894892d 100644 Binary files a/InstructorsAndTrainees/resources/icons/circleRed.png and b/InstructorsAndTrainees/resources/icons/circleRed.png differ diff --git a/InstructorsAndTrainees/resources/icons/circleYellow.png b/InstructorsAndTrainees/resources/icons/circleYellow.png index 3ad6b3b..0c43260 100644 Binary files a/InstructorsAndTrainees/resources/icons/circleYellow.png and b/InstructorsAndTrainees/resources/icons/circleYellow.png differ diff --git a/InstructorsAndTrainees/resources/icons/connectDB.png b/InstructorsAndTrainees/resources/icons/connectDB.png index 76f8737..d660cb3 100644 Binary files a/InstructorsAndTrainees/resources/icons/connectDB.png and b/InstructorsAndTrainees/resources/icons/connectDB.png differ diff --git a/InstructorsAndTrainees/resources/icons/delete.png b/InstructorsAndTrainees/resources/icons/delete.png index 1abb5de..9792337 100644 Binary files a/InstructorsAndTrainees/resources/icons/delete.png and b/InstructorsAndTrainees/resources/icons/delete.png differ diff --git a/InstructorsAndTrainees/resources/icons/deleteGroup.png b/InstructorsAndTrainees/resources/icons/deleteGroup.png index a8cb2b9..cf18230 100644 Binary files a/InstructorsAndTrainees/resources/icons/deleteGroup.png and b/InstructorsAndTrainees/resources/icons/deleteGroup.png differ diff --git a/InstructorsAndTrainees/resources/icons/deleteInstructor.png b/InstructorsAndTrainees/resources/icons/deleteInstructor.png index 99c6196..b904805 100644 Binary files a/InstructorsAndTrainees/resources/icons/deleteInstructor.png and b/InstructorsAndTrainees/resources/icons/deleteInstructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/deleteTrainee.png b/InstructorsAndTrainees/resources/icons/deleteTrainee.png index fd2c6dd..d077828 100644 Binary files a/InstructorsAndTrainees/resources/icons/deleteTrainee.png and b/InstructorsAndTrainees/resources/icons/deleteTrainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/docTasks.png b/InstructorsAndTrainees/resources/icons/docTasks.png index 6c9248d..3e46edb 100644 Binary files a/InstructorsAndTrainees/resources/icons/docTasks.png and b/InstructorsAndTrainees/resources/icons/docTasks.png differ diff --git a/InstructorsAndTrainees/resources/icons/edit.png b/InstructorsAndTrainees/resources/icons/edit.png index bc05807..da953fe 100644 Binary files a/InstructorsAndTrainees/resources/icons/edit.png and b/InstructorsAndTrainees/resources/icons/edit.png differ diff --git a/InstructorsAndTrainees/resources/icons/editorDB.png b/InstructorsAndTrainees/resources/icons/editorDB.png index c701ab6..b33e91b 100644 Binary files a/InstructorsAndTrainees/resources/icons/editorDB.png and b/InstructorsAndTrainees/resources/icons/editorDB.png differ diff --git a/InstructorsAndTrainees/resources/icons/filter.png b/InstructorsAndTrainees/resources/icons/filter.png index 7f4e679..438fd8c 100644 Binary files a/InstructorsAndTrainees/resources/icons/filter.png and b/InstructorsAndTrainees/resources/icons/filter.png differ diff --git a/InstructorsAndTrainees/resources/icons/group.png b/InstructorsAndTrainees/resources/icons/group.png index 01e0d9e..f22de93 100644 Binary files a/InstructorsAndTrainees/resources/icons/group.png and b/InstructorsAndTrainees/resources/icons/group.png differ diff --git a/InstructorsAndTrainees/resources/icons/instructor.png b/InstructorsAndTrainees/resources/icons/instructor.png index cc448f2..08e235b 100644 Binary files a/InstructorsAndTrainees/resources/icons/instructor.png and b/InstructorsAndTrainees/resources/icons/instructor.png differ diff --git a/InstructorsAndTrainees/resources/icons/instructorAdmin.png b/InstructorsAndTrainees/resources/icons/instructorAdmin.png index c9d18ff..f5f697d 100644 Binary files a/InstructorsAndTrainees/resources/icons/instructorAdmin.png and b/InstructorsAndTrainees/resources/icons/instructorAdmin.png differ diff --git a/InstructorsAndTrainees/resources/icons/instructorArchive.png b/InstructorsAndTrainees/resources/icons/instructorArchive.png index 3f0cb65..fab8033 100644 Binary files a/InstructorsAndTrainees/resources/icons/instructorArchive.png and b/InstructorsAndTrainees/resources/icons/instructorArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/instructorFromArchive.png b/InstructorsAndTrainees/resources/icons/instructorFromArchive.png index f861ebf..d465d0c 100644 Binary files a/InstructorsAndTrainees/resources/icons/instructorFromArchive.png and b/InstructorsAndTrainees/resources/icons/instructorFromArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/lms.png b/InstructorsAndTrainees/resources/icons/lms.png index c3c244e..5f4aed5 100644 Binary files a/InstructorsAndTrainees/resources/icons/lms.png and b/InstructorsAndTrainees/resources/icons/lms.png differ diff --git a/InstructorsAndTrainees/resources/icons/login-user.png b/InstructorsAndTrainees/resources/icons/login-user.png index 68b3674..66f8f28 100644 Binary files a/InstructorsAndTrainees/resources/icons/login-user.png and b/InstructorsAndTrainees/resources/icons/login-user.png differ diff --git a/InstructorsAndTrainees/resources/icons/malfunction.png b/InstructorsAndTrainees/resources/icons/malfunction.png index 616daec..fd99a60 100644 Binary files a/InstructorsAndTrainees/resources/icons/malfunction.png and b/InstructorsAndTrainees/resources/icons/malfunction.png differ diff --git a/InstructorsAndTrainees/resources/icons/newGroup.png b/InstructorsAndTrainees/resources/icons/newGroup.png index 9fa9a5a..f1592d4 100644 Binary files a/InstructorsAndTrainees/resources/icons/newGroup.png and b/InstructorsAndTrainees/resources/icons/newGroup.png differ diff --git a/InstructorsAndTrainees/resources/icons/procedure.png b/InstructorsAndTrainees/resources/icons/procedure.png index 13eb854..ca2800a 100644 Binary files a/InstructorsAndTrainees/resources/icons/procedure.png and b/InstructorsAndTrainees/resources/icons/procedure.png differ diff --git a/InstructorsAndTrainees/resources/icons/rectGray.png b/InstructorsAndTrainees/resources/icons/rectGray.png index 85940d2..afd6a45 100644 Binary files a/InstructorsAndTrainees/resources/icons/rectGray.png and b/InstructorsAndTrainees/resources/icons/rectGray.png differ diff --git a/InstructorsAndTrainees/resources/icons/rectGreen.png b/InstructorsAndTrainees/resources/icons/rectGreen.png index ad00eb8..2f5f234 100644 Binary files a/InstructorsAndTrainees/resources/icons/rectGreen.png and b/InstructorsAndTrainees/resources/icons/rectGreen.png differ diff --git a/InstructorsAndTrainees/resources/icons/sendMsg.png b/InstructorsAndTrainees/resources/icons/sendMsg.png index 783f67b..eb866f5 100644 Binary files a/InstructorsAndTrainees/resources/icons/sendMsg.png and b/InstructorsAndTrainees/resources/icons/sendMsg.png differ diff --git a/InstructorsAndTrainees/resources/icons/settings.png b/InstructorsAndTrainees/resources/icons/settings.png index 91dfee9..49340c5 100644 Binary files a/InstructorsAndTrainees/resources/icons/settings.png and b/InstructorsAndTrainees/resources/icons/settings.png differ diff --git a/InstructorsAndTrainees/resources/icons/sign.png b/InstructorsAndTrainees/resources/icons/sign.png index 842ee2d..3346779 100644 Binary files a/InstructorsAndTrainees/resources/icons/sign.png and b/InstructorsAndTrainees/resources/icons/sign.png differ diff --git a/InstructorsAndTrainees/resources/icons/sign.png.bak b/InstructorsAndTrainees/resources/icons/sign.png.bak deleted file mode 100644 index 4daf7eb..0000000 Binary files a/InstructorsAndTrainees/resources/icons/sign.png.bak and /dev/null differ diff --git a/InstructorsAndTrainees/resources/icons/style.png b/InstructorsAndTrainees/resources/icons/style.png index 05e9621..8c1a0b3 100644 Binary files a/InstructorsAndTrainees/resources/icons/style.png and b/InstructorsAndTrainees/resources/icons/style.png differ diff --git a/InstructorsAndTrainees/resources/icons/task.png b/InstructorsAndTrainees/resources/icons/task.png index 5a4ae16..f93e649 100644 Binary files a/InstructorsAndTrainees/resources/icons/task.png and b/InstructorsAndTrainees/resources/icons/task.png differ diff --git a/InstructorsAndTrainees/resources/icons/trainee.png b/InstructorsAndTrainees/resources/icons/trainee.png index 18d434e..bc30f37 100644 Binary files a/InstructorsAndTrainees/resources/icons/trainee.png and b/InstructorsAndTrainees/resources/icons/trainee.png differ diff --git a/InstructorsAndTrainees/resources/icons/traineeArchive.png b/InstructorsAndTrainees/resources/icons/traineeArchive.png index 91ffb87..f5b616d 100644 Binary files a/InstructorsAndTrainees/resources/icons/traineeArchive.png and b/InstructorsAndTrainees/resources/icons/traineeArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/traineeFromArchive.png b/InstructorsAndTrainees/resources/icons/traineeFromArchive.png index 9ce07dd..4df6d7f 100644 Binary files a/InstructorsAndTrainees/resources/icons/traineeFromArchive.png and b/InstructorsAndTrainees/resources/icons/traineeFromArchive.png differ diff --git a/InstructorsAndTrainees/resources/icons/updateVersion.png b/InstructorsAndTrainees/resources/icons/updateVersion.png index f6c46fb..91bf38a 100644 Binary files a/InstructorsAndTrainees/resources/icons/updateVersion.png and b/InstructorsAndTrainees/resources/icons/updateVersion.png differ diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index db29c71..300762e 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -203,7 +203,7 @@ void AMMtasksWidget::slot_UpdateTasksAMMforTrainee(int trainee_id) } } -void AMMtasksWidget::loadTasksAMM(bool flRequestFromDB) +void AMMtasksWidget::loadTasksAMM(bool flRequestFirst) { //Обновление дерева treeWidget->clear(); @@ -212,10 +212,10 @@ void AMMtasksWidget::loadTasksAMM(bool flRequestFromDB) QByteArray arrayAMM; - if(flRequestFromDB) - arrayAMM = connectorToServer->getListTaskAmmArray(); + //if(flRequestFirst) + arrayAMM = connectorToServer->getListTaskAmmArray(); - emit signal_prepareAMMListItems(arrayAMM, flOnlyActive); + emit signal_prepareAMMListItems(arrayAMM, flOnlyActive, flRequestFirst); } void AMMtasksWidget::slot_AMMlistItemsReady(QList listItems) @@ -349,5 +349,5 @@ void AMMtasksWidget::on_btnOnlyActive_clicked() { flOnlyActive = false; } - loadTasksAMM(true); + loadTasksAMM(false); } diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index 5b67f03..0332745 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h @@ -48,11 +48,11 @@ public Q_SLOTS: private: void preparationTreeWidget(); void reSetHeadTreeWidget(); - void loadTasksAMM(bool flRequestFromDB = true); + void loadTasksAMM(bool flRequestFirst = true); void assignTaskAMMtoTrainee(); Q_SIGNALS: - void signal_prepareAMMListItems(QByteArray array, bool flOnlyActive); + void signal_prepareAMMListItems(QByteArray array, bool flOnlyActive, bool flRequestFirst); void signal_prepareAMMListItemsForTrainee(QList listTask); void signal_AssignedTask(); diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp index fa92f31..c1cc49d 100644 --- a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp +++ b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp @@ -92,6 +92,7 @@ QTreeWidgetItem *TaskAMMFIMTreePreparation::addModuleToTreeWidgetAMM(Module *mod QString code = ""; itemModule = new QTreeWidgetItem(); + countItems++; if(parentItem) parentItem->addChild(itemModule); @@ -386,28 +387,46 @@ void TaskAMMFIMTreePreparation::domElementParserAMM(QDomElement element, Module* }while (! (childElement = childElement.nextSiblingElement()).isNull()); } -void TaskAMMFIMTreePreparation::slot_prepareAMMListItems(QByteArray array, bool flOnlyActive) +void TaskAMMFIMTreePreparation::slot_prepareAMMListItems(QByteArray array, bool flOnlyActive, bool flRequestFirst) { qDebug() << "TaskAMMFIMTreePreparation::slot_prepareAMMListItems thread ID " << QThread::currentThreadId(); - loadAMMtasksFromXML(array); - - listItems.clear(); - - for(Module* module : listAllModulesAMM) + if(flRequestFirst) { - QTreeWidgetItem* item = addModuleToTreeWidgetAMM(module, flOnlyActive); - listItems.append(item); + loadAMMtasksFromXML(array); } - Q_EMIT signal_listAMMItemsReady(listItems); + if(flOnlyActive) + { + listItemsOnlyActive.clear(); + + for(Module* module : listAllModulesAMM) + { + QTreeWidgetItem* item = addModuleToTreeWidgetAMM(module, true); + listItemsOnlyActive.append(item); + } + + emit signal_listAMMItemsReady(listItemsOnlyActive); + } + else + { + listItemsAll.clear(); + + for(Module* module : listAllModulesAMM) + { + QTreeWidgetItem* item = addModuleToTreeWidgetAMM(module, false); + listItemsAll.append(item); + } + + emit signal_listAMMItemsReady(listItemsAll); + } } void TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee(QList listTasks) { qDebug() << "TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee thread ID " << QThread::currentThreadId(); - listItems.clear(); + listItemsAll.clear(); mtxAccess.lock(); @@ -452,12 +471,12 @@ void TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee(QListsetToolTip(0, text); - listItems.append(item); + listItemsAll.append(item); } mtxAccess.unlock(); - Q_EMIT signal_listAMMItemsReady(listItems); + Q_EMIT signal_listAMMItemsReady(listItemsAll); } void TaskAMMFIMTreePreparation::slot_prepareFIMListItems(QByteArray array) @@ -466,7 +485,7 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItems(QByteArray array) loadFIMtasksFromXML(array); - listItems.clear(); + listItemsAll.clear(); mtxAccess.lock(); @@ -540,19 +559,19 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItems(QByteArray array) itemMalfunction->addChild(itemSign); } } - listItems.append(itemTask); + listItemsAll.append(itemTask); } mtxAccess.unlock(); - Q_EMIT signal_listFIMItemsReady(listItems); + Q_EMIT signal_listFIMItemsReady(listItemsAll); } void TaskAMMFIMTreePreparation::slot_prepareFIMListItemsForTrainee(QList listTasks) { qDebug() << "TaskAMMFIMTreePreparation::slot_prepareFIMListItemsForTrainee thread ID " << QThread::currentThreadId(); - listItems.clear(); + listItemsAll.clear(); mtxAccess.lock(); this->listTasksFIM = listTasks; @@ -632,10 +651,10 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItemsForTrainee(QList listTasks); void slot_prepareFIMListItems(QByteArray array); @@ -67,7 +67,8 @@ Q_SIGNALS: void signal_listFIMItemsReady(QList listItemsFIM); private: - QList listItems; + QList listItemsAll; + QList listItemsOnlyActive; QList listAllModulesAMM; @@ -78,6 +79,8 @@ private: TypeListTreeAMMFIM type; QMutex mtxAccess; + + int countItems = 0; }; #endif // TASKTREEPREPARATION_H