From ed95a8eee3fe0d714c01a0d23acaf821367df7cf Mon Sep 17 00:00:00 2001 From: kotcheshir73 Date: Fri, 18 Mar 2022 22:29:39 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9=20=D0=BA=D0=B0=D1=84?= =?UTF-8?q?=D0=B5=D0=B4=D1=80=D1=8B,=20=D0=B8=D1=82=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModelsDepartment/IOrderSyncHistoryModel.cs | 16 ++++++++++++++++ .../IOrderSyncHistoryRecordModel.cs | 15 +++++++++++++++ .../Models/Department/OrderSyncHistory.cs | 11 +++-------- .../Models/Department/OrderSyncHistoryRecord.cs | 13 +++---------- .../OrderSyncHistoryBindingModels.cs | 13 ++++++------- .../OrderSyncHistoryRecordBindingModels.cs | 14 ++++++-------- .../OrderSyncHistoryRecordViewModels.cs | 15 +++++++-------- .../ViewModels/OrderSyncHistoryViewModels.cs | 14 +++++++------- 8 files changed, 63 insertions(+), 48 deletions(-) create mode 100644 DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs create mode 100644 DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs new file mode 100644 index 0000000..6196a78 --- /dev/null +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs @@ -0,0 +1,16 @@ +using CoreModels.Tools; +using ModuleTools.Attributes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CoreModels.ModelsDepartment +{ + [EntityDescription("OrderSyncHistory", "История синхронизации приказов")] + public interface IOrderSyncHistoryModel : IId + { + DateTime SyncDate { get; } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs new file mode 100644 index 0000000..271319a --- /dev/null +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs @@ -0,0 +1,15 @@ +using CoreModels.Tools; +using ModuleTools.Attributes; +using System; + +namespace CoreModels.ModelsDepartment +{ + [EntityDescription("OrderSyncHistoryRecord", "Дисципилна кафедры")] + [EntityDependency("OrderSyncHistory", "OrderSyncHistoryId", "История синхронизации прказов, к которой относитя запись")] + public interface IOrderSyncHistoryRecordModel : IId + { + Guid OrderSyncHistoryId { get; } + + string Information { get; } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistory.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistory.cs index e8864f2..bde1bf9 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistory.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistory.cs @@ -1,4 +1,4 @@ -using ModuleTools.Attributes; +using CoreModels.ModelsDepartment; using ModuleTools.Interfaces; using System; using System.Collections.Generic; @@ -8,16 +8,11 @@ using System.Runtime.Serialization; namespace DatabaseCore.Models.Department { - /// - /// Класс, описывающий историю синхронизации приказов - /// - [DataContract] - [EntityDescription("OrderSyncHistory", "История синхронизации приказов")] - public class OrderSyncHistory : IdEntity, IEntitySecurityExtenstion + [DataContract] + public class OrderSyncHistory : IdEntity, IEntitySecurityExtenstion, IOrderSyncHistoryModel { [DataMember] [Required(ErrorMessage = "required")] - [MapConfiguration("SyncDate")] public DateTime SyncDate { get; set; } //------------------------------------------------------------------------- diff --git a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistoryRecord.cs b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistoryRecord.cs index fff6ba7..3153a81 100644 --- a/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistoryRecord.cs +++ b/DepartmentPortal/Common/DatabaseCore/Models/Department/OrderSyncHistoryRecord.cs @@ -1,4 +1,4 @@ -using ModuleTools.Attributes; +using CoreModels.ModelsDepartment; using ModuleTools.Interfaces; using System; using System.ComponentModel.DataAnnotations; @@ -6,22 +6,15 @@ using System.Runtime.Serialization; namespace DatabaseCore.Models.Department { - /// - /// Класс, описывающий запись истории синхронизации приказов - /// - [DataContract] - [EntityDescription("OrderSyncHistoryRecord", "Дисципилна кафедры")] - [EntityDependency("OrderSyncHistory", "OrderSyncHistoryId", "История синхронизации прказов, к которой относитя запись")] - public class OrderSyncHistoryRecord : IdEntity, IEntitySecurityExtenstion + [DataContract] + public class OrderSyncHistoryRecord : IdEntity, IEntitySecurityExtenstion, IOrderSyncHistoryRecordModel { [DataMember] [Required(ErrorMessage = "required")] - [MapConfiguration("OrderSyncHistoryId")] public Guid OrderSyncHistoryId { get; set; } [DataMember] [Required(ErrorMessage = "required")] - [MapConfiguration("Information")] public string Information { get; set; } //------------------------------------------------------------------------- diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs index b71e3ae..81f790b 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryBindingModels.cs @@ -1,24 +1,23 @@ -using ModuleTools.Attributes; +using CoreModels.ModelsDepartment; using ModuleTools.BindingModels; using System; using System.ComponentModel.DataAnnotations; namespace DepartmentBusinessLogic.BindingModels { - /// - /// Получение истории синхронизации приказов - /// - public class OrderSyncHistoryGetBindingModel : GetBindingModel + /// + /// Получение истории синхронизации приказов + /// + public class OrderSyncHistoryGetBindingModel : GetBindingModel { } /// /// Сохранение истории синхронизации приказов /// - public class OrderSyncHistorySetBindingModel : SetBindingModel + public class OrderSyncHistorySetBindingModel : SetBindingModel, IOrderSyncHistoryModel { [Required(ErrorMessage = "required")] - [MapConfiguration("SyncDate")] public DateTime SyncDate { get; set; } } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs index d7ac655..7240d92 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BindingModels/OrderSyncHistoryRecordBindingModels.cs @@ -1,14 +1,14 @@ -using ModuleTools.Attributes; +using CoreModels.ModelsDepartment; using ModuleTools.BindingModels; using System; using System.ComponentModel.DataAnnotations; namespace DepartmentBusinessLogic.BindingModels { - /// - /// Получение записи истории синхронизации приказов - /// - public class OrderSyncHistoryRecordGetBindingModel : GetBindingModel + /// + /// Получение записи истории синхронизации приказов + /// + public class OrderSyncHistoryRecordGetBindingModel : GetBindingModel { public Guid? OrderSyncHistoryId { get; set; } } @@ -16,14 +16,12 @@ namespace DepartmentBusinessLogic.BindingModels /// /// Сохранение записи истории синхронизации приказов /// - public class OrderSyncHistoryRecordSetBindingModel : SetBindingModel + public class OrderSyncHistoryRecordSetBindingModel : SetBindingModel, IOrderSyncHistoryRecordModel { [Required(ErrorMessage = "required")] - [MapConfiguration("OrderSyncHistoryId")] public Guid OrderSyncHistoryId { get; set; } [Required(ErrorMessage = "required")] - [MapConfiguration("Information")] public string Information { get; set; } } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs index d205d02..f85fbe1 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryRecordViewModels.cs @@ -1,23 +1,23 @@ -using ModuleTools.Attributes; +using CoreModels.ModelsDepartment; +using ModuleTools.Attributes; using ModuleTools.Enums; using ModuleTools.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels { - /// - /// Список записей историй синхронизации приказов - /// - public class OrderSyncHistoryRecordListViewModel : ListViewModel { } + /// + /// Список записей историй синхронизации приказов + /// + public class OrderSyncHistoryRecordListViewModel : ListViewModel { } /// /// Элемент записи историй синхронизации приказов /// [ViewModelControlElementClass(HaveDependenceEntities = false, Width = 800, Height = 500)] - public class OrderSyncHistoryRecordViewModel : ElementViewModel + public class OrderSyncHistoryRecordViewModel : ElementViewModel, IOrderSyncHistoryRecordModel { [ViewModelControlElementProperty("История", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "DepartmentWindowsDesktop.EntityControls.ControlOrderSyncHistoryList, DepartmentWindowsDesktop")] - [MapConfiguration("OrderSyncHistoryId")] public Guid OrderSyncHistoryId { get; set; } [ViewModelControlListProperty("Дата", ColumnWidth = 100, DefaultCellStyleFormat = "dd.MM.yyyy")] @@ -26,7 +26,6 @@ namespace DepartmentBusinessLogic.ViewModels [ViewModelControlListProperty("Описание")] [ViewModelControlElementProperty("Описание", ControlType.ControlText, Height = 200, MustHaveValue = true)] - [MapConfiguration("Information")] public string Information { get; set; } } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs index 33e55dc..2ddeb4d 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/ViewModels/OrderSyncHistoryViewModels.cs @@ -1,14 +1,15 @@ -using ModuleTools.Attributes; +using CoreModels.ModelsDepartment; +using ModuleTools.Attributes; using ModuleTools.Enums; using ModuleTools.ViewModels; using System; namespace DepartmentBusinessLogic.ViewModels { - /// - /// Список историй синхронизации приказов - /// - public class OrderSyncHistoryListViewModel : ListViewModel { } + /// + /// Список историй синхронизации приказов + /// + public class OrderSyncHistoryListViewModel : ListViewModel { } /// /// Элемент история синхронизации приказов @@ -16,10 +17,9 @@ namespace DepartmentBusinessLogic.ViewModels [ViewModelControlElementClass(HaveDependenceEntities = true, Width = 800, Height = 500)] [ViewModelControlElementDependenceEntity(Title = "Записи", Order = 1, ParentPropertyName = "OrderSyncHistoryId", ControlTypeObject = "DepartmentWindowsDesktop.EntityControls.ControlOrderSyncHistoryRecordList, DepartmentWindowsDesktop")] - public class OrderSyncHistoryViewModel : ElementViewModel + public class OrderSyncHistoryViewModel : ElementViewModel, IOrderSyncHistoryModel { [ViewModelControlElementProperty("Дата", ControlType.ControlDateTime, MustHaveValue = true, ReadOnly = true)] - [MapConfiguration("SyncDate")] public DateTime SyncDate { get; set; } [ViewModelControlListProperty("Дата")]