From a37c33399e6cc7d9f442135c8d34e57d8422f617 Mon Sep 17 00:00:00 2001 From: Sergey Kozyrev Date: Sat, 24 Feb 2024 09:21:12 +0400 Subject: [PATCH] DateUpdate --- SewingDresses/SewingDressesFileImplement/Models/Order.cs | 6 ++++-- SewingDresses/SewingDressesView/MainForm.Designer.cs | 1 + SewingDresses/SewingDressesView/MainForm.cs | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SewingDresses/SewingDressesFileImplement/Models/Order.cs b/SewingDresses/SewingDressesFileImplement/Models/Order.cs index 943a121..08d0a00 100644 --- a/SewingDresses/SewingDressesFileImplement/Models/Order.cs +++ b/SewingDresses/SewingDressesFileImplement/Models/Order.cs @@ -39,6 +39,7 @@ namespace SewingDressesFileImplement.Models { return null; } + var dateImplement = element.Element("DateImplement")?.Value; return new Order() { Id = Convert.ToInt32(element.Attribute("Id")!.Value), @@ -46,7 +47,8 @@ namespace SewingDressesFileImplement.Models Count = Convert.ToInt32(element.Element("Count")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value, new System.Globalization.CultureInfo("en-US")), Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.Value), - DateCreate = Convert.ToDateTime(element.Element("DateCreate")?.Value) + DateCreate = Convert.ToDateTime(element.Element("DateCreate")?.Value), + DateImplement = string.IsNullOrEmpty(dateImplement) ? null : Convert.ToDateTime(dateImplement) }; } public void Update(OrderBindingModel model) @@ -73,7 +75,7 @@ namespace SewingDressesFileImplement.Models new XElement("DressId", DressId), new XElement("Count", Count), new XElement("Sum", Sum), - new XElement("Status", Status - OrderStatus.Неизвестен), + new XElement("Status", Status - OrderStatus.Принят), new XElement("DateCreate", DateCreate), new XElement("DateImplement", DateImplement)); } diff --git a/SewingDresses/SewingDressesView/MainForm.Designer.cs b/SewingDresses/SewingDressesView/MainForm.Designer.cs index cee4ca6..a107745 100644 --- a/SewingDresses/SewingDressesView/MainForm.Designer.cs +++ b/SewingDresses/SewingDressesView/MainForm.Designer.cs @@ -148,6 +148,7 @@ MainMenuStrip = menuStrip1; Name = "MainForm"; Text = "Магазин пошива одежды"; + Load += MainForm_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); menuStrip1.ResumeLayout(false); menuStrip1.PerformLayout(); diff --git a/SewingDresses/SewingDressesView/MainForm.cs b/SewingDresses/SewingDressesView/MainForm.cs index 5ff9c56..a5d837f 100644 --- a/SewingDresses/SewingDressesView/MainForm.cs +++ b/SewingDresses/SewingDressesView/MainForm.cs @@ -141,5 +141,10 @@ namespace SewingDressesView { LoadData(); } + + private void MainForm_Load(object sender, EventArgs e) + { + LoadData(); + } } }