diff --git a/SewingDresses/SewingDressesFileImplement/Models/Component.cs b/SewingDresses/SewingDressesFileImplement/Models/Component.cs index a03ad84..8338296 100644 --- a/SewingDresses/SewingDressesFileImplement/Models/Component.cs +++ b/SewingDresses/SewingDressesFileImplement/Models/Component.cs @@ -33,7 +33,7 @@ namespace SewingDressesFileImplement.Models { Id = Convert.ToInt32(element.Attribute("Id")!.Value), ComponentName = element.Element("ComponentName")!.Value, - Cost = Convert.ToDouble(element.Element("Cost")!.Value) + Cost = Convert.ToDouble(element.Element("Cost")!.Value, new System.Globalization.CultureInfo("en-US")) }; } diff --git a/SewingDresses/SewingDressesFileImplement/Models/Order.cs b/SewingDresses/SewingDressesFileImplement/Models/Order.cs index 8cdeaf7..943a121 100644 --- a/SewingDresses/SewingDressesFileImplement/Models/Order.cs +++ b/SewingDresses/SewingDressesFileImplement/Models/Order.cs @@ -44,7 +44,7 @@ namespace SewingDressesFileImplement.Models Id = Convert.ToInt32(element.Attribute("Id")!.Value), DressId = Convert.ToInt32(element.Element("DressId")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), - Sum = Convert.ToInt32(element.Element("Sum")!.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) }; @@ -73,7 +73,7 @@ namespace SewingDressesFileImplement.Models new XElement("DressId", DressId), new XElement("Count", Count), new XElement("Sum", Sum), - new XElement("Status", Status), + new XElement("Status", Status - OrderStatus.Неизвестен), new XElement("DateCreate", DateCreate), new XElement("DateImplement", DateImplement)); } diff --git a/SewingDresses/SewingDressesView/MainForm.cs b/SewingDresses/SewingDressesView/MainForm.cs index 87120a0..5ff9c56 100644 --- a/SewingDresses/SewingDressesView/MainForm.cs +++ b/SewingDresses/SewingDressesView/MainForm.cs @@ -24,7 +24,6 @@ namespace SewingDressesView { dataGridView.DataSource = list; dataGridView.Columns["DressId"].Visible = false; - dataGridView.Columns["DressName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Load orders"); }