From 04e6e6766b4525ed622ecf2517f848cd08bc1234 Mon Sep 17 00:00:00 2001 From: kotcheshir73 Date: Fri, 18 Mar 2022 22:38:52 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20Mod?= =?UTF-8?q?uleTools=20=D0=BD=D0=B0=20ToolsModule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Attributes/EntityDependencyAttribute.cs | 39 --- .../Attributes/EntityDescriptionAttribute.cs | 32 --- .../Attributes/ViewModelPropertyAttribute.cs | 36 --- .../BindingModels/AccessBindingModel.cs | 20 -- .../BindingModels/GetBinidingModel.cs | 15 -- .../BindingModels/PageSettingBinidingModel.cs | 23 -- .../BindingModels/SetBinidingModel.cs | 15 -- .../Common/CommonTools/CommonTools.csproj | 7 - .../Enums/ResultServiceStatusCode.cs | 38 --- .../Extensions/OperationResultExtensions.cs | 66 ----- .../OperationResultModel.cs | 41 ---- .../ViewModels/ElementViewModel.cs | 14 -- .../CommonTools/ViewModels/ListViewModel.cs | 16 -- .../Common/CoreModels/CoreModels.csproj | 2 +- .../ModelsDepartment/IAcademicPlanModel.cs | 2 +- .../IAcademicPlanRecordModel.cs | 2 +- .../IAcademicPlanRecordTimeNormHourModel.cs | 2 +- .../ModelsDepartment/IClassroomModel.cs | 2 +- .../ModelsDepartment/IDisciplineBlockModel.cs | 2 +- .../ModelsDepartment/IDisciplineModel.cs | 2 +- .../IEducationDirectionModel.cs | 2 +- .../ModelsDepartment/IEmployeeModel.cs | 2 +- .../ModelsDepartment/IEmployeePostModel.cs | 2 +- .../ILecturerAcademicDegreeModel.cs | 2 +- .../ILecturerAcademicRankModel.cs | 2 +- .../ModelsDepartment/ILecturerModel.cs | 2 +- .../ModelsDepartment/ILecturerPostModel.cs | 2 +- .../ModelsDepartment/IOrderModel.cs | 2 +- .../IOrderStudentRecordModel.cs | 2 +- .../IOrderSyncHistoryModel.cs | 2 +- .../IOrderSyncHistoryRecordModel.cs | 2 +- .../CoreModels/ModelsDepartment/IPostModel.cs | 2 +- .../ModelsDepartment/IStudentGroupModel.cs | 2 +- .../ModelsDepartment/IStudentModel.cs | 2 +- .../ModelsDepartment/ITimeNormModel.cs | 2 +- .../CoreModels/ModelsSecurity/IAccessModel.cs | 4 +- .../ModelsSecurity/IEnviromentSettingModel.cs | 2 +- .../CoreModels/ModelsSecurity/IRoleModel.cs | 2 +- .../CoreModels/ModelsSecurity/IUserModel.cs | 2 +- .../ModelsSecurity/IUserRoleModel.cs | 2 +- .../AbstractGenerticEntityService.cs | 12 +- .../Common/DatabaseCore/DatabaseContext.cs | 2 +- .../Common/DatabaseCore/DatabaseCore.csproj | 2 +- .../Models/Department/AcademicPlan.cs | 2 +- .../Models/Department/AcademicPlanRecord.cs | 2 +- .../AcademicPlanRecordTimeNormHour.cs | 2 +- .../Models/Department/Classroom.cs | 2 +- .../Models/Department/Discipline.cs | 2 +- .../Models/Department/DisciplineBlock.cs | 2 +- .../Models/Department/EducationDirection.cs | 2 +- .../Models/Department/Employee.cs | 4 +- .../Models/Department/EmployeePost.cs | 2 +- .../Models/Department/Lecturer.cs | 4 +- .../Department/LecturerAcademicDegree.cs | 2 +- .../Models/Department/LecturerAcademicRank.cs | 2 +- .../Models/Department/LecturerPost.cs | 2 +- .../DatabaseCore/Models/Department/Order.cs | 2 +- .../Models/Department/OrderStudentRecord.cs | 2 +- .../Models/Department/OrderSyncHistory.cs | 2 +- .../Department/OrderSyncHistoryRecord.cs | 2 +- .../DatabaseCore/Models/Department/Post.cs | 2 +- .../DatabaseCore/Models/Department/Student.cs | 4 +- .../Models/Department/StudentGroup.cs | 2 +- .../Models/Department/TimeNorm.cs | 2 +- .../Common/DatabaseCore/Models/IdEntity.cs | 2 +- .../DatabaseCore/Models/Security/Access.cs | 4 +- .../Models/Security/EnviromentSetting.cs | 2 +- .../DatabaseCore/Models/Security/Role.cs | 2 +- .../DatabaseCore/Models/Security/User.cs | 4 +- .../DatabaseCore/Models/Security/UserRole.cs | 2 +- .../Common/DatabaseCore/SecurityManager.cs | 6 +- .../BaseControls/AbstractBaseControl.cs | 2 +- .../BaseControls/BaseControlDateTime.cs | 2 +- .../BaseControls/BaseControlString.cs | 2 +- .../BaseControls/BaseControlText.cs | 2 +- .../BusinessLogics/DesktopLoader.cs | 2 +- .../Common/DesktopTools/DesktopTools.csproj | 2 +- .../DesktopTools/Interfaces/IControl.cs | 2 +- .../GenericControlEntityElement.cs | 12 +- .../MainControls/GenericControlEntityList.cs | 12 +- .../MainControlViewEntityElement.cs | 2 +- .../MainControls/MainControlViewEntityList.cs | 2 +- .../Attributes/EntityDependencyAttribute.cs | 40 ---- .../Attributes/EntityDescriptionAttribute.cs | 33 --- .../Attributes/MapConfigurationAttribute.cs | 35 --- .../ViewModelOnListPropertyAttribute.cs | 51 ---- .../BindingModels/AccessBindingModel.cs | 20 -- .../BindingModels/GetBindingModel.cs | 30 --- .../BindingModels/SetBindingModel.cs | 15 -- .../BusinessLogics/BusinessLogicCore.cs | 226 ------------------ .../ModelTools/BusinessLogics/Mapper.cs | 100 -------- .../BusinessLogics/ServiceProviderLoader.cs | 112 --------- .../UnityContainerConfigurator.cs | 54 ----- .../ModelTools/Enums/AccessOperation.cs | 100 -------- .../Common/ModelTools/Enums/AccessType.cs | 28 --- .../Enums/ResultServiceStatusCode.cs | 38 --- .../ModelTools/Interfaces/IEntityService.cs | 41 ---- .../Interfaces/IImplementationExtension.cs | 13 - .../Interfaces/IWindowDesktopExtension.cs | 17 -- .../ModelTools/Models/OperationResultModel.cs | 114 --------- .../Models/SecurityManagerCheckAccessModel.cs | 39 --- .../WindowDesktopExtensionControlModel.cs | 19 -- .../ModelTools/ViewModels/ElementViewModel.cs | 15 -- .../ModuleTools/Extensions/StringExtension.cs | 28 --- .../Interfaces/ISecurityManager.cs | 67 ------ .../Common/ModuleTools/ModuleTools.csproj | 11 - .../ModuleTools/ViewModels/ListViewModel.cs | 16 -- .../Attributes/CheckRigthForMapAttribute.cs | 2 +- .../Attributes/EntityDependencyAttribute.cs | 2 +- .../Attributes/EntityDescriptionAttribute.cs | 2 +- .../Attributes/MapConfigurationAttribute.cs | 2 +- .../ViewModelControlElementClassAttribute.cs | 2 +- ...ControlElementDependenceEntityAttribute.cs | 2 +- ...iewModelControlElementPropertyAttribute.cs | 4 +- .../ViewModelControlListPropertyAttribute.cs | 2 +- .../BindingModels/AccessBindingModel.cs | 2 +- .../BindingModels/GetBindingModel.cs | 2 +- .../BindingModels/SetBindingModel.cs | 4 +- .../BusinessLogics/CoreBusinessLogic.cs | 10 +- .../BusinessLogics/DependencyManager.cs | 4 +- .../BusinessLogics/GenericBusinessLogic.cs | 10 +- .../BusinessLogics/Mapper.cs | 4 +- .../BusinessLogics/ServiceProviderLoader.cs | 6 +- .../BusinessLogics/UnityContainerManager.cs | 4 +- .../Enums/AccessOperation.cs | 2 +- .../Enums/AccessType.cs | 2 +- .../Enums/ControlType.cs | 2 +- .../Enums/ResultServiceStatusCode.cs | 2 +- .../Extensions/StringExtension.cs | 2 +- .../Interfaces/IDependencyManager.cs | 2 +- .../Interfaces/IEntitySecurityExtenstion.cs | 2 +- .../Interfaces/IGenerticEntityService.cs | 6 +- .../Interfaces/IImplementationExtension.cs | 2 +- .../Interfaces/ISecurityManager.cs | 4 +- .../Models/OperationResultModel.cs | 4 +- .../Models/SecurityManagerCheckAccessModel.cs | 6 +- .../ToolsModule.csproj} | 0 .../ViewModels/ElementViewModel.cs | 4 +- .../ViewModels/ListViewModel.cs | 2 +- .../AcademicPlanBindingModels.cs | 2 +- .../AcademicPlanRecordBindingModels.cs | 2 +- ...emicPlanRecordTimeNormHourBindingModels.cs | 2 +- .../BindingModels/ClassroomBindingModels.cs | 2 +- .../BindingModels/DisciplineBindingModels.cs | 2 +- .../DisciplineBlockBindingModels.cs | 2 +- .../EducationDirectionBindingModels.cs | 2 +- .../BindingModels/EmployeeBindingModels.cs | 2 +- .../EmployeePostBindingModels.cs | 2 +- .../LecturerAcademicDegreeBindingModels.cs | 2 +- .../LecturerAcademicRankBindingModels.cs | 4 +- .../BindingModels/LecturerBindingModels.cs | 2 +- .../LecturerPostBindingModels.cs | 2 +- .../BindingModels/OrderBindingModels.cs | 2 +- .../OrderStudentRecordBindingModel.cs | 2 +- .../OrderSyncHistoryBindingModels.cs | 2 +- .../OrderSyncHistoryRecordBindingModels.cs | 2 +- .../BindingModels/PostBindingModels.cs | 2 +- .../BindingModels/StudentBindingModels.cs | 2 +- .../StudentGroupBindingModels.cs | 2 +- .../BindingModels/TimeNormBindingModels.cs | 2 +- .../AcademicPlanBusinessLogic.cs | 4 +- .../AcademicPlanRecordBusinessLogic.cs | 4 +- ...emicPlanRecordTimeNormHourBusinessLogic.cs | 4 +- .../BusinessLogics/ClassroomBusinessLogic.cs | 4 +- .../DisciplineBlockBusinessLogic.cs | 4 +- .../BusinessLogics/DisciplineBusinessLogic.cs | 4 +- .../EducationDirectionBusinessLogic.cs | 4 +- .../BusinessLogics/EmployeeBusinessLogic.cs | 4 +- .../EmployeePostBusinessLogic.cs | 4 +- .../LecturerAcademicDegreeBusinessLogic.cs | 4 +- .../LecturerAcademicRankBusinessLogic.cs | 4 +- .../BusinessLogics/LecturerBusinessLogic.cs | 4 +- .../LecturerPostBusinessLogic.cs | 4 +- .../BusinessLogics/OrderBusinessLogic.cs | 4 +- .../OrderStudentRecordBusinessLogic.cs | 4 +- .../OrderSyncHistoryBusinessLogic.cs | 8 +- .../OrderSyncHistoryRecordBusinessLogic.cs | 4 +- .../BusinessLogics/PostBusinessLogic.cs | 4 +- .../BusinessLogics/StudentBusinessLogic.cs | 4 +- .../StudentGroupBusinessLogic.cs | 4 +- .../BusinessLogics/TimeNormBusinessLogic.cs | 4 +- .../DepartmentBusinessLogic.csproj | 1 - .../Interfaces/IAcademicPlanRecordService.cs | 2 +- .../IAcademicPlanRecordTimeNormHourService.cs | 2 +- .../Interfaces/IAcademicPlanService.cs | 4 +- .../Interfaces/IClassroomService.cs | 2 +- .../Interfaces/IDisciplineBlockService.cs | 2 +- .../Interfaces/IDisciplineService.cs | 2 +- .../Interfaces/IEducationDirectionService.cs | 2 +- .../Interfaces/IEmployeePostService.cs | 2 +- .../Interfaces/IEmployeeService.cs | 2 +- .../ILecturerAcademicDegreeService.cs | 2 +- .../ILecturerAcademicRankService.cs | 2 +- .../Interfaces/ILecturerPostService.cs | 2 +- .../Interfaces/ILecturerService.cs | 2 +- .../Interfaces/IOrderService.cs | 2 +- .../Interfaces/IOrderStudentRecordService.cs | 2 +- .../IOrderSyncHistoryRecordService.cs | 2 +- .../Interfaces/IOrderSyncHistoryService.cs | 2 +- .../Interfaces/IPostService.cs | 2 +- .../Interfaces/IStudentGroupService.cs | 2 +- .../Interfaces/IStudentService.cs | 2 +- .../Interfaces/ITimeNormService.cs | 2 +- ...cademicPlanRecordTimeNormHourViewModels.cs | 6 +- .../AcademicPlanRecordViewModels.cs | 6 +- .../ViewModels/AcademicPlanViewModels.cs | 6 +- .../ViewModels/ClassroomViewModels.cs | 6 +- .../ViewModels/DisciplineBlockViewModels.cs | 6 +- .../ViewModels/DisciplineViewModels.cs | 6 +- .../EducationDirectionViewModels.cs | 6 +- .../ViewModels/EmployeePostViewModels.cs | 6 +- .../ViewModels/EmployeeViewModels.cs | 6 +- .../LecturerAcademicDegreeViewModels.cs | 6 +- .../LecturerAcademicRankViewModels.cs | 6 +- .../ViewModels/LecturerPostViewModels.cs | 6 +- .../ViewModels/LecturerViewModels.cs | 6 +- .../ViewModels/OrderStudentRecordViewModel.cs | 6 +- .../OrderSyncHistoryRecordViewModels.cs | 6 +- .../ViewModels/OrderSyncHistoryViewModels.cs | 6 +- .../ViewModels/OrderViewModels.cs | 6 +- .../ViewModels/PostViewModels.cs | 6 +- .../ViewModels/StudentGroupViewModels.cs | 6 +- .../ViewModels/StudentViewModels.cs | 6 +- .../ViewModels/TimeNormViewModels.cs | 6 +- .../DepartmentImplementationExtensions.cs | 4 +- .../AcademicPlanRecordService.cs | 2 +- .../AcademicPlanRecordTimeNormHourService.cs | 2 +- .../Implementations/AcademicPlanService.cs | 6 +- .../Implementations/ClassroomService.cs | 2 +- .../Implementations/DisciplineBlockService.cs | 4 +- .../Implementations/DisciplineService.cs | 6 +- .../EducationDirectionService.cs | 4 +- .../Implementations/EmployeePostService.cs | 2 +- .../Implementations/EmployeeService.cs | 4 +- .../LecturerAcademicDegreeService.cs | 4 +- .../LecturerAcademicRankService.cs | 4 +- .../Implementations/LecturerPostService.cs | 2 +- .../Implementations/LecturerService.cs | 4 +- .../Implementations/OrderService.cs | 6 +- .../OrderStudentRecordService.cs | 2 +- .../OrderSyncHistoryRecordService.cs | 6 +- .../OrderSyncHistoryService.cs | 6 +- .../Implementations/PostService.cs | 4 +- .../Implementations/StudentGroupService.cs | 4 +- .../Implementations/StudentService.cs | 4 +- .../Implementations/TimeNormService.cs | 2 +- .../DepartmentWindowDesktopExtension.cs | 10 +- .../AcademicPlan/ControlAcademicPlanList.cs | 2 +- .../ControlAcademicPlanRecordList.cs | 2 +- ...ntrolAcademicPlanRecordTimeNormHourList.cs | 2 +- .../Classroom/ControlClassroomList.cs | 2 +- .../Discipline/ControlDisciplineList.cs | 4 +- .../ControlDisciplineBlockList.cs | 2 +- .../ControlEducationDirectionList.cs | 2 +- .../Employee/ControlEmployeeElement.cs | 4 +- .../Employee/ControlEmployeeList.cs | 2 +- .../EmployeePost/ControlEmployeePostList.cs | 2 +- .../Lecturer/ControlLecturerElement.cs | 4 +- .../Lecturer/ControlLecturerList.cs | 2 +- .../ControlLecturerAcademicDegreeList.cs | 2 +- .../ControlLecturerAcademicRankList.cs | 2 +- .../LecturerPost/ControlLecturerPostList.cs | 2 +- .../EntityControls/Order/ControlOrderList.cs | 2 +- .../ControlOrderStudentRecordList.cs | 2 +- .../ControlOrderSyncHistoryList.cs | 2 +- .../ControlOrderSyncHistoryRecordList.cs | 2 +- .../EntityControls/Post/ControlPostList.cs | 2 +- .../Student/ControlStudentElement.cs | 4 +- .../Student/ControlStudentList.cs | 2 +- .../StudentGroup/ControlStudentGroupList.cs | 2 +- .../TimeNorm/ControlTimeNormList.cs | 2 +- DepartmentPortal/DepartmentPortal.sln | 16 +- .../DepartmentPortalDesctop/FormEnter.cs | 6 +- .../DepartmentPortalDesctop/Program.cs | 4 +- .../BindingModels/AccessBindingModels.cs | 4 +- .../EnviromentSettingBindingModels.cs | 2 +- .../BindingModels/RoleBindingModels.cs | 2 +- .../BindingModels/UserBindingModels.cs | 2 +- .../BindingModels/UserRoleBindingModels.cs | 2 +- .../BusinessLogics/AccessBusinessLogic.cs | 4 +- .../BusinessLogics/BackupBusinessLogic.cs | 6 +- .../EnviromentSettingBusinessLogic.cs | 4 +- .../BusinessLogics/RoleBusinessLogic.cs | 4 +- .../SynchronizationBusinessLogic.cs | 4 +- .../BusinessLogics/UserBusinessLogic.cs | 4 +- .../BusinessLogics/UserRoleBusinessLogic.cs | 4 +- .../Interfaces/IAccessService.cs | 2 +- .../Interfaces/IBackupService.cs | 2 +- .../Interfaces/IEnviromentSettingService.cs | 2 +- .../Interfaces/IRoleService.cs | 2 +- .../Interfaces/ISynchronizationService.cs | 2 +- .../Interfaces/IUserRoleService.cs | 2 +- .../Interfaces/IUserService.cs | 2 +- .../SecurityBusinessLogic.csproj | 1 - .../ViewModels/AccessViewModels.cs | 6 +- .../ViewModels/EnviromentSettingViewModels.cs | 6 +- .../ViewModels/RoleViewModels.cs | 6 +- .../ViewModels/UserRoleViewModels.cs | 6 +- .../ViewModels/UserViewModels.cs | 6 +- .../Implementations/AccessService.cs | 2 +- .../BackupJsonContractService.cs | 8 +- .../EnviromentSettingService.cs | 4 +- .../Implementations/RoleService.cs | 6 +- .../Implementations/SynchronizationService.cs | 2 +- .../Implementations/UserRoleService.cs | 2 +- .../Implementations/UserService.cs | 6 +- .../SecurityImplementationExtensions.cs | 4 +- .../Access/ControlAccessList.cs | 4 +- .../ControlEnviromentSettingList.cs | 2 +- .../EntityControls/Role/ControlRoleList.cs | 2 +- .../EntityControls/User/ControlUserList.cs | 2 +- .../UserRole/ControlUserRoleList.cs | 2 +- .../SecurityWindowDesktopExtension.cs | 10 +- .../SpecialControls/BackupControl.cs | 4 +- .../SpecialControls/SynchronizationControl.cs | 4 +- 315 files changed, 459 insertions(+), 2085 deletions(-) delete mode 100644 DepartmentPortal/Common/CommonTools/Attributes/EntityDependencyAttribute.cs delete mode 100644 DepartmentPortal/Common/CommonTools/Attributes/EntityDescriptionAttribute.cs delete mode 100644 DepartmentPortal/Common/CommonTools/Attributes/ViewModelPropertyAttribute.cs delete mode 100644 DepartmentPortal/Common/CommonTools/BindingModels/AccessBindingModel.cs delete mode 100644 DepartmentPortal/Common/CommonTools/BindingModels/GetBinidingModel.cs delete mode 100644 DepartmentPortal/Common/CommonTools/BindingModels/PageSettingBinidingModel.cs delete mode 100644 DepartmentPortal/Common/CommonTools/BindingModels/SetBinidingModel.cs delete mode 100644 DepartmentPortal/Common/CommonTools/CommonTools.csproj delete mode 100644 DepartmentPortal/Common/CommonTools/Enums/ResultServiceStatusCode.cs delete mode 100644 DepartmentPortal/Common/CommonTools/Extensions/OperationResultExtensions.cs delete mode 100644 DepartmentPortal/Common/CommonTools/OperationResultModels/OperationResultModel.cs delete mode 100644 DepartmentPortal/Common/CommonTools/ViewModels/ElementViewModel.cs delete mode 100644 DepartmentPortal/Common/CommonTools/ViewModels/ListViewModel.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Attributes/EntityDependencyAttribute.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Attributes/EntityDescriptionAttribute.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Attributes/MapConfigurationAttribute.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Attributes/ViewModelOnListPropertyAttribute.cs delete mode 100644 DepartmentPortal/Common/ModelTools/BindingModels/AccessBindingModel.cs delete mode 100644 DepartmentPortal/Common/ModelTools/BindingModels/GetBindingModel.cs delete mode 100644 DepartmentPortal/Common/ModelTools/BindingModels/SetBindingModel.cs delete mode 100644 DepartmentPortal/Common/ModelTools/BusinessLogics/BusinessLogicCore.cs delete mode 100644 DepartmentPortal/Common/ModelTools/BusinessLogics/Mapper.cs delete mode 100644 DepartmentPortal/Common/ModelTools/BusinessLogics/ServiceProviderLoader.cs delete mode 100644 DepartmentPortal/Common/ModelTools/BusinessLogics/UnityContainerConfigurator.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Enums/AccessOperation.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Enums/AccessType.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Enums/ResultServiceStatusCode.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Interfaces/IEntityService.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Interfaces/IImplementationExtension.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Interfaces/IWindowDesktopExtension.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Models/OperationResultModel.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Models/SecurityManagerCheckAccessModel.cs delete mode 100644 DepartmentPortal/Common/ModelTools/Models/WindowDesktopExtensionControlModel.cs delete mode 100644 DepartmentPortal/Common/ModelTools/ViewModels/ElementViewModel.cs delete mode 100644 DepartmentPortal/Common/ModuleTools/Extensions/StringExtension.cs delete mode 100644 DepartmentPortal/Common/ModuleTools/Interfaces/ISecurityManager.cs delete mode 100644 DepartmentPortal/Common/ModuleTools/ModuleTools.csproj delete mode 100644 DepartmentPortal/Common/ModuleTools/ViewModels/ListViewModel.cs rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Attributes/CheckRigthForMapAttribute.cs (92%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Attributes/EntityDependencyAttribute.cs (98%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Attributes/EntityDescriptionAttribute.cs (97%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Attributes/MapConfigurationAttribute.cs (98%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Attributes/ViewModelControlElementClassAttribute.cs (96%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Attributes/ViewModelControlElementDependenceEntityAttribute.cs (97%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Attributes/ViewModelControlElementPropertyAttribute.cs (97%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Attributes/ViewModelControlListPropertyAttribute.cs (97%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BindingModels/AccessBindingModel.cs (91%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BindingModels/GetBindingModel.cs (96%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BindingModels/SetBindingModel.cs (82%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BusinessLogics/CoreBusinessLogic.cs (90%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BusinessLogics/DependencyManager.cs (96%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BusinessLogics/GenericBusinessLogic.cs (96%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BusinessLogics/Mapper.cs (98%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BusinessLogics/ServiceProviderLoader.cs (95%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/BusinessLogics/UnityContainerManager.cs (90%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Enums/AccessOperation.cs (98%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Enums/AccessType.cs (91%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Enums/ControlType.cs (97%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Enums/ResultServiceStatusCode.cs (95%) rename DepartmentPortal/Common/{ModelTools => ToolsModule}/Extensions/StringExtension.cs (95%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Interfaces/IDependencyManager.cs (96%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Interfaces/IEntitySecurityExtenstion.cs (93%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Interfaces/IGenerticEntityService.cs (92%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Interfaces/IImplementationExtension.cs (88%) rename DepartmentPortal/Common/{ModelTools => ToolsModule}/Interfaces/ISecurityManager.cs (96%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Models/OperationResultModel.cs (98%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/Models/SecurityManagerCheckAccessModel.cs (90%) rename DepartmentPortal/Common/{ModelTools/ModelTools.csproj => ToolsModule/ToolsModule.csproj} (100%) rename DepartmentPortal/Common/{ModuleTools => ToolsModule}/ViewModels/ElementViewModel.cs (85%) rename DepartmentPortal/Common/{ModelTools => ToolsModule}/ViewModels/ListViewModel.cs (90%) diff --git a/DepartmentPortal/Common/CommonTools/Attributes/EntityDependencyAttribute.cs b/DepartmentPortal/Common/CommonTools/Attributes/EntityDependencyAttribute.cs deleted file mode 100644 index 190f05f..0000000 --- a/DepartmentPortal/Common/CommonTools/Attributes/EntityDependencyAttribute.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; - -namespace CommonTools.Attributes -{ - /// - /// Описание зависимости сущности от другой сущности (требуется для сохранения и загрузки данных) - /// - [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] - public class EntityDependencyAttribute : Attribute - { - /// - /// Название класса от котрого зависит этот класс - /// - public string ClassName { get; set; } - - /// - /// Название поле в этом классе, которое ссылает на другой класс (идентификатор) - /// - public string ColumnName { get; set; } - - /// - /// Описание зависимости - /// - public string Description { get; set; } - - /// - /// Конструктор - /// - /// Название класса от котрого зависит этот класс - /// Название поле в этом классе, которое ссылает на другой класс (идентификатор) - /// Описание зависимости - public EntityDependencyAttribute(string className, string columnName, string description) - { - ClassName = className; - ColumnName = columnName; - Description = description; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/Attributes/EntityDescriptionAttribute.cs b/DepartmentPortal/Common/CommonTools/Attributes/EntityDescriptionAttribute.cs deleted file mode 100644 index 746b2c9..0000000 --- a/DepartmentPortal/Common/CommonTools/Attributes/EntityDescriptionAttribute.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; - -namespace CommonTools.Attributes -{ - /// - /// Описание класса из базы данных, его назначение - /// - [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] - public class EntityDescriptionAttribute : Attribute - { - /// - /// Название сущности, которую описывает класс - /// - public string EntityName { get; set; } - - /// - /// Описание назначения сущности - /// - public string Description { get; set; } - - /// - /// Конструктор - /// - /// Название сущности, которую описывает класс - /// Описание назначения сущности - public EntityDescriptionAttribute(string entityName, string description) - { - EntityName = entityName; - Description = description; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/Attributes/ViewModelPropertyAttribute.cs b/DepartmentPortal/Common/CommonTools/Attributes/ViewModelPropertyAttribute.cs deleted file mode 100644 index 3e2ea0c..0000000 --- a/DepartmentPortal/Common/CommonTools/Attributes/ViewModelPropertyAttribute.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; - -namespace CommonTools.Attributes -{ - [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)] - public class ViewModelPropertyAttribute : Attribute - { - /// - /// Название на форме - /// - public string DisplayName { get; set; } - - /// - /// Скрывать или нет - /// - public bool IsHide { get; set; } - - /// - /// Ширина колонки - /// - public int ColumnWidth { get; set; } - - /// - /// Конструктор - /// - /// Название на форме - /// Скрывать или нет - /// Ширина колонки - public ViewModelPropertyAttribute(string displayName, int columnWidth, bool isHide = false) - { - DisplayName = displayName; - ColumnWidth = columnWidth; - IsHide = isHide; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/BindingModels/AccessBindingModel.cs b/DepartmentPortal/Common/CommonTools/BindingModels/AccessBindingModel.cs deleted file mode 100644 index 8e6675d..0000000 --- a/DepartmentPortal/Common/CommonTools/BindingModels/AccessBindingModel.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -namespace CommonTools.BindingModels -{ - /// - /// Информация для доступа к выполнению операций - /// - public class AccessBindingModel - { - /// - /// Пропускать проверку (работает только для получения данных) - /// - public bool SkipCheck { get; set; } - - /// - /// Идентификатор пользователя, который запрашивает выполнение операции - /// - public Guid? UserId { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/BindingModels/GetBinidingModel.cs b/DepartmentPortal/Common/CommonTools/BindingModels/GetBinidingModel.cs deleted file mode 100644 index 86f430c..0000000 --- a/DepartmentPortal/Common/CommonTools/BindingModels/GetBinidingModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace CommonTools.BindingModels -{ - /// - /// Получение записи по идентификатору - /// - public class GetBinidingModel : AccessBindingModel - { - /// - /// Идентификатор получаемой записи - /// - public Guid? Id { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/BindingModels/PageSettingBinidingModel.cs b/DepartmentPortal/Common/CommonTools/BindingModels/PageSettingBinidingModel.cs deleted file mode 100644 index 8391343..0000000 --- a/DepartmentPortal/Common/CommonTools/BindingModels/PageSettingBinidingModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace CommonTools.BindingModels -{ - /// - /// Пагинация для получения записей - /// - public class PageSettingBinidingModel : AccessBindingModel - { - /// - /// Номер страницы, которую получаем - /// - public int? PageNumber { get; set; } - - /// - /// Количество записей возвращаемых - /// - public int? PageSize { get; set; } - - /// - /// Иной признак, по которму отбираем записи - /// - public string PageName { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/BindingModels/SetBinidingModel.cs b/DepartmentPortal/Common/CommonTools/BindingModels/SetBinidingModel.cs deleted file mode 100644 index b05bcd5..0000000 --- a/DepartmentPortal/Common/CommonTools/BindingModels/SetBinidingModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace CommonTools.BindingModels -{ - /// - /// Сохранение записи по идентификатору - /// - public class SetBinidingModel : AccessBindingModel - { - /// - /// Идентификатор записи - /// - public Guid Id { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/CommonTools.csproj b/DepartmentPortal/Common/CommonTools/CommonTools.csproj deleted file mode 100644 index f208d30..0000000 --- a/DepartmentPortal/Common/CommonTools/CommonTools.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - net5.0 - - - diff --git a/DepartmentPortal/Common/CommonTools/Enums/ResultServiceStatusCode.cs b/DepartmentPortal/Common/CommonTools/Enums/ResultServiceStatusCode.cs deleted file mode 100644 index be03c80..0000000 --- a/DepartmentPortal/Common/CommonTools/Enums/ResultServiceStatusCode.cs +++ /dev/null @@ -1,38 +0,0 @@ -namespace CommonTools.Enums -{ - /// - /// Статус результата операции - /// - public enum ResultServiceStatusCode - { - /// - /// Успешно - /// - Success = 200, - - /// - /// Ошибка общая - /// - Error = 400, - - /// - /// Элемент уже сущствует - /// - ExsistItem = 401, - - /// - /// Запись удалена - /// - WasDelete = 402, - - /// - /// Не найдено - /// - NotFound = 404, - - /// - /// Не найден файл - /// - FileNotFound = 405 - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/Extensions/OperationResultExtensions.cs b/DepartmentPortal/Common/CommonTools/Extensions/OperationResultExtensions.cs deleted file mode 100644 index cee511d..0000000 --- a/DepartmentPortal/Common/CommonTools/Extensions/OperationResultExtensions.cs +++ /dev/null @@ -1,66 +0,0 @@ -using CommonTools.Enums; -using CommonTools.OperationResultModels; -using System; - -namespace CommonTools.Extensions -{ - /// - /// Расширения для результата операции - /// - public static class OperationResultExtensions - { - /// - /// Добавление простой ошибки - /// - /// - /// - /// - public static void AddError(this OperationResultModel model, string key, string value) => model.AddError(key, value, ResultServiceStatusCode.Error); - - /// - /// Добавление простой ошибки со сменой статуса - /// - /// - /// - /// - /// - public static void AddError(this OperationResultModel model, string key, string error, ResultServiceStatusCode statusCode) - { - model.Errors.Add((key, error)); - model.StatusCode = statusCode; - } - - /// - /// Добавление ошибки - /// - /// - /// - public static void AddError(this OperationResultModel model, Exception error) => model.AddError(error, ResultServiceStatusCode.Error); - - /// - /// Добавление ошибки - /// - /// - /// - /// - public static void AddError(this OperationResultModel model, Exception error, ResultServiceStatusCode statusCode) => model.AddError("Ошибка", error, statusCode); - - /// - /// Добавление ошибки (включая вложеннные) - /// - /// - /// - /// - /// - public static void AddError(this OperationResultModel model, string key, Exception error, ResultServiceStatusCode statusCode) - { - model.Errors.Add((key, error.Message)); - while (error.InnerException != null) - { - error = error.InnerException; - model.Errors.Add(("Inner error:", error.Message)); - } - model.StatusCode = statusCode; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/OperationResultModels/OperationResultModel.cs b/DepartmentPortal/Common/CommonTools/OperationResultModels/OperationResultModel.cs deleted file mode 100644 index ab9056b..0000000 --- a/DepartmentPortal/Common/CommonTools/OperationResultModels/OperationResultModel.cs +++ /dev/null @@ -1,41 +0,0 @@ -using CommonTools.Enums; -using CommonTools.ViewModels; -using System.Collections.Generic; - -namespace CommonTools.OperationResultModels -{ - /// - /// Результат любой операции - /// - public class OperationResultModel - { - /// - /// Успешность операции (количество ошибок = 0) - /// - public bool IsSucceeded => Errors.Count == 0; - - /// - /// Статус операции - /// - public ResultServiceStatusCode StatusCode { get; set; } - - /// - /// Спсиок ошибок - /// - public List<(string Title, string Message)> Errors { get; private set; } - - /// - /// Объект, получаемый по результатам операции - /// - public object Result { get; private set; } - - /// - /// Конструктор по умолчанию - /// - public OperationResultModel() - { - Errors = new List<(string Title, string Message)>(); - StatusCode = ResultServiceStatusCode.Success; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/ViewModels/ElementViewModel.cs b/DepartmentPortal/Common/CommonTools/ViewModels/ElementViewModel.cs deleted file mode 100644 index 1479933..0000000 --- a/DepartmentPortal/Common/CommonTools/ViewModels/ElementViewModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using CommonTools.Attributes; -using System; - -namespace CommonTools.ViewModels -{ - /// - /// Возвращаемая запись - /// - public class ElementViewModel - { - [ViewModelProperty("Идентификатор", 1, true)] - public Guid Id { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CommonTools/ViewModels/ListViewModel.cs b/DepartmentPortal/Common/CommonTools/ViewModels/ListViewModel.cs deleted file mode 100644 index 64d6940..0000000 --- a/DepartmentPortal/Common/CommonTools/ViewModels/ListViewModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; - -namespace CommonTools.ViewModels -{ - /// - /// Список возвращаемых значений - /// - /// - public class ListViewModel - where T : ElementViewModel - { - public int MaxCount { get; set; } - - public List List { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/CoreModels/CoreModels.csproj b/DepartmentPortal/Common/CoreModels/CoreModels.csproj index 9deb5b3..7aa0b1b 100644 --- a/DepartmentPortal/Common/CoreModels/CoreModels.csproj +++ b/DepartmentPortal/Common/CoreModels/CoreModels.csproj @@ -5,7 +5,7 @@ - + diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs index 2ecd3de..a80831a 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs index 7d1ca00..6b61c41 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs index dd27105..afe5cae 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs index 1566a08..4fd66a8 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs index a516545..4bc9605 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs index 2c9ded0..0c0c966 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs index df98d5b..be01636 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs index f473e6e..8d56b93 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs index 3fab840..8328e75 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs index bf9a827..f4ddbda 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs index 5e5e905..a740e70 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs index b17084b..a2fa873 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs index 5ed2036..2eae9bf 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs index 232d759..4d93541 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs index afa435f..d69d4c1 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs index 6196a78..2ae97bc 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; using System.Collections.Generic; using System.Linq; diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs index 271319a..e073d80 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs index 9b1c9a8..0284556 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs index 53f971a..109ef0c 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs index 8668f39..e997fbe 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs index 6173137..c8f16a7 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsDepartment diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs index b5dc78a..4e96f8b 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs @@ -1,6 +1,6 @@ using CoreModels.Tools; -using ModuleTools.Attributes; -using ModuleTools.Enums; +using ToolsModule.Attributes; +using ToolsModule.Enums; using System; namespace CoreModels.ModelsSecurity diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs index 72b005f..f469cca 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; namespace CoreModels.ModelsSecurity { diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs index f57a461..6ba2341 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; namespace CoreModels.ModelsSecurity { diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs index bffe71d..c6d0296 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsSecurity diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs index d972e42..4b1915a 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; namespace CoreModels.ModelsSecurity diff --git a/DepartmentPortal/Common/DatabaseCore/AbstractGenerticEntityService.cs b/DepartmentPortal/Common/DatabaseCore/AbstractGenerticEntityService.cs index 57564da..7dc6dcf 100644 --- a/DepartmentPortal/Common/DatabaseCore/AbstractGenerticEntityService.cs +++ b/DepartmentPortal/Common/DatabaseCore/AbstractGenerticEntityService.cs @@ -1,11 +1,11 @@ using DatabaseCore.Models; using Microsoft.EntityFrameworkCore; -using ModuleTools.BindingModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Interfaces; -using ModuleTools.Models; -using ModuleTools.ViewModels; +using ToolsModule.BindingModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Interfaces; +using ToolsModule.Models; +using ToolsModule.ViewModels; using System; using System.Linq; diff --git a/DepartmentPortal/Common/DatabaseCore/DatabaseContext.cs b/DepartmentPortal/Common/DatabaseCore/DatabaseContext.cs index 046e6a7..25b0a3f 100644 --- a/DepartmentPortal/Common/DatabaseCore/DatabaseContext.cs +++ b/DepartmentPortal/Common/DatabaseCore/DatabaseContext.cs @@ -13,7 +13,7 @@ namespace DatabaseCore if (optionsBuilder.IsConfigured == false) { #if RELEASE - var connectionString = ModuleTools.ServiceProvider.ServiceProviderLoader.GetConfigData("connectionString"); + var connectionString = ToolsModule.ServiceProvider.ServiceProviderLoader.GetConfigData("connectionString"); optionsBuilder.UseSqlServer(connectionString); #endif diff --git a/DepartmentPortal/Common/DatabaseCore/DatabaseCore.csproj b/DepartmentPortal/Common/DatabaseCore/DatabaseCore.csproj index ed38e53..75e85a4 100644 --- a/DepartmentPortal/Common/DatabaseCore/DatabaseCore.csproj +++ b/DepartmentPortal/Common/DatabaseCore/DatabaseCore.csproj @@ -15,7 +15,7 @@ - + diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlan.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlan.cs index fea4241..aa9bec3 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlan.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlan.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlanRecord.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlanRecord.cs index e8c44dd..0184b11 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlanRecord.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlanRecord.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlanRecordTimeNormHour.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlanRecordTimeNormHour.cs index a7f0d01..74d92d1 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlanRecordTimeNormHour.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/AcademicPlanRecordTimeNormHour.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/Classroom.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/Classroom.cs index dabb565..d4c7d20 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/Classroom.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/Classroom.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/Discipline.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/Discipline.cs index 8cbd5ad..9dd5a45 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/Discipline.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/Discipline.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/DisciplineBlock.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/DisciplineBlock.cs index 8642ba7..029843b 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/DisciplineBlock.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/DisciplineBlock.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/EducationDirection.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/EducationDirection.cs index 7a1bcf3..d0ca853 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/EducationDirection.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/EducationDirection.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/Employee.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/Employee.cs index c44d01e..61eb2d1 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/Employee.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/Employee.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; using DatabaseCore.Models.Security; -using ModuleTools.Extensions; -using ModuleTools.Interfaces; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/EmployeePost.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/EmployeePost.cs index 8409a7e..8a0b458 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/EmployeePost.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/EmployeePost.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/Lecturer.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/Lecturer.cs index 06be478..da8bf2a 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/Lecturer.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/Lecturer.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; using DatabaseCore.Models.Security; -using ModuleTools.Extensions; -using ModuleTools.Interfaces; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerAcademicDegree.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerAcademicDegree.cs index efc0a01..604ca51 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerAcademicDegree.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerAcademicDegree.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerAcademicRank.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerAcademicRank.cs index 0764e63..5917f00 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerAcademicRank.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerAcademicRank.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerPost.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerPost.cs index 364b97a..355e5b6 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerPost.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/LecturerPost.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/Order.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/Order.cs index 5d0f954..51ecce1 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/Order.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/Order.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderStudentRecord.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderStudentRecord.cs index 8a5405b..820d3ed 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderStudentRecord.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderStudentRecord.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistory.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistory.cs index bde1bf9..e0afce0 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistory.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistory.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistoryRecord.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistoryRecord.cs index 3153a81..5317d5a 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistoryRecord.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistoryRecord.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/Post.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/Post.cs index 66faceb..96e96d6 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/Post.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/Post.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/Student.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/Student.cs index a6134ff..3f99e24 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/Student.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/Student.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; using DatabaseCore.Models.Security; -using ModuleTools.Extensions; -using ModuleTools.Interfaces; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/StudentGroup.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/StudentGroup.cs index 965bda7..1ed73eb 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/StudentGroup.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/StudentGroup.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/TimeNorm.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/TimeNorm.cs index fcdcd08..f1f9f25 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/TimeNorm.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/TimeNorm.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/IdEntity.cs b/DepartmentPortal/Common/DatabaseCore/Models/IdEntity.cs index c3a8477..ce258ba 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/IdEntity.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/IdEntity.cs @@ -1,4 +1,4 @@ -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Security/Access.cs b/DepartmentPortal/Common/DatabaseCore/Models/Security/Access.cs index ee9eaf4..a6fadcc 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Security/Access.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Security/Access.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Enums; -using ModuleTools.Interfaces; +using ToolsModule.Enums; +using ToolsModule.Interfaces; using System; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Security/EnviromentSetting.cs b/DepartmentPortal/Common/DatabaseCore/Models/Security/EnviromentSetting.cs index a994a2c..bb7b20e 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Security/EnviromentSetting.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Security/EnviromentSetting.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Security/Role.cs b/DepartmentPortal/Common/DatabaseCore/Models/Security/Role.cs index 5442d7a..39d6312 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Security/Role.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Security/Role.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Security/User.cs b/DepartmentPortal/Common/DatabaseCore/Models/Security/User.cs index 4087547..cdfa8a2 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Security/User.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Security/User.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsSecurity; using DatabaseCore.Models.Department; -using ModuleTools.Attributes; -using ModuleTools.Interfaces; +using ToolsModule.Attributes; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Security/UserRole.cs b/DepartmentPortal/Common/DatabaseCore/Models/Security/UserRole.cs index a07b2e1..650786f 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Security/UserRole.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Security/UserRole.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using System.Runtime.Serialization; diff --git a/DepartmentPortal/Common/DatabaseCore/SecurityManager.cs b/DepartmentPortal/Common/DatabaseCore/SecurityManager.cs index a9e6799..69eff1c 100644 --- a/DepartmentPortal/Common/DatabaseCore/SecurityManager.cs +++ b/DepartmentPortal/Common/DatabaseCore/SecurityManager.cs @@ -1,7 +1,7 @@ using DatabaseCore.Models.Security; -using ModuleTools.Enums; -using ModuleTools.Interfaces; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Interfaces; +using ToolsModule.Models; using System; using System.Collections.Generic; using System.Linq; diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.cs b/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.cs index dda2c1c..7550f38 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.cs +++ b/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.cs @@ -1,5 +1,5 @@ using DesktopTools.Interfaces; -using ModuleTools.Extensions; +using ToolsModule.Extensions; using System; using System.Windows.Forms; diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.cs b/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.cs index c895d91..44e57ac 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.cs +++ b/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.cs @@ -1,5 +1,5 @@ using DesktopTools.Interfaces; -using ModuleTools.Extensions; +using ToolsModule.Extensions; using System; using System.Windows.Forms; diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.cs b/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.cs index 8ba18e6..fad35bc 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.cs +++ b/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.cs @@ -1,5 +1,5 @@ using DesktopTools.Interfaces; -using ModuleTools.Extensions; +using ToolsModule.Extensions; using System; using System.Drawing; diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.cs b/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.cs index d84cb0b..662b25c 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.cs +++ b/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.cs @@ -1,5 +1,5 @@ using DesktopTools.Interfaces; -using ModuleTools.Extensions; +using ToolsModule.Extensions; using System; using System.Drawing; diff --git a/DepartmentPortal/Common/DesktopTools/BusinessLogics/DesktopLoader.cs b/DepartmentPortal/Common/DesktopTools/BusinessLogics/DesktopLoader.cs index cdf05ae..b5e3ca9 100644 --- a/DepartmentPortal/Common/DesktopTools/BusinessLogics/DesktopLoader.cs +++ b/DepartmentPortal/Common/DesktopTools/BusinessLogics/DesktopLoader.cs @@ -1,5 +1,5 @@ using DesktopTools.Interfaces; -using ModuleTools.Extensions; +using ToolsModule.Extensions; using System; using System.Collections.Generic; using System.IO; diff --git a/DepartmentPortal/Common/DesktopTools/DesktopTools.csproj b/DepartmentPortal/Common/DesktopTools/DesktopTools.csproj index 31a8bdc..fe5aa5f 100644 --- a/DepartmentPortal/Common/DesktopTools/DesktopTools.csproj +++ b/DepartmentPortal/Common/DesktopTools/DesktopTools.csproj @@ -6,7 +6,7 @@ - + diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IControl.cs b/DepartmentPortal/Common/DesktopTools/Interfaces/IControl.cs index 29b1c07..dda94a4 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IControl.cs +++ b/DepartmentPortal/Common/DesktopTools/Interfaces/IControl.cs @@ -1,5 +1,5 @@ using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; namespace DesktopTools.Interfaces diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs index e1baccc..8d2a9ff 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs +++ b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs @@ -3,12 +3,12 @@ using DesktopTools.Enums; using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Attributes; -using ModuleTools.BindingModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Extensions; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.BindingModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.ViewModels; using System; using System.Linq; using System.Reflection; diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.cs b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.cs index 288af03..642d5df 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.cs +++ b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.cs @@ -2,12 +2,12 @@ using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Attributes; -using ModuleTools.BindingModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Extensions; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.BindingModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.ViewModels; using System; using System.Collections.Generic; using System.Linq; diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.cs b/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.cs index 62693c3..6c9a3a7 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.cs +++ b/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.cs @@ -1,6 +1,6 @@ using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Windows.Forms; diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.cs b/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.cs index 3518d0e..b30c309 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.cs +++ b/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.cs @@ -1,6 +1,6 @@ using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Windows.Forms; diff --git a/DepartmentPortal/Common/ModelTools/Attributes/EntityDependencyAttribute.cs b/DepartmentPortal/Common/ModelTools/Attributes/EntityDependencyAttribute.cs deleted file mode 100644 index 55e5bad..0000000 --- a/DepartmentPortal/Common/ModelTools/Attributes/EntityDependencyAttribute.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; - -namespace ModelTools.Attributes -{ - /// - /// Оописание зависимости сущности от другой сущности (требуется для выстраивания последоватльности сохранения и загрузки данных, - /// применяется к классам-описывающим сущности в хранилище) - /// - [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] - public class EntityDependencyAttribute : Attribute - { - /// - /// Название класса от котрого зависит этот класс - /// - public string ClassName { get; set; } - - /// - /// Название поле в этом классе, которое ссылает на другой класс (идентификатор) - /// - public string ColumnName { get; set; } - - /// - /// Описание зависимости - /// - public string Description { get; set; } - - /// - /// Описание зависимости сущности от другой сущности (требуется для сохранения и загрузки данных) - /// - /// Название класса от котрого зависит этот класс - /// Название поле в этом классе, которое ссылает на другой класс (идентификатор) - /// Описание зависимости - public EntityDependencyAttribute(string className, string columnName, string description) - { - ClassName = className; - ColumnName = columnName; - Description = description; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Attributes/EntityDescriptionAttribute.cs b/DepartmentPortal/Common/ModelTools/Attributes/EntityDescriptionAttribute.cs deleted file mode 100644 index 0152981..0000000 --- a/DepartmentPortal/Common/ModelTools/Attributes/EntityDescriptionAttribute.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; - -namespace ModelTools.Attributes -{ - /// - /// Оописание класса из базы данных, его назначение (требуется для выстраивания иерархии с описанием классов, - /// применяется к классам-описывающим сущности в хранилище) - /// - [AttributeUsage(AttributeTargets.Class)] - public class EntityDescriptionAttribute : Attribute - { - /// - /// Название сущности, которую описывает класс - /// - public string EntityName { get; set; } - - /// - /// Описание назначения сущности - /// - public string Description { get; set; } - - /// - /// Описание класса из базы данных, его назначение - /// - /// Название сущности, которую описывает класс - /// Описание назначения сущности - public EntityDescriptionAttribute(string entityName, string description) - { - EntityName = entityName; - Description = description; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Attributes/MapConfigurationAttribute.cs b/DepartmentPortal/Common/ModelTools/Attributes/MapConfigurationAttribute.cs deleted file mode 100644 index 2da5a77..0000000 --- a/DepartmentPortal/Common/ModelTools/Attributes/MapConfigurationAttribute.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; - -namespace ModelTools.Attributes -{ - /// - /// Настройка для полей сущности правил маппинга в классе, который требуется заполнять данными из другого класса - /// (требуется для заполнения свойств объекта значениями одного класса значениями свойств объектов другого класса, - /// применяется при создании класса-описывающего сущность в хранилище из класса SetBindingModel - /// и из класса-описывающего сущность в хранилище в класс ElementViewModel) - /// - [AttributeUsage(AttributeTargets.Property)] - public class MapConfigurationAttribute : Attribute - { - /// - /// Название свойства с класса, из которого извлекаем данные - /// - public string PropertyNameFromModel { get; set; } - - /// - /// Сложное свойство (свойствое в другом классе-свойстве) - /// - public bool IsDifficle { get; set; } - - /// - /// Настройка для полей сущности правил маппинга - /// - /// Название свойства с класса, из которого извлекаем данные - /// Сложное свойство (свойствое в другом классе-свойстве) - public MapConfigurationAttribute(string propertyNameFromMModel, bool isDifficle = false) - { - PropertyNameFromModel = propertyNameFromMModel; - IsDifficle = isDifficle; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Attributes/ViewModelOnListPropertyAttribute.cs b/DepartmentPortal/Common/ModelTools/Attributes/ViewModelOnListPropertyAttribute.cs deleted file mode 100644 index 6d5ea24..0000000 --- a/DepartmentPortal/Common/ModelTools/Attributes/ViewModelOnListPropertyAttribute.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; - -namespace ModelTools.Attributes -{ - /// - /// Настройка отображения свойства класса при табличном выводе списка объектов класса (требуется для автоматизации вывода списка, - /// применяется к классам ElementViewModel) - /// - [AttributeUsage(AttributeTargets.Property)] - public class ViewModelOnListPropertyAttribute : Attribute - { - /// - /// Название на форме - /// - public string DisplayName { get; set; } - - /// - /// Скрывать или нет при выводе списка - /// - public bool IsHide { get; set; } - - /// - /// Ширина колонки - /// - public int? ColumnWidth { get; set; } - - /// - /// Настройка отображения элемента в контролах - /// - /// Название на форме - /// Скрывать или нет - public ViewModelOnListPropertyAttribute(string displayName, bool isHide = false) - { - DisplayName = displayName; - ColumnWidth = null; - IsHide = isHide; - } - - /// - /// Конструктор - /// - /// Название на форме - /// Ширина колонки - public ViewModelOnListPropertyAttribute(string displayName, int columnWidth) - { - DisplayName = displayName; - ColumnWidth = columnWidth; - IsHide = false; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/BindingModels/AccessBindingModel.cs b/DepartmentPortal/Common/ModelTools/BindingModels/AccessBindingModel.cs deleted file mode 100644 index cda456c..0000000 --- a/DepartmentPortal/Common/ModelTools/BindingModels/AccessBindingModel.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -namespace ModelTools.BindingModels -{ - /// - /// Информация для доступа к выполнению операций - /// - public class AccessBindingModel - { - /// - /// Пропускать проверку (работает только для получения данных) - /// - public bool SkipCheck { get; set; } - - /// - /// Идентификатор пользователя, который запрашивает выполнение операции - /// - public Guid? UserId { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/BindingModels/GetBindingModel.cs b/DepartmentPortal/Common/ModelTools/BindingModels/GetBindingModel.cs deleted file mode 100644 index c13aa05..0000000 --- a/DepartmentPortal/Common/ModelTools/BindingModels/GetBindingModel.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; - -namespace ModelTools.BindingModels -{ - /// - /// Получение записи - /// - public class GetBindingModel : AccessBindingModel - { - /// - /// Идентификатор получаемой записи (для одной записи) - /// - public Guid? Id { get; set; } - - /// - /// Номер страницы, которую получаем (для списка) - /// - public int? PageNumber { get; set; } - - /// - /// Количество записей возвращаемых (для списка) - /// - public int? PageSize { get; set; } - - /// - /// Иной признак, по которму отбираем записи (для списка) - /// - public string PageName { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/BindingModels/SetBindingModel.cs b/DepartmentPortal/Common/ModelTools/BindingModels/SetBindingModel.cs deleted file mode 100644 index 894357a..0000000 --- a/DepartmentPortal/Common/ModelTools/BindingModels/SetBindingModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace ModelTools.BindingModels -{ - /// - /// Сохранение записи по идентификатору - /// - public class SetBindingModel : AccessBindingModel - { - /// - /// Идентификатор записи - /// - public Guid Id { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/BusinessLogics/BusinessLogicCore.cs b/DepartmentPortal/Common/ModelTools/BusinessLogics/BusinessLogicCore.cs deleted file mode 100644 index 935401f..0000000 --- a/DepartmentPortal/Common/ModelTools/BusinessLogics/BusinessLogicCore.cs +++ /dev/null @@ -1,226 +0,0 @@ -using ModelTools.BindingModels; -using ModelTools.Enums; -using ModelTools.Interfaces; -using ModelTools.Models; -using ModelTools.ViewModels; -using System; -using System.Collections.Generic; - -namespace ModelTools.BusinessLogics -{ - /// - /// Базовый класс для логики сущности - /// - /// - /// - /// - /// - public abstract class BusinessLogicCore - where G : GetBindingModel - where S : SetBindingModel - where L : ListViewModel - where E : ElementViewModel - { - /// - /// Перечень ошибок при выполнении операции - /// - public List<(string Title, string Message)> Errors { get; protected set; } - - protected IEntityService Service { get; set; } - - protected ISecurityManager Security { get; set; } - - protected readonly AccessOperation _serviceOperation; - - protected readonly string _entity; - - public BusinessLogicCore(IEntityService service, string entity, AccessOperation serviceOperation) - { - Service = service; - Errors = new List<(string Title, string Message)>(); - Security = UnityContainerConfigurator.Resolve(); - _entity = entity; - _serviceOperation = serviceOperation; - } - - /// - /// Проверка доступности операции для пользователя - /// - /// - /// - /// - protected bool NoAccess(AccessBindingModel model, AccessType type) - { - if (Security.CheckAccess(new SecurityManagerCheckAccessModel(model, _serviceOperation, type, _entity))) - { - return false; - } - - Errors.Add(("Ошибка безопасности", Security.ErrorMessage)); - return true; - } - - /// - /// Получение списка записей - /// - /// - /// - public L GetList(G model) - { - Errors.Clear(); - try - { - if (NoAccess(model, AccessType.SimpleView) && NoAccess(model, AccessType.FullView)) - { - return null; - } - var result = Service.Read(model); - if (!result.IsSucceeded) - { - Errors.AddRange(Errors); - return null; - } - - return ConvertToL(result); - } - catch (Exception ex) - { - Errors.Add(("Ошибка получения", ex.Message)); - } - return null; - } - - /// - /// Получение записи - /// - /// - /// - public E GetElement(G model) - { - Errors.Clear(); - try - { - if (NoAccess(model, AccessType.SimpleView) && NoAccess(model, AccessType.FullView)) - { - return null; - } - var result = Service.Read(model); - if (!result.IsSucceeded) - { - Errors.AddRange(Errors); - return null; - } - return ConvertToE(result); - } - catch (Exception ex) - { - Errors.Add(("Ошибка получения", ex.Message)); - } - return null; - } - - /// - /// Создание записи - /// - /// - /// - public E Create(S model) - { - Errors.Clear(); - try - { - if (NoAccess(model, AccessType.Change)) - { - return null; - } - var result = Service.Create(model); - if (!result.IsSucceeded) - { - Errors.AddRange(Errors); - return null; - } - - return ConvertToE(result); - } - catch (Exception ex) - { - Errors.Add(("Ошибка создания", ex.Message)); - } - return null; - } - - /// - /// Изменение записи - /// - /// - /// - public E Update(S model) - { - Errors.Clear(); - try - { - if (NoAccess(model, AccessType.Change)) - { - return null; - } - var result = Service.Update(model); - if (!result.IsSucceeded) - { - Errors.AddRange(Errors); - return null; - } - - return ConvertToE(result); - } - catch (Exception ex) - { - Errors.Add(("Ошибка изменения", ex.Message)); - } - return null; - } - - /// - /// Удаление записи - /// - /// - /// - public bool Delete(G model) - { - Errors.Clear(); - try - { - if (NoAccess(model, AccessType.Delete)) - { - return false; - } - var result = Service.Delete(model); - if (!result.IsSucceeded) - { - Errors.AddRange(Errors); - return false; - } - - return true; - } - catch (Exception ex) - { - Errors.Add(("Ошибка удаления", ex.Message)); - } - return false; - } - - /// - /// Получить список элементов - /// - /// - /// - protected abstract L ConvertToL(OperationResultModel model); - - /// - /// Получить элемент - /// - /// - /// - protected abstract E ConvertToE(OperationResultModel model); - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/BusinessLogics/Mapper.cs b/DepartmentPortal/Common/ModelTools/BusinessLogics/Mapper.cs deleted file mode 100644 index 109b791..0000000 --- a/DepartmentPortal/Common/ModelTools/BusinessLogics/Mapper.cs +++ /dev/null @@ -1,100 +0,0 @@ -using ModelTools.Attributes; -using System; -using System.Reflection; - -namespace ModelTools.BusinessLogics -{ - /// - /// Маппер сущностей - /// - public class Mapper - { - /// - /// Преобразование из одного класса в другой - /// - /// - /// - /// - /// - public static To MapToClass(From obj) where To : class => FillObject(obj, (To)Activator.CreateInstance(typeof(To))); - - /// - /// Преобразование из одного класса в другой - /// - /// - /// - /// - /// - /// - public static To MapToClass(From obj, To newObject) where To : class => FillObject(obj, newObject); - - /// - /// Заполнение объекта - /// - /// - /// - /// - /// - /// - private static To FillObject(From obj, To newObject) - where To : class - { - if (obj == null) - { - return null; - } - - if (newObject == null) - { - return null; - } - var typeFrom = typeof(From); - var typeTo = typeof(To); - var properties = typeTo.GetProperties(); - foreach (var property in properties) - { - var customAttribute = property.GetCustomAttribute(); - if (customAttribute != null) - { - object value = obj; - if (customAttribute.IsDifficle) - { - var props = customAttribute.PropertyNameFromModel.Split('.'); - foreach (var prop in props) - { - var bindingProperty = value.GetType().GetProperty(prop); - if (bindingProperty != null) - { - value = bindingProperty.GetValue(value); - if (value is null) - { - break; - } - } - else - { - value = null; - break; - } - } - } - else - { - var bindingProperty = typeFrom.GetProperty(customAttribute.PropertyNameFromModel); - if (bindingProperty != null) - { - value = bindingProperty.GetValue(obj); - } - } - if (value is null) - { - continue; - } - property.SetValue(newObject, value); - } - } - - return newObject; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/BusinessLogics/ServiceProviderLoader.cs b/DepartmentPortal/Common/ModelTools/BusinessLogics/ServiceProviderLoader.cs deleted file mode 100644 index 6e096ab..0000000 --- a/DepartmentPortal/Common/ModelTools/BusinessLogics/ServiceProviderLoader.cs +++ /dev/null @@ -1,112 +0,0 @@ -using ModelTools.Extensions; -using ModelTools.Interfaces; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Xml.XPath; - -namespace ModelTools.BusinessLogics -{ - /// - /// Загрузчик данных - /// - public static class ServiceProviderLoader - { - private static readonly string _configFileName = "DepartmentPortal.config"; - - private static readonly string _pathToImplementationExt = "..\\..\\..\\..\\ImplementationExtensions\\"; - - private static readonly string _pathToWindowDestopExt = "..\\..\\..\\..\\WindowDestopExtensions\\"; - - /// - /// Получение данных с файла настроек - /// - /// - /// - public static string GetConfigData(string key) - { - var fileName = GetFile(_configFileName); - if (!File.Exists(fileName)) - { - return string.Empty; - } - - var doc = new XPathDocument(fileName); - var nav = doc.CreateNavigator(); - var data = nav.SelectDescendants(key, "", false); - data.MoveNext(); - return data.Current.Value; - } - - /// - /// Загрузка всех классов-реализаций IImplementationExtension - /// - /// - public static List GetImplementationExtensions() - { - var list = new List(); - if(Directory.Exists(_pathToImplementationExt)) - { - var files = Directory.GetFiles(_pathToImplementationExt, "*.dll", SearchOption.AllDirectories); - var loadedFiles = new List(); - foreach(var file in files.Distinct()) - { - if(loadedFiles.Contains(file.GetFileName())) - { - continue; - } - Assembly asm = Assembly.LoadFrom(file); - foreach (var t in asm.GetExportedTypes()) - { - if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) - { - list.Add((IImplementationExtension)Activator.CreateInstance(t)); - } - } - loadedFiles.Add(file.GetFileName()); - } - } - return list; - } - - /// - /// Загрузка всех классов-реализаций IWindowDesktopExtension - /// - /// - public static List GetWindowDesktopExtensions() - { - var list = new List(); - if (Directory.Exists(_pathToWindowDestopExt)) - { - var files = Directory.GetFiles(_pathToWindowDestopExt, "*.dll", SearchOption.AllDirectories); - var loadedFiles = new List(); - foreach (var file in files.Distinct()) - { - if (loadedFiles.Contains(file.GetFileName())) - { - continue; - } - Assembly asm = Assembly.LoadFrom(file); - foreach (var t in asm.GetExportedTypes()) - { - if (t.IsClass && typeof(IWindowDesktopExtension).IsAssignableFrom(t)) - { - list.Add((IWindowDesktopExtension)Activator.CreateInstance(t)); - } - } - loadedFiles.Add(file.GetFileName()); - } - } - return list; - } - - /// - /// Получение имени файла - /// - /// - /// - private static string GetFile(string fileName) => Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), fileName); - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/BusinessLogics/UnityContainerConfigurator.cs b/DepartmentPortal/Common/ModelTools/BusinessLogics/UnityContainerConfigurator.cs deleted file mode 100644 index cb352c1..0000000 --- a/DepartmentPortal/Common/ModelTools/BusinessLogics/UnityContainerConfigurator.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using Unity; -using Unity.Lifetime; - -namespace ModelTools.BusinessLogics -{ - /// - /// Работа с UnityContainer - /// - public class UnityContainerConfigurator - { - private static IUnityContainer _unityContainer; - - public static IUnityContainer Container - { - get - { - if (_unityContainer == null) _unityContainer = new UnityContainer(); - return _unityContainer; - } - } - - /// - /// Инициализация сервисов - /// - public static void InitServices() - { - var ext = ServiceProviderLoader.GetImplementationExtensions(); - if (ext.Count == 0) - { - throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); - } - // регистрируем в UnityContainaer зависимости - foreach (var e in ext) - { - e.RegisterServices(); - } - } - - /// - /// Добавление зависимости - /// - /// - /// - public static void PublishService() where U : T => Container.RegisterType(new HierarchicalLifetimeManager()); - - /// - /// Получение класса со всеми зависмостями - /// - /// - /// - public static T Resolve() => Container.Resolve(); - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Enums/AccessOperation.cs b/DepartmentPortal/Common/ModelTools/Enums/AccessOperation.cs deleted file mode 100644 index 67a70f6..0000000 --- a/DepartmentPortal/Common/ModelTools/Enums/AccessOperation.cs +++ /dev/null @@ -1,100 +0,0 @@ -namespace ModelTools.Enums -{ - /// - /// Операции в системе - /// - public enum AccessOperation - { - #region Администрирование - Администрирование = 0, - - Роли = 1, - - Доступы = 2, - - Пользователи = 3, - - НастройкиСреды = 4, - #endregion - - #region База - Кафедра = 100, - - Аудитории = 101, - - Направления = 102, - - Преподаватели = 103, // + должности, звания - - Дисциплины = 104, // + Блоки дисциплин - - Группы = 105, // - - Студенты = 106, - - Приказы_студентов = 107, - #endregion - - // Меню Учебный процесс - Учебный_процесс = 150, - - Учебные_планы = 120, - - Виды_нагрузок = 121, - - Учебные_года = 122, - - Даты_семестра = 126, - - Контингент = 123, - - Нормы_времени = 124, - - Расчет_штатов = 125, - - Расчасовки = 127, - - Преподавательская_ставка = 128, - - Индивидуальный_план = 130, - - // Меню Расписание - Расписание = 200, - - Расписание_аудитории = 201, - - Расписание_группы = 202, - - Расписание_преподаватели = 203, - - Расписание_настройки = 204, - - Расписание_интервалы_пар = 205, - - Расписание_дисциплины = 206, - - // Меню Сервис - Сервис = 300, - - Генерация_билетов = 301, - - // Меню зав лаб - ЗавЛабораторией = 400, - - МатериальноТехническиеЦенности = 401, - - УстановленоеПО = 402, - - // Экзамены - составление билетов и проведение - СоставлениеЭкзаменов = 500, - - Ведомости = 501, - - ШаблоныБилетов = 502, - - // Web-портал - Новости = 600, - - Комментарии = 601 - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Enums/AccessType.cs b/DepartmentPortal/Common/ModelTools/Enums/AccessType.cs deleted file mode 100644 index 6dc2a14..0000000 --- a/DepartmentPortal/Common/ModelTools/Enums/AccessType.cs +++ /dev/null @@ -1,28 +0,0 @@ -namespace ModelTools.Enums -{ - /// - /// Тип операции - /// - public enum AccessType : int - { - /// - /// Простой просомтр - /// - SimpleView = 1, - - /// - /// Полный просомтр - /// - FullView = 2, - - /// - /// Добавление/Изменение - /// - Change = 4, - - /// - /// Удаление - /// - Delete = 8 - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Enums/ResultServiceStatusCode.cs b/DepartmentPortal/Common/ModelTools/Enums/ResultServiceStatusCode.cs deleted file mode 100644 index d31bf2d..0000000 --- a/DepartmentPortal/Common/ModelTools/Enums/ResultServiceStatusCode.cs +++ /dev/null @@ -1,38 +0,0 @@ -namespace ModelTools.Enums -{ - /// - /// Статус результата операции - /// - public enum ResultServiceStatusCode - { - /// - /// Успешно - /// - Success = 200, - - /// - /// Ошибка общая - /// - Error = 400, - - /// - /// Элемент уже сущствует - /// - ExsistItem = 401, - - /// - /// Запись удалена - /// - WasDelete = 402, - - /// - /// Не найдено - /// - NotFound = 404, - - /// - /// Не найден файл - /// - FileNotFound = 405 - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Interfaces/IEntityService.cs b/DepartmentPortal/Common/ModelTools/Interfaces/IEntityService.cs deleted file mode 100644 index 0e35b3d..0000000 --- a/DepartmentPortal/Common/ModelTools/Interfaces/IEntityService.cs +++ /dev/null @@ -1,41 +0,0 @@ -using ModelTools.BindingModels; -using ModelTools.Models; - -namespace ModelTools.Interfaces -{ - /// - /// Описание логики для хранилища сущности - /// - public interface IEntityService - where G : GetBindingModel - where S : SetBindingModel - { - /// - /// Получение списка сущностей - /// - /// - /// - OperationResultModel Read(G model); - - /// - /// Создание новой сущности - /// - /// - /// - OperationResultModel Create(S model); - - /// - /// Изменение сущности - /// - /// - /// - OperationResultModel Update(S model); - - /// - /// Удаление сущности - /// - /// - /// - OperationResultModel Delete(G model); - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Interfaces/IImplementationExtension.cs b/DepartmentPortal/Common/ModelTools/Interfaces/IImplementationExtension.cs deleted file mode 100644 index 25d51c7..0000000 --- a/DepartmentPortal/Common/ModelTools/Interfaces/IImplementationExtension.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace ModelTools.Interfaces -{ - /// - /// Интерфейс для регистрации зависимостей в модулях - /// - public interface IImplementationExtension - { - /// - /// Регистрация сервисов - /// - public void RegisterServices(); - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Interfaces/IWindowDesktopExtension.cs b/DepartmentPortal/Common/ModelTools/Interfaces/IWindowDesktopExtension.cs deleted file mode 100644 index 32a6f69..0000000 --- a/DepartmentPortal/Common/ModelTools/Interfaces/IWindowDesktopExtension.cs +++ /dev/null @@ -1,17 +0,0 @@ -using ModelTools.Models; -using System.Collections.Generic; - -namespace ModelTools.Interfaces -{ - /// - /// Интерфейс для регистрации контролов для десктопного приложения - /// - public interface IWindowDesktopExtension - { - /// - /// Получение списка контролов модуля, доступных для работы по авторизованному пользователю - /// - /// - List GetListControlEntityList(); - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Models/OperationResultModel.cs b/DepartmentPortal/Common/ModelTools/Models/OperationResultModel.cs deleted file mode 100644 index 7b0d4b7..0000000 --- a/DepartmentPortal/Common/ModelTools/Models/OperationResultModel.cs +++ /dev/null @@ -1,114 +0,0 @@ -using ModelTools.Enums; -using System; -using System.Collections.Generic; - -namespace ModelTools.Models -{ - /// - /// Результат любой операции с сущностью - /// - public class OperationResultModel - { - /// - /// Успешность операции (количество ошибок = 0) - /// - public bool IsSucceeded => Errors.Count == 0; - - /// - /// Статус операции - /// - public ResultServiceStatusCode StatusCode { get; set; } - - /// - /// Спсиок ошибок - /// - public List<(string Title, string Message)> Errors { get; private set; } - - /// - /// Объект, получаемый по результатам операции - /// - public object Result { get; private set; } - - /// - /// Конструктор по умолчанию - /// - public OperationResultModel() - { - Errors = new List<(string Title, string Message)>(); - StatusCode = ResultServiceStatusCode.Success; - } - - /// - /// Успешно - /// - /// - /// - public static OperationResultModel Success(object obj) - { - return new OperationResultModel - { - Result = obj, - Errors = new List<(string Title, string Message)>(), - StatusCode = ResultServiceStatusCode.Success - }; - } - - /// - /// Добавление простой ошибки - /// - /// - /// - /// - public static OperationResultModel Error(string key, string value) => Error(key, value, ResultServiceStatusCode.Error); - - /// - /// Добавление простой ошибки со сменой статуса - /// - /// - /// - /// - /// - public static OperationResultModel Error(string key, string error, ResultServiceStatusCode statusCode) - { - var model = new OperationResultModel(); - model.Errors.Add((key, error)); - model.StatusCode = statusCode; - return model; - } - - /// - /// Добавление ошибки - /// - /// - /// - public static OperationResultModel Error(Exception error) => Error(error, ResultServiceStatusCode.Error); - - /// - /// Добавление ошибки - /// - /// - /// - /// - public static OperationResultModel Error(Exception error, ResultServiceStatusCode statusCode) => Error("Ошибка", error, statusCode); - - /// - /// Добавление ошибки (включая вложеннные) - /// - /// - /// - /// - /// - public static OperationResultModel Error(string key, Exception error, ResultServiceStatusCode statusCode) - { - var model = new OperationResultModel(); - model.Errors.Add((key, error.Message)); - while (error.InnerException != null) - { - error = error.InnerException; - model.Errors.Add(("Inner error:", error.Message)); - } - model.StatusCode = statusCode; - return model; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Models/SecurityManagerCheckAccessModel.cs b/DepartmentPortal/Common/ModelTools/Models/SecurityManagerCheckAccessModel.cs deleted file mode 100644 index f541df1..0000000 --- a/DepartmentPortal/Common/ModelTools/Models/SecurityManagerCheckAccessModel.cs +++ /dev/null @@ -1,39 +0,0 @@ -using ModelTools.BindingModels; -using ModelTools.Enums; - -namespace ModelTools.Models -{ - /// - /// Данные для проверки доступа - /// - public class SecurityManagerCheckAccessModel - { - /// - /// Данные по пользователю - /// - public AccessBindingModel Model { get; set; } - - /// - /// Операция, которую хотят выполнить - /// - public AccessOperation Operation { get; set; } - - /// - /// Тип операции - /// - public AccessType Type { get; set; } - - /// - /// Для какой сущности - /// - public string Entity { get; set; } - - public SecurityManagerCheckAccessModel(AccessBindingModel model, AccessOperation operation, AccessType type, string entity) - { - Model = model; - Operation = operation; - Type = type; - Entity = entity; - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/Models/WindowDesktopExtensionControlModel.cs b/DepartmentPortal/Common/ModelTools/Models/WindowDesktopExtensionControlModel.cs deleted file mode 100644 index 23cd82a..0000000 --- a/DepartmentPortal/Common/ModelTools/Models/WindowDesktopExtensionControlModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ModelTools.Models -{ - public class WindowDesktopExtensionControlModel - { - public Guid Id { get; set; } - - public int Order { get; set; } - - public string Title { get; set; } - - public object Control { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModelTools/ViewModels/ElementViewModel.cs b/DepartmentPortal/Common/ModelTools/ViewModels/ElementViewModel.cs deleted file mode 100644 index c603eb1..0000000 --- a/DepartmentPortal/Common/ModelTools/ViewModels/ElementViewModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ModelTools.Attributes; -using System; - -namespace ModelTools.ViewModels -{ - /// - /// Возвращаемая запись - /// - public class ElementViewModel - { - [ViewModelOnListProperty("Идентификатор", isHide: true)] - [MapConfiguration("Id")] - public Guid Id { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModuleTools/Extensions/StringExtension.cs b/DepartmentPortal/Common/ModuleTools/Extensions/StringExtension.cs deleted file mode 100644 index 20495b3..0000000 --- a/DepartmentPortal/Common/ModuleTools/Extensions/StringExtension.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.IO; - -namespace ModuleTools.Extensions -{ - public static class StringExtension - { - /// - /// Проверка, что строка пустая - /// - /// - /// - public static bool IsEmpty(this string str) => string.IsNullOrEmpty(str); - - /// - /// Проверка, что строка не пустая - /// - /// - /// - public static bool IsNotEmpty(this string str) => !string.IsNullOrEmpty(str); - - /// - /// Получение имени файла по полному пути - /// - /// - /// - public static string GetFileName(this string str) => (new FileInfo(str)).Name; - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModuleTools/Interfaces/ISecurityManager.cs b/DepartmentPortal/Common/ModuleTools/Interfaces/ISecurityManager.cs deleted file mode 100644 index c2acc52..0000000 --- a/DepartmentPortal/Common/ModuleTools/Interfaces/ISecurityManager.cs +++ /dev/null @@ -1,67 +0,0 @@ -using ModuleTools.Models; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace ModuleTools.Interfaces -{ - /// - /// Интерфейс для аутентификации пользователя и проверки доступа к операциям для пользователя - /// - public interface ISecurityManager - { - /// - /// Аутентифицированный пользователь - /// - public Guid? User { get; set; } - - /// - /// Список ролей аутентифицированного пользователь - /// - public List Roles { get; set; } - - /// - /// Выполнена ли аутентификация - /// - public bool IsAuth { get; } - - /// - /// Сообщение с причиной не получения доступа - /// - string ErrorMessage { get; set; } - - /// - /// Авторизация пользователя к операции - /// - /// Данные по операции - /// - bool CheckAccess(SecurityManagerCheckAccessModel model); - - /// - /// Проверка наличия старотвых данных для работы с ситемой - /// - void CheckStartDataSource(); - - /// - /// Аутентификация пользователя - /// - /// - /// - /// - Task LoginAsync(string login, string password); - - /// - /// Выход из системы - /// - /// - Task LogoutAsync(); - - /// - /// Смена пароля - /// - /// - /// - /// - Task ChangePassword(string login, string oldPassword, string newPassword); - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModuleTools/ModuleTools.csproj b/DepartmentPortal/Common/ModuleTools/ModuleTools.csproj deleted file mode 100644 index dfb11d9..0000000 --- a/DepartmentPortal/Common/ModuleTools/ModuleTools.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - net5.0 - - - - - - - diff --git a/DepartmentPortal/Common/ModuleTools/ViewModels/ListViewModel.cs b/DepartmentPortal/Common/ModuleTools/ViewModels/ListViewModel.cs deleted file mode 100644 index 33de5e8..0000000 --- a/DepartmentPortal/Common/ModuleTools/ViewModels/ListViewModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; - -namespace ModuleTools.ViewModels -{ - /// - /// Список возвращаемых значений - /// - /// - public class ListViewModel - where T : ElementViewModel - { - public int MaxCount { get; set; } - - public List List { get; set; } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/ModuleTools/Attributes/CheckRigthForMapAttribute.cs b/DepartmentPortal/Common/ToolsModule/Attributes/CheckRigthForMapAttribute.cs similarity index 92% rename from DepartmentPortal/Common/ModuleTools/Attributes/CheckRigthForMapAttribute.cs rename to DepartmentPortal/Common/ToolsModule/Attributes/CheckRigthForMapAttribute.cs index e0817fd..23d264d 100644 --- a/DepartmentPortal/Common/ModuleTools/Attributes/CheckRigthForMapAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/Attributes/CheckRigthForMapAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.Attributes +namespace ToolsModule.Attributes { /// /// Признак, гооврящий о том, что нужна проверка доступа к значению свойства при создании одного объекта на основе другого diff --git a/DepartmentPortal/Common/ModuleTools/Attributes/EntityDependencyAttribute.cs b/DepartmentPortal/Common/ToolsModule/Attributes/EntityDependencyAttribute.cs similarity index 98% rename from DepartmentPortal/Common/ModuleTools/Attributes/EntityDependencyAttribute.cs rename to DepartmentPortal/Common/ToolsModule/Attributes/EntityDependencyAttribute.cs index ad3cf9d..04a7e51 100644 --- a/DepartmentPortal/Common/ModuleTools/Attributes/EntityDependencyAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/Attributes/EntityDependencyAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.Attributes +namespace ToolsModule.Attributes { /// /// Оописание зависимости сущности от другой сущности (требуется для выстраивания последоватльности сохранения и загрузки данных, diff --git a/DepartmentPortal/Common/ModuleTools/Attributes/EntityDescriptionAttribute.cs b/DepartmentPortal/Common/ToolsModule/Attributes/EntityDescriptionAttribute.cs similarity index 97% rename from DepartmentPortal/Common/ModuleTools/Attributes/EntityDescriptionAttribute.cs rename to DepartmentPortal/Common/ToolsModule/Attributes/EntityDescriptionAttribute.cs index 2e8259b..9424c1e 100644 --- a/DepartmentPortal/Common/ModuleTools/Attributes/EntityDescriptionAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/Attributes/EntityDescriptionAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.Attributes +namespace ToolsModule.Attributes { /// /// Оописание класса из базы данных, его назначение (требуется для выстраивания иерархии с описанием классов, diff --git a/DepartmentPortal/Common/ModuleTools/Attributes/MapConfigurationAttribute.cs b/DepartmentPortal/Common/ToolsModule/Attributes/MapConfigurationAttribute.cs similarity index 98% rename from DepartmentPortal/Common/ModuleTools/Attributes/MapConfigurationAttribute.cs rename to DepartmentPortal/Common/ToolsModule/Attributes/MapConfigurationAttribute.cs index 63bc68a..23227f5 100644 --- a/DepartmentPortal/Common/ModuleTools/Attributes/MapConfigurationAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/Attributes/MapConfigurationAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ModuleTools.Attributes +namespace ToolsModule.Attributes { /// /// Настройка для полей сущности правил маппинга в классе, который требуется заполнять данными из другого класса diff --git a/DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementClassAttribute.cs b/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementClassAttribute.cs similarity index 96% rename from DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementClassAttribute.cs rename to DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementClassAttribute.cs index 7e8d872..bdc21b8 100644 --- a/DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementClassAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementClassAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.Attributes +namespace ToolsModule.Attributes { /// /// Настройка контрола отображения объекта класса (требуется для автоматизации вывода элемента, diff --git a/DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementDependenceEntityAttribute.cs b/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementDependenceEntityAttribute.cs similarity index 97% rename from DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementDependenceEntityAttribute.cs rename to DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementDependenceEntityAttribute.cs index 9574677..5822a9d 100644 --- a/DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementDependenceEntityAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementDependenceEntityAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.Attributes +namespace ToolsModule.Attributes { /// /// Настройка контрола отображения? указывающая на дочерний контрол (требуется для автоматизации вывода элемента, diff --git a/DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementPropertyAttribute.cs b/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementPropertyAttribute.cs similarity index 97% rename from DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementPropertyAttribute.cs rename to DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementPropertyAttribute.cs index 871057f..29dd263 100644 --- a/DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementPropertyAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementPropertyAttribute.cs @@ -1,7 +1,7 @@ -using ModuleTools.Enums; +using ToolsModule.Enums; using System; -namespace ModuleTools.Attributes +namespace ToolsModule.Attributes { /// /// Настройка отображения свойства класса при выводе объекта класса (требуется для автоматизации вывода элемента, diff --git a/DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlListPropertyAttribute.cs b/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlListPropertyAttribute.cs similarity index 97% rename from DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlListPropertyAttribute.cs rename to DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlListPropertyAttribute.cs index 2773012..c552806 100644 --- a/DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlListPropertyAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlListPropertyAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.Attributes +namespace ToolsModule.Attributes { /// /// Настройка отображения свойства класса при табличном выводе списка объектов класса (требуется для автоматизации вывода списка, diff --git a/DepartmentPortal/Common/ModuleTools/BindingModels/AccessBindingModel.cs b/DepartmentPortal/Common/ToolsModule/BindingModels/AccessBindingModel.cs similarity index 91% rename from DepartmentPortal/Common/ModuleTools/BindingModels/AccessBindingModel.cs rename to DepartmentPortal/Common/ToolsModule/BindingModels/AccessBindingModel.cs index aca56d5..7cc437a 100644 --- a/DepartmentPortal/Common/ModuleTools/BindingModels/AccessBindingModel.cs +++ b/DepartmentPortal/Common/ToolsModule/BindingModels/AccessBindingModel.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.BindingModels +namespace ToolsModule.BindingModels { /// /// Информация для доступа к выполнению операций diff --git a/DepartmentPortal/Common/ModuleTools/BindingModels/GetBindingModel.cs b/DepartmentPortal/Common/ToolsModule/BindingModels/GetBindingModel.cs similarity index 96% rename from DepartmentPortal/Common/ModuleTools/BindingModels/GetBindingModel.cs rename to DepartmentPortal/Common/ToolsModule/BindingModels/GetBindingModel.cs index 5f872de..72c768c 100644 --- a/DepartmentPortal/Common/ModuleTools/BindingModels/GetBindingModel.cs +++ b/DepartmentPortal/Common/ToolsModule/BindingModels/GetBindingModel.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.BindingModels +namespace ToolsModule.BindingModels { /// /// Получение записи diff --git a/DepartmentPortal/Common/ModuleTools/BindingModels/SetBindingModel.cs b/DepartmentPortal/Common/ToolsModule/BindingModels/SetBindingModel.cs similarity index 82% rename from DepartmentPortal/Common/ModuleTools/BindingModels/SetBindingModel.cs rename to DepartmentPortal/Common/ToolsModule/BindingModels/SetBindingModel.cs index dfaf502..254a392 100644 --- a/DepartmentPortal/Common/ModuleTools/BindingModels/SetBindingModel.cs +++ b/DepartmentPortal/Common/ToolsModule/BindingModels/SetBindingModel.cs @@ -1,7 +1,7 @@ -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; -namespace ModuleTools.BindingModels +namespace ToolsModule.BindingModels { /// /// Сохранение записи по идентификатору diff --git a/DepartmentPortal/Common/ModuleTools/BusinessLogics/CoreBusinessLogic.cs b/DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs similarity index 90% rename from DepartmentPortal/Common/ModuleTools/BusinessLogics/CoreBusinessLogic.cs rename to DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs index 65433d0..e372764 100644 --- a/DepartmentPortal/Common/ModuleTools/BusinessLogics/CoreBusinessLogic.cs +++ b/DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs @@ -1,10 +1,10 @@ -using ModuleTools.BindingModels; -using ModuleTools.Enums; -using ModuleTools.Interfaces; -using ModuleTools.Models; +using ToolsModule.BindingModels; +using ToolsModule.Enums; +using ToolsModule.Interfaces; +using ToolsModule.Models; using System.Collections.Generic; -namespace ModuleTools.BusinessLogics +namespace ToolsModule.BusinessLogics { /// /// Основа всех бизнес-логик diff --git a/DepartmentPortal/Common/ModuleTools/BusinessLogics/DependencyManager.cs b/DepartmentPortal/Common/ToolsModule/BusinessLogics/DependencyManager.cs similarity index 96% rename from DepartmentPortal/Common/ModuleTools/BusinessLogics/DependencyManager.cs rename to DepartmentPortal/Common/ToolsModule/BusinessLogics/DependencyManager.cs index 79ccc50..7fc6d3f 100644 --- a/DepartmentPortal/Common/ModuleTools/BusinessLogics/DependencyManager.cs +++ b/DepartmentPortal/Common/ToolsModule/BusinessLogics/DependencyManager.cs @@ -1,7 +1,7 @@ -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; -namespace ModuleTools.BusinessLogics +namespace ToolsModule.BusinessLogics { /// /// Менеджер для работы с зависимостями diff --git a/DepartmentPortal/Common/ModuleTools/BusinessLogics/GenericBusinessLogic.cs b/DepartmentPortal/Common/ToolsModule/BusinessLogics/GenericBusinessLogic.cs similarity index 96% rename from DepartmentPortal/Common/ModuleTools/BusinessLogics/GenericBusinessLogic.cs rename to DepartmentPortal/Common/ToolsModule/BusinessLogics/GenericBusinessLogic.cs index 76e828b..8181a1f 100644 --- a/DepartmentPortal/Common/ModuleTools/BusinessLogics/GenericBusinessLogic.cs +++ b/DepartmentPortal/Common/ToolsModule/BusinessLogics/GenericBusinessLogic.cs @@ -1,10 +1,10 @@ -using ModuleTools.BindingModels; -using ModuleTools.Enums; -using ModuleTools.Interfaces; -using ModuleTools.ViewModels; +using ToolsModule.BindingModels; +using ToolsModule.Enums; +using ToolsModule.Interfaces; +using ToolsModule.ViewModels; using System; -namespace ModuleTools.BusinessLogics +namespace ToolsModule.BusinessLogics { /// /// Базовый класс для логики сущности diff --git a/DepartmentPortal/Common/ModuleTools/BusinessLogics/Mapper.cs b/DepartmentPortal/Common/ToolsModule/BusinessLogics/Mapper.cs similarity index 98% rename from DepartmentPortal/Common/ModuleTools/BusinessLogics/Mapper.cs rename to DepartmentPortal/Common/ToolsModule/BusinessLogics/Mapper.cs index deb85e9..4ecd251 100644 --- a/DepartmentPortal/Common/ModuleTools/BusinessLogics/Mapper.cs +++ b/DepartmentPortal/Common/ToolsModule/BusinessLogics/Mapper.cs @@ -1,10 +1,10 @@ -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; using System.Collections; using System.Linq; using System.Reflection; -namespace ModuleTools.BusinessLogics +namespace ToolsModule.BusinessLogics { /// /// Маппер сущностей diff --git a/DepartmentPortal/Common/ModuleTools/BusinessLogics/ServiceProviderLoader.cs b/DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs similarity index 95% rename from DepartmentPortal/Common/ModuleTools/BusinessLogics/ServiceProviderLoader.cs rename to DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs index f36a7fa..4ca8434 100644 --- a/DepartmentPortal/Common/ModuleTools/BusinessLogics/ServiceProviderLoader.cs +++ b/DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs @@ -1,5 +1,5 @@ -using ModuleTools.Extensions; -using ModuleTools.Interfaces; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.IO; @@ -7,7 +7,7 @@ using System.Linq; using System.Reflection; using System.Xml.XPath; -namespace ModuleTools.BusinessLogics +namespace ToolsModule.BusinessLogics { /// /// Загрузчик данных diff --git a/DepartmentPortal/Common/ModuleTools/BusinessLogics/UnityContainerManager.cs b/DepartmentPortal/Common/ToolsModule/BusinessLogics/UnityContainerManager.cs similarity index 90% rename from DepartmentPortal/Common/ModuleTools/BusinessLogics/UnityContainerManager.cs rename to DepartmentPortal/Common/ToolsModule/BusinessLogics/UnityContainerManager.cs index 26a3917..dfd0089 100644 --- a/DepartmentPortal/Common/ModuleTools/BusinessLogics/UnityContainerManager.cs +++ b/DepartmentPortal/Common/ToolsModule/BusinessLogics/UnityContainerManager.cs @@ -1,9 +1,9 @@ -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using System; using Unity; using Unity.Lifetime; -namespace ModuleTools.BusinessLogics +namespace ToolsModule.BusinessLogics { /// /// Работа с UnityContainer diff --git a/DepartmentPortal/Common/ModuleTools/Enums/AccessOperation.cs b/DepartmentPortal/Common/ToolsModule/Enums/AccessOperation.cs similarity index 98% rename from DepartmentPortal/Common/ModuleTools/Enums/AccessOperation.cs rename to DepartmentPortal/Common/ToolsModule/Enums/AccessOperation.cs index d75d4a3..515b974 100644 --- a/DepartmentPortal/Common/ModuleTools/Enums/AccessOperation.cs +++ b/DepartmentPortal/Common/ToolsModule/Enums/AccessOperation.cs @@ -1,4 +1,4 @@ -namespace ModuleTools.Enums +namespace ToolsModule.Enums { /// /// Операции в системе diff --git a/DepartmentPortal/Common/ModuleTools/Enums/AccessType.cs b/DepartmentPortal/Common/ToolsModule/Enums/AccessType.cs similarity index 91% rename from DepartmentPortal/Common/ModuleTools/Enums/AccessType.cs rename to DepartmentPortal/Common/ToolsModule/Enums/AccessType.cs index 035fa90..404498f 100644 --- a/DepartmentPortal/Common/ModuleTools/Enums/AccessType.cs +++ b/DepartmentPortal/Common/ToolsModule/Enums/AccessType.cs @@ -1,4 +1,4 @@ -namespace ModuleTools.Enums +namespace ToolsModule.Enums { /// /// Тип операции diff --git a/DepartmentPortal/Common/ModuleTools/Enums/ControlType.cs b/DepartmentPortal/Common/ToolsModule/Enums/ControlType.cs similarity index 97% rename from DepartmentPortal/Common/ModuleTools/Enums/ControlType.cs rename to DepartmentPortal/Common/ToolsModule/Enums/ControlType.cs index d0e2ed5..cae4d31 100644 --- a/DepartmentPortal/Common/ModuleTools/Enums/ControlType.cs +++ b/DepartmentPortal/Common/ToolsModule/Enums/ControlType.cs @@ -1,4 +1,4 @@ -namespace ModuleTools.Enums +namespace ToolsModule.Enums { /// /// Тип контрола, через который следует отображать свойство с ViewModel diff --git a/DepartmentPortal/Common/ModuleTools/Enums/ResultServiceStatusCode.cs b/DepartmentPortal/Common/ToolsModule/Enums/ResultServiceStatusCode.cs similarity index 95% rename from DepartmentPortal/Common/ModuleTools/Enums/ResultServiceStatusCode.cs rename to DepartmentPortal/Common/ToolsModule/Enums/ResultServiceStatusCode.cs index 310f9b2..4f79959 100644 --- a/DepartmentPortal/Common/ModuleTools/Enums/ResultServiceStatusCode.cs +++ b/DepartmentPortal/Common/ToolsModule/Enums/ResultServiceStatusCode.cs @@ -1,4 +1,4 @@ -namespace ModuleTools.Enums +namespace ToolsModule.Enums { /// /// Статус результата операции diff --git a/DepartmentPortal/Common/ModelTools/Extensions/StringExtension.cs b/DepartmentPortal/Common/ToolsModule/Extensions/StringExtension.cs similarity index 95% rename from DepartmentPortal/Common/ModelTools/Extensions/StringExtension.cs rename to DepartmentPortal/Common/ToolsModule/Extensions/StringExtension.cs index b656bfd..cadc4d6 100644 --- a/DepartmentPortal/Common/ModelTools/Extensions/StringExtension.cs +++ b/DepartmentPortal/Common/ToolsModule/Extensions/StringExtension.cs @@ -1,6 +1,6 @@ using System.IO; -namespace ModelTools.Extensions +namespace ToolsModule.Extensions { public static class StringExtension { diff --git a/DepartmentPortal/Common/ModuleTools/Interfaces/IDependencyManager.cs b/DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyManager.cs similarity index 96% rename from DepartmentPortal/Common/ModuleTools/Interfaces/IDependencyManager.cs rename to DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyManager.cs index 165396f..39b1fbf 100644 --- a/DepartmentPortal/Common/ModuleTools/Interfaces/IDependencyManager.cs +++ b/DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyManager.cs @@ -1,6 +1,6 @@ using System; -namespace ModuleTools.Interfaces +namespace ToolsModule.Interfaces { /// /// Интерфейс установки зависмости между элементами diff --git a/DepartmentPortal/Common/ModuleTools/Interfaces/IEntitySecurityExtenstion.cs b/DepartmentPortal/Common/ToolsModule/Interfaces/IEntitySecurityExtenstion.cs similarity index 93% rename from DepartmentPortal/Common/ModuleTools/Interfaces/IEntitySecurityExtenstion.cs rename to DepartmentPortal/Common/ToolsModule/Interfaces/IEntitySecurityExtenstion.cs index 0bb43e8..a257a41 100644 --- a/DepartmentPortal/Common/ModuleTools/Interfaces/IEntitySecurityExtenstion.cs +++ b/DepartmentPortal/Common/ToolsModule/Interfaces/IEntitySecurityExtenstion.cs @@ -1,4 +1,4 @@ -namespace ModuleTools.Interfaces +namespace ToolsModule.Interfaces { /// /// Работа с сущностями с применением скрытности для полей diff --git a/DepartmentPortal/Common/ModuleTools/Interfaces/IGenerticEntityService.cs b/DepartmentPortal/Common/ToolsModule/Interfaces/IGenerticEntityService.cs similarity index 92% rename from DepartmentPortal/Common/ModuleTools/Interfaces/IGenerticEntityService.cs rename to DepartmentPortal/Common/ToolsModule/Interfaces/IGenerticEntityService.cs index c85f1c3..14be9eb 100644 --- a/DepartmentPortal/Common/ModuleTools/Interfaces/IGenerticEntityService.cs +++ b/DepartmentPortal/Common/ToolsModule/Interfaces/IGenerticEntityService.cs @@ -1,7 +1,7 @@ -using ModuleTools.BindingModels; -using ModuleTools.Models; +using ToolsModule.BindingModels; +using ToolsModule.Models; -namespace ModuleTools.Interfaces +namespace ToolsModule.Interfaces { /// /// Описание логики для хранилища сущности diff --git a/DepartmentPortal/Common/ModuleTools/Interfaces/IImplementationExtension.cs b/DepartmentPortal/Common/ToolsModule/Interfaces/IImplementationExtension.cs similarity index 88% rename from DepartmentPortal/Common/ModuleTools/Interfaces/IImplementationExtension.cs rename to DepartmentPortal/Common/ToolsModule/Interfaces/IImplementationExtension.cs index a4a8002..d765ab2 100644 --- a/DepartmentPortal/Common/ModuleTools/Interfaces/IImplementationExtension.cs +++ b/DepartmentPortal/Common/ToolsModule/Interfaces/IImplementationExtension.cs @@ -1,4 +1,4 @@ -namespace ModuleTools.Interfaces +namespace ToolsModule.Interfaces { /// /// Интерфейс для регистрации зависимостей в модулях diff --git a/DepartmentPortal/Common/ModelTools/Interfaces/ISecurityManager.cs b/DepartmentPortal/Common/ToolsModule/Interfaces/ISecurityManager.cs similarity index 96% rename from DepartmentPortal/Common/ModelTools/Interfaces/ISecurityManager.cs rename to DepartmentPortal/Common/ToolsModule/Interfaces/ISecurityManager.cs index 3ac0607..57e5f89 100644 --- a/DepartmentPortal/Common/ModelTools/Interfaces/ISecurityManager.cs +++ b/DepartmentPortal/Common/ToolsModule/Interfaces/ISecurityManager.cs @@ -1,9 +1,9 @@ -using ModelTools.Models; +using ToolsModule.Models; using System; using System.Collections.Generic; using System.Threading.Tasks; -namespace ModelTools.Interfaces +namespace ToolsModule.Interfaces { /// /// Интерфейс для аутентификации пользователя и проверки доступа к операциям для пользователя diff --git a/DepartmentPortal/Common/ModuleTools/Models/OperationResultModel.cs b/DepartmentPortal/Common/ToolsModule/Models/OperationResultModel.cs similarity index 98% rename from DepartmentPortal/Common/ModuleTools/Models/OperationResultModel.cs rename to DepartmentPortal/Common/ToolsModule/Models/OperationResultModel.cs index 9ea390d..6baa0df 100644 --- a/DepartmentPortal/Common/ModuleTools/Models/OperationResultModel.cs +++ b/DepartmentPortal/Common/ToolsModule/Models/OperationResultModel.cs @@ -1,8 +1,8 @@ -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; -namespace ModuleTools.Models +namespace ToolsModule.Models { /// /// Результат любой операции с сущностью diff --git a/DepartmentPortal/Common/ModuleTools/Models/SecurityManagerCheckAccessModel.cs b/DepartmentPortal/Common/ToolsModule/Models/SecurityManagerCheckAccessModel.cs similarity index 90% rename from DepartmentPortal/Common/ModuleTools/Models/SecurityManagerCheckAccessModel.cs rename to DepartmentPortal/Common/ToolsModule/Models/SecurityManagerCheckAccessModel.cs index cf5a511..b8b193d 100644 --- a/DepartmentPortal/Common/ModuleTools/Models/SecurityManagerCheckAccessModel.cs +++ b/DepartmentPortal/Common/ToolsModule/Models/SecurityManagerCheckAccessModel.cs @@ -1,7 +1,7 @@ -using ModuleTools.BindingModels; -using ModuleTools.Enums; +using ToolsModule.BindingModels; +using ToolsModule.Enums; -namespace ModuleTools.Models +namespace ToolsModule.Models { /// /// Данные для проверки доступа diff --git a/DepartmentPortal/Common/ModelTools/ModelTools.csproj b/DepartmentPortal/Common/ToolsModule/ToolsModule.csproj similarity index 100% rename from DepartmentPortal/Common/ModelTools/ModelTools.csproj rename to DepartmentPortal/Common/ToolsModule/ToolsModule.csproj diff --git a/DepartmentPortal/Common/ModuleTools/ViewModels/ElementViewModel.cs b/DepartmentPortal/Common/ToolsModule/ViewModels/ElementViewModel.cs similarity index 85% rename from DepartmentPortal/Common/ModuleTools/ViewModels/ElementViewModel.cs rename to DepartmentPortal/Common/ToolsModule/ViewModels/ElementViewModel.cs index 620f6cf..a17a2ea 100644 --- a/DepartmentPortal/Common/ModuleTools/ViewModels/ElementViewModel.cs +++ b/DepartmentPortal/Common/ToolsModule/ViewModels/ElementViewModel.cs @@ -1,7 +1,7 @@ -using ModuleTools.Attributes; +using ToolsModule.Attributes; using System; -namespace ModuleTools.ViewModels +namespace ToolsModule.ViewModels { /// /// Возвращаемая запись diff --git a/DepartmentPortal/Common/ModelTools/ViewModels/ListViewModel.cs b/DepartmentPortal/Common/ToolsModule/ViewModels/ListViewModel.cs similarity index 90% rename from DepartmentPortal/Common/ModelTools/ViewModels/ListViewModel.cs rename to DepartmentPortal/Common/ToolsModule/ViewModels/ListViewModel.cs index f98f307..711e74b 100644 --- a/DepartmentPortal/Common/ModelTools/ViewModels/ListViewModel.cs +++ b/DepartmentPortal/Common/ToolsModule/ViewModels/ListViewModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ModelTools.ViewModels +namespace ToolsModule.ViewModels { /// /// Список возвращаемых значений diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanBindingModels.cs index edf6e1b..9b34222 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordBindingModels.cs index fc612d6..884ed75 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs index 068b646..d62cd7f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/ClassroomBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/ClassroomBindingModels.cs index 86b05e4..017df58 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/ClassroomBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/ClassroomBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBindingModels.cs index 9c27fac..a10b98f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBlockBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBlockBindingModels.cs index 8245e23..9aed486 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBlockBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBlockBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; namespace DepartmentBusinessLogic.BindingModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EducationDirectionBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EducationDirectionBindingModels.cs index 35e1445..87419ff 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EducationDirectionBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EducationDirectionBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeeBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeeBindingModels.cs index 692a9aa..58b05f3 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeeBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeeBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeePostBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeePostBindingModels.cs index 554f520..1c073e3 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeePostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeePostBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicDegreeBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicDegreeBindingModels.cs index 347f94b..d93fd89 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicDegreeBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicDegreeBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; namespace DepartmentBusinessLogic.BindingModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicRankBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicRankBindingModels.cs index 7180882..bf0e0ca 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicRankBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicRankBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.BindingModels; +using ToolsModule.Attributes; +using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; namespace DepartmentBusinessLogic.BindingModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerBindingModels.cs index 0928952..8a8a9b3 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerPostBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerPostBindingModels.cs index e13ee75..d1b545c 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerPostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerPostBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderBindingModels.cs index 1af1e10..dc27626 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderStudentRecordBindingModel.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderStudentRecordBindingModel.cs index 271c261..0be8a65 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderStudentRecordBindingModel.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderStudentRecordBindingModel.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs index 81f790b..1cf6f8f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs index 7240d92..50f39f0 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/PostBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/PostBindingModels.cs index a84c018..d800bea 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/PostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/PostBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; namespace DepartmentBusinessLogic.BindingModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentBindingModels.cs index 64835cb..10acfbe 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentGroupBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentGroupBindingModels.cs index f39b8c0..540c91d 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentGroupBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentGroupBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/TimeNormBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/TimeNormBindingModels.cs index 7ee585b..e50d423 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/TimeNormBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/TimeNormBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanBusinessLogic.cs index 8bc2e89..9b43299 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordBusinessLogic.cs index 043fd99..1f53851 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordTimeNormHourBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordTimeNormHourBusinessLogic.cs index 943086d..5635976 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordTimeNormHourBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordTimeNormHourBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/ClassroomBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/ClassroomBusinessLogic.cs index a194114..f13a88b 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/ClassroomBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/ClassroomBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBlockBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBlockBusinessLogic.cs index 6477882..8ce7599 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBlockBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBlockBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBusinessLogic.cs index 5ae5abe..e601d05 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EducationDirectionBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EducationDirectionBusinessLogic.cs index 382949d..67591a8 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EducationDirectionBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EducationDirectionBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeeBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeeBusinessLogic.cs index 4293a5e..efa114c 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeeBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeeBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeePostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeePostBusinessLogic.cs index 98b23ea..a88b38c 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeePostBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeePostBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicDegreeBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicDegreeBusinessLogic.cs index dd7602f..cb0c28c 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicDegreeBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicDegreeBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicRankBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicRankBusinessLogic.cs index 5316efd..5dab05b 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicRankBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicRankBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerBusinessLogic.cs index faabede..87909fd 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerPostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerPostBusinessLogic.cs index 696211f..96cdf3f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerPostBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerPostBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderBusinessLogic.cs index 33d0d49..121e809 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderStudentRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderStudentRecordBusinessLogic.cs index 4694d72..0069250 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderStudentRecordBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderStudentRecordBusinessLogic.cs @@ -2,8 +2,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryBusinessLogic.cs index 6dc2cbe..bb945d7 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryBusinessLogic.cs @@ -3,10 +3,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.HelperModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Extensions; -using ModuleTools.Interfaces; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryRecordBusinessLogic.cs index 0db68ad..b418551 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryRecordBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryRecordBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/PostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/PostBusinessLogic.cs index bc81cc9..db8ec23 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/PostBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/PostBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentBusinessLogic.cs index 3aad668..992e825 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentGroupBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentGroupBusinessLogic.cs index 6653bde..8d69a7c 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentGroupBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentGroupBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/TimeNormBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/TimeNormBusinessLogic.cs index 4353cca..185336f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/TimeNormBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/TimeNormBusinessLogic.cs @@ -1,8 +1,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentBusinessLogic.csproj b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentBusinessLogic.csproj index 93b6fc3..18a75bd 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentBusinessLogic.csproj +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentBusinessLogic.csproj @@ -5,7 +5,6 @@ - diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordService.cs index f0e0495..d8ecda5 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordTimeNormHourService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordTimeNormHourService.cs index e968ffb..73fc074 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordTimeNormHourService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordTimeNormHourService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanService.cs index 6528788..cb9053a 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanService.cs @@ -1,6 +1,6 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; -using ModuleTools.Models; +using ToolsModule.Interfaces; +using ToolsModule.Models; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IClassroomService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IClassroomService.cs index ee8c0e2..77a7989 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IClassroomService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IClassroomService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineBlockService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineBlockService.cs index 4032e34..12ec0ce 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineBlockService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineBlockService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineService.cs index f1b897e..c36c42c 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEducationDirectionService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEducationDirectionService.cs index f5b6b79..ce36838 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEducationDirectionService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEducationDirectionService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeePostService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeePostService.cs index bb79fe4..0bc7515 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeePostService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeePostService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeeService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeeService.cs index 7331f0c..9450204 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeeService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeeService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicDegreeService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicDegreeService.cs index a0abbf5..21cd751 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicDegreeService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicDegreeService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicRankService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicRankService.cs index c538374..54f11b3 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicRankService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicRankService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerPostService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerPostService.cs index b230302..5cb271f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerPostService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerPostService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerService.cs index d24df98..015f520 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderService.cs index 4cffbdd..7df074c 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderStudentRecordService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderStudentRecordService.cs index 6cccad1..bb3d133 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderStudentRecordService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderStudentRecordService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryRecordService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryRecordService.cs index 59f3244..ecd182c 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryRecordService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryRecordService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryService.cs index 308050a..7218aec 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IPostService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IPostService.cs index 3316cc3..3340346 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IPostService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IPostService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentGroupService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentGroupService.cs index 48ea5ed..7c24779 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentGroupService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentGroupService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentService.cs index 16fde89..00f56ec 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ITimeNormService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ITimeNormService.cs index 9b6a134..321778f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ITimeNormService.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ITimeNormService.cs @@ -1,5 +1,5 @@ using DepartmentBusinessLogic.BindingModels; -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; namespace DepartmentBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs index 9ed3fc3..522b7bf 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordViewModels.cs index a8c59a6..950778d 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanViewModels.cs index a8ebe5c..81f215d 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/ClassroomViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/ClassroomViewModels.cs index 1c19a76..bcea183 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/ClassroomViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/ClassroomViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineBlockViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineBlockViewModels.cs index 0bf0720..9b3db1e 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineBlockViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineBlockViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; namespace DepartmentBusinessLogic.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineViewModels.cs index bb2d91d..271c8c4 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EducationDirectionViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EducationDirectionViewModels.cs index 79ff534..3aaf1d9 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EducationDirectionViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EducationDirectionViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeePostViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeePostViewModels.cs index 6697105..4b0c22a 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeePostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeePostViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeeViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeeViewModels.cs index 7dfcf04..b9f3a31 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeeViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeeViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicDegreeViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicDegreeViewModels.cs index 477ad4d..9e20256 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicDegreeViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicDegreeViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; namespace DepartmentBusinessLogic.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicRankViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicRankViewModels.cs index 0725ca3..d528636 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicRankViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicRankViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; namespace DepartmentBusinessLogic.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerPostViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerPostViewModels.cs index 33e01dd..d7bceee 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerPostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerPostViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerViewModels.cs index cd70336..f31f3b5 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderStudentRecordViewModel.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderStudentRecordViewModel.cs index 1a9303c..57cb34d 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderStudentRecordViewModel.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderStudentRecordViewModel.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs index f85fbe1..4486616 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs index 2ddeb4d..b6f4d38 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderViewModels.cs index 45f48bb..ab7f9a4 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/PostViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/PostViewModels.cs index 5cb9cae..ded29e7 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/PostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/PostViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; namespace DepartmentBusinessLogic.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentGroupViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentGroupViewModels.cs index 55c696e..3c0fb3d 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentGroupViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentGroupViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentViewModels.cs index b2c8901..8d996e1 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/TimeNormViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/TimeNormViewModels.cs index 66be0ed..9b5f88f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/TimeNormViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/TimeNormViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs index 4aceecc..fe27051 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs @@ -1,7 +1,7 @@ using DepartmentBusinessLogic.Interfaces; using DepartmentDatabaseImplementation.Implementations; -using ModuleTools.BusinessLogics; -using ModuleTools.Interfaces; +using ToolsModule.BusinessLogics; +using ToolsModule.Interfaces; namespace DepartmentDatabaseImplementation { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordService.cs index 6eca46c..2319afe 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordService.cs @@ -4,7 +4,7 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordTimeNormHourService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordTimeNormHourService.cs index 2bad659..7c141b0 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordTimeNormHourService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordTimeNormHourService.cs @@ -4,7 +4,7 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanService.cs index f53ea5c..f3ee1a9 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanService.cs @@ -6,9 +6,9 @@ using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using DepartmentDatabaseImplementation.Models; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Extensions; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.Models; using System; using System.Collections.Generic; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/ClassroomService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/ClassroomService.cs index c91df71..adc02bd 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/ClassroomService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/ClassroomService.cs @@ -5,7 +5,7 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineBlockService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineBlockService.cs index 6b62199..4c5b2f2 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineBlockService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineBlockService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineService.cs index d2f5b1d..62617b2 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineService.cs @@ -4,9 +4,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Extensions; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EducationDirectionService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EducationDirectionService.cs index c4d7207..9ecf894 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EducationDirectionService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EducationDirectionService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Models; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeePostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeePostService.cs index 994ebd5..5fc89b4 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeePostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeePostService.cs @@ -4,7 +4,7 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeeService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeeService.cs index 207a2be..cf9e7ba 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeeService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeeService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Models; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicDegreeService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicDegreeService.cs index fa1dd00..0a59a1f 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicDegreeService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicDegreeService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicRankService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicRankService.cs index 6a49bf8..71824f2 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicRankService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicRankService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerPostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerPostService.cs index aee2a79..7373d07 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerPostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerPostService.cs @@ -4,7 +4,7 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerService.cs index 71436cd..128a4ab 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Models; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderService.cs index 78b2e6d..526d740 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderService.cs @@ -4,9 +4,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Extensions; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderStudentRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderStudentRecordService.cs index 8725811..e3fc671 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderStudentRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderStudentRecordService.cs @@ -4,7 +4,7 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryRecordService.cs index 75f5161..f2774ad 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryRecordService.cs @@ -4,9 +4,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Models; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryService.cs index 99637f9..a14347a 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryService.cs @@ -3,9 +3,9 @@ using DatabaseCore.Models.Department; using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Models; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/PostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/PostService.cs index 0883ea9..d8db7ae 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/PostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/PostService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentGroupService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentGroupService.cs index 23ca71c..69c5c82 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentGroupService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentGroupService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Models; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentService.cs index 23054a6..a169f16 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentService.cs @@ -4,8 +4,8 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Extensions; -using ModuleTools.Models; +using ToolsModule.Extensions; +using ToolsModule.Models; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/TimeNormService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/TimeNormService.cs index 9c8cfbb..0b747a6 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/TimeNormService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/TimeNormService.cs @@ -4,7 +4,7 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.Interfaces; using DepartmentBusinessLogic.ViewModels; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using System.Linq; namespace DepartmentDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs index 62d422a..ad0dd8d 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs @@ -1,11 +1,11 @@ using DepartmentWindowsDesktop.EntityControls; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BindingModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Interfaces; -using ModuleTools.Models; +using ToolsModule.BindingModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Interfaces; +using ToolsModule.Models; using System.Collections.Generic; namespace DepartmentWindowsDesktop diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs index d01d348..5db57f2 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs @@ -6,7 +6,7 @@ using DesktopTools.Enums; using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; using System.Windows.Forms; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs index efdc33d..cd133e2 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs @@ -6,7 +6,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; using System.Data; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs index 2fa9afb..9393677 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs index bd1c302..d9eff6d 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs index eb7d2f8..760e082 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs @@ -5,8 +5,8 @@ using DesktopTools.BaseControls; using DesktopTools.Controls; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using System; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs index 1045982..9a6639c 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs index bfbf23a..afd3eb0 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs index 9c50368..a02054a 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs @@ -6,8 +6,8 @@ using DesktopTools.Controls; using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BusinessLogics; -using ModuleTools.Extensions; +using ToolsModule.BusinessLogics; +using ToolsModule.Extensions; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs index b8eb2f6..75540b5 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs index a102afb..48419f1 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs index 3e9270d..0d27fe4 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs @@ -6,8 +6,8 @@ using DesktopTools.Controls; using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BusinessLogics; -using ModuleTools.Extensions; +using ToolsModule.BusinessLogics; +using ToolsModule.Extensions; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs index ad53882..b7fbe91 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs index fe53990..8c116f2 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs index 2a39dfc..dbe645d 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs index b07c55a..3c5baf3 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs index 16da37d..47cbb29 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs @@ -4,7 +4,7 @@ using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs index b9edc17..67ac744 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs @@ -4,7 +4,7 @@ using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs index fe59132..e99804d 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs @@ -6,7 +6,7 @@ using DesktopTools.Enums; using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs index 29ef4bb..0adab7c 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs index e9e6bbf..012e85f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs index 16bb4a1..137eeeb 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs @@ -6,8 +6,8 @@ using DesktopTools.Controls; using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BusinessLogics; -using ModuleTools.Extensions; +using ToolsModule.BusinessLogics; +using ToolsModule.Extensions; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs index 9a5ff73..4e3bf71 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs @@ -6,7 +6,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; using System.Linq; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs index f7d04ef..8e913b7 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs index bed2a18..33af590 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs @@ -5,7 +5,7 @@ using DesktopTools.Controls; using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/DepartmentPortal.sln b/DepartmentPortal/DepartmentPortal.sln index 3db6a90..98136d6 100644 --- a/DepartmentPortal/DepartmentPortal.sln +++ b/DepartmentPortal/DepartmentPortal.sln @@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityWindowsDesktop", "S EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityDatabaseImplementation", "Security\SecurityDatabaseImplementation\SecurityDatabaseImplementation.csproj", "{26FCAAC6-F8F4-4CE6-92FE-1C6C376E5DE6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModuleTools", "Common\ModuleTools\ModuleTools.csproj", "{84CD6D9F-9B38-4392-B8A5-4FD32CF54BEC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Department", "Department", "{A19E7709-6AD8-4E9B-B3AB-4339C67D9F39}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DepartmentBusinessLogic", "Department\DepartmentBusinessLogic\DepartmentBusinessLogic.csproj", "{69B94DB1-D1BE-4905-81AC-A5D49D0C9719}" @@ -29,7 +27,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DepartmentDatabaseImplement EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DepartmentWindowsDesktop", "Department\DepartmentWindowsDesktop\DepartmentWindowsDesktop.csproj", "{8E12DE14-0D83-48D8-964D-8B2BB06DB129}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreModels", "Common\CoreModels\CoreModels.csproj", "{FDF81413-ABAD-4890-A60F-4FEC62DD2A7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreModels", "Common\CoreModels\CoreModels.csproj", "{FDF81413-ABAD-4890-A60F-4FEC62DD2A7D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToolsModule", "Common\ToolsModule\ToolsModule.csproj", "{26F68044-DA58-4E85-ACD7-FCC0B52B422B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -61,10 +61,6 @@ Global {26FCAAC6-F8F4-4CE6-92FE-1C6C376E5DE6}.Debug|Any CPU.Build.0 = Debug|Any CPU {26FCAAC6-F8F4-4CE6-92FE-1C6C376E5DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU {26FCAAC6-F8F4-4CE6-92FE-1C6C376E5DE6}.Release|Any CPU.Build.0 = Release|Any CPU - {84CD6D9F-9B38-4392-B8A5-4FD32CF54BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84CD6D9F-9B38-4392-B8A5-4FD32CF54BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84CD6D9F-9B38-4392-B8A5-4FD32CF54BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84CD6D9F-9B38-4392-B8A5-4FD32CF54BEC}.Release|Any CPU.Build.0 = Release|Any CPU {69B94DB1-D1BE-4905-81AC-A5D49D0C9719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {69B94DB1-D1BE-4905-81AC-A5D49D0C9719}.Debug|Any CPU.Build.0 = Debug|Any CPU {69B94DB1-D1BE-4905-81AC-A5D49D0C9719}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -81,6 +77,10 @@ Global {FDF81413-ABAD-4890-A60F-4FEC62DD2A7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FDF81413-ABAD-4890-A60F-4FEC62DD2A7D}.Release|Any CPU.ActiveCfg = Release|Any CPU {FDF81413-ABAD-4890-A60F-4FEC62DD2A7D}.Release|Any CPU.Build.0 = Release|Any CPU + {26F68044-DA58-4E85-ACD7-FCC0B52B422B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26F68044-DA58-4E85-ACD7-FCC0B52B422B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26F68044-DA58-4E85-ACD7-FCC0B52B422B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26F68044-DA58-4E85-ACD7-FCC0B52B422B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -91,11 +91,11 @@ Global {6B923E2B-85EE-4490-81BA-C7AB5DB582AC} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} {40F7C37A-3544-4A6A-893D-D611DE100036} = {7DA26C36-778E-4563-9AEC-966E26EA7B2A} {26FCAAC6-F8F4-4CE6-92FE-1C6C376E5DE6} = {7DA26C36-778E-4563-9AEC-966E26EA7B2A} - {84CD6D9F-9B38-4392-B8A5-4FD32CF54BEC} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} {69B94DB1-D1BE-4905-81AC-A5D49D0C9719} = {A19E7709-6AD8-4E9B-B3AB-4339C67D9F39} {1A9E20FE-6324-4839-A3AD-5726305122A5} = {A19E7709-6AD8-4E9B-B3AB-4339C67D9F39} {8E12DE14-0D83-48D8-964D-8B2BB06DB129} = {A19E7709-6AD8-4E9B-B3AB-4339C67D9F39} {FDF81413-ABAD-4890-A60F-4FEC62DD2A7D} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} + {26F68044-DA58-4E85-ACD7-FCC0B52B422B} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBA0CB49-EF2D-4538-9D00-FCEDA24879A9} diff --git a/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs b/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs index 09a5943..906a1bd 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs @@ -1,6 +1,6 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Extensions; -using ModuleTools.Interfaces; +using ToolsModule.BusinessLogics; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/DepartmentPortal/DepartmentPortalDesctop/Program.cs b/DepartmentPortal/DepartmentPortalDesctop/Program.cs index 8da9821..a41665d 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/Program.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/Program.cs @@ -1,6 +1,6 @@ using DatabaseCore; -using ModuleTools.BusinessLogics; -using ModuleTools.Interfaces; +using ToolsModule.BusinessLogics; +using ToolsModule.Interfaces; using System; using System.Windows.Forms; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs index 0d29b2c..ceccd27 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsSecurity; -using ModuleTools.BindingModels; -using ModuleTools.Enums; +using ToolsModule.BindingModels; +using ToolsModule.Enums; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/EnviromentSettingBindingModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/EnviromentSettingBindingModels.cs index a887973..d8981ac 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/EnviromentSettingBindingModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/EnviromentSettingBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsSecurity; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; namespace SecurityBusinessLogic.BindingModels diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/RoleBindingModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/RoleBindingModels.cs index 94dbe4f..6724fa6 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/RoleBindingModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/RoleBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsSecurity; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; namespace SecurityBusinessLogic.BindingModels diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserBindingModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserBindingModels.cs index bd6b39b..5a9b1f5 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserBindingModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsSecurity; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserRoleBindingModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserRoleBindingModels.cs index 1bc989e..428f0f6 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserRoleBindingModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/UserRoleBindingModels.cs @@ -1,5 +1,5 @@ using CoreModels.ModelsSecurity; -using ModuleTools.BindingModels; +using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs index 68f0d8a..7de38d9 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs @@ -1,5 +1,5 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs index d21690e..7238a84 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs @@ -1,6 +1,6 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Extensions; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Extensions; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using System; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs index 8378046..753c425 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs @@ -1,5 +1,5 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs index 21790d5..9fe1ec7 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs @@ -1,5 +1,5 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs index d268e4b..093a586 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs @@ -1,5 +1,5 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.Interfaces; using System; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs index e7b27a5..09320e7 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs @@ -1,5 +1,5 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserRoleBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserRoleBusinessLogic.cs index c97bcc7..f93b2de 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserRoleBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserRoleBusinessLogic.cs @@ -1,5 +1,5 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IAccessService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IAccessService.cs index fd4d517..a6f29c6 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IAccessService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IAccessService.cs @@ -1,4 +1,4 @@ -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using SecurityBusinessLogic.BindingModels; namespace SecurityBusinessLogic.Interfaces diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IBackupService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IBackupService.cs index 9b67b80..59cb37b 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IBackupService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IBackupService.cs @@ -1,4 +1,4 @@ -using ModuleTools.Models; +using ToolsModule.Models; using SecurityBusinessLogic.BindingModels; namespace SecurityBusinessLogic.Interfaces diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IEnviromentSettingService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IEnviromentSettingService.cs index f0fc73c..b7c9911 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IEnviromentSettingService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IEnviromentSettingService.cs @@ -1,4 +1,4 @@ -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using SecurityBusinessLogic.BindingModels; namespace SecurityBusinessLogic.Interfaces diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IRoleService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IRoleService.cs index c8e50eb..28cab67 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IRoleService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IRoleService.cs @@ -1,4 +1,4 @@ -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using SecurityBusinessLogic.BindingModels; namespace SecurityBusinessLogic.Interfaces diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/ISynchronizationService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/ISynchronizationService.cs index 6dd23e2..6807d22 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/ISynchronizationService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/ISynchronizationService.cs @@ -1,4 +1,4 @@ -using ModuleTools.Models; +using ToolsModule.Models; namespace SecurityBusinessLogic.Interfaces { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserRoleService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserRoleService.cs index ae8b1ee..75b2e65 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserRoleService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserRoleService.cs @@ -1,4 +1,4 @@ -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using SecurityBusinessLogic.BindingModels; namespace SecurityBusinessLogic.Interfaces diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserService.cs index e177d3f..93fa316 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserService.cs @@ -1,4 +1,4 @@ -using ModuleTools.Interfaces; +using ToolsModule.Interfaces; using SecurityBusinessLogic.BindingModels; namespace SecurityBusinessLogic.Interfaces diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/SecurityBusinessLogic.csproj b/DepartmentPortal/Security/SecurityBusinessLogic/SecurityBusinessLogic.csproj index e3bb8c2..fa7ca50 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/SecurityBusinessLogic.csproj +++ b/DepartmentPortal/Security/SecurityBusinessLogic/SecurityBusinessLogic.csproj @@ -10,7 +10,6 @@ - diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/AccessViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/AccessViewModels.cs index 117a830..c3c7d16 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/AccessViewModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/AccessViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace SecurityBusinessLogic.ViewModels diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/EnviromentSettingViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/EnviromentSettingViewModels.cs index ed7d14c..ee42f41 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/EnviromentSettingViewModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/EnviromentSettingViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; namespace SecurityBusinessLogic.ViewModels { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs index 9cabe1c..217d8e3 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/RoleViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; namespace SecurityBusinessLogic.ViewModels { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserRoleViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserRoleViewModels.cs index 3454938..9112818 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserRoleViewModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserRoleViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace SecurityBusinessLogic.ViewModels diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs index f8c203d..ebcf46b 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsSecurity; -using ModuleTools.Attributes; -using ModuleTools.Enums; -using ModuleTools.ViewModels; +using ToolsModule.Attributes; +using ToolsModule.Enums; +using ToolsModule.ViewModels; using System; namespace SecurityBusinessLogic.ViewModels diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs index aee6aa6..14b36d3 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs @@ -1,7 +1,7 @@ using DatabaseCore; using DatabaseCore.Models.Security; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs index 6a5276f..65236fe 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs @@ -1,8 +1,8 @@ using DatabaseCore; -using ModuleTools.Attributes; -using ModuleTools.Extensions; -using ModuleTools.Interfaces; -using ModuleTools.Models; +using ToolsModule.Attributes; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; +using ToolsModule.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using System; diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/EnviromentSettingService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/EnviromentSettingService.cs index b39edb0..fda1ae8 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/EnviromentSettingService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/EnviromentSettingService.cs @@ -1,8 +1,8 @@ using DatabaseCore; using DatabaseCore.Models.Security; using Microsoft.EntityFrameworkCore; -using ModuleTools.Extensions; -using ModuleTools.Models; +using ToolsModule.Extensions; +using ToolsModule.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/RoleService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/RoleService.cs index b0bb848..8cb32b7 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/RoleService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/RoleService.cs @@ -1,9 +1,9 @@ using DatabaseCore; using DatabaseCore.Models.Security; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Extensions; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs index 7cb9717..e8928eb 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs @@ -1,4 +1,4 @@ -using ModuleTools.Models; +using ToolsModule.Models; using SecurityBusinessLogic.Interfaces; namespace SecurityDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserRoleService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserRoleService.cs index 755e084..4dffe65 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserRoleService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserRoleService.cs @@ -1,7 +1,7 @@ using DatabaseCore; using DatabaseCore.Models.Security; using Microsoft.EntityFrameworkCore; -using ModuleTools.Models; +using ToolsModule.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserService.cs index 99abcf4..734104f 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserService.cs @@ -2,9 +2,9 @@ using DatabaseCore.Models.Department; using DatabaseCore.Models.Security; using Microsoft.EntityFrameworkCore; -using ModuleTools.Enums; -using ModuleTools.Extensions; -using ModuleTools.Models; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.Interfaces; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs index d4a4eb3..58a9e11 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs @@ -1,5 +1,5 @@ -using ModuleTools.BusinessLogics; -using ModuleTools.Interfaces; +using ToolsModule.BusinessLogics; +using ToolsModule.Interfaces; using SecurityBusinessLogic.Interfaces; using SecurityDatabaseImplementation.Implementations; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs index b350bc7..d5e491e 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs @@ -2,8 +2,8 @@ using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs index 7bd7862..2bac7a2 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs @@ -2,7 +2,7 @@ using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs index 02076be..d8d97cf 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs @@ -2,7 +2,7 @@ using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs index 0365d27..bb896de 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs @@ -2,7 +2,7 @@ using DesktopTools.Controls; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs index 4c36d1a..70a83a8 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs @@ -2,7 +2,7 @@ using DesktopTools.Enums; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.Enums; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs index 7207913..cbe87f6 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs @@ -1,10 +1,10 @@ using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BindingModels; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; -using ModuleTools.Interfaces; -using ModuleTools.Models; +using ToolsModule.BindingModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Interfaces; +using ToolsModule.Models; using SecurityWindowsDesktop.EntityControls; using SecurityWindowsDesktop.SpecialControls; using System.Collections.Generic; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs index 60395bd..8b61873 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs @@ -1,8 +1,8 @@ using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using System; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs index 4e8562f..ff9840a 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs @@ -1,8 +1,8 @@ using DesktopTools.Helpers; using DesktopTools.Interfaces; using DesktopTools.Models; -using ModuleTools.BusinessLogics; -using ModuleTools.Enums; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; using SecurityBusinessLogic.BusinessLogics; using System; using System.Windows.Forms;