Belnik/PIbd-21_Belianin_N.N._FurnitureAssembly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Правки

Browse Source
This commit is contained in:
nikbel2004@outlook.com 2024-05-03 12:02:34 +04:00
parent 5a0e120e05
commit dae7a15976
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabase.cs
View File

@ -1,5 +1,4 @@
using BlacksmithWorkshopDatabaseImplement.Models; using FurnitureAssemblyDatabaseImplement.Models;
using FurnitureAssemblyDatabaseImplement.Models;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

2
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ShopStorage.cs
View File

@ -1,4 +1,4 @@
using BlacksmithWorkshopDatabaseImplement.Models; using FurnitureAssemblyDatabaseImplement.Models;
using FurnitureAssemblyContracts.BindingModels; using FurnitureAssemblyContracts.BindingModels;
using FurnitureAssemblyContracts.SearchModels; using FurnitureAssemblyContracts.SearchModels;
using FurnitureAssemblyContracts.StoragesContracts; using FurnitureAssemblyContracts.StoragesContracts;

6
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs
View File

@ -101,13 +101,13 @@ namespace FurnitureAssemblyDatabaseImplement.Models
var furniture = context.Furnitures.First(x => x.Id == Id); 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 context.FurnitureWorkPieces.Add(new FurnitureWorkPiece
{ {
Furniture = furniture, Furniture = furniture,
WorkPiece = context.WorkPieces.First(x => x.Id == mwp.Key), WorkPiece = context.WorkPieces.First(x => x.Id == fwp.Key),
Count = mwp.Value.Item2 Count = fwp.Value.Item2
}); });
context.SaveChanges(); context.SaveChanges();

2
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Shop.cs
View File

@ -11,7 +11,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace BlacksmithWorkshopDatabaseImplement.Models namespace FurnitureAssemblyDatabaseImplement.Models
{ {
public class Shop : IShopModel public class Shop : IShopModel
{ {

2
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/ShopFurniture.cs
View File

@ -1,4 +1,4 @@
using BlacksmithWorkshopDatabaseImplement.Models; using FurnitureAssemblyDatabaseImplement.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

6
FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs
View File

@ -25,14 +25,14 @@ namespace FurnitureAssemblyView
{ {
get get
{ {
if(_list == null) if (_list == null)
{ {
return null; return null;
} }
foreach(var elem in _list) foreach (var elem in _list)
{ {
if(elem.Id == Id) if (elem.Id == Id)
{ {
return elem; return elem;
} }

22
FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs generated
View File

@ -31,7 +31,7 @@
buttonAdd = new Button(); buttonAdd = new Button();
buttonUpdate = new Button(); buttonUpdate = new Button();
buttonDelete = new Button(); buttonDelete = new Button();
buttonRef = new Button(); buttonRefresh = new Button();
dataGridView = new DataGridView(); dataGridView = new DataGridView();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout(); SuspendLayout();
@ -66,15 +66,15 @@
buttonDelete.UseVisualStyleBackColor = true; buttonDelete.UseVisualStyleBackColor = true;
buttonDelete.Click += ButtonDelete_Click; buttonDelete.Click += ButtonDelete_Click;
// //
// buttonRef // buttonRefresh
// //
buttonRef.Location = new Point(640, 245); buttonRefresh.Location = new Point(640, 245);
buttonRef.Name = "buttonRef"; buttonRefresh.Name = "buttonRef";
buttonRef.Size = new Size(116, 50); buttonRefresh.Size = new Size(116, 50);
buttonRef.TabIndex = 3; buttonRefresh.TabIndex = 3;
buttonRef.Text = "Обновить"; buttonRefresh.Text = "Обновить";
buttonRef.UseVisualStyleBackColor = true; buttonRefresh.UseVisualStyleBackColor = true;
buttonRef.Click += ButtonRef_Click; buttonRefresh.Click += ButtonRefresh_Click;
// //
// dataGridView // dataGridView
// //
@ -92,7 +92,7 @@
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(781, 450); ClientSize = new Size(781, 450);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(buttonRef); Controls.Add(buttonRefresh);
Controls.Add(buttonDelete); Controls.Add(buttonDelete);
Controls.Add(buttonUpdate); Controls.Add(buttonUpdate);
Controls.Add(buttonAdd); Controls.Add(buttonAdd);
@ -108,7 +108,7 @@
private Button buttonAdd; private Button buttonAdd;
private Button buttonUpdate; private Button buttonUpdate;
private Button buttonDelete; private Button buttonDelete;
private Button buttonRef; private Button buttonRefresh;
private DataGridView dataGridView; private DataGridView dataGridView;
} }
} }

2
FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs
View File

@ -118,7 +118,7 @@ namespace FurnitureAssemblyView
} }
} }
private void ButtonRef_Click(object sender, EventArgs e) private void ButtonRefresh_Click(object sender, EventArgs e)
{ {
LoadData(); LoadData();
} }

1
FurnitureAssembly/FurnitureAssemblyView/FormMain.cs
View File

@ -48,6 +48,7 @@ namespace FurnitureAssemblyView
{ {
dataGridView.DataSource = list; dataGridView.DataSource = list;
dataGridView.Columns["FurnitureId"].Visible = false; dataGridView.Columns["FurnitureId"].Visible = false;
dataGridView.Columns["FurnitureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
} }
_logger.LogInformation("Загрузка заказов"); _logger.LogInformation("Загрузка заказов");