diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..11869fc --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 3.5) + +project(LMS LANGUAGES CXX) + +add_subdirectory(DataBaseLMS) +add_subdirectory(InstructorsAndTrainees) +add_subdirectory(GUIdataBaseLMS) +add_subdirectory(ServerLMS) +add_subdirectory(TestServerLMS) + +add_dependencies(InstructorsAndTrainees DataBaseLMS) +add_dependencies(GUIdataBaseLMS InstructorsAndTrainees) +add_dependencies(ServerLMS DataBaseLMS) +add_dependencies(TestServerLMS ServerLMS) diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt b/DataBaseLMS/CMakeLists.txt similarity index 73% rename from DB_LMS/DataBaseLMS/CMakeLists.txt rename to DataBaseLMS/CMakeLists.txt index ee0fd13..4b7dc4c 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt +++ b/DataBaseLMS/CMakeLists.txt @@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5) project(DataBaseLMS LANGUAGES CXX) -get_filename_component(PROJECT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) -get_filename_component(REPO_PATH ${PROJECT_PATH} DIRECTORY) +get_filename_component(REPO_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOUIC ON) @@ -60,27 +59,27 @@ if(PROJECT_TYPE_DEBUG) add_custom_command(TARGET DataBaseLMS POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/DB_LMS/Debug64/libDataBaseLMS.dll - ${REPO_PATH}/BUILDS/TestServerLMS/Debug64) + ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS/libDataBaseLMS.dll + ${REPO_PATH}/BUILDS/Debug64/TestServerLMS) add_custom_command(TARGET DataBaseLMS POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/DB_LMS/Debug64/libDataBaseLMS.dll - ${REPO_PATH}/BUILDS/GUIdataBaseLMS/Debug64) + ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS/libDataBaseLMS.dll + ${REPO_PATH}/BUILDS/Debug64/GUIdataBaseLMS) elseif() add_custom_command(TARGET DataBaseLMS POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/DB_LMS/Release64/libDataBaseLMS.dll - ${REPO_PATH}/BUILDS/TestServerLMS/Release64) + ${REPO_PATH}/BUILDS/Release64/DataBaseLMS/libDataBaseLMS.dll + ${REPO_PATH}/BUILDS/Release64/TestServerLMS) add_custom_command(TARGET DataBaseLMS POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/DB_LMS/Release64/libDataBaseLMS.dll - ${REPO_PATH}/BUILDS/GUIdataBaseLMS/Release64) + ${REPO_PATH}/BUILDS/Release64/DataBaseLMS/libDataBaseLMS.dll + ${REPO_PATH}/BUILDS/Release64/GUIdataBaseLMS) endif() diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user.00ce76f b/DataBaseLMS/CMakeLists.txt.user.00ce76f similarity index 100% rename from DB_LMS/DataBaseLMS/CMakeLists.txt.user.00ce76f rename to DataBaseLMS/CMakeLists.txt.user.00ce76f diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user.15ef247 b/DataBaseLMS/CMakeLists.txt.user.15ef247 similarity index 100% rename from DB_LMS/DataBaseLMS/CMakeLists.txt.user.15ef247 rename to DataBaseLMS/CMakeLists.txt.user.15ef247 diff --git a/DB_LMS/DataBaseLMS/DataBaseLMS_global.h b/DataBaseLMS/DataBaseLMS_global.h similarity index 100% rename from DB_LMS/DataBaseLMS/DataBaseLMS_global.h rename to DataBaseLMS/DataBaseLMS_global.h diff --git a/DB_LMS/DataBaseLMS/basicentity.cpp b/DataBaseLMS/basicentity.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/basicentity.cpp rename to DataBaseLMS/basicentity.cpp diff --git a/DB_LMS/DataBaseLMS/basicentity.h b/DataBaseLMS/basicentity.h similarity index 100% rename from DB_LMS/DataBaseLMS/basicentity.h rename to DataBaseLMS/basicentity.h diff --git a/DB_LMS/DataBaseLMS/classroom.cpp b/DataBaseLMS/classroom.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/classroom.cpp rename to DataBaseLMS/classroom.cpp diff --git a/DB_LMS/DataBaseLMS/classroom.h b/DataBaseLMS/classroom.h similarity index 100% rename from DB_LMS/DataBaseLMS/classroom.h rename to DataBaseLMS/classroom.h diff --git a/DB_LMS/DataBaseLMS/computer.cpp b/DataBaseLMS/computer.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/computer.cpp rename to DataBaseLMS/computer.cpp diff --git a/DB_LMS/DataBaseLMS/computer.h b/DataBaseLMS/computer.h similarity index 100% rename from DB_LMS/DataBaseLMS/computer.h rename to DataBaseLMS/computer.h diff --git a/DB_LMS/DataBaseLMS/databaselms.cpp b/DataBaseLMS/databaselms.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/databaselms.cpp rename to DataBaseLMS/databaselms.cpp diff --git a/DB_LMS/DataBaseLMS/databaselms.h b/DataBaseLMS/databaselms.h similarity index 100% rename from DB_LMS/DataBaseLMS/databaselms.h rename to DataBaseLMS/databaselms.h diff --git a/DB_LMS/DataBaseLMS/group.cpp b/DataBaseLMS/group.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/group.cpp rename to DataBaseLMS/group.cpp diff --git a/DB_LMS/DataBaseLMS/group.h b/DataBaseLMS/group.h similarity index 100% rename from DB_LMS/DataBaseLMS/group.h rename to DataBaseLMS/group.h diff --git a/DB_LMS/DataBaseLMS/instructor.cpp b/DataBaseLMS/instructor.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/instructor.cpp rename to DataBaseLMS/instructor.cpp diff --git a/DB_LMS/DataBaseLMS/instructor.h b/DataBaseLMS/instructor.h similarity index 100% rename from DB_LMS/DataBaseLMS/instructor.h rename to DataBaseLMS/instructor.h diff --git a/DB_LMS/DataBaseLMS/interfacedatabaselms.cpp b/DataBaseLMS/interfacedatabaselms.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/interfacedatabaselms.cpp rename to DataBaseLMS/interfacedatabaselms.cpp diff --git a/DB_LMS/DataBaseLMS/interfacedatabaselms.h b/DataBaseLMS/interfacedatabaselms.h similarity index 100% rename from DB_LMS/DataBaseLMS/interfacedatabaselms.h rename to DataBaseLMS/interfacedatabaselms.h diff --git a/DB_LMS/DataBaseLMS/task.cpp b/DataBaseLMS/task.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/task.cpp rename to DataBaseLMS/task.cpp diff --git a/DB_LMS/DataBaseLMS/task.h b/DataBaseLMS/task.h similarity index 100% rename from DB_LMS/DataBaseLMS/task.h rename to DataBaseLMS/task.h diff --git a/DB_LMS/DataBaseLMS/trainee.cpp b/DataBaseLMS/trainee.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/trainee.cpp rename to DataBaseLMS/trainee.cpp diff --git a/DB_LMS/DataBaseLMS/trainee.h b/DataBaseLMS/trainee.h similarity index 100% rename from DB_LMS/DataBaseLMS/trainee.h rename to DataBaseLMS/trainee.h diff --git a/DB_LMS/DataBaseLMS/translations/DataBaseLMS_ru_RU.qm b/DataBaseLMS/translations/DataBaseLMS_ru_RU.qm similarity index 100% rename from DB_LMS/DataBaseLMS/translations/DataBaseLMS_ru_RU.qm rename to DataBaseLMS/translations/DataBaseLMS_ru_RU.qm diff --git a/DB_LMS/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts b/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts similarity index 100% rename from DB_LMS/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts rename to DataBaseLMS/translations/DataBaseLMS_ru_RU.ts diff --git a/DB_LMS/DataBaseLMS/user.cpp b/DataBaseLMS/user.cpp similarity index 100% rename from DB_LMS/DataBaseLMS/user.cpp rename to DataBaseLMS/user.cpp diff --git a/DB_LMS/DataBaseLMS/user.h b/DataBaseLMS/user.h similarity index 100% rename from DB_LMS/DataBaseLMS/user.h rename to DataBaseLMS/user.h diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt b/GUIdataBaseLMS/CMakeLists.txt similarity index 72% rename from GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt rename to GUIdataBaseLMS/CMakeLists.txt index 48ee309..c5bc10a 100644 --- a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt +++ b/GUIdataBaseLMS/CMakeLists.txt @@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5) project(GUIdataBaseLMS LANGUAGES CXX) -get_filename_component(PROJECT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) -get_filename_component(REPO_PATH ${PROJECT_PATH} DIRECTORY) +get_filename_component(REPO_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOUIC ON) @@ -40,26 +39,26 @@ target_link_libraries(GUIdataBaseLMS PRIVATE Qt5::Xml) target_link_libraries(GUIdataBaseLMS PRIVATE Qt5::Network) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/instructors) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/trainees) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/tasks) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/docTasks) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/connectorToServer) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/connectorToServer/Core) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/messanger) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/instructors) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/trainees) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/tasks) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/docTasks) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/connectorToServer) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/connectorToServer/Core) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/messanger) if(PROJECT_TYPE_DEBUG) - target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_IaT/Debug64) + target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees) elseif() - target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_IaT/Release64) + target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees) endif() target_link_libraries(GUIdataBaseLMS PRIVATE libInstructorsAndTrainees.dll) -target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS) +target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) if(PROJECT_TYPE_DEBUG) - target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64) + target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) elseif() - target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64) + target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) endif() target_link_libraries(GUIdataBaseLMS PRIVATE libDataBaseLMS.dll) diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user.00ce76f b/GUIdataBaseLMS/CMakeLists.txt.user.00ce76f similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user.00ce76f rename to GUIdataBaseLMS/CMakeLists.txt.user.00ce76f diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user.15ef247 b/GUIdataBaseLMS/CMakeLists.txt.user.15ef247 similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user.15ef247 rename to GUIdataBaseLMS/CMakeLists.txt.user.15ef247 diff --git a/GUIdataBaseLMS/StaticData/authData.xml b/GUIdataBaseLMS/StaticData/authData.xml new file mode 100644 index 0000000..69f75cd --- /dev/null +++ b/GUIdataBaseLMS/StaticData/authData.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/GUIdataBaseLMS/StaticData/settings.xml b/GUIdataBaseLMS/StaticData/settings.xml new file mode 100644 index 0000000..9aafbf5 --- /dev/null +++ b/GUIdataBaseLMS/StaticData/settings.xml @@ -0,0 +1,4 @@ + + + + diff --git a/GUIdataBaseLMS/StaticData/temp.xml b/GUIdataBaseLMS/StaticData/temp.xml new file mode 100644 index 0000000..40e39ea --- /dev/null +++ b/GUIdataBaseLMS/StaticData/temp.xml @@ -0,0 +1,2 @@ + + diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/main.cpp b/GUIdataBaseLMS/main.cpp similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/main.cpp rename to GUIdataBaseLMS/main.cpp diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/mainwindow.cpp b/GUIdataBaseLMS/mainwindow.cpp similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/mainwindow.cpp rename to GUIdataBaseLMS/mainwindow.cpp diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/mainwindow.h b/GUIdataBaseLMS/mainwindow.h similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/mainwindow.h rename to GUIdataBaseLMS/mainwindow.h diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/mainwindow.ui b/GUIdataBaseLMS/mainwindow.ui similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/mainwindow.ui rename to GUIdataBaseLMS/mainwindow.ui diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/testDBpgSQL.qrc b/GUIdataBaseLMS/testDBpgSQL.qrc similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/testDBpgSQL.qrc rename to GUIdataBaseLMS/testDBpgSQL.qrc diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.qm b/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.qm similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.qm rename to GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.qm diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.ts b/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.ts similarity index 100% rename from GUIdataBaseLMS/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.ts rename to GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.ts diff --git a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt similarity index 90% rename from DB_IaT/InstructorsAndTrainees/CMakeLists.txt rename to InstructorsAndTrainees/CMakeLists.txt index 75a5c22..4d76833 100644 --- a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5) project(InstructorsAndTrainees LANGUAGES CXX) -get_filename_component(PROJECT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) -get_filename_component(REPO_PATH ${PROJECT_PATH} DIRECTORY) +get_filename_component(REPO_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOUIC ON) @@ -118,11 +117,11 @@ target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_ target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY) -target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS) +target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) if(PROJECT_TYPE_DEBUG) - target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64) + target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) elseif() - target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64) + target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) endif() target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseLMS.dll) @@ -131,14 +130,14 @@ if(PROJECT_TYPE_DEBUG) add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/DB_IaT/Debug64/libInstructorsAndTrainees.dll - ${REPO_PATH}/BUILDS/GUIdataBaseLMS/Debug64) + ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll + ${REPO_PATH}/BUILDS/Debug64/GUIdataBaseLMS) elseif() add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/DB_IaT/Release64/libInstructorsAndTrainees.dll - ${REPO_PATH}/BUILDS/GUIdataBaseLMS/Release64) + ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll + ${REPO_PATH}/BUILDS/Release64/GUIdataBaseLMS) endif() diff --git a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user.00ce76f b/InstructorsAndTrainees/CMakeLists.txt.user.00ce76f similarity index 100% rename from DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user.00ce76f rename to InstructorsAndTrainees/CMakeLists.txt.user.00ce76f diff --git a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user.15ef247 b/InstructorsAndTrainees/CMakeLists.txt.user.15ef247 similarity index 100% rename from DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user.15ef247 rename to InstructorsAndTrainees/CMakeLists.txt.user.15ef247 diff --git a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user.88628a1 b/InstructorsAndTrainees/CMakeLists.txt.user.88628a1 similarity index 100% rename from DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user.88628a1 rename to InstructorsAndTrainees/CMakeLists.txt.user.88628a1 diff --git a/DB_IaT/InstructorsAndTrainees/commonview.cpp b/InstructorsAndTrainees/commonview.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/commonview.cpp rename to InstructorsAndTrainees/commonview.cpp diff --git a/DB_IaT/InstructorsAndTrainees/commonview.h b/InstructorsAndTrainees/commonview.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/commonview.h rename to InstructorsAndTrainees/commonview.h diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h b/InstructorsAndTrainees/connectorToServer/Core/FileData.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h rename to InstructorsAndTrainees/connectorToServer/Core/FileData.h diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp b/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp rename to InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h b/InstructorsAndTrainees/connectorToServer/Core/dataparser.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h rename to InstructorsAndTrainees/connectorToServer/Core/dataparser.h diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp rename to InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h rename to InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp rename to InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h rename to InstructorsAndTrainees/connectorToServer/Core/sendsystem.h diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp b/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp rename to InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h b/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h rename to InstructorsAndTrainees/connectorToServer/Core/tcpclient.h diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp b/InstructorsAndTrainees/connectorToServer/Core/tools.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp rename to InstructorsAndTrainees/connectorToServer/Core/tools.cpp diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h b/InstructorsAndTrainees/connectorToServer/Core/tools.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h rename to InstructorsAndTrainees/connectorToServer/Core/tools.h diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h b/InstructorsAndTrainees/connectorToServer/Datas.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h rename to InstructorsAndTrainees/connectorToServer/Datas.h diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp rename to InstructorsAndTrainees/connectorToServer/connectortoserver.cpp diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h rename to InstructorsAndTrainees/connectorToServer/connectortoserver.h diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp b/InstructorsAndTrainees/docTasks/doctaskswidget.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp rename to InstructorsAndTrainees/docTasks/doctaskswidget.cpp diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h b/InstructorsAndTrainees/docTasks/doctaskswidget.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h rename to InstructorsAndTrainees/docTasks/doctaskswidget.h diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.ui b/InstructorsAndTrainees/docTasks/doctaskswidget.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.ui rename to InstructorsAndTrainees/docTasks/doctaskswidget.ui diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp b/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp rename to InstructorsAndTrainees/docTasks/fimtaskswidget.cpp diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.h b/InstructorsAndTrainees/docTasks/fimtaskswidget.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.h rename to InstructorsAndTrainees/docTasks/fimtaskswidget.h diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.ui b/InstructorsAndTrainees/docTasks/fimtaskswidget.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.ui rename to InstructorsAndTrainees/docTasks/fimtaskswidget.ui diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp b/InstructorsAndTrainees/docTasks/module.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/module.cpp rename to InstructorsAndTrainees/docTasks/module.cpp diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/module.h b/InstructorsAndTrainees/docTasks/module.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/module.h rename to InstructorsAndTrainees/docTasks/module.h diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/tasksAmmFim.cpp b/InstructorsAndTrainees/docTasks/tasksAmmFim.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/tasksAmmFim.cpp rename to InstructorsAndTrainees/docTasks/tasksAmmFim.cpp diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/tasksAmmFim.h b/InstructorsAndTrainees/docTasks/tasksAmmFim.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/docTasks/tasksAmmFim.h rename to InstructorsAndTrainees/docTasks/tasksAmmFim.h diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp b/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp rename to InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h b/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h rename to InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui b/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui rename to InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp b/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp rename to InstructorsAndTrainees/instructors/dialogeditinstructor.cpp diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h b/InstructorsAndTrainees/instructors/dialogeditinstructor.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h rename to InstructorsAndTrainees/instructors/dialogeditinstructor.h diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.ui b/InstructorsAndTrainees/instructors/dialogeditinstructor.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.ui rename to InstructorsAndTrainees/instructors/dialogeditinstructor.ui diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp b/InstructorsAndTrainees/instructors/editorinstructors.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp rename to InstructorsAndTrainees/instructors/editorinstructors.cpp diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h b/InstructorsAndTrainees/instructors/editorinstructors.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h rename to InstructorsAndTrainees/instructors/editorinstructors.h diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.ui b/InstructorsAndTrainees/instructors/editorinstructors.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.ui rename to InstructorsAndTrainees/instructors/editorinstructors.ui diff --git a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp b/InstructorsAndTrainees/instructors/instructorsview.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp rename to InstructorsAndTrainees/instructors/instructorsview.cpp diff --git a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h b/InstructorsAndTrainees/instructors/instructorsview.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h rename to InstructorsAndTrainees/instructors/instructorsview.h diff --git a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/InstructorsAndTrainees/instructors/viewerinstructors.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp rename to InstructorsAndTrainees/instructors/viewerinstructors.cpp diff --git a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h b/InstructorsAndTrainees/instructors/viewerinstructors.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h rename to InstructorsAndTrainees/instructors/viewerinstructors.h diff --git a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.ui b/InstructorsAndTrainees/instructors/viewerinstructors.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.ui rename to InstructorsAndTrainees/instructors/viewerinstructors.ui diff --git a/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h b/InstructorsAndTrainees/instructorsAndTrainees_global.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h rename to InstructorsAndTrainees/instructorsAndTrainees_global.h diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp rename to InstructorsAndTrainees/instructorsandtraineeswidget.cpp diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h b/InstructorsAndTrainees/instructorsandtraineeswidget.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h rename to InstructorsAndTrainees/instructorsandtraineeswidget.h diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui rename to InstructorsAndTrainees/instructorsandtraineeswidget.ui diff --git a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp b/InstructorsAndTrainees/messanger/messangerwidget.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp rename to InstructorsAndTrainees/messanger/messangerwidget.cpp diff --git a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h b/InstructorsAndTrainees/messanger/messangerwidget.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h rename to InstructorsAndTrainees/messanger/messangerwidget.h diff --git a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.ui b/InstructorsAndTrainees/messanger/messangerwidget.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.ui rename to InstructorsAndTrainees/messanger/messangerwidget.ui diff --git a/DB_IaT/InstructorsAndTrainees/messanger/msgwidget.cpp b/InstructorsAndTrainees/messanger/msgwidget.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/messanger/msgwidget.cpp rename to InstructorsAndTrainees/messanger/msgwidget.cpp diff --git a/DB_IaT/InstructorsAndTrainees/messanger/msgwidget.h b/InstructorsAndTrainees/messanger/msgwidget.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/messanger/msgwidget.h rename to InstructorsAndTrainees/messanger/msgwidget.h diff --git a/DB_IaT/InstructorsAndTrainees/messanger/msgwidget.ui b/InstructorsAndTrainees/messanger/msgwidget.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/messanger/msgwidget.ui rename to InstructorsAndTrainees/messanger/msgwidget.ui diff --git a/DB_IaT/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp b/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp rename to InstructorsAndTrainees/messanger/tabdialogmessenger.cpp diff --git a/DB_IaT/InstructorsAndTrainees/messanger/tabdialogmessenger.h b/InstructorsAndTrainees/messanger/tabdialogmessenger.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/messanger/tabdialogmessenger.h rename to InstructorsAndTrainees/messanger/tabdialogmessenger.h diff --git a/DB_IaT/InstructorsAndTrainees/resources.qrc b/InstructorsAndTrainees/resources.qrc similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources.qrc rename to InstructorsAndTrainees/resources.qrc diff --git a/DB_IaT/InstructorsAndTrainees/resources/css/styleSheetMain.css b/InstructorsAndTrainees/resources/css/styleSheetMain.css similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/css/styleSheetMain.css rename to InstructorsAndTrainees/resources/css/styleSheetMain.css diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/DB-instructors.png b/InstructorsAndTrainees/resources/icons/DB-instructors.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/DB-instructors.png rename to InstructorsAndTrainees/resources/icons/DB-instructors.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/DB-trainees.png b/InstructorsAndTrainees/resources/icons/DB-trainees.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/DB-trainees.png rename to InstructorsAndTrainees/resources/icons/DB-trainees.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/addInstructor.png b/InstructorsAndTrainees/resources/icons/addInstructor.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/addInstructor.png rename to InstructorsAndTrainees/resources/icons/addInstructor.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/addTrainee.png b/InstructorsAndTrainees/resources/icons/addTrainee.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/addTrainee.png rename to InstructorsAndTrainees/resources/icons/addTrainee.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/admin.png b/InstructorsAndTrainees/resources/icons/admin.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/admin.png rename to InstructorsAndTrainees/resources/icons/admin.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/archive.png b/InstructorsAndTrainees/resources/icons/archive.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/archive.png rename to InstructorsAndTrainees/resources/icons/archive.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/branch-closed.png b/InstructorsAndTrainees/resources/icons/branch-closed.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/branch-closed.png rename to InstructorsAndTrainees/resources/icons/branch-closed.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/branch-end.png b/InstructorsAndTrainees/resources/icons/branch-end.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/branch-end.png rename to InstructorsAndTrainees/resources/icons/branch-end.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/branch-more.png b/InstructorsAndTrainees/resources/icons/branch-more.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/branch-more.png rename to InstructorsAndTrainees/resources/icons/branch-more.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/branch-open.png b/InstructorsAndTrainees/resources/icons/branch-open.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/branch-open.png rename to InstructorsAndTrainees/resources/icons/branch-open.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/chekNo.png b/InstructorsAndTrainees/resources/icons/chekNo.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/chekNo.png rename to InstructorsAndTrainees/resources/icons/chekNo.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/chekYes.png b/InstructorsAndTrainees/resources/icons/chekYes.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/chekYes.png rename to InstructorsAndTrainees/resources/icons/chekYes.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/circleGray.png b/InstructorsAndTrainees/resources/icons/circleGray.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/circleGray.png rename to InstructorsAndTrainees/resources/icons/circleGray.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/circleGreen.png b/InstructorsAndTrainees/resources/icons/circleGreen.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/circleGreen.png rename to InstructorsAndTrainees/resources/icons/circleGreen.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/connectDB.png b/InstructorsAndTrainees/resources/icons/connectDB.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/connectDB.png rename to InstructorsAndTrainees/resources/icons/connectDB.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/deleteGroup.png b/InstructorsAndTrainees/resources/icons/deleteGroup.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/deleteGroup.png rename to InstructorsAndTrainees/resources/icons/deleteGroup.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/deleteInstructor.png b/InstructorsAndTrainees/resources/icons/deleteInstructor.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/deleteInstructor.png rename to InstructorsAndTrainees/resources/icons/deleteInstructor.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/deleteTrainee.png b/InstructorsAndTrainees/resources/icons/deleteTrainee.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/deleteTrainee.png rename to InstructorsAndTrainees/resources/icons/deleteTrainee.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/docTasks.png b/InstructorsAndTrainees/resources/icons/docTasks.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/docTasks.png rename to InstructorsAndTrainees/resources/icons/docTasks.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/edit.png b/InstructorsAndTrainees/resources/icons/edit.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/edit.png rename to InstructorsAndTrainees/resources/icons/edit.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/group.png b/InstructorsAndTrainees/resources/icons/group.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/group.png rename to InstructorsAndTrainees/resources/icons/group.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/instructor.png b/InstructorsAndTrainees/resources/icons/instructor.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/instructor.png rename to InstructorsAndTrainees/resources/icons/instructor.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/instructorAdmin.png b/InstructorsAndTrainees/resources/icons/instructorAdmin.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/instructorAdmin.png rename to InstructorsAndTrainees/resources/icons/instructorAdmin.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/instructorArchive.png b/InstructorsAndTrainees/resources/icons/instructorArchive.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/instructorArchive.png rename to InstructorsAndTrainees/resources/icons/instructorArchive.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/instructorFromArchive.png b/InstructorsAndTrainees/resources/icons/instructorFromArchive.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/instructorFromArchive.png rename to InstructorsAndTrainees/resources/icons/instructorFromArchive.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/login-user.png b/InstructorsAndTrainees/resources/icons/login-user.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/login-user.png rename to InstructorsAndTrainees/resources/icons/login-user.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/malfunction.png b/InstructorsAndTrainees/resources/icons/malfunction.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/malfunction.png rename to InstructorsAndTrainees/resources/icons/malfunction.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/messengerPrint.png b/InstructorsAndTrainees/resources/icons/messengerPrint.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/messengerPrint.png rename to InstructorsAndTrainees/resources/icons/messengerPrint.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/newGroup.png b/InstructorsAndTrainees/resources/icons/newGroup.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/newGroup.png rename to InstructorsAndTrainees/resources/icons/newGroup.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/procedure.png b/InstructorsAndTrainees/resources/icons/procedure.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/procedure.png rename to InstructorsAndTrainees/resources/icons/procedure.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/rectGray.png b/InstructorsAndTrainees/resources/icons/rectGray.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/rectGray.png rename to InstructorsAndTrainees/resources/icons/rectGray.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/rectGreen.png b/InstructorsAndTrainees/resources/icons/rectGreen.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/rectGreen.png rename to InstructorsAndTrainees/resources/icons/rectGreen.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/sendMsg.png b/InstructorsAndTrainees/resources/icons/sendMsg.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/sendMsg.png rename to InstructorsAndTrainees/resources/icons/sendMsg.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/sign.png b/InstructorsAndTrainees/resources/icons/sign.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/sign.png rename to InstructorsAndTrainees/resources/icons/sign.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/sign.png.bak b/InstructorsAndTrainees/resources/icons/sign.png.bak similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/sign.png.bak rename to InstructorsAndTrainees/resources/icons/sign.png.bak diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/task.png b/InstructorsAndTrainees/resources/icons/task.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/task.png rename to InstructorsAndTrainees/resources/icons/task.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/trainee.png b/InstructorsAndTrainees/resources/icons/trainee.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/trainee.png rename to InstructorsAndTrainees/resources/icons/trainee.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/traineeArchive.png b/InstructorsAndTrainees/resources/icons/traineeArchive.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/traineeArchive.png rename to InstructorsAndTrainees/resources/icons/traineeArchive.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/traineeFromArchive.png b/InstructorsAndTrainees/resources/icons/traineeFromArchive.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/traineeFromArchive.png rename to InstructorsAndTrainees/resources/icons/traineeFromArchive.png diff --git a/DB_IaT/InstructorsAndTrainees/resources/icons/vline.png b/InstructorsAndTrainees/resources/icons/vline.png similarity index 100% rename from DB_IaT/InstructorsAndTrainees/resources/icons/vline.png rename to InstructorsAndTrainees/resources/icons/vline.png diff --git a/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp b/InstructorsAndTrainees/tasks/taskswidget.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp rename to InstructorsAndTrainees/tasks/taskswidget.cpp diff --git a/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h b/InstructorsAndTrainees/tasks/taskswidget.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h rename to InstructorsAndTrainees/tasks/taskswidget.h diff --git a/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.ui b/InstructorsAndTrainees/tasks/taskswidget.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/tasks/taskswidget.ui rename to InstructorsAndTrainees/tasks/taskswidget.ui diff --git a/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp b/InstructorsAndTrainees/trainees/computersLocations.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp rename to InstructorsAndTrainees/trainees/computersLocations.cpp diff --git a/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h b/InstructorsAndTrainees/trainees/computersLocations.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h rename to InstructorsAndTrainees/trainees/computersLocations.h diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp b/InstructorsAndTrainees/trainees/dialogeditgroup.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp rename to InstructorsAndTrainees/trainees/dialogeditgroup.cpp diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h b/InstructorsAndTrainees/trainees/dialogeditgroup.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h rename to InstructorsAndTrainees/trainees/dialogeditgroup.h diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.ui b/InstructorsAndTrainees/trainees/dialogeditgroup.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.ui rename to InstructorsAndTrainees/trainees/dialogeditgroup.ui diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp b/InstructorsAndTrainees/trainees/dialogedittrainee.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp rename to InstructorsAndTrainees/trainees/dialogedittrainee.cpp diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h b/InstructorsAndTrainees/trainees/dialogedittrainee.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h rename to InstructorsAndTrainees/trainees/dialogedittrainee.h diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.ui b/InstructorsAndTrainees/trainees/dialogedittrainee.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.ui rename to InstructorsAndTrainees/trainees/dialogedittrainee.ui diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp b/InstructorsAndTrainees/trainees/editortrainees.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp rename to InstructorsAndTrainees/trainees/editortrainees.cpp diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h b/InstructorsAndTrainees/trainees/editortrainees.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h rename to InstructorsAndTrainees/trainees/editortrainees.h diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.ui b/InstructorsAndTrainees/trainees/editortrainees.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/editortrainees.ui rename to InstructorsAndTrainees/trainees/editortrainees.ui diff --git a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp b/InstructorsAndTrainees/trainees/traineesview.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp rename to InstructorsAndTrainees/trainees/traineesview.cpp diff --git a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h b/InstructorsAndTrainees/trainees/traineesview.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/traineesview.h rename to InstructorsAndTrainees/trainees/traineesview.h diff --git a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp rename to InstructorsAndTrainees/trainees/viewertrainees.cpp diff --git a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h rename to InstructorsAndTrainees/trainees/viewertrainees.h diff --git a/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.ui b/InstructorsAndTrainees/trainees/viewertrainees.ui similarity index 100% rename from DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.ui rename to InstructorsAndTrainees/trainees/viewertrainees.ui diff --git a/DB_IaT/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm similarity index 100% rename from DB_IaT/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm rename to InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm diff --git a/DB_IaT/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts similarity index 100% rename from DB_IaT/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts rename to InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts diff --git a/ServerLMS/ServerLMS/CMakeLists.txt b/ServerLMS/CMakeLists.txt similarity index 85% rename from ServerLMS/ServerLMS/CMakeLists.txt rename to ServerLMS/CMakeLists.txt index 6254547..31ad5f0 100644 --- a/ServerLMS/ServerLMS/CMakeLists.txt +++ b/ServerLMS/CMakeLists.txt @@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5) project(ServerLMS LANGUAGES CXX) -get_filename_component(PROJECT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) -get_filename_component(REPO_PATH ${PROJECT_PATH} DIRECTORY) +get_filename_component(REPO_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOUIC ON) @@ -77,11 +76,11 @@ target_link_libraries(ServerLMS PRIVATE Qt5::Sql) target_link_libraries(ServerLMS PRIVATE Qt5::Xml) -target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS) +target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) if(PROJECT_TYPE_DEBUG) - target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64) + target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) elseif() - target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64) + target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) endif() target_link_libraries(ServerLMS PRIVATE libDataBaseLMS.dll) @@ -93,12 +92,12 @@ if(PROJECT_TYPE_DEBUG) add_custom_command(TARGET ServerLMS POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/ServerLMS/Debug64/libServerLMS.dll - ${REPO_PATH}/BUILDS/TestServerLMS/Debug64) + ${REPO_PATH}/BUILDS/Debug64/ServerLMS/libServerLMS.dll + ${REPO_PATH}/BUILDS/Debug64/TestServerLMS) elseif() add_custom_command(TARGET ServerLMS POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/ServerLMS/Release64/libServerLMS.dll - ${REPO_PATH}/BUILDS/TestServerLMS/Release64) + ${REPO_PATH}/BUILDS/Release64/ServerLMS/libServerLMS.dll + ${REPO_PATH}/BUILDS/Release64/TestServerLMS) endif() diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user.00ce76f b/ServerLMS/CMakeLists.txt.user.00ce76f similarity index 100% rename from ServerLMS/ServerLMS/CMakeLists.txt.user.00ce76f rename to ServerLMS/CMakeLists.txt.user.00ce76f diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user.02bbda2 b/ServerLMS/CMakeLists.txt.user.02bbda2 similarity index 100% rename from ServerLMS/ServerLMS/CMakeLists.txt.user.02bbda2 rename to ServerLMS/CMakeLists.txt.user.02bbda2 diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user.15ef247 b/ServerLMS/CMakeLists.txt.user.15ef247 similarity index 100% rename from ServerLMS/ServerLMS/CMakeLists.txt.user.15ef247 rename to ServerLMS/CMakeLists.txt.user.15ef247 diff --git a/ServerLMS/ServerLMS/Data/Client.h b/ServerLMS/Data/Client.h similarity index 100% rename from ServerLMS/ServerLMS/Data/Client.h rename to ServerLMS/Data/Client.h diff --git a/ServerLMS/ServerLMS/Data/PacketType.h b/ServerLMS/Data/PacketType.h similarity index 100% rename from ServerLMS/ServerLMS/Data/PacketType.h rename to ServerLMS/Data/PacketType.h diff --git a/ServerLMS/ServerLMS/Data/StreamingVersionData.h b/ServerLMS/Data/StreamingVersionData.h similarity index 100% rename from ServerLMS/ServerLMS/Data/StreamingVersionData.h rename to ServerLMS/Data/StreamingVersionData.h diff --git a/ServerLMS/ServerLMS/Data/typesDataServerClient.h b/ServerLMS/Data/typesDataServerClient.h similarity index 100% rename from ServerLMS/ServerLMS/Data/typesDataServerClient.h rename to ServerLMS/Data/typesDataServerClient.h diff --git a/ServerLMS/ServerLMS/ServerLMS_global.h b/ServerLMS/ServerLMS_global.h similarity index 100% rename from ServerLMS/ServerLMS/ServerLMS_global.h rename to ServerLMS/ServerLMS_global.h diff --git a/ServerLMS/ServerLMS/Systems/Parsers/clientanswerparser.cpp b/ServerLMS/Systems/Parsers/clientanswerparser.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/Parsers/clientanswerparser.cpp rename to ServerLMS/Systems/Parsers/clientanswerparser.cpp diff --git a/ServerLMS/ServerLMS/Systems/Parsers/clientanswerparser.h b/ServerLMS/Systems/Parsers/clientanswerparser.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/Parsers/clientanswerparser.h rename to ServerLMS/Systems/Parsers/clientanswerparser.h diff --git a/ServerLMS/ServerLMS/Systems/Parsers/dataparser.cpp b/ServerLMS/Systems/Parsers/dataparser.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/Parsers/dataparser.cpp rename to ServerLMS/Systems/Parsers/dataparser.cpp diff --git a/ServerLMS/ServerLMS/Systems/Parsers/dataparser.h b/ServerLMS/Systems/Parsers/dataparser.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/Parsers/dataparser.h rename to ServerLMS/Systems/Parsers/dataparser.h diff --git a/ServerLMS/ServerLMS/Systems/Parsers/dbanswerparser.cpp b/ServerLMS/Systems/Parsers/dbanswerparser.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/Parsers/dbanswerparser.cpp rename to ServerLMS/Systems/Parsers/dbanswerparser.cpp diff --git a/ServerLMS/ServerLMS/Systems/Parsers/dbanswerparser.h b/ServerLMS/Systems/Parsers/dbanswerparser.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/Parsers/dbanswerparser.h rename to ServerLMS/Systems/Parsers/dbanswerparser.h diff --git a/ServerLMS/ServerLMS/Systems/Parsers/processparser.cpp b/ServerLMS/Systems/Parsers/processparser.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/Parsers/processparser.cpp rename to ServerLMS/Systems/Parsers/processparser.cpp diff --git a/ServerLMS/ServerLMS/Systems/Parsers/processparser.h b/ServerLMS/Systems/Parsers/processparser.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/Parsers/processparser.h rename to ServerLMS/Systems/Parsers/processparser.h diff --git a/ServerLMS/ServerLMS/Systems/assetsmanager.cpp b/ServerLMS/Systems/assetsmanager.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/assetsmanager.cpp rename to ServerLMS/Systems/assetsmanager.cpp diff --git a/ServerLMS/ServerLMS/Systems/assetsmanager.h b/ServerLMS/Systems/assetsmanager.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/assetsmanager.h rename to ServerLMS/Systems/assetsmanager.h diff --git a/ServerLMS/ServerLMS/Systems/commonclienthandler.cpp b/ServerLMS/Systems/commonclienthandler.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/commonclienthandler.cpp rename to ServerLMS/Systems/commonclienthandler.cpp diff --git a/ServerLMS/ServerLMS/Systems/commonclienthandler.h b/ServerLMS/Systems/commonclienthandler.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/commonclienthandler.h rename to ServerLMS/Systems/commonclienthandler.h diff --git a/ServerLMS/ServerLMS/Systems/logger.cpp b/ServerLMS/Systems/logger.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/logger.cpp rename to ServerLMS/Systems/logger.cpp diff --git a/ServerLMS/ServerLMS/Systems/logger.h b/ServerLMS/Systems/logger.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/logger.h rename to ServerLMS/Systems/logger.h diff --git a/ServerLMS/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/Systems/processingsystem.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/processingsystem.cpp rename to ServerLMS/Systems/processingsystem.cpp diff --git a/ServerLMS/ServerLMS/Systems/processingsystem.h b/ServerLMS/Systems/processingsystem.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/processingsystem.h rename to ServerLMS/Systems/processingsystem.h diff --git a/ServerLMS/ServerLMS/Systems/recognizesystem.cpp b/ServerLMS/Systems/recognizesystem.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/recognizesystem.cpp rename to ServerLMS/Systems/recognizesystem.cpp diff --git a/ServerLMS/ServerLMS/Systems/recognizesystem.h b/ServerLMS/Systems/recognizesystem.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/recognizesystem.h rename to ServerLMS/Systems/recognizesystem.h diff --git a/ServerLMS/ServerLMS/Systems/sendsystem.cpp b/ServerLMS/Systems/sendsystem.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/sendsystem.cpp rename to ServerLMS/Systems/sendsystem.cpp diff --git a/ServerLMS/ServerLMS/Systems/sendsystem.h b/ServerLMS/Systems/sendsystem.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/sendsystem.h rename to ServerLMS/Systems/sendsystem.h diff --git a/ServerLMS/ServerLMS/Systems/tools.cpp b/ServerLMS/Systems/tools.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/tools.cpp rename to ServerLMS/Systems/tools.cpp diff --git a/ServerLMS/ServerLMS/Systems/tools.h b/ServerLMS/Systems/tools.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/tools.h rename to ServerLMS/Systems/tools.h diff --git a/ServerLMS/ServerLMS/Systems/updatecontroller.cpp b/ServerLMS/Systems/updatecontroller.cpp similarity index 100% rename from ServerLMS/ServerLMS/Systems/updatecontroller.cpp rename to ServerLMS/Systems/updatecontroller.cpp diff --git a/ServerLMS/ServerLMS/Systems/updatecontroller.h b/ServerLMS/Systems/updatecontroller.h similarity index 100% rename from ServerLMS/ServerLMS/Systems/updatecontroller.h rename to ServerLMS/Systems/updatecontroller.h diff --git a/ServerLMS/ServerLMS/clienthandler.cpp b/ServerLMS/clienthandler.cpp similarity index 100% rename from ServerLMS/ServerLMS/clienthandler.cpp rename to ServerLMS/clienthandler.cpp diff --git a/ServerLMS/ServerLMS/clienthandler.h b/ServerLMS/clienthandler.h similarity index 100% rename from ServerLMS/ServerLMS/clienthandler.h rename to ServerLMS/clienthandler.h diff --git a/ServerLMS/ServerLMS/multithreadserver.cpp b/ServerLMS/multithreadserver.cpp similarity index 100% rename from ServerLMS/ServerLMS/multithreadserver.cpp rename to ServerLMS/multithreadserver.cpp diff --git a/ServerLMS/ServerLMS/multithreadserver.h b/ServerLMS/multithreadserver.h similarity index 100% rename from ServerLMS/ServerLMS/multithreadserver.h rename to ServerLMS/multithreadserver.h diff --git a/ServerLMS/ServerLMS/providerdblms.cpp b/ServerLMS/providerdblms.cpp similarity index 100% rename from ServerLMS/ServerLMS/providerdblms.cpp rename to ServerLMS/providerdblms.cpp diff --git a/ServerLMS/ServerLMS/providerdblms.h b/ServerLMS/providerdblms.h similarity index 100% rename from ServerLMS/ServerLMS/providerdblms.h rename to ServerLMS/providerdblms.h diff --git a/ServerLMS/ServerLMS/resources.qrc b/ServerLMS/resources.qrc similarity index 100% rename from ServerLMS/ServerLMS/resources.qrc rename to ServerLMS/resources.qrc diff --git a/ServerLMS/ServerLMS/resources/blankXML/ListGroups.xml b/ServerLMS/resources/blankXML/ListGroups.xml similarity index 100% rename from ServerLMS/ServerLMS/resources/blankXML/ListGroups.xml rename to ServerLMS/resources/blankXML/ListGroups.xml diff --git a/ServerLMS/ServerLMS/resources/blankXML/ListInstructors.xml b/ServerLMS/resources/blankXML/ListInstructors.xml similarity index 100% rename from ServerLMS/ServerLMS/resources/blankXML/ListInstructors.xml rename to ServerLMS/resources/blankXML/ListInstructors.xml diff --git a/ServerLMS/ServerLMS/resources/blankXML/ListTrainees.xml b/ServerLMS/resources/blankXML/ListTrainees.xml similarity index 100% rename from ServerLMS/ServerLMS/resources/blankXML/ListTrainees.xml rename to ServerLMS/resources/blankXML/ListTrainees.xml diff --git a/ServerLMS/ServerLMS/resources/icons/switchOff.png b/ServerLMS/resources/icons/switchOff.png similarity index 100% rename from ServerLMS/ServerLMS/resources/icons/switchOff.png rename to ServerLMS/resources/icons/switchOff.png diff --git a/ServerLMS/ServerLMS/resources/icons/switchOn.png b/ServerLMS/resources/icons/switchOn.png similarity index 100% rename from ServerLMS/ServerLMS/resources/icons/switchOn.png rename to ServerLMS/resources/icons/switchOn.png diff --git a/ServerLMS/ServerLMS/serverlmswidget.cpp b/ServerLMS/serverlmswidget.cpp similarity index 100% rename from ServerLMS/ServerLMS/serverlmswidget.cpp rename to ServerLMS/serverlmswidget.cpp diff --git a/ServerLMS/ServerLMS/serverlmswidget.h b/ServerLMS/serverlmswidget.h similarity index 100% rename from ServerLMS/ServerLMS/serverlmswidget.h rename to ServerLMS/serverlmswidget.h diff --git a/ServerLMS/ServerLMS/serverlmswidget.ui b/ServerLMS/serverlmswidget.ui similarity index 100% rename from ServerLMS/ServerLMS/serverlmswidget.ui rename to ServerLMS/serverlmswidget.ui diff --git a/ServerLMS/ServerLMS/translations/ServerLMS_ru_RU.qm b/ServerLMS/translations/ServerLMS_ru_RU.qm similarity index 100% rename from ServerLMS/ServerLMS/translations/ServerLMS_ru_RU.qm rename to ServerLMS/translations/ServerLMS_ru_RU.qm diff --git a/ServerLMS/ServerLMS/translations/ServerLMS_ru_RU.ts b/ServerLMS/translations/ServerLMS_ru_RU.ts similarity index 100% rename from ServerLMS/ServerLMS/translations/ServerLMS_ru_RU.ts rename to ServerLMS/translations/ServerLMS_ru_RU.ts diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt b/TestServerLMS/CMakeLists.txt similarity index 83% rename from TestServerLMS/TestServerLMS/CMakeLists.txt rename to TestServerLMS/CMakeLists.txt index 9c69ead..29e4313 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt +++ b/TestServerLMS/CMakeLists.txt @@ -4,8 +4,7 @@ project(TestServerLMS LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) -get_filename_component(PROJECT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) -get_filename_component(REPO_PATH ${PROJECT_PATH} DIRECTORY) +get_filename_component(REPO_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) @@ -42,18 +41,18 @@ target_link_libraries(TestServerLMS PRIVATE Qt5::Sql) target_link_libraries(TestServerLMS PRIVATE Qt5::Xml) message("${CMAKE_CURRENT_SOURCE_DIR}") -target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS) +target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) if(PROJECT_TYPE_DEBUG) - target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64) + target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) elseif() - target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64) + target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) endif() target_link_libraries(TestServerLMS PRIVATE libDataBaseLMS.dll) -target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../ServerLMS/ServerLMS) +target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS) if(PROJECT_TYPE_DEBUG) - target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/ServerLMS/Debug64) + target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/ServerLMS) elseif() - target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/ServerLMS/Release64) + target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/ServerLMS) endif() target_link_libraries(TestServerLMS PRIVATE libServerLMS.dll) diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt.user.00ce76f b/TestServerLMS/CMakeLists.txt.user.00ce76f similarity index 100% rename from TestServerLMS/TestServerLMS/CMakeLists.txt.user.00ce76f rename to TestServerLMS/CMakeLists.txt.user.00ce76f diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt.user.15ef247 b/TestServerLMS/CMakeLists.txt.user.15ef247 similarity index 100% rename from TestServerLMS/TestServerLMS/CMakeLists.txt.user.15ef247 rename to TestServerLMS/CMakeLists.txt.user.15ef247 diff --git a/TestServerLMS/TestServerLMS/main.cpp b/TestServerLMS/main.cpp similarity index 100% rename from TestServerLMS/TestServerLMS/main.cpp rename to TestServerLMS/main.cpp diff --git a/TestServerLMS/TestServerLMS/mainwindow.cpp b/TestServerLMS/mainwindow.cpp similarity index 100% rename from TestServerLMS/TestServerLMS/mainwindow.cpp rename to TestServerLMS/mainwindow.cpp diff --git a/TestServerLMS/TestServerLMS/mainwindow.h b/TestServerLMS/mainwindow.h similarity index 100% rename from TestServerLMS/TestServerLMS/mainwindow.h rename to TestServerLMS/mainwindow.h diff --git a/TestServerLMS/TestServerLMS/mainwindow.ui b/TestServerLMS/mainwindow.ui similarity index 100% rename from TestServerLMS/TestServerLMS/mainwindow.ui rename to TestServerLMS/mainwindow.ui diff --git a/TestServerLMS/TestServerLMS/testServerLMS.qrc b/TestServerLMS/testServerLMS.qrc similarity index 100% rename from TestServerLMS/TestServerLMS/testServerLMS.qrc rename to TestServerLMS/testServerLMS.qrc diff --git a/TestServerLMS/TestServerLMS/translations/testServerLMS_ru_RU.qm b/TestServerLMS/translations/testServerLMS_ru_RU.qm similarity index 100% rename from TestServerLMS/TestServerLMS/translations/testServerLMS_ru_RU.qm rename to TestServerLMS/translations/testServerLMS_ru_RU.qm diff --git a/TestServerLMS/TestServerLMS/translations/testServerLMS_ru_RU.ts b/TestServerLMS/translations/testServerLMS_ru_RU.ts similarity index 100% rename from TestServerLMS/TestServerLMS/translations/testServerLMS_ru_RU.ts rename to TestServerLMS/translations/testServerLMS_ru_RU.ts