diff --git a/.gitignore b/.gitignore index ca1c7a3..aaf9887 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +*.dll # Mono auto generated files mono_crash.* diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs index acde684..d7ac202 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs @@ -24,6 +24,7 @@ logic) InitializeComponent(); _logger = logger; _logic = logic; + LoadData(); } private void LoadData() diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs index 9fc467c..625df2d 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs @@ -25,6 +25,7 @@ logic) InitializeComponent(); _logger = logger; _logic = logic; + LoadData(); } private void FormComponents_Load(object sender, EventArgs e) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs index e40c07e..da5033e 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -65,6 +65,10 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics if (type.IsInterface && type.GetInterface(typeIId.Name) != null) { + if(!type.IsInterface) + { + throw new Exception("fgdfd"); + } var modelType = _backUpInfo.GetTypeByModelInterface(type.Name); if (modelType == null) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs index 554268b..6c3e71c 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs @@ -15,7 +15,7 @@ namespace BlacksmithWorkshopContracts.ViewModels public int Id { get; set; } [Column(title: "Название компонента", width: 150)] public string ComponentName { get; set; } = string.Empty; - [Column(title: "цена")] + [Column(title: "цена", width: 150)] public double Cost { get; set; } } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/MessageInfo.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/MessageInfo.cs index 2e7a0b1..6dafb1d 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/MessageInfo.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/MessageInfo.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; namespace BlacksmithWorkshopDatabaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { [Key] diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs index 50dd406..7db404d 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs @@ -13,6 +13,7 @@ using System.Xml.Linq; namespace BlacksmithWorkshopDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel { [DataMember] @@ -23,8 +24,8 @@ namespace BlacksmithWorkshopDatabaseImplement.Models [DataMember] [Required] public int Count { get; private set; } - [Required] [DataMember] + [Required] public double Sum { get; private set; } [DataMember] public string ManufactureName { get; private set; } = string.Empty; @@ -96,7 +97,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Models Status = model.Status; DateImplement = model.DateImplement; - ImplementerId = model.ImplementerId; ; + ImplementerId = model.ImplementerId; diff --git a/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs b/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs index 4265f25..90afe4a 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs @@ -72,7 +72,7 @@ namespace BlacksmithWorkshopFileImplement.Models Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value), - ClientId = Convert.ToInt32(element.Element("ClientId")!.Value) + //ClientId = Convert.ToInt32(element.Element("ClientId")!.Value) }; } public void Update(OrderBindingModel model) diff --git a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopContracts.dll b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopContracts.dll index 7427eaa..d88e309 100644 Binary files a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopContracts.dll and b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopContracts.dll differ diff --git a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopDatabaseImplement.dll b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopDatabaseImplement.dll index bf27cef..420e8f6 100644 Binary files a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopDatabaseImplement.dll and b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopDatabaseImplement.dll differ diff --git a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopFileImplement.dll b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopFileImplement.dll index c96669e..5aceeaa 100644 Binary files a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopFileImplement.dll and b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopFileImplement.dll differ diff --git a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopListImplement.dll b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopListImplement.dll index 42870fa..f8304ad 100644 Binary files a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopListImplement.dll and b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopListImplement.dll differ