diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabase.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabase.cs index 08c7464..ed3df63 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabase.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabase.cs @@ -1,5 +1,4 @@ -using BlacksmithWorkshopDatabaseImplement.Models; -using FurnitureAssemblyDatabaseImplement.Models; +using FurnitureAssemblyDatabaseImplement.Models; using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ShopStorage.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ShopStorage.cs index 6425e20..719f3cb 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ShopStorage.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ShopStorage.cs @@ -1,4 +1,4 @@ -using BlacksmithWorkshopDatabaseImplement.Models; +using FurnitureAssemblyDatabaseImplement.Models; using FurnitureAssemblyContracts.BindingModels; using FurnitureAssemblyContracts.SearchModels; using FurnitureAssemblyContracts.StoragesContracts; diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs index f9d5968..6c2e16c 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs @@ -101,13 +101,13 @@ namespace FurnitureAssemblyDatabaseImplement.Models var furniture = context.Furnitures.First(x => x.Id == Id); - foreach(var mwp in model.FurnitureWorkPieces) + foreach(var fwp in model.FurnitureWorkPieces) { context.FurnitureWorkPieces.Add(new FurnitureWorkPiece { Furniture = furniture, - WorkPiece = context.WorkPieces.First(x => x.Id == mwp.Key), - Count = mwp.Value.Item2 + WorkPiece = context.WorkPieces.First(x => x.Id == fwp.Key), + Count = fwp.Value.Item2 }); context.SaveChanges(); diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Shop.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Shop.cs index c0db239..67ff0dd 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Shop.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Shop.cs @@ -11,7 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BlacksmithWorkshopDatabaseImplement.Models +namespace FurnitureAssemblyDatabaseImplement.Models { public class Shop : IShopModel { diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/ShopFurniture.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/ShopFurniture.cs index 8d83e90..5d1cc11 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/ShopFurniture.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/ShopFurniture.cs @@ -1,4 +1,4 @@ -using BlacksmithWorkshopDatabaseImplement.Models; +using FurnitureAssemblyDatabaseImplement.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs index ba1eb37..ea61f85 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs @@ -25,14 +25,14 @@ namespace FurnitureAssemblyView { get { - if(_list == null) + if (_list == null) { return null; } - foreach(var elem in _list) + foreach (var elem in _list) { - if(elem.Id == Id) + if (elem.Id == Id) { return elem; } diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs index dcb756c..6fec1fc 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs @@ -31,7 +31,7 @@ buttonAdd = new Button(); buttonUpdate = new Button(); buttonDelete = new Button(); - buttonRef = new Button(); + buttonRefresh = new Button(); dataGridView = new DataGridView(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -66,15 +66,15 @@ buttonDelete.UseVisualStyleBackColor = true; buttonDelete.Click += ButtonDelete_Click; // - // buttonRef + // buttonRefresh // - buttonRef.Location = new Point(640, 245); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(116, 50); - buttonRef.TabIndex = 3; - buttonRef.Text = "Обновить"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; + buttonRefresh.Location = new Point(640, 245); + buttonRefresh.Name = "buttonRef"; + buttonRefresh.Size = new Size(116, 50); + buttonRefresh.TabIndex = 3; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; // // dataGridView // @@ -92,7 +92,7 @@ AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(781, 450); Controls.Add(dataGridView); - Controls.Add(buttonRef); + Controls.Add(buttonRefresh); Controls.Add(buttonDelete); Controls.Add(buttonUpdate); Controls.Add(buttonAdd); @@ -108,7 +108,7 @@ private Button buttonAdd; private Button buttonUpdate; private Button buttonDelete; - private Button buttonRef; + private Button buttonRefresh; private DataGridView dataGridView; } } \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs index 4bfd6b9..1e8b461 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs @@ -118,7 +118,7 @@ namespace FurnitureAssemblyView } } - private void ButtonRef_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { LoadData(); } diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormMain.cs b/FurnitureAssembly/FurnitureAssemblyView/FormMain.cs index 716ce11..cfdba3b 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormMain.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormMain.cs @@ -48,6 +48,7 @@ namespace FurnitureAssemblyView { dataGridView.DataSource = list; dataGridView.Columns["FurnitureId"].Visible = false; + dataGridView.Columns["FurnitureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка заказов");