From cce896bf2b49b200417bd7dd4945fad2cfa7483f Mon Sep 17 00:00:00 2001 From: kotcheshir73 Date: Sat, 19 Mar 2022 22:48:13 +0400 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3,=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=BA=D0=B0=D1=84=D0=B5=D0=B4=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AcademicPlanRecordBusinessLogic.cs | 16 ----- ...emicPlanRecordTimeNormHourBusinessLogic.cs | 16 ----- .../BusinessLogics/ClassroomBusinessLogic.cs | 16 ----- .../DisciplineBlockBusinessLogic.cs | 16 ----- .../BusinessLogics/DisciplineBusinessLogic.cs | 16 ----- .../EducationDirectionBusinessLogic.cs | 16 ----- .../BusinessLogics/EmployeeBusinessLogic.cs | 16 ----- .../EmployeePostBusinessLogic.cs | 16 ----- .../AcademicPlanBusinessLogic.cs | 17 +++--- .../AcademicPlanRecordBusinessLogic.cs | 17 ++++++ ...emicPlanRecordTimeNormHourBusinessLogic.cs | 17 ++++++ .../ClassroomBusinessLogic.cs | 17 ++++++ .../DisciplineBlockBusinessLogic.cs | 17 ++++++ .../DisciplineBusinessLogic.cs | 17 ++++++ .../EducationDirectionBusinessLogic.cs | 17 ++++++ .../EmployeeBusinessLogic.cs | 17 ++++++ .../EmployeePostBusinessLogic.cs | 17 ++++++ .../LecturerAcademicDegreeBusinessLogic.cs | 17 ++++++ .../LecturerAcademicRankBusinessLogic.cs | 17 ++++++ .../LecturerBusinessLogic.cs | 17 ++++++ .../LecturerPostBusinessLogic.cs | 17 ++++++ .../OrderBusinessLogic.cs | 17 ++++++ .../OrderStudentRecordBusinessLogic.cs | 19 +++--- .../OrderSyncHistoryBusinessLogic.cs | 61 ++++++++++--------- .../OrderSyncHistoryRecordBusinessLogic.cs | 17 ++++++ .../GenericBusinessLogic/PostBusinessLogic.cs | 17 ++++++ .../StudentBusinessLogic.cs | 17 ++++++ .../StudentGroupBusinessLogic.cs | 17 ++++++ .../TimeNormBusinessLogic.cs | 17 ++++++ .../LecturerAcademicDegreeBusinessLogic.cs | 16 ----- .../LecturerAcademicRankBusinessLogic.cs | 16 ----- .../BusinessLogics/LecturerBusinessLogic.cs | 16 ----- .../LecturerPostBusinessLogic.cs | 16 ----- .../BusinessLogics/OrderBusinessLogic.cs | 16 ----- .../OrderSyncHistoryRecordBusinessLogic.cs | 16 ----- .../BusinessLogics/PostBusinessLogic.cs | 16 ----- .../BusinessLogics/StudentBusinessLogic.cs | 16 ----- .../StudentGroupBusinessLogic.cs | 16 ----- .../BusinessLogics/TimeNormBusinessLogic.cs | 16 ----- .../DepartmentBusinessLogic.csproj | 3 +- .../DepartmentLogicDependencyRegistration.cs | 46 ++++++++++++++ .../Interfaces/IAcademicPlanRecordService.cs | 10 --- .../IAcademicPlanRecordTimeNormHourService.cs | 10 --- .../Interfaces/IAcademicPlanService.cs | 19 ------ .../Interfaces/IClassroomService.cs | 10 --- .../Interfaces/IDisciplineBlockService.cs | 10 --- .../Interfaces/IDisciplineService.cs | 10 --- .../Interfaces/IEducationDirectionService.cs | 10 --- .../Interfaces/IEmployeePostService.cs | 10 --- .../Interfaces/IEmployeeService.cs | 10 --- .../ILecturerAcademicDegreeService.cs | 10 --- .../ILecturerAcademicRankService.cs | 10 --- .../Interfaces/ILecturerPostService.cs | 10 --- .../Interfaces/ILecturerService.cs | 10 --- .../Interfaces/IOrderService.cs | 10 --- .../Interfaces/IOrderStudentRecordService.cs | 10 --- .../IOrderSyncHistoryRecordService.cs | 10 --- .../Interfaces/IOrderSyncHistoryService.cs | 10 --- .../Interfaces/IPostService.cs | 10 --- .../Interfaces/IStudentGroupService.cs | 10 --- .../Interfaces/IStudentService.cs | 10 --- .../Interfaces/ITimeNormService.cs | 10 --- .../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 | 5 +- .../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 +- .../DepartmentContract.csproj | 12 ++++ .../IGenericEntityLogic/IAcademicPlanLogic.cs | 14 +++++ .../IAcademicPlanRecordLogic.cs | 11 ++++ .../IAcademicPlanRecordTimeNormHourLogic.cs | 11 ++++ .../IGenericEntityLogic/IClassroomLogic.cs | 11 ++++ .../IDisciplineBlockLogic.cs | 11 ++++ .../IGenericEntityLogic/IDisciplineLogic.cs | 11 ++++ .../IEducationDirectionLogic.cs | 11 ++++ .../IGenericEntityLogic/IEmployeeLogic.cs | 11 ++++ .../IGenericEntityLogic/IEmployeePostLogic.cs | 11 ++++ .../ILecturerAcademicDegreeLogic.cs | 11 ++++ .../ILecturerAcademicRankLogic.cs | 11 ++++ .../IGenericEntityLogic/ILecturerLogic.cs | 11 ++++ .../IGenericEntityLogic/ILecturerPostLogic.cs | 11 ++++ .../Logics/IGenericEntityLogic/IOrderLogic.cs | 11 ++++ .../IOrderStudentRecordLogic.cs | 11 ++++ .../IOrderSyncHistoryLogic.cs | 18 ++++++ .../IOrderSyncHistoryRecordLogic.cs | 11 ++++ .../Logics/IGenericEntityLogic/IPostLogic.cs | 11 ++++ .../IGenericEntityLogic/IStudentGroupLogic.cs | 11 ++++ .../IGenericEntityLogic/IStudentLogic.cs | 11 ++++ .../IGenericEntityLogic/ITimeNormLogic.cs | 11 ++++ .../IAcademicPlanRecordService.cs | 10 +++ .../IAcademicPlanRecordTimeNormHourService.cs | 10 +++ .../IAcademicPlanService.cs | 19 ++++++ .../IClassroomService.cs | 10 +++ .../IDisciplineBlockService.cs | 10 +++ .../IDisciplineService.cs | 10 +++ .../IEducationDirectionService.cs | 10 +++ .../IEmployeePostService.cs | 10 +++ .../IGenericEntityService/IEmployeeService.cs | 10 +++ .../ILecturerAcademicDegreeService.cs | 10 +++ .../ILecturerAcademicRankService.cs | 10 +++ .../ILecturerPostService.cs | 10 +++ .../IGenericEntityService/ILecturerService.cs | 10 +++ .../IGenericEntityService/IOrderService.cs | 10 +++ .../IOrderStudentRecordService.cs | 10 +++ .../IOrderSyncHistoryRecordService.cs | 10 +++ .../IOrderSyncHistoryService.cs | 10 +++ .../IGenericEntityService/IPostService.cs | 10 +++ .../IStudentGroupService.cs | 10 +++ .../IGenericEntityService/IStudentService.cs | 10 +++ .../IGenericEntityService/ITimeNormService.cs | 10 +++ ...cademicPlanRecordTimeNormHourViewModels.cs | 2 +- .../AcademicPlanRecordViewModels.cs | 2 +- .../ViewModels/AcademicPlanViewModels.cs | 2 +- .../ViewModels/ClassroomViewModels.cs | 2 +- .../ViewModels/DisciplineBlockViewModels.cs | 2 +- .../ViewModels/DisciplineViewModels.cs | 2 +- .../EducationDirectionViewModels.cs | 2 +- .../ViewModels/EmployeePostViewModels.cs | 2 +- .../ViewModels/EmployeeViewModels.cs | 2 +- .../LecturerAcademicDegreeViewModels.cs | 2 +- .../LecturerAcademicRankViewModels.cs | 2 +- .../ViewModels/LecturerPostViewModels.cs | 2 +- .../ViewModels/LecturerViewModels.cs | 2 +- .../ViewModels/OrderStudentRecordViewModel.cs | 2 +- .../OrderSyncHistoryRecordViewModels.cs | 2 +- .../ViewModels/OrderSyncHistoryViewModels.cs | 2 +- .../ViewModels/OrderViewModels.cs | 2 +- .../ViewModels/PostViewModels.cs | 2 +- .../ViewModels/StudentGroupViewModels.cs | 2 +- .../ViewModels/StudentViewModels.cs | 2 +- .../ViewModels/TimeNormViewModels.cs | 2 +- .../DepartmentDatabaseImplementation.csproj | 2 +- .../DepartmentImplementationExtensions.cs | 5 +- .../AcademicPlanRecordService.cs | 18 +++--- .../AcademicPlanRecordTimeNormHourService.cs | 18 +++--- .../AcademicPlanService.cs | 18 +++--- .../ClassroomService.cs | 14 ++--- .../DisciplineBlockService.cs | 18 +++--- .../DisciplineService.cs | 18 +++--- .../EducationDirectionService.cs | 19 +++--- .../EmployeePostService.cs | 18 +++--- .../EmployeeService.cs | 20 +++--- .../LecturerAcademicDegreeService.cs | 18 +++--- .../LecturerAcademicRankService.cs | 18 +++--- .../LecturerPostService.cs | 16 ++--- .../LecturerService.cs | 20 +++--- .../OrderService.cs | 18 +++--- .../OrderStudentRecordService.cs | 18 +++--- .../OrderSyncHistoryRecordService.cs | 12 ++-- .../OrderSyncHistoryService.cs | 12 ++-- .../PostService.cs | 18 +++--- .../StudentGroupService.cs | 20 +++--- .../StudentService.cs | 20 +++--- .../TimeNormService.cs | 18 +++--- .../ControlAcademicPlanElement.cs | 22 +++---- .../AcademicPlan/ControlAcademicPlanList.cs | 22 +++---- .../ControlAcademicPlanRecordElement.cs | 18 +++--- .../ControlAcademicPlanRecordList.cs | 16 ++--- ...olAcademicPlanRecordTimeNormHourElement.cs | 18 +++--- ...ntrolAcademicPlanRecordTimeNormHourList.cs | 14 ++--- .../Classroom/ControlClassroomElement.cs | 18 +++--- .../Classroom/ControlClassroomList.cs | 20 +++--- .../Discipline/ControlDisciplineElement.cs | 18 +++--- .../Discipline/ControlDisciplineList.cs | 16 ++--- .../ControlDisciplineBlockElement.cs | 18 +++--- .../ControlDisciplineBlockList.cs | 20 +++--- .../ControlEducationDirectionElement.cs | 18 +++--- .../ControlEducationDirectionList.cs | 20 +++--- .../Employee/ControlEmployeeElement.cs | 22 +++---- .../Employee/ControlEmployeeList.cs | 20 +++--- .../ControlEmployeePostElement.cs | 18 +++--- .../EmployeePost/ControlEmployeePostList.cs | 20 +++--- .../Lecturer/ControlLecturerElement.cs | 22 +++---- .../Lecturer/ControlLecturerList.cs | 20 +++--- .../ControlLecturerAcademicDegreeElement.cs | 18 +++--- .../ControlLecturerAcademicDegreeList.cs | 20 +++--- .../ControlLecturerAcademicRankElement.cs | 18 +++--- .../ControlLecturerAcademicRankList.cs | 20 +++--- .../ControlLecturerPostElement.cs | 18 +++--- .../LecturerPost/ControlLecturerPostList.cs | 14 ++--- .../Order/ControlOrderElement.cs | 18 +++--- .../EntityControls/Order/ControlOrderList.cs | 18 +++--- .../ControlOrderStudentRecordElement.cs | 18 +++--- .../ControlOrderStudentRecordList.cs | 26 ++++---- .../ControlOrderSyncHistoryElement.cs | 18 +++--- .../ControlOrderSyncHistoryList.cs | 14 ++--- .../ControlOrderSyncHistoryRecordElement.cs | 18 +++--- .../ControlOrderSyncHistoryRecordList.cs | 20 +++--- .../EntityControls/Post/ControlPostElement.cs | 18 +++--- .../EntityControls/Post/ControlPostList.cs | 20 +++--- .../Student/ControlStudentElement.cs | 22 +++---- .../Student/ControlStudentList.cs | 14 ++--- .../ControlStudentGroupElement.cs | 18 +++--- .../StudentGroup/ControlStudentGroupList.cs | 20 +++--- .../TimeNorm/ControlTimeNormElement.cs | 18 +++--- .../TimeNorm/ControlTimeNormList.cs | 20 +++--- DepartmentPortal/DepartmentPortal.sln | 7 +++ .../BusinessLogics/BackupBusinessLogic.cs | 2 +- .../AccessBusinessLogic.cs | 2 +- .../EnviromentSettingBusinessLogic.cs | 2 +- .../GenericBusinessLogic/RoleBusinessLogic.cs | 2 +- .../GenericBusinessLogic/UserBusinessLogic.cs | 2 +- .../UserRoleBusinessLogic.cs | 2 +- .../SynchronizationBusinessLogic.cs | 2 +- .../Services/IBackupService.cs | 2 +- .../IGenericEntityService/IAccessService.cs | 2 +- .../IEnviromentSettingService.cs | 2 +- .../IGenericEntityService/IRoleService.cs | 2 +- .../IGenericEntityService/IUserRoleService.cs | 2 +- .../IGenericEntityService/IUserService.cs | 2 +- .../Services/ISynchronizationService.cs | 2 +- .../AccessService.cs | 4 +- .../EnviromentSettingService.cs | 4 +- .../RoleService.cs | 4 +- .../UserRoleService.cs | 4 +- .../UserService.cs | 4 +- .../BackupJsonContractService.cs | 2 +- .../Implementations/SynchronizationService.cs | 2 +- .../SecurityImplementationExtensions.cs | 5 +- 235 files changed, 1537 insertions(+), 1209 deletions(-) delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordTimeNormHourBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/ClassroomBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBlockBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EducationDirectionBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeeBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeePostBusinessLogic.cs rename DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/{ => GenericBusinessLogic}/AcademicPlanBusinessLogic.cs (52%) create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordTimeNormHourBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/ClassroomBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBlockBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EducationDirectionBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeeBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeePostBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicDegreeBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicRankBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerPostBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderBusinessLogic.cs rename DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/{ => GenericBusinessLogic}/OrderStudentRecordBusinessLogic.cs (92%) rename DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/{ => GenericBusinessLogic}/OrderSyncHistoryBusinessLogic.cs (96%) create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryRecordBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/PostBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentGroupBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/TimeNormBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicDegreeBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicRankBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerPostBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryRecordBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/PostBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentGroupBusinessLogic.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/TimeNormBusinessLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordTimeNormHourService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IClassroomService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineBlockService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEducationDirectionService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeePostService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeeService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicDegreeService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicRankService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerPostService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderStudentRecordService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryRecordService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IPostService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentGroupService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentService.cs delete mode 100644 DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ITimeNormService.cs rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/AcademicPlanBindingModels.cs (95%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/AcademicPlanRecordBindingModels.cs (96%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs (95%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/ClassroomBindingModels.cs (96%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/DisciplineBindingModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/DisciplineBlockBindingModels.cs (94%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/EducationDirectionBindingModels.cs (96%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/EmployeeBindingModels.cs (96%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/EmployeePostBindingModels.cs (95%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/LecturerAcademicDegreeBindingModels.cs (94%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/LecturerAcademicRankBindingModels.cs (90%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/LecturerBindingModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/LecturerPostBindingModels.cs (95%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/OrderBindingModels.cs (94%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/OrderStudentRecordBindingModel.cs (95%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/OrderSyncHistoryBindingModels.cs (92%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/OrderSyncHistoryRecordBindingModels.cs (94%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/PostBindingModels.cs (93%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/StudentBindingModels.cs (96%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/StudentGroupBindingModels.cs (94%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/BindingModels/TimeNormBindingModels.cs (97%) create mode 100644 DepartmentPortal/Department/DepartmentContract/DepartmentContract.csproj create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordTimeNormHourLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IClassroomLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineBlockLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEducationDirectionLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeeLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeePostLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicDegreeLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicRankLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerPostLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderStudentRecordLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryRecordLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IPostLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentGroupLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ITimeNormLogic.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordTimeNormHourService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IClassroomService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineBlockService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEducationDirectionService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeePostService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeeService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicDegreeService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicRankService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerPostService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderStudentRecordService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryRecordService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IPostService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentGroupService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentService.cs create mode 100644 DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ITimeNormService.cs rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/AcademicPlanRecordViewModels.cs (98%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/AcademicPlanViewModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/ClassroomViewModels.cs (98%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/DisciplineBlockViewModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/DisciplineViewModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/EducationDirectionViewModels.cs (98%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/EmployeePostViewModels.cs (98%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/EmployeeViewModels.cs (98%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/LecturerAcademicDegreeViewModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/LecturerAcademicRankViewModels.cs (96%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/LecturerPostViewModels.cs (98%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/LecturerViewModels.cs (99%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/OrderStudentRecordViewModel.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/OrderSyncHistoryRecordViewModels.cs (96%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/OrderSyncHistoryViewModels.cs (96%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/OrderViewModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/PostViewModels.cs (97%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/StudentGroupViewModels.cs (98%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/StudentViewModels.cs (98%) rename DepartmentPortal/Department/{DepartmentBusinessLogic => DepartmentContract}/ViewModels/TimeNormViewModels.cs (98%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/AcademicPlanRecordService.cs (88%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/AcademicPlanRecordTimeNormHourService.cs (86%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/AcademicPlanService.cs (98%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/ClassroomService.cs (87%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/DisciplineBlockService.cs (86%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/DisciplineService.cs (86%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/EducationDirectionService.cs (86%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/EmployeePostService.cs (84%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/EmployeeService.cs (88%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/LecturerAcademicDegreeService.cs (85%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/LecturerAcademicRankService.cs (85%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/LecturerPostService.cs (88%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/LecturerService.cs (91%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/OrderService.cs (88%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/OrderStudentRecordService.cs (89%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/OrderSyncHistoryRecordService.cs (94%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/OrderSyncHistoryService.cs (94%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/PostService.cs (85%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/StudentGroupService.cs (88%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/StudentService.cs (89%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/{ => AbstractGenerticEntityService}/TimeNormService.cs (83%) rename DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/{ => AbstractGenerticEntityService}/AccessService.cs (93%) rename DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/{ => AbstractGenerticEntityService}/EnviromentSettingService.cs (93%) rename DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/{ => AbstractGenerticEntityService}/RoleService.cs (94%) rename DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/{ => AbstractGenerticEntityService}/UserRoleService.cs (93%) rename DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/{ => AbstractGenerticEntityService}/UserService.cs (96%) diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordBusinessLogic.cs deleted file mode 100644 index 1f53851..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с записями учебного плана - /// - public class AcademicPlanRecordBusinessLogic : GenericBusinessLogic - { - public AcademicPlanRecordBusinessLogic(IAcademicPlanRecordService service) : base(service, "Записи Учебных Планов", AccessOperation.УчебныеПланы) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordTimeNormHourBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordTimeNormHourBusinessLogic.cs deleted file mode 100644 index 5635976..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanRecordTimeNormHourBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с часами нагрузок записей учебных планов - /// - public class AcademicPlanRecordTimeNormHourBusinessLogic : GenericBusinessLogic - { - public AcademicPlanRecordTimeNormHourBusinessLogic(IAcademicPlanRecordTimeNormHourService service) : base(service, "Часы Нагрузок Записей Учебных Планов", AccessOperation.УчебныеПланы) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/ClassroomBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/ClassroomBusinessLogic.cs deleted file mode 100644 index f13a88b..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/ClassroomBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с аудиториями - /// - public class ClassroomBusinessLogic : GenericBusinessLogic - { - public ClassroomBusinessLogic(IClassroomService service) : base(service, "Аудитории", AccessOperation.Аудитории) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBlockBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBlockBusinessLogic.cs deleted file mode 100644 index 8ce7599..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBlockBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с блоками дисциплин - /// - public class DisciplineBlockBusinessLogic : GenericBusinessLogic - { - public DisciplineBlockBusinessLogic(IDisciplineBlockService service) : base(service, "Аудитории", AccessOperation.Дисциплины) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBusinessLogic.cs deleted file mode 100644 index e601d05..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/DisciplineBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с дисциплинами - /// - public class DisciplineBusinessLogic : GenericBusinessLogic - { - public DisciplineBusinessLogic(IDisciplineService service) : base(service, "Аудитории", AccessOperation.Дисциплины) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EducationDirectionBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EducationDirectionBusinessLogic.cs deleted file mode 100644 index 67591a8..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EducationDirectionBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с направлениями обучений - /// - public class EducationDirectionBusinessLogic : GenericBusinessLogic - { - public EducationDirectionBusinessLogic(IEducationDirectionService service) : base(service, "Направления Обучений", AccessOperation.НаправленияОбучений) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeeBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeeBusinessLogic.cs deleted file mode 100644 index efa114c..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeeBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с сотрудниками - /// - public class EmployeeBusinessLogic : GenericBusinessLogic - { - public EmployeeBusinessLogic(IEmployeeService service) : base(service, "Сотрудники", AccessOperation.Сотрудники) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeePostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeePostBusinessLogic.cs deleted file mode 100644 index a88b38c..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/EmployeePostBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы со связями сотрудников и должностей - /// - public class EmployeePostBusinessLogic : GenericBusinessLogic - { - public EmployeePostBusinessLogic(IEmployeePostService service) : base(service, "Должности сотрудников", AccessOperation.Сотрудники) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanBusinessLogic.cs similarity index 52% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanBusinessLogic.cs rename to DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanBusinessLogic.cs index 9b43299..4b0ce27 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/AcademicPlanBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanBusinessLogic.cs @@ -1,15 +1,16 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using ToolsModule.BusinessLogics; using ToolsModule.Enums; -namespace DepartmentBusinessLogic.BusinessLogics +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic { - /// - /// Логика работы с учебными планами - /// - public class AcademicPlanBusinessLogic : GenericBusinessLogic + /// + /// Логика работы с учебными планами + /// + public class AcademicPlanBusinessLogic : GenericBusinessLogic, IAcademicPlanLogic { public AcademicPlanBusinessLogic(IAcademicPlanService service) : base(service, "Учебные Планы", AccessOperation.УчебныеПланы) { } diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs new file mode 100644 index 0000000..7a09e7d --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с записями учебного плана + /// + public class AcademicPlanRecordBusinessLogic : GenericBusinessLogic, IAcademicPlanRecordLogic + { + public AcademicPlanRecordBusinessLogic(IAcademicPlanRecordService service) : base(service, "Записи Учебных Планов", AccessOperation.УчебныеПланы) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordTimeNormHourBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordTimeNormHourBusinessLogic.cs new file mode 100644 index 0000000..ca27ca4 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordTimeNormHourBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с часами нагрузок записей учебных планов + /// + public class AcademicPlanRecordTimeNormHourBusinessLogic : GenericBusinessLogic, IAcademicPlanRecordTimeNormHourLogic + { + public AcademicPlanRecordTimeNormHourBusinessLogic(IAcademicPlanRecordTimeNormHourService service) : base(service, "Часы Нагрузок Записей Учебных Планов", AccessOperation.УчебныеПланы) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/ClassroomBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/ClassroomBusinessLogic.cs new file mode 100644 index 0000000..627adc0 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/ClassroomBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с аудиториями + /// + public class ClassroomBusinessLogic : GenericBusinessLogic, IClassroomLogic + { + public ClassroomBusinessLogic(IClassroomService service) : base(service, "Аудитории", AccessOperation.Аудитории) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBlockBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBlockBusinessLogic.cs new file mode 100644 index 0000000..5e59f68 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBlockBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с блоками дисциплин + /// + public class DisciplineBlockBusinessLogic : GenericBusinessLogic, IDisciplineBlockLogic + { + public DisciplineBlockBusinessLogic(IDisciplineBlockService service) : base(service, "Аудитории", AccessOperation.Дисциплины) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBusinessLogic.cs new file mode 100644 index 0000000..4c95a0a --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с дисциплинами + /// + public class DisciplineBusinessLogic : GenericBusinessLogic, IDisciplineLogic + { + public DisciplineBusinessLogic(IDisciplineService service) : base(service, "Аудитории", AccessOperation.Дисциплины) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EducationDirectionBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EducationDirectionBusinessLogic.cs new file mode 100644 index 0000000..43eedcf --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EducationDirectionBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с направлениями обучений + /// + public class EducationDirectionBusinessLogic : GenericBusinessLogic, IEducationDirectionLogic + { + public EducationDirectionBusinessLogic(IEducationDirectionService service) : base(service, "Направления Обучений", AccessOperation.НаправленияОбучений) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeeBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeeBusinessLogic.cs new file mode 100644 index 0000000..2f99390 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeeBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с сотрудниками + /// + public class EmployeeBusinessLogic : GenericBusinessLogic, IEmployeeLogic + { + public EmployeeBusinessLogic(IEmployeeService service) : base(service, "Сотрудники", AccessOperation.Сотрудники) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeePostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeePostBusinessLogic.cs new file mode 100644 index 0000000..8484c6f --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeePostBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы со связями сотрудников и должностей + /// + public class EmployeePostBusinessLogic : GenericBusinessLogic, IEmployeePostLogic + { + public EmployeePostBusinessLogic(IEmployeePostService service) : base(service, "Должности сотрудников", AccessOperation.Сотрудники) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicDegreeBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicDegreeBusinessLogic.cs new file mode 100644 index 0000000..f81cb94 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicDegreeBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с цчеными степенями + /// + public class LecturerAcademicDegreeBusinessLogic : GenericBusinessLogic, ILecturerAcademicDegreeLogic + { + public LecturerAcademicDegreeBusinessLogic(ILecturerAcademicDegreeService service) : base(service, "Преподаватели", AccessOperation.Преподаватели) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicRankBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicRankBusinessLogic.cs new file mode 100644 index 0000000..383b105 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicRankBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с учеными званиями + /// + public class LecturerAcademicRankBusinessLogic : GenericBusinessLogic, ILecturerAcademicRankLogic + { + public LecturerAcademicRankBusinessLogic(ILecturerAcademicRankService service) : base(service, "Преподаватели", AccessOperation.Преподаватели) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerBusinessLogic.cs new file mode 100644 index 0000000..f4a1eb3 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с преподавателями + /// + public class LecturerBusinessLogic : GenericBusinessLogic, ILecturerLogic + { + public LecturerBusinessLogic(ILecturerService service) : base(service, "Преподаватели", AccessOperation.Преподаватели) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerPostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerPostBusinessLogic.cs new file mode 100644 index 0000000..5da7163 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerPostBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы со связями преподавателей и должностей + /// + public class LecturerPostBusinessLogic : GenericBusinessLogic, ILecturerPostLogic + { + public LecturerPostBusinessLogic(ILecturerPostService service) : base(service, "Преподаватели", AccessOperation.Преподаватели) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderBusinessLogic.cs new file mode 100644 index 0000000..4b5e18e --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с приказами + /// + public class OrderBusinessLogic : GenericBusinessLogic, IOrderLogic + { + public OrderBusinessLogic(IOrderService service) : base(service, "Приказы", AccessOperation.Приказы) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderStudentRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs similarity index 92% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderStudentRecordBusinessLogic.cs rename to DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs index 0069250..fd7477f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderStudentRecordBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs @@ -1,18 +1,19 @@ using CoreModels.Enums.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using SecurityContract.BindingModels; +using SecurityContract.Logics.IGenericEntityLogic; using ToolsModule.BusinessLogics; using ToolsModule.Enums; -using SecurityBusinessLogic.BindingModels; -using SecurityBusinessLogic.BusinessLogics; -namespace DepartmentBusinessLogic.BusinessLogics +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic { /// /// Логика работы с записями приказов /// - public class OrderStudentRecordBusinessLogic : GenericBusinessLogic + public class OrderStudentRecordBusinessLogic : GenericBusinessLogic, IOrderStudentRecordLogic { public OrderStudentRecordBusinessLogic(IOrderStudentRecordService service) : base(service, "Приказы", AccessOperation.Приказы) { } @@ -21,8 +22,8 @@ namespace DepartmentBusinessLogic.BusinessLogics var result = base.Create(model); if (result != null) { - var studentLogic = DependencyManager.Instance.Resolve(); - var userLogic = DependencyManager.Instance.Resolve(); + var studentLogic = DependencyManager.Instance.Resolve(); + var userLogic = DependencyManager.Instance.Resolve(); var student = studentLogic.GetElement(new StudentGetBindingModel { Id = result.StudentId }); if (student == null) { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryBusinessLogic.cs rename to DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs index f2de679..849ab35 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs @@ -1,15 +1,12 @@ using CoreModels.Enums.Department; -using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.HelperModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; -using ToolsModule.Extensions; -using ToolsModule.Interfaces; -using SecurityBusinessLogic.BindingModels; -using SecurityBusinessLogic.BusinessLogics; -using SecurityBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using SecurityContract.BindingModels; +using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.ViewModels; using System; using System.Collections.Generic; using System.Linq; @@ -18,31 +15,35 @@ using System.Net.Http.Headers; using System.Text; using System.Text.Json; using System.Threading.Tasks; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; -namespace DepartmentBusinessLogic.BusinessLogics +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic { /// /// Логика работы с историями синхронизации приказов /// - public class OrderSyncHistoryBusinessLogic : GenericBusinessLogic + public class OrderSyncHistoryBusinessLogic : GenericBusinessLogic, IOrderSyncHistoryLogic { - private OrderSyncHistoryRecordBusinessLogic _recordLogic; + private IOrderSyncHistoryRecordLogic _recordLogic; - private EnviromentSettingBusinessLogic _enviromentSettingLogic; + private IEnviromentSettingLogic _enviromentSettingLogic; - private StudentGroupBusinessLogic _groupsLogic; + private IStudentGroupLogic _groupsLogic; - private StudentBusinessLogic _studentLogic; + private IStudentLogic _studentLogic; - private UserBusinessLogic _userLogic; + private IUserLogic _userLogic; - private UserRoleBusinessLogic _userRoleLogic; + private IUserRoleLogic _userRoleLogic; - private RoleBusinessLogic _roleLogic; + private IRoleLogic _roleLogic; - private OrderBusinessLogic _orderLogic; + private IOrderLogic _orderLogic; - private OrderStudentRecordBusinessLogic _orderStudentRecordLogic; + private IOrderStudentRecordLogic _orderStudentRecordLogic; public OrderSyncHistoryBusinessLogic(IOrderSyncHistoryService service) : base(service, "Синхронизация Приказов", AccessOperation.СинхронизацияПриказов) { } @@ -268,15 +269,15 @@ namespace DepartmentBusinessLogic.BusinessLogics private void InitLogics() { - _recordLogic = DependencyManager.Instance.Resolve(); - _enviromentSettingLogic = DependencyManager.Instance.Resolve(); - _groupsLogic = DependencyManager.Instance.Resolve(); - _studentLogic = DependencyManager.Instance.Resolve(); - _orderLogic = DependencyManager.Instance.Resolve(); - _orderStudentRecordLogic = DependencyManager.Instance.Resolve(); - _userLogic = DependencyManager.Instance.Resolve(); - _userRoleLogic = DependencyManager.Instance.Resolve(); - _roleLogic = DependencyManager.Instance.Resolve(); + _recordLogic = DependencyManager.Instance.Resolve(); + _enviromentSettingLogic = DependencyManager.Instance.Resolve(); + _groupsLogic = DependencyManager.Instance.Resolve(); + _studentLogic = DependencyManager.Instance.Resolve(); + _orderLogic = DependencyManager.Instance.Resolve(); + _orderStudentRecordLogic = DependencyManager.Instance.Resolve(); + _userLogic = DependencyManager.Instance.Resolve(); + _userRoleLogic = DependencyManager.Instance.Resolve(); + _roleLogic = DependencyManager.Instance.Resolve(); } private EnviromentSettingViewModel GetAddress(OrderSyncHistoryViewModel history) diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryRecordBusinessLogic.cs new file mode 100644 index 0000000..252c7c2 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryRecordBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с записями историй синхронизации приказов + /// + public class OrderSyncHistoryRecordBusinessLogic : GenericBusinessLogic, IOrderSyncHistoryRecordLogic + { + public OrderSyncHistoryRecordBusinessLogic(IOrderSyncHistoryRecordService service) : base(service, "Синхронизация Приказов", AccessOperation.СинхронизацияПриказов) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/PostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/PostBusinessLogic.cs new file mode 100644 index 0000000..2983b44 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/PostBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с должностями + /// + public class PostBusinessLogic : GenericBusinessLogic, IPostLogic + { + public PostBusinessLogic(IPostService service) : base(service, "Должности", AccessOperation.Сотрудники) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentBusinessLogic.cs new file mode 100644 index 0000000..bb24c2b --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы со студентами + /// + public class StudentBusinessLogic : GenericBusinessLogic, IStudentLogic + { + public StudentBusinessLogic(IStudentService service) : base(service, "Студенты", AccessOperation.Студенты) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentGroupBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentGroupBusinessLogic.cs new file mode 100644 index 0000000..13c493d --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentGroupBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с учебными группами + /// + public class StudentGroupBusinessLogic : GenericBusinessLogic, IStudentGroupLogic + { + public StudentGroupBusinessLogic(IStudentGroupService service) : base(service, "Учебные Группы", AccessOperation.УчебныеГруппы) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/TimeNormBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/TimeNormBusinessLogic.cs new file mode 100644 index 0000000..3f951c7 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/TimeNormBusinessLogic.cs @@ -0,0 +1,17 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using ToolsModule.BusinessLogics; +using ToolsModule.Enums; + +namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic +{ + /// + /// Логика работы с нормами времени + /// + public class TimeNormBusinessLogic : GenericBusinessLogic, ITimeNormLogic + { + public TimeNormBusinessLogic(ITimeNormService service) : base(service, "Нормы Времени", AccessOperation.НормыВремени) { } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicDegreeBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicDegreeBusinessLogic.cs deleted file mode 100644 index cb0c28c..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicDegreeBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с цчеными степенями - /// - public class LecturerAcademicDegreeBusinessLogic : GenericBusinessLogic - { - public LecturerAcademicDegreeBusinessLogic(ILecturerAcademicDegreeService service) : base(service, "Преподаватели", AccessOperation.Преподаватели) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicRankBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicRankBusinessLogic.cs deleted file mode 100644 index 5dab05b..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerAcademicRankBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с учеными званиями - /// - public class LecturerAcademicRankBusinessLogic : GenericBusinessLogic - { - public LecturerAcademicRankBusinessLogic(ILecturerAcademicRankService service) : base(service, "Преподаватели", AccessOperation.Преподаватели) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerBusinessLogic.cs deleted file mode 100644 index 87909fd..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с преподавателями - /// - public class LecturerBusinessLogic : GenericBusinessLogic - { - public LecturerBusinessLogic(ILecturerService service) : base(service, "Преподаватели", AccessOperation.Преподаватели) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerPostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerPostBusinessLogic.cs deleted file mode 100644 index 96cdf3f..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/LecturerPostBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы со связями преподавателей и должностей - /// - public class LecturerPostBusinessLogic : GenericBusinessLogic - { - public LecturerPostBusinessLogic(ILecturerPostService service) : base(service, "Преподаватели", AccessOperation.Преподаватели) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderBusinessLogic.cs deleted file mode 100644 index 121e809..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с приказами - /// - public class OrderBusinessLogic : GenericBusinessLogic - { - public OrderBusinessLogic(IOrderService service) : base(service, "Приказы", AccessOperation.Приказы) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryRecordBusinessLogic.cs deleted file mode 100644 index b418551..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/OrderSyncHistoryRecordBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с записями историй синхронизации приказов - /// - public class OrderSyncHistoryRecordBusinessLogic : GenericBusinessLogic - { - public OrderSyncHistoryRecordBusinessLogic(IOrderSyncHistoryRecordService service) : base(service, "Синхронизация Приказов", AccessOperation.СинхронизацияПриказов) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/PostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/PostBusinessLogic.cs deleted file mode 100644 index db8ec23..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/PostBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с должностями - /// - public class PostBusinessLogic : GenericBusinessLogic - { - public PostBusinessLogic(IPostService service) : base(service, "Должности", AccessOperation.Сотрудники) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentBusinessLogic.cs deleted file mode 100644 index 992e825..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы со студентами - /// - public class StudentBusinessLogic : GenericBusinessLogic - { - public StudentBusinessLogic(IStudentService service) : base(service, "Студенты", AccessOperation.Студенты) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentGroupBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentGroupBusinessLogic.cs deleted file mode 100644 index 8d69a7c..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/StudentGroupBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с учебными группами - /// - public class StudentGroupBusinessLogic : GenericBusinessLogic - { - public StudentGroupBusinessLogic(IStudentGroupService service) : base(service, "Учебные Группы", AccessOperation.УчебныеГруппы) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/TimeNormBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/TimeNormBusinessLogic.cs deleted file mode 100644 index 185336f..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/TimeNormBusinessLogic.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; - -namespace DepartmentBusinessLogic.BusinessLogics -{ - /// - /// Логика работы с нормами времени - /// - public class TimeNormBusinessLogic : GenericBusinessLogic - { - public TimeNormBusinessLogic(ITimeNormService service) : base(service, "Нормы Времени", AccessOperation.НормыВремени) { } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentBusinessLogic.csproj b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentBusinessLogic.csproj index 18a75bd..9a9af50 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentBusinessLogic.csproj +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentBusinessLogic.csproj @@ -5,7 +5,8 @@ - + + diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs new file mode 100644 index 0000000..34234dc --- /dev/null +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs @@ -0,0 +1,46 @@ +using DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic; +using DepartmentContract.Logics.IGenericEntityLogic; +using ToolsModule.BusinessLogics; +using ToolsModule.Interfaces; + +namespace DepartmentBusinessLogic +{ + public class DepartmentLogicDependencyRegistration : IImplementationExtension + { + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordService.cs deleted file mode 100644 index dfe919c..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение записей учебного плана - /// - public interface IAcademicPlanRecordService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordTimeNormHourService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordTimeNormHourService.cs deleted file mode 100644 index dfe35fe..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanRecordTimeNormHourService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение часов нагрузки записи чебного плана - /// - public interface IAcademicPlanRecordTimeNormHourService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanService.cs deleted file mode 100644 index ff281fc..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IAcademicPlanService.cs +++ /dev/null @@ -1,19 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; -using ToolsModule.Models; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение учебных планов - /// - public interface IAcademicPlanService : IGenericEntityService - { - /// - /// Загрузка учебного плана - /// - /// - /// - public OperationResultModel LoadPlx(AcademicPlanLoadPlxModel model); - } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IClassroomService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IClassroomService.cs deleted file mode 100644 index 2283599..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IClassroomService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение аудиторий - /// - public interface IClassroomService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineBlockService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineBlockService.cs deleted file mode 100644 index 13f08da..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineBlockService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение блоков дисциплин - /// - public interface IDisciplineBlockService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineService.cs deleted file mode 100644 index b9488cb..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IDisciplineService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение дисциплин - /// - public interface IDisciplineService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEducationDirectionService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEducationDirectionService.cs deleted file mode 100644 index 3416a31..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEducationDirectionService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение нправлений обучений - /// - public interface IEducationDirectionService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeePostService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeePostService.cs deleted file mode 100644 index 4818b93..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeePostService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение связей сотрудников и должностей - /// - public interface IEmployeePostService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeeService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeeService.cs deleted file mode 100644 index b6157c7..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IEmployeeService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение сотрудников - /// - public interface IEmployeeService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicDegreeService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicDegreeService.cs deleted file mode 100644 index a5cac23..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicDegreeService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение ученых степеней преподавателей - /// - public interface ILecturerAcademicDegreeService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicRankService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicRankService.cs deleted file mode 100644 index 779ddbc..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerAcademicRankService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение ученых званий преподавателей - /// - public interface ILecturerAcademicRankService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerPostService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerPostService.cs deleted file mode 100644 index 062629a..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerPostService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение должностей преподавателей - /// - public interface ILecturerPostService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerService.cs deleted file mode 100644 index b7cfd4c..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ILecturerService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение преподавателей - /// - public interface ILecturerService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderService.cs deleted file mode 100644 index 55ed8c5..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение приказов - /// - public interface IOrderService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderStudentRecordService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderStudentRecordService.cs deleted file mode 100644 index c709167..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderStudentRecordService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение записей приказов по студентам - /// - public interface IOrderStudentRecordService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryRecordService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryRecordService.cs deleted file mode 100644 index 0085a4f..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryRecordService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение записей историй синхронизации приказов - /// - public interface IOrderSyncHistoryRecordService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryService.cs deleted file mode 100644 index ee90cfc..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IOrderSyncHistoryService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение историй синхронизации приказов - /// - public interface IOrderSyncHistoryService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IPostService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IPostService.cs deleted file mode 100644 index 3bc932a..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IPostService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение должностей - /// - public interface IPostService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentGroupService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentGroupService.cs deleted file mode 100644 index 0007338..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentGroupService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение учебных групп - /// - public interface IStudentGroupService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentService.cs deleted file mode 100644 index a26a6cb..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/IStudentService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение студентов - /// - public interface IStudentService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ITimeNormService.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ITimeNormService.cs deleted file mode 100644 index e271770..0000000 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/Interfaces/ITimeNormService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DepartmentBusinessLogic.BindingModels; -using ToolsModule.Interfaces; - -namespace DepartmentBusinessLogic.Interfaces -{ - /// - /// Хранение норм времени - /// - public interface ITimeNormService : IGenericEntityService { } -} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanBindingModels.cs similarity index 95% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanBindingModels.cs index 9b34222..ba29501 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение учебного года diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordBindingModels.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordBindingModels.cs index 884ed75..3c98989 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordBindingModels.cs @@ -4,7 +4,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение записи учебного плана diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs similarity index 95% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs index d62cd7f..cd57fcb 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение часов по норме времени для записи учебного плана diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/ClassroomBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/ClassroomBindingModels.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/ClassroomBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/ClassroomBindingModels.cs index 017df58..69dc6ed 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/ClassroomBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/ClassroomBindingModels.cs @@ -4,7 +4,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение аудитории diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBindingModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBindingModels.cs index a10b98f..1a09620 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение дисциплины diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBlockBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBlockBindingModels.cs similarity index 94% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBlockBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBlockBindingModels.cs index 9aed486..52d5b58 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/DisciplineBlockBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBlockBindingModels.cs @@ -2,7 +2,7 @@ using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение блока дисциплин diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EducationDirectionBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/EducationDirectionBindingModels.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EducationDirectionBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/EducationDirectionBindingModels.cs index 87419ff..d99b236 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EducationDirectionBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/EducationDirectionBindingModels.cs @@ -4,7 +4,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение направления обучения diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeeBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeeBindingModels.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeeBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeeBindingModels.cs index 58b05f3..f0f2231 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeeBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeeBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение сотрудника diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeePostBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeePostBindingModels.cs similarity index 95% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeePostBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeePostBindingModels.cs index 1c073e3..49f2824 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/EmployeePostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeePostBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение связи сотрудника с должностью diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicDegreeBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicDegreeBindingModels.cs similarity index 94% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicDegreeBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicDegreeBindingModels.cs index d93fd89..15b9cb1 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicDegreeBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicDegreeBindingModels.cs @@ -2,7 +2,7 @@ using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение ученой степени преподавателя diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicRankBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicRankBindingModels.cs similarity index 90% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicRankBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicRankBindingModels.cs index bf0e0ca..0571d98 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerAcademicRankBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicRankBindingModels.cs @@ -1,9 +1,8 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; +using ToolsModule.BindingModels; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение ученого звания преподавателя diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerBindingModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerBindingModels.cs index 8a8a9b3..f514cac 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение преподавателя diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerPostBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerPostBindingModels.cs similarity index 95% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerPostBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerPostBindingModels.cs index d1b545c..a7b4848 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/LecturerPostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerPostBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение связи преподавателя с должностью diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderBindingModels.cs similarity index 94% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/OrderBindingModels.cs index dc27626..e2386bd 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderBindingModels.cs @@ -4,7 +4,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение приказа diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderStudentRecordBindingModel.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderStudentRecordBindingModel.cs similarity index 95% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderStudentRecordBindingModel.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/OrderStudentRecordBindingModel.cs index 0be8a65..db7c8f3 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderStudentRecordBindingModel.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderStudentRecordBindingModel.cs @@ -4,7 +4,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение записи приказа по студенту diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryBindingModels.cs similarity index 92% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryBindingModels.cs index 1cf6f8f..41b8810 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение истории синхронизации приказов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryRecordBindingModels.cs similarity index 94% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryRecordBindingModels.cs index 50f39f0..29f75e4 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryRecordBindingModels.cs @@ -3,7 +3,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение записи истории синхронизации приказов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/PostBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/PostBindingModels.cs similarity index 93% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/PostBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/PostBindingModels.cs index d800bea..8e29bb3 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/PostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/PostBindingModels.cs @@ -2,7 +2,7 @@ using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение должности сотрудника diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentBindingModels.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/StudentBindingModels.cs index 10acfbe..751cd36 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentBindingModels.cs @@ -4,7 +4,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение студента diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentGroupBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentGroupBindingModels.cs similarity index 94% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentGroupBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/StudentGroupBindingModels.cs index 540c91d..0a3835d 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/StudentGroupBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentGroupBindingModels.cs @@ -4,7 +4,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение студенческой группы diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/TimeNormBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/TimeNormBindingModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/TimeNormBindingModels.cs rename to DepartmentPortal/Department/DepartmentContract/BindingModels/TimeNormBindingModels.cs index e50d423..e6037f2 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/TimeNormBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/TimeNormBindingModels.cs @@ -4,7 +4,7 @@ using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; -namespace DepartmentBusinessLogic.BindingModels +namespace DepartmentContract.BindingModels { /// /// Получение нормы времени diff --git a/DepartmentPortal/Department/DepartmentContract/DepartmentContract.csproj b/DepartmentPortal/Department/DepartmentContract/DepartmentContract.csproj new file mode 100644 index 0000000..2ee500d --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/DepartmentContract.csproj @@ -0,0 +1,12 @@ + + + + net5.0 + + + + + + + + diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanLogic.cs new file mode 100644 index 0000000..dcb2048 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanLogic.cs @@ -0,0 +1,14 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с учебными планами + /// + public interface IAcademicPlanLogic : IGenericEntityLogic + { + bool LoadPlx(AcademicPlanLoadPlxModel model); + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordLogic.cs new file mode 100644 index 0000000..f3fbb72 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с записями учебного плана + /// + public interface IAcademicPlanRecordLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordTimeNormHourLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordTimeNormHourLogic.cs new file mode 100644 index 0000000..57da9c5 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordTimeNormHourLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с часами нагрузок записей учебных планов + /// + public interface IAcademicPlanRecordTimeNormHourLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IClassroomLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IClassroomLogic.cs new file mode 100644 index 0000000..3f8498a --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IClassroomLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с аудиториями + /// + public interface IClassroomLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineBlockLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineBlockLogic.cs new file mode 100644 index 0000000..4aa64df --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineBlockLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с блоками дисциплин + /// + public interface IDisciplineBlockLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineLogic.cs new file mode 100644 index 0000000..2018088 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с дисциплинами + /// + public interface IDisciplineLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEducationDirectionLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEducationDirectionLogic.cs new file mode 100644 index 0000000..8402a9c --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEducationDirectionLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с направлениями обучений + /// + public interface IEducationDirectionLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeeLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeeLogic.cs new file mode 100644 index 0000000..46681d4 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeeLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с сотрудниками + /// + public interface IEmployeeLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeePostLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeePostLogic.cs new file mode 100644 index 0000000..ea69f32 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeePostLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы со связями сотрудников и должностей + /// + public interface IEmployeePostLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicDegreeLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicDegreeLogic.cs new file mode 100644 index 0000000..64dfe39 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicDegreeLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с цчеными степенями + /// + public interface ILecturerAcademicDegreeLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicRankLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicRankLogic.cs new file mode 100644 index 0000000..84433f8 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicRankLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с учеными званиями + /// + public interface ILecturerAcademicRankLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerLogic.cs new file mode 100644 index 0000000..623f095 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с преподавателями + /// + public interface ILecturerLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerPostLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerPostLogic.cs new file mode 100644 index 0000000..bce902a --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerPostLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы со связями преподавателей и должностей + /// + public interface ILecturerPostLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderLogic.cs new file mode 100644 index 0000000..5c26d54 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с приказами + /// + public interface IOrderLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderStudentRecordLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderStudentRecordLogic.cs new file mode 100644 index 0000000..0483dfa --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderStudentRecordLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с записями приказов + /// + public interface IOrderStudentRecordLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryLogic.cs new file mode 100644 index 0000000..14d355b --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryLogic.cs @@ -0,0 +1,18 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using System; +using System.Threading.Tasks; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с историями синхронизации приказов + /// + public interface IOrderSyncHistoryLogic : IGenericEntityLogic + { + Task SyncOrders(); + + Task SyncStudentOrders(Guid studentId); + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryRecordLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryRecordLogic.cs new file mode 100644 index 0000000..831d4f7 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryRecordLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с записями историй синхронизации приказов + /// + public interface IOrderSyncHistoryRecordLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IPostLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IPostLogic.cs new file mode 100644 index 0000000..0ef4724 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IPostLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с должностями + /// + public interface IPostLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentGroupLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentGroupLogic.cs new file mode 100644 index 0000000..e4aba68 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentGroupLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с учебными группами + /// + public interface IStudentGroupLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentLogic.cs new file mode 100644 index 0000000..fa2d7cf --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы со студентами + /// + public interface IStudentLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ITimeNormLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ITimeNormLogic.cs new file mode 100644 index 0000000..02d0900 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ITimeNormLogic.cs @@ -0,0 +1,11 @@ +using DepartmentContract.BindingModels; +using DepartmentContract.ViewModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Logics.IGenericEntityLogic +{ + /// + /// Логика работы с нормами времени + /// + public interface ITimeNormLogic : IGenericEntityLogic { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordService.cs new file mode 100644 index 0000000..02794a5 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение записей учебного плана + /// + public interface IAcademicPlanRecordService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordTimeNormHourService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordTimeNormHourService.cs new file mode 100644 index 0000000..32a74f0 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordTimeNormHourService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение часов нагрузки записи чебного плана + /// + public interface IAcademicPlanRecordTimeNormHourService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanService.cs new file mode 100644 index 0000000..2b1dae5 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanService.cs @@ -0,0 +1,19 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; +using ToolsModule.Models; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение учебных планов + /// + public interface IAcademicPlanService : IGenericEntityService + { + /// + /// Загрузка учебного плана + /// + /// + /// + public OperationResultModel LoadPlx(AcademicPlanLoadPlxModel model); + } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IClassroomService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IClassroomService.cs new file mode 100644 index 0000000..7bfcb2b --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IClassroomService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение аудиторий + /// + public interface IClassroomService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineBlockService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineBlockService.cs new file mode 100644 index 0000000..3138f7f --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineBlockService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение блоков дисциплин + /// + public interface IDisciplineBlockService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineService.cs new file mode 100644 index 0000000..142cf78 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение дисциплин + /// + public interface IDisciplineService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEducationDirectionService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEducationDirectionService.cs new file mode 100644 index 0000000..b63c31a --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEducationDirectionService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение нправлений обучений + /// + public interface IEducationDirectionService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeePostService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeePostService.cs new file mode 100644 index 0000000..eecce04 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeePostService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение связей сотрудников и должностей + /// + public interface IEmployeePostService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeeService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeeService.cs new file mode 100644 index 0000000..0e965de --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeeService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение сотрудников + /// + public interface IEmployeeService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicDegreeService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicDegreeService.cs new file mode 100644 index 0000000..f6f20b7 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicDegreeService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение ученых степеней преподавателей + /// + public interface ILecturerAcademicDegreeService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicRankService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicRankService.cs new file mode 100644 index 0000000..a7e84fd --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicRankService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение ученых званий преподавателей + /// + public interface ILecturerAcademicRankService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerPostService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerPostService.cs new file mode 100644 index 0000000..ca508c7 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerPostService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение должностей преподавателей + /// + public interface ILecturerPostService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerService.cs new file mode 100644 index 0000000..354ccb8 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение преподавателей + /// + public interface ILecturerService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderService.cs new file mode 100644 index 0000000..900abf6 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение приказов + /// + public interface IOrderService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderStudentRecordService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderStudentRecordService.cs new file mode 100644 index 0000000..1353013 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderStudentRecordService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение записей приказов по студентам + /// + public interface IOrderStudentRecordService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryRecordService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryRecordService.cs new file mode 100644 index 0000000..15c34be --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryRecordService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение записей историй синхронизации приказов + /// + public interface IOrderSyncHistoryRecordService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryService.cs new file mode 100644 index 0000000..e2cc78e --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение историй синхронизации приказов + /// + public interface IOrderSyncHistoryService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IPostService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IPostService.cs new file mode 100644 index 0000000..a79e12a --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IPostService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение должностей + /// + public interface IPostService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentGroupService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentGroupService.cs new file mode 100644 index 0000000..8dd563d --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentGroupService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение учебных групп + /// + public interface IStudentGroupService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentService.cs new file mode 100644 index 0000000..b1747a1 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение студентов + /// + public interface IStudentService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ITimeNormService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ITimeNormService.cs new file mode 100644 index 0000000..b13eff9 --- /dev/null +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ITimeNormService.cs @@ -0,0 +1,10 @@ +using DepartmentContract.BindingModels; +using ToolsModule.Interfaces; + +namespace DepartmentContract.Services.IGenericEntityService +{ + /// + /// Хранение норм времени + /// + public interface ITimeNormService : IGenericEntityService { } +} \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs index 522b7bf..c8f1d72 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список часов по нагрузке для записи учебного плана diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordViewModels.cs index 950778d..1ddf256 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanRecordViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordViewModels.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список аудиторий diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanViewModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanViewModels.cs index 81f215d..d7dcb02 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/AcademicPlanViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanViewModels.cs @@ -4,7 +4,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список учбеных планов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/ClassroomViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/ClassroomViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/ClassroomViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/ClassroomViewModels.cs index bcea183..d66dc77 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/ClassroomViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/ClassroomViewModels.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список аудиторий diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineBlockViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineBlockViewModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineBlockViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineBlockViewModels.cs index 9b3db1e..8f0ca57 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineBlockViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineBlockViewModels.cs @@ -3,7 +3,7 @@ using ToolsModule.Attributes; using ToolsModule.Enums; using ToolsModule.ViewModels; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список блоков дисциплин diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineViewModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineViewModels.cs index 271c8c4..97ea4ad 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/DisciplineViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineViewModels.cs @@ -4,7 +4,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список дисциплин diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EducationDirectionViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/EducationDirectionViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EducationDirectionViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/EducationDirectionViewModels.cs index 3aaf1d9..ae26718 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EducationDirectionViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/EducationDirectionViewModels.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список напарвлений обучений diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeePostViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeePostViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeePostViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeePostViewModels.cs index 4b0c22a..e943359 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeePostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeePostViewModels.cs @@ -4,7 +4,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список связей сотрудников и должностей diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeeViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeeViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeeViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeeViewModels.cs index b9f3a31..d31400e 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/EmployeeViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeeViewModels.cs @@ -4,7 +4,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список сотрудников diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicDegreeViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicDegreeViewModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicDegreeViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicDegreeViewModels.cs index 9e20256..87caebc 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicDegreeViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicDegreeViewModels.cs @@ -3,7 +3,7 @@ using ToolsModule.Attributes; using ToolsModule.Enums; using ToolsModule.ViewModels; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список должностей преподавателей diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicRankViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicRankViewModels.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicRankViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicRankViewModels.cs index d528636..f81e608 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerAcademicRankViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicRankViewModels.cs @@ -3,7 +3,7 @@ using ToolsModule.Attributes; using ToolsModule.Enums; using ToolsModule.ViewModels; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список должностей преподавателей diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerPostViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerPostViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerPostViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerPostViewModels.cs index d7bceee..79c97d9 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerPostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerPostViewModels.cs @@ -4,7 +4,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список связей преподавателей и должностей diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerViewModels.cs similarity index 99% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerViewModels.cs index f31f3b5..0c42387 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/LecturerViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerViewModels.cs @@ -4,7 +4,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список преподавателей diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderStudentRecordViewModel.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderStudentRecordViewModel.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderStudentRecordViewModel.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/OrderStudentRecordViewModel.cs index 57cb34d..4759ba7 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderStudentRecordViewModel.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderStudentRecordViewModel.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список приказов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryRecordViewModels.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryRecordViewModels.cs index 4486616..45db119 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryRecordViewModels.cs @@ -4,7 +4,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список записей историй синхронизации приказов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryViewModels.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryViewModels.cs index b6f4d38..ab87417 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryViewModels.cs @@ -4,7 +4,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список историй синхронизации приказов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderViewModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/OrderViewModels.cs index ab7f9a4..60736e8 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderViewModels.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список приказов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/PostViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/PostViewModels.cs similarity index 97% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/PostViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/PostViewModels.cs index ded29e7..a125417 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/PostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/PostViewModels.cs @@ -3,7 +3,7 @@ using ToolsModule.Attributes; using ToolsModule.Enums; using ToolsModule.ViewModels; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список должностей diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentGroupViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentGroupViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentGroupViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/StudentGroupViewModels.cs index 3c0fb3d..bfb8961 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentGroupViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentGroupViewModels.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список учебных групп diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/StudentViewModels.cs index 8d996e1..c322de0 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/StudentViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentViewModels.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список студентов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/TimeNormViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/TimeNormViewModels.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/TimeNormViewModels.cs rename to DepartmentPortal/Department/DepartmentContract/ViewModels/TimeNormViewModels.cs index 9b5f88f..518e95b 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/TimeNormViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/TimeNormViewModels.cs @@ -5,7 +5,7 @@ using ToolsModule.Enums; using ToolsModule.ViewModels; using System; -namespace DepartmentBusinessLogic.ViewModels +namespace DepartmentContract.ViewModels { /// /// Список норм времени diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentDatabaseImplementation.csproj b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentDatabaseImplementation.csproj index 1d71d7c..1de37f5 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentDatabaseImplementation.csproj +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentDatabaseImplementation.csproj @@ -6,7 +6,7 @@ - + diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs index fe27051..aa901c8 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs @@ -1,11 +1,12 @@ -using DepartmentBusinessLogic.Interfaces; +using DepartmentContract.Services.IGenericEntityService; using DepartmentDatabaseImplementation.Implementations; +using DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService; using ToolsModule.BusinessLogics; using ToolsModule.Interfaces; namespace DepartmentDatabaseImplementation { - public class DepartmentImplementationExtensions : IImplementationExtension + public class DepartmentImplementationExtensions : IImplementationExtension { public void RegisterServices() { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordService.cs similarity index 88% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordService.cs index 94af3d6..76bd96c 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordService.cs @@ -1,19 +1,19 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Models; using System; using System.Linq; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IAcademicPlanRecordService - /// - public class AcademicPlanRecordService : + /// + /// Реализация IAcademicPlanRecordService + /// + public class AcademicPlanRecordService : AbstractGenerticEntityService, IAcademicPlanRecordService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordTimeNormHourService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordTimeNormHourService.cs similarity index 86% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordTimeNormHourService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordTimeNormHourService.cs index 254781a..7fbd91c 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanRecordTimeNormHourService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordTimeNormHourService.cs @@ -1,18 +1,18 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Models; using System.Linq; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IAcademicPlanRecordTimeNormHourService - /// - public class AcademicPlanRecordTimeNormHourService : + /// + /// Реализация IAcademicPlanRecordTimeNormHourService + /// + public class AcademicPlanRecordTimeNormHourService : AbstractGenerticEntityService, IAcademicPlanRecordTimeNormHourService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanService.cs similarity index 98% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanService.cs index e2853c4..5dec3b9 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AcademicPlanService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanService.cs @@ -1,20 +1,20 @@ -using CoreModels.Enums.Department; -using CoreDatabase; +using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using CoreModels.Enums.Department; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using DepartmentDatabaseImplementation.Models; using Microsoft.EntityFrameworkCore; -using ToolsModule.Enums; -using ToolsModule.Extensions; -using ToolsModule.Models; using System; using System.Collections.Generic; using System.Linq; using System.Xml.Linq; +using ToolsModule.Enums; +using ToolsModule.Extensions; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация IAcademicPlanService diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/ClassroomService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/ClassroomService.cs similarity index 87% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/ClassroomService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/ClassroomService.cs index 33efeff..568dbee 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/ClassroomService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/ClassroomService.cs @@ -1,14 +1,14 @@ -using CoreModels.Enums.Department; -using CoreDatabase; +using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using CoreModels.Enums.Department; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Models; using System.Linq; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация интерфейса IClassroomService diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineBlockService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineBlockService.cs similarity index 86% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineBlockService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineBlockService.cs index 16c05e2..7fcf1d1 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineBlockService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineBlockService.cs @@ -1,19 +1,19 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; +using System.Linq; using ToolsModule.Enums; using ToolsModule.Models; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IDisciplineBlockService - /// - public class DisciplineBlockService : + /// + /// Реализация IDisciplineBlockService + /// + public class DisciplineBlockService : AbstractGenerticEntityService, IDisciplineBlockService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineService.cs similarity index 86% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineService.cs index bd43231..3e44f2c 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/DisciplineService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineService.cs @@ -1,20 +1,20 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; +using System.Linq; using ToolsModule.Enums; using ToolsModule.Extensions; using ToolsModule.Models; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IDisciplineService - /// - public class DisciplineService : + /// + /// Реализация IDisciplineService + /// + public class DisciplineService : AbstractGenerticEntityService, IDisciplineService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EducationDirectionService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EducationDirectionService.cs similarity index 86% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EducationDirectionService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EducationDirectionService.cs index b8106d7..b7d8286 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EducationDirectionService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EducationDirectionService.cs @@ -1,20 +1,19 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; +using System.Linq; using ToolsModule.Enums; using ToolsModule.Models; -using System; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация интерфейса IEducationDirectionService - /// - public class EducationDirectionService : + /// + /// Реализация интерфейса IEducationDirectionService + /// + public class EducationDirectionService : AbstractGenerticEntityService, IEducationDirectionService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeePostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeePostService.cs similarity index 84% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeePostService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeePostService.cs index 2080fe1..afd60d2 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeePostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeePostService.cs @@ -1,18 +1,18 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Models; using System.Linq; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IEmployeePostService - /// - public class EmployeePostService : + /// + /// Реализация IEmployeePostService + /// + public class EmployeePostService : AbstractGenerticEntityService, IEmployeePostService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeeService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeeService.cs similarity index 88% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeeService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeeService.cs index 09ebea3..667d74c 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/EmployeeService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeeService.cs @@ -1,20 +1,20 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Enums; -using ToolsModule.Models; using System; using System.Linq; +using ToolsModule.Enums; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IEmployeeService - /// - public class EmployeeService : + /// + /// Реализация IEmployeeService + /// + public class EmployeeService : AbstractGenerticEntityService, IEmployeeService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicDegreeService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicDegreeService.cs similarity index 85% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicDegreeService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicDegreeService.cs index f4ed093..ec14b81 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicDegreeService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicDegreeService.cs @@ -1,19 +1,19 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; +using System.Linq; using ToolsModule.Enums; using ToolsModule.Models; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация ILecturerAcademicDegreeService - /// - public class LecturerAcademicDegreeService : + /// + /// Реализация ILecturerAcademicDegreeService + /// + public class LecturerAcademicDegreeService : AbstractGenerticEntityService, ILecturerAcademicDegreeService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicRankService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicRankService.cs similarity index 85% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicRankService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicRankService.cs index 26546f4..e06129b 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerAcademicRankService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicRankService.cs @@ -1,19 +1,19 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; +using System.Linq; using ToolsModule.Enums; using ToolsModule.Models; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация ILecturerAcademicRankService - /// - public class LecturerAcademicRankService : + /// + /// Реализация ILecturerAcademicRankService + /// + public class LecturerAcademicRankService : AbstractGenerticEntityService, ILecturerAcademicRankService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerPostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerPostService.cs similarity index 88% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerPostService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerPostService.cs index 86dc5bb..a5a0b1f 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerPostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerPostService.cs @@ -1,18 +1,18 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Models; using System.Linq; +using ToolsModule.Models; namespace DepartmentDatabaseImplementation.Implementations { - /// - /// Реализация ILecturerPostService - /// - public class LecturerPostService : + /// + /// Реализация ILecturerPostService + /// + public class LecturerPostService : AbstractGenerticEntityService, ILecturerPostService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerService.cs similarity index 91% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerService.cs index c463659..60d361c 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/LecturerService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerService.cs @@ -1,20 +1,20 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Enums; -using ToolsModule.Models; using System; using System.Linq; +using ToolsModule.Enums; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация ILecturerService - /// - public class LecturerService : + /// + /// Реализация ILecturerService + /// + public class LecturerService : AbstractGenerticEntityService, ILecturerService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderService.cs similarity index 88% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderService.cs index b41e0e6..271ebee 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderService.cs @@ -1,20 +1,20 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; +using System.Linq; using ToolsModule.Enums; using ToolsModule.Extensions; using ToolsModule.Models; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IOrderService - /// - public class OrderService : + /// + /// Реализация IOrderService + /// + public class OrderService : AbstractGenerticEntityService, IOrderService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderStudentRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderStudentRecordService.cs similarity index 89% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderStudentRecordService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderStudentRecordService.cs index 33977f3..ff036d1 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderStudentRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderStudentRecordService.cs @@ -1,18 +1,18 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Models; using System.Linq; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IOrderStudentRecordService - /// - public class OrderStudentRecordService : + /// + /// Реализация IOrderStudentRecordService + /// + public class OrderStudentRecordService : AbstractGenerticEntityService, IOrderStudentRecordService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryRecordService.cs similarity index 94% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryRecordService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryRecordService.cs index 7663495..18fa6b1 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryRecordService.cs @@ -1,16 +1,16 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; +using System; +using System.Linq; using ToolsModule.BusinessLogics; using ToolsModule.Enums; using ToolsModule.Models; -using System; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация IOrderSyncHistoryRecordService diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryService.cs similarity index 94% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryService.cs index ea5d953..e6bf002 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/OrderSyncHistoryService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryService.cs @@ -1,15 +1,15 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; +using System; +using System.Linq; using ToolsModule.BusinessLogics; using ToolsModule.Enums; using ToolsModule.Models; -using System; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация IOrderSyncHistoryService diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/PostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/PostService.cs similarity index 85% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/PostService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/PostService.cs index 5b36a3e..ba951e8 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/PostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/PostService.cs @@ -1,19 +1,19 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; +using System.Linq; using ToolsModule.Enums; using ToolsModule.Models; -using System.Linq; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IPostService - /// - public class PostService : + /// + /// Реализация IPostService + /// + public class PostService : AbstractGenerticEntityService, IPostService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentGroupService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentGroupService.cs similarity index 88% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentGroupService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentGroupService.cs index 6349eaa..90218a3 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentGroupService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentGroupService.cs @@ -1,20 +1,20 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Enums; -using ToolsModule.Models; using System; using System.Linq; +using ToolsModule.Enums; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IStudentGroupService - /// - public class StudentGroupService : + /// + /// Реализация IStudentGroupService + /// + public class StudentGroupService : AbstractGenerticEntityService, IStudentGroupService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentService.cs similarity index 89% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentService.cs index c17b6db..37d186b 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/StudentService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentService.cs @@ -1,20 +1,20 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Extensions; -using ToolsModule.Models; using System; using System.Linq; +using ToolsModule.Extensions; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация IStudentService - /// - public class StudentService : + /// + /// Реализация IStudentService + /// + public class StudentService : AbstractGenerticEntityService, IStudentService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/TimeNormService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/TimeNormService.cs similarity index 83% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/TimeNormService.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/TimeNormService.cs index 0868324..8297e55 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/TimeNormService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/TimeNormService.cs @@ -1,18 +1,18 @@ using CoreDatabase; using CoreDatabase.Models.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.Interfaces; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Services.IGenericEntityService; +using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; -using ToolsModule.Models; using System.Linq; +using ToolsModule.Models; -namespace DepartmentDatabaseImplementation.Implementations +namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { - /// - /// Реализация ITimeNormService - /// - public class TimeNormService : + /// + /// Реализация ITimeNormService + /// + public class TimeNormService : AbstractGenerticEntityService, ITimeNormService { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs index eba827d..87cb1d5 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; +using System.Windows.Forms; using ToolsDesktop.Controls; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; -using System.Collections.Generic; -using System.Windows.Forms; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для учебного плана - /// - public partial class ControlAcademicPlanElement : - GenericControlEntityElement, + /// + /// Реализация контрола для учебного плана + /// + public partial class ControlAcademicPlanElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlAcademicPlanElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs index 894b889..4d5ef5b 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs @@ -1,23 +1,23 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; +using System.Windows.Forms; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; -using System.Windows.Forms; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка учебных планов - /// - public partial class ControlAcademicPlanList : - GenericControlEntityList, + /// + /// Реализация контрола для списка учебных планов + /// + public partial class ControlAcademicPlanList : + GenericControlEntityList, IGenericControlEntityList { public ControlAcademicPlanList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs index b996770..639f90e 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для записи учебного плана - /// - public partial class ControlAcademicPlanRecordElement : - GenericControlEntityElement, + /// + /// Реализация контрола для записи учебного плана + /// + public partial class ControlAcademicPlanRecordElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlAcademicPlanRecordElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs index 5ccf96e..4280796 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs @@ -1,16 +1,16 @@ using CoreModels.Enums.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; namespace DepartmentWindowsDesktop.EntityControls { @@ -18,7 +18,7 @@ namespace DepartmentWindowsDesktop.EntityControls /// Реализация контрола для записей учебного плана /// public partial class ControlAcademicPlanRecordList : - GenericControlEntityList, + GenericControlEntityList, IGenericControlEntityList { public ControlAcademicPlanRecordList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs index 6f7c59c..2e37560 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для часов нагрузки записи учебного плана - /// - public partial class ControlAcademicPlanRecordTimeNormHourElement : - GenericControlEntityElement, + /// + /// Реализация контрола для часов нагрузки записи учебного плана + /// + public partial class ControlAcademicPlanRecordTimeNormHourElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlAcademicPlanRecordTimeNormHourElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs index 30d5370..1facac5 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - public partial class ControlAcademicPlanRecordTimeNormHourList : - GenericControlEntityList, + public partial class ControlAcademicPlanRecordTimeNormHourList : + GenericControlEntityList, IGenericControlEntityList { public ControlAcademicPlanRecordTimeNormHourList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs index c6be254..b96c863 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для аудитории - /// - public partial class ControlClassroomElement : - GenericControlEntityElement, + /// + /// Реализация контрола для аудитории + /// + public partial class ControlClassroomElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlClassroomElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs index 9716a29..add02c3 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка аудиторий - /// - public partial class ControlClassroomList : - GenericControlEntityList, + /// + /// Реализация контрола для списка аудиторий + /// + public partial class ControlClassroomList : + GenericControlEntityList, IGenericControlEntityList { public ControlClassroomList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs index ac40568..78eebd1 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для дисциплины - /// - public partial class ControlDisciplineElement : - GenericControlEntityElement, + /// + /// Реализация контрола для дисциплины + /// + public partial class ControlDisciplineElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlDisciplineElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs index 5b52b27..c624632 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs @@ -1,14 +1,14 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Linq; using ToolsDesktop.BaseControls; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Enums; -using System; -using System.Linq; namespace DepartmentWindowsDesktop.EntityControls { @@ -16,15 +16,15 @@ namespace DepartmentWindowsDesktop.EntityControls /// Реализация контрола для списка дисциплин /// public partial class ControlDisciplineList : - GenericControlEntityList, + GenericControlEntityList, IGenericControlEntityList { - private readonly DisciplineBlockBusinessLogic _disciplineBlockBusinessLogic; + private readonly IDisciplineBlockLogic _disciplineBlockBusinessLogic; public ControlDisciplineList() { InitializeComponent(); - _disciplineBlockBusinessLogic = DependencyManager.Instance.Resolve(); + _disciplineBlockBusinessLogic = DependencyManager.Instance.Resolve(); Title = "Дисциплины"; ControlId = new Guid("1731f50b-b20b-44c4-aa56-b335764fae7a"); AccessOperation = AccessOperation.Дисциплины; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs index f504b54..9abf4a0 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для блока дисциплин - /// - public partial class ControlDisciplineBlockElement : - GenericControlEntityElement, + /// + /// Реализация контрола для блока дисциплин + /// + public partial class ControlDisciplineBlockElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlDisciplineBlockElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs index 7acf4cd..1756291 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка блоков дисциплин - /// - public partial class ControlDisciplineBlockList : - GenericControlEntityList, + /// + /// Реализация контрола для списка блоков дисциплин + /// + public partial class ControlDisciplineBlockList : + GenericControlEntityList, IGenericControlEntityList { public ControlDisciplineBlockList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs index 2ace957..e381f5e 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для направления обучения - /// - public partial class ControlEducationDirectionElement : - GenericControlEntityElement, + /// + /// Реализация контрола для направления обучения + /// + public partial class ControlEducationDirectionElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlEducationDirectionElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs index d1bf0ad..587a00e 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка направлений обучений - /// - public partial class ControlEducationDirectionList : - GenericControlEntityList, + /// + /// Реализация контрола для списка направлений обучений + /// + public partial class ControlEducationDirectionList : + GenericControlEntityList, IGenericControlEntityList { public ControlEducationDirectionList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs index df7ac14..a0dd3f2 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs @@ -1,6 +1,11 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using SecurityContract.BindingModels; +using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.BaseControls; using ToolsDesktop.Controls; using ToolsDesktop.Helpers; @@ -8,11 +13,6 @@ using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Extensions; -using SecurityBusinessLogic.BindingModels; -using SecurityBusinessLogic.BusinessLogics; -using SecurityBusinessLogic.ViewModels; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { @@ -20,7 +20,7 @@ namespace DepartmentWindowsDesktop.EntityControls /// Реализация контрола для сотрудника /// public partial class ControlEmployeeElement : - GenericControlEntityElement, + GenericControlEntityElement, IGenericControlEntityElement { public ControlEmployeeElement() @@ -50,7 +50,7 @@ namespace DepartmentWindowsDesktop.EntityControls var model = new EmployeeSetBindingModel(); if (FillModel(model)) { - var logic = DependencyManager.Instance.Resolve(); + var logic = DependencyManager.Instance.Resolve(); var userName = $"{model.LastName}{(model.FirstName.IsNotEmpty() ? $" {model.FirstName[0]}." : string.Empty)}{(model.Patronymic.IsNotEmpty() ? $"{model.Patronymic[0]}." : string.Empty)}"; var result = logic.GetList(new UserGetBindingModel { UserNameForSearch = userName }); if (result != null) @@ -100,7 +100,7 @@ namespace DepartmentWindowsDesktop.EntityControls var model = new EmployeeSetBindingModel(); if (FillModel(model)) { - var logic = DependencyManager.Instance.Resolve(); + var logic = DependencyManager.Instance.Resolve(); var user = logic.GetElement(new UserGetBindingModel { Id = _element.UserId }); if (user == null) { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs index 1f66f60..9576ad6 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка сотрудников - /// - public partial class ControlEmployeeList : - GenericControlEntityList, + /// + /// Реализация контрола для списка сотрудников + /// + public partial class ControlEmployeeList : + GenericControlEntityList, IGenericControlEntityList { public ControlEmployeeList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs index 0671641..fda08ab 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для связи сотрудника с должностью - /// - public partial class ControlEmployeePostElement : - GenericControlEntityElement, + /// + /// Реализация контрола для связи сотрудника с должностью + /// + public partial class ControlEmployeePostElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlEmployeePostElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs index 887928f..73640a7 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка должностней сотрудника - /// - public partial class ControlEmployeePostList : - GenericControlEntityList, + /// + /// Реализация контрола для списка должностней сотрудника + /// + public partial class ControlEmployeePostList : + GenericControlEntityList, IGenericControlEntityList { public ControlEmployeePostList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs index ba29590..c17f732 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs @@ -1,6 +1,11 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using SecurityContract.BindingModels; +using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.BaseControls; using ToolsDesktop.Controls; using ToolsDesktop.Helpers; @@ -8,11 +13,6 @@ using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Extensions; -using SecurityBusinessLogic.BindingModels; -using SecurityBusinessLogic.BusinessLogics; -using SecurityBusinessLogic.ViewModels; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { @@ -20,7 +20,7 @@ namespace DepartmentWindowsDesktop.EntityControls /// Реализация контрола для преподавателя /// public partial class ControlLecturerElement : - GenericControlEntityElement, + GenericControlEntityElement, IGenericControlEntityElement { public ControlLecturerElement() @@ -50,7 +50,7 @@ namespace DepartmentWindowsDesktop.EntityControls var model = new LecturerSetBindingModel(); if (FillModel(model)) { - var logic = DependencyManager.Instance.Resolve(); + var logic = DependencyManager.Instance.Resolve(); var userName = $"{model.LastName}{(model.FirstName.IsNotEmpty() ? $" {model.FirstName[0]}." : string.Empty)}{(model.Patronymic.IsNotEmpty() ? $"{model.Patronymic[0]}." : string.Empty)}"; var result = logic.GetList(new UserGetBindingModel { UserNameForSearch = userName }); if (result != null) @@ -100,7 +100,7 @@ namespace DepartmentWindowsDesktop.EntityControls var model = new LecturerSetBindingModel(); if (FillModel(model)) { - var logic = DependencyManager.Instance.Resolve(); + var logic = DependencyManager.Instance.Resolve(); var user = logic.GetElement(new UserGetBindingModel { Id = _element.UserId }); if (user == null) { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs index d71809a..b1acd7b 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка преподавателей - /// - public partial class ControlLecturerList : - GenericControlEntityList, + /// + /// Реализация контрола для списка преподавателей + /// + public partial class ControlLecturerList : + GenericControlEntityList, IGenericControlEntityList { public ControlLecturerList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs index aca3fbe..e2d77dd 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для ученой степени - /// - public partial class ControlLecturerAcademicDegreeElement : - GenericControlEntityElement, + /// + /// Реализация контрола для ученой степени + /// + public partial class ControlLecturerAcademicDegreeElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlLecturerAcademicDegreeElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs index 22009f5..eab4272 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка ученых степеней - /// - public partial class ControlLecturerAcademicDegreeList : - GenericControlEntityList, + /// + /// Реализация контрола для списка ученых степеней + /// + public partial class ControlLecturerAcademicDegreeList : + GenericControlEntityList, IGenericControlEntityList { public ControlLecturerAcademicDegreeList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs index 3b551b4..03bc4dd 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для ученого звания - /// - public partial class ControlLecturerAcademicRankElement : - GenericControlEntityElement, + /// + /// Реализация контрола для ученого звания + /// + public partial class ControlLecturerAcademicRankElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlLecturerAcademicRankElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs index 39c8dbc..80b8f5f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка ученых званий - /// - public partial class ControlLecturerAcademicRankList : - GenericControlEntityList, + /// + /// Реализация контрола для списка ученых званий + /// + public partial class ControlLecturerAcademicRankList : + GenericControlEntityList, IGenericControlEntityList { public ControlLecturerAcademicRankList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs index 988f44f..055cf1d 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для сязи преподавателя и должности - /// - public partial class ControlLecturerPostElement : - GenericControlEntityElement, + /// + /// Реализация контрола для сязи преподавателя и должности + /// + public partial class ControlLecturerPostElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlLecturerPostElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs index d980ce2..543d79b 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - public partial class ControlLecturerPostList : - GenericControlEntityList, + public partial class ControlLecturerPostList : + GenericControlEntityList, IGenericControlEntityList { public ControlLecturerPostList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderElement.cs index 7b3fb3f..7d43428 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для приказа - /// - public partial class ControlOrderElement : - GenericControlEntityElement, + /// + /// Реализация контрола для приказа + /// + public partial class ControlOrderElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlOrderElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs index cafeee8..be86d30 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs @@ -1,19 +1,19 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка приказов - /// - public partial class ControlOrderList : - GenericControlEntityList, + /// + /// Реализация контрола для списка приказов + /// + public partial class ControlOrderList : + GenericControlEntityList, IGenericControlEntityList { public ControlOrderList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordElement.cs index ada0a35..a066250 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для записи приказа по студентам - /// - public partial class ControlOrderStudentRecordElement : - GenericControlEntityElement, + /// + /// Реализация контрола для записи приказа по студентам + /// + public partial class ControlOrderStudentRecordElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlOrderStudentRecordElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs index 9d971d9..b70aaff 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs @@ -1,22 +1,22 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; -using ToolsDesktop.Controls; -using ToolsDesktop.Interfaces; -using ToolsDesktop.Models; -using ToolsModule.Enums; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; using System; using System.Threading.Tasks; +using ToolsDesktop.Controls; using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BusinessLogics; +using ToolsModule.Enums; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка записей приказов по студентам - /// - public partial class ControlOrderStudentRecordList : - GenericControlEntityList, + /// + /// Реализация контрола для списка записей приказов по студентам + /// + public partial class ControlOrderStudentRecordList : + GenericControlEntityList, IGenericControlEntityList { public ControlOrderStudentRecordList() @@ -50,7 +50,7 @@ namespace DepartmentWindowsDesktop.EntityControls { return; } - var orderSyncHistoryBusinessLogic = DependencyManager.Instance.Resolve(); + var orderSyncHistoryBusinessLogic = DependencyManager.Instance.Resolve(); var flag = await orderSyncHistoryBusinessLogic.SyncStudentOrders(ParentId.Value); if (!flag) { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryElement.cs index d43221b..2e47781 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для истории синхронизации приказов - /// - public partial class ControlOrderSyncHistoryElement : - GenericControlEntityElement, + /// + /// Реализация контрола для истории синхронизации приказов + /// + public partial class ControlOrderSyncHistoryElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlOrderSyncHistoryElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs index 17512ae..5742192 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs @@ -1,15 +1,15 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace DepartmentWindowsDesktop.EntityControls { @@ -17,7 +17,7 @@ namespace DepartmentWindowsDesktop.EntityControls /// Реализация контрола для списка историй синхронизации приказов /// public partial class ControlOrderSyncHistoryList : - GenericControlEntityList, + GenericControlEntityList, IGenericControlEntityList { public ControlOrderSyncHistoryList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordElement.cs index 08330ab..dc3b61a 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для записи истории синхронизации приказов - /// - public partial class ControlOrderSyncHistoryRecordElement : - GenericControlEntityElement, + /// + /// Реализация контрола для записи истории синхронизации приказов + /// + public partial class ControlOrderSyncHistoryRecordElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlOrderSyncHistoryRecordElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs index 2271155..8adfbe8 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка записей истории синхронизации приказов - /// - public partial class ControlOrderSyncHistoryRecordList : - GenericControlEntityList, + /// + /// Реализация контрола для списка записей истории синхронизации приказов + /// + public partial class ControlOrderSyncHistoryRecordList : + GenericControlEntityList, IGenericControlEntityList { public ControlOrderSyncHistoryRecordList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs index 3d3dea3..6fb72b1 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для должности - /// - public partial class ControlPostElement : - GenericControlEntityElement, + /// + /// Реализация контрола для должности + /// + public partial class ControlPostElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlPostElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs index 28ef476..e3ae80f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка должностей - /// - public partial class ControlPostList : - GenericControlEntityList, + /// + /// Реализация контрола для списка должностей + /// + public partial class ControlPostList : + GenericControlEntityList, IGenericControlEntityList { public ControlPostList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs index bc935ea..cadce67 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs @@ -1,6 +1,11 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using SecurityContract.BindingModels; +using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.BaseControls; using ToolsDesktop.Controls; using ToolsDesktop.Helpers; @@ -8,11 +13,6 @@ using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Extensions; -using SecurityBusinessLogic.BindingModels; -using SecurityBusinessLogic.BusinessLogics; -using SecurityBusinessLogic.ViewModels; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { @@ -20,7 +20,7 @@ namespace DepartmentWindowsDesktop.EntityControls /// Реализация контрола для студента /// public partial class ControlStudentElement : - GenericControlEntityElement, + GenericControlEntityElement, IGenericControlEntityElement { public ControlStudentElement() @@ -50,7 +50,7 @@ namespace DepartmentWindowsDesktop.EntityControls var model = new StudentSetBindingModel(); if (FillModel(model)) { - var logic = DependencyManager.Instance.Resolve(); + var logic = DependencyManager.Instance.Resolve(); var userName = $"{model.LastName}{(model.FirstName.IsNotEmpty() ? $" {model.FirstName[0]}." : string.Empty)}{(model.Patronymic.IsNotEmpty() ? $"{model.Patronymic[0]}." : string.Empty)}"; var user = logic.GetElement(new UserGetBindingModel { Login = model.NumberOfBook }); if (user == null) @@ -93,7 +93,7 @@ namespace DepartmentWindowsDesktop.EntityControls var model = new StudentSetBindingModel(); if (FillModel(model)) { - var logic = DependencyManager.Instance.Resolve(); + var logic = DependencyManager.Instance.Resolve(); var user = logic.GetElement(new UserGetBindingModel { Id = _element.UserId }); if (user == null) { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs index f5f6f44..ff9b50f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs @@ -1,15 +1,15 @@ using CoreModels.Enums.Department; -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; -using System.Linq; namespace DepartmentWindowsDesktop.EntityControls { @@ -17,7 +17,7 @@ namespace DepartmentWindowsDesktop.EntityControls /// Реализация контрола для списка студентов /// public partial class ControlStudentList : - GenericControlEntityList, + GenericControlEntityList, IGenericControlEntityList { public ControlStudentList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupElement.cs index 6fe4c4f..cf68afb 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для учебной группы - /// - public partial class ControlStudentGroupElement : - GenericControlEntityElement, + /// + /// Реализация контрола для учебной группы + /// + public partial class ControlStudentGroupElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlStudentGroupElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs index d90dd12..f5e6ab8 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка учебных групп - /// - public partial class ControlStudentGroupList : - GenericControlEntityList, + /// + /// Реализация контрола для списка учебных групп + /// + public partial class ControlStudentGroupList : + GenericControlEntityList, IGenericControlEntityList { public ControlStudentGroupList() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs index 37c8485..1890b2c 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs @@ -1,18 +1,18 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using System; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для нормы времени - /// - public partial class ControlTimeNormElement : - GenericControlEntityElement, + /// + /// Реализация контрола для нормы времени + /// + public partial class ControlTimeNormElement : + GenericControlEntityElement, IGenericControlEntityElement { public ControlTimeNormElement() diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs index 9bfd067..6b10f09 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs @@ -1,21 +1,21 @@ -using DepartmentBusinessLogic.BindingModels; -using DepartmentBusinessLogic.BusinessLogics; -using DepartmentBusinessLogic.ViewModels; +using DepartmentContract.BindingModels; +using DepartmentContract.Logics.IGenericEntityLogic; +using DepartmentContract.ViewModels; +using System; +using System.Collections.Generic; using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Enums; -using System; -using System.Collections.Generic; namespace DepartmentWindowsDesktop.EntityControls { - /// - /// Реализация контрола для списка норм времени - /// - public partial class ControlTimeNormList : - GenericControlEntityList, + /// + /// Реализация контрола для списка норм времени + /// + public partial class ControlTimeNormList : + GenericControlEntityList, IGenericControlEntityList { public ControlTimeNormList() diff --git a/DepartmentPortal/DepartmentPortal.sln b/DepartmentPortal/DepartmentPortal.sln index 53f7e1b..7df049d 100644 --- a/DepartmentPortal/DepartmentPortal.sln +++ b/DepartmentPortal/DepartmentPortal.sln @@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreDatabase", "Common\Core EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecurityContract", "Security\SecurityContract\SecurityContract.csproj", "{E9F9B0D8-18F3-40C3-843F-53D2F8B2293E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DepartmentContract", "Department\DepartmentContract\DepartmentContract.csproj", "{5AA4DBD9-FD82-46D6-8A62-78DB269296B3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -87,6 +89,10 @@ Global {E9F9B0D8-18F3-40C3-843F-53D2F8B2293E}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9F9B0D8-18F3-40C3-843F-53D2F8B2293E}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9F9B0D8-18F3-40C3-843F-53D2F8B2293E}.Release|Any CPU.Build.0 = Release|Any CPU + {5AA4DBD9-FD82-46D6-8A62-78DB269296B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5AA4DBD9-FD82-46D6-8A62-78DB269296B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5AA4DBD9-FD82-46D6-8A62-78DB269296B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5AA4DBD9-FD82-46D6-8A62-78DB269296B3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -103,6 +109,7 @@ Global {FF2FD244-613D-4BE7-A6D6-6B71A45C662E} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} {C2AADB97-4122-48AB-9E48-6C2A9C33BFE4} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} {E9F9B0D8-18F3-40C3-843F-53D2F8B2293E} = {7DA26C36-778E-4563-9AEC-966E26EA7B2A} + {5AA4DBD9-FD82-46D6-8A62-78DB269296B3} = {A19E7709-6AD8-4E9B-B3AB-4339C67D9F39} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBA0CB49-EF2D-4538-9D00-FCEDA24879A9} diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs index 22b37b2..e8df696 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using SecurityContract.Interfaces; +using SecurityContract.Services; using SecurityContract.Logics; using System; using System.IO; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/AccessBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/AccessBusinessLogic.cs index 2109358..b7b3c8c 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/AccessBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/AccessBusinessLogic.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; using SecurityContract.ViewModels; using ToolsModule.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/EnviromentSettingBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/EnviromentSettingBusinessLogic.cs index 3211404..f0097da 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/EnviromentSettingBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/EnviromentSettingBusinessLogic.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; using SecurityContract.ViewModels; using ToolsModule.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/RoleBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/RoleBusinessLogic.cs index 3a316e6..e75e199 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/RoleBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/RoleBusinessLogic.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; using SecurityContract.ViewModels; using ToolsModule.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserBusinessLogic.cs index bf842d1..9cfadab 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserBusinessLogic.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; using SecurityContract.ViewModels; using System; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserRoleBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserRoleBusinessLogic.cs index 40895dc..2214a6b 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserRoleBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserRoleBusinessLogic.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; using SecurityContract.ViewModels; using ToolsModule.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs index 3511525..bc477e9 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs @@ -1,4 +1,4 @@ -using SecurityContract.Interfaces; +using SecurityContract.Services; using SecurityContract.Logics; using System; using ToolsModule.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityContract/Services/IBackupService.cs b/DepartmentPortal/Security/SecurityContract/Services/IBackupService.cs index f48a9db..2d18dbf 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IBackupService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IBackupService.cs @@ -1,7 +1,7 @@ using SecurityContract.BindingModels; using ToolsModule.Models; -namespace SecurityContract.Interfaces +namespace SecurityContract.Services { /// /// Сервис работы по выгрузке и загрузке данных diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IAccessService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IAccessService.cs index bd6341f..c59ec55 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IAccessService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IAccessService.cs @@ -1,7 +1,7 @@ using SecurityContract.BindingModels; using ToolsModule.Interfaces; -namespace SecurityContract.Interfaces.IGenericEntityService +namespace SecurityContract.Services.IGenericEntityService { /// /// Хранение доступов diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IEnviromentSettingService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IEnviromentSettingService.cs index 39d2984..157a0d2 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IEnviromentSettingService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IEnviromentSettingService.cs @@ -1,7 +1,7 @@ using SecurityContract.BindingModels; using ToolsModule.Interfaces; -namespace SecurityContract.Interfaces.IGenericEntityService +namespace SecurityContract.Services.IGenericEntityService { /// /// Хранение общих настроек системы diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IRoleService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IRoleService.cs index 55b1267..4e87ee3 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IRoleService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IRoleService.cs @@ -1,7 +1,7 @@ using SecurityContract.BindingModels; using ToolsModule.Interfaces; -namespace SecurityContract.Interfaces.IGenericEntityService +namespace SecurityContract.Services.IGenericEntityService { /// /// Хранение ролей diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserRoleService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserRoleService.cs index 3fe8cc8..7eee7c2 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserRoleService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserRoleService.cs @@ -1,7 +1,7 @@ using SecurityContract.BindingModels; using ToolsModule.Interfaces; -namespace SecurityContract.Interfaces.IGenericEntityService +namespace SecurityContract.Services.IGenericEntityService { /// /// Хранение связей пользователей с ролями diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserService.cs index de2fa04..70086d3 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserService.cs @@ -1,7 +1,7 @@ using SecurityContract.BindingModels; using ToolsModule.Interfaces; -namespace SecurityContract.Interfaces.IGenericEntityService +namespace SecurityContract.Services.IGenericEntityService { /// /// Хранение пользователей diff --git a/DepartmentPortal/Security/SecurityContract/Services/ISynchronizationService.cs b/DepartmentPortal/Security/SecurityContract/Services/ISynchronizationService.cs index 6614855..def3b58 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/ISynchronizationService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/ISynchronizationService.cs @@ -1,6 +1,6 @@ using ToolsModule.Models; -namespace SecurityContract.Interfaces +namespace SecurityContract.Services { /// /// Синхронизация пользователей (преподаватели, сотрудники, студенты) diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/AccessService.cs similarity index 93% rename from DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs rename to DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/AccessService.cs index 0fce5b9..0bf38f1 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/AccessService.cs @@ -2,12 +2,12 @@ using CoreDatabase.Models.Security; using Microsoft.EntityFrameworkCore; using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System.Linq; using ToolsModule.Models; -namespace SecurityDatabaseImplementation.Implementations +namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация IAccessService diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/EnviromentSettingService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/EnviromentSettingService.cs similarity index 93% rename from DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/EnviromentSettingService.cs rename to DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/EnviromentSettingService.cs index fb8cff6..3f0c8e6 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/EnviromentSettingService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/EnviromentSettingService.cs @@ -2,13 +2,13 @@ using CoreDatabase.Models.Security; using Microsoft.EntityFrameworkCore; using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System.Linq; using ToolsModule.Extensions; using ToolsModule.Models; -namespace SecurityDatabaseImplementation.Implementations +namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация IEnviromentSettingService diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/RoleService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/RoleService.cs similarity index 94% rename from DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/RoleService.cs rename to DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/RoleService.cs index 1054b57..7f5b5f5 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/RoleService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/RoleService.cs @@ -2,7 +2,7 @@ using CoreDatabase.Models.Security; using Microsoft.EntityFrameworkCore; using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System; using System.Linq; @@ -10,7 +10,7 @@ using ToolsModule.Enums; using ToolsModule.Extensions; using ToolsModule.Models; -namespace SecurityDatabaseImplementation.Implementations +namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация IRoleService diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserRoleService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserRoleService.cs similarity index 93% rename from DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserRoleService.cs rename to DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserRoleService.cs index b98306d..68fdf85 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserRoleService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserRoleService.cs @@ -2,12 +2,12 @@ using CoreDatabase.Models.Security; using Microsoft.EntityFrameworkCore; using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System.Linq; using ToolsModule.Models; -namespace SecurityDatabaseImplementation.Implementations +namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация IUserRoleService diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserService.cs similarity index 96% rename from DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserService.cs rename to DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserService.cs index 2163869..fd879f2 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/UserService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserService.cs @@ -3,7 +3,7 @@ using CoreDatabase.Models.Department; using CoreDatabase.Models.Security; using Microsoft.EntityFrameworkCore; using SecurityContract.BindingModels; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System; using System.Linq; @@ -11,7 +11,7 @@ using ToolsModule.Enums; using ToolsModule.Extensions; using ToolsModule.Models; -namespace SecurityDatabaseImplementation.Implementations +namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { /// /// Реализация IUserService diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs index e3e484b..0c68c1e 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs @@ -1,6 +1,6 @@ using CoreDatabase; using SecurityContract.BindingModels; -using SecurityContract.Interfaces; +using SecurityContract.Services; using System; using System.Collections.Generic; using System.IO; diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs index 2a1addf..6e6e790 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs @@ -1,4 +1,4 @@ -using SecurityContract.Interfaces; +using SecurityContract.Services; using ToolsModule.Models; namespace SecurityDatabaseImplementation.Implementations diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs index 214dd4c..adcf639 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs @@ -1,6 +1,7 @@ -using SecurityContract.Interfaces; -using SecurityContract.Interfaces.IGenericEntityService; +using SecurityContract.Services; +using SecurityContract.Services.IGenericEntityService; using SecurityDatabaseImplementation.Implementations; +using SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService; using ToolsModule.BusinessLogics; using ToolsModule.Interfaces;