viltskaa/PIbd-22_Bazunov_A.I._SushiBar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bazunov A.I. Lab Work Hard #8 #20

Closed
viltskaa wants to merge 9 commits from LabWork_8_hard into LabWork_7_hard
pull from: LabWork_8_hard
merge into: viltskaa:LabWork_7_hard
Conversation 1 Commits 9 Files Changed 57 +22 -50
3 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cf431df304 - Show all commits

40
SushiBar/SushiBar/FormMain.cs
View File

@ -204,32 +204,20 @@ namespace SushiBar
private void StoreToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormStores));
if (service is FormStores form)
{
form.ShowDialog();
}
var service = DependencyManager.Instance.Resolve<FormStores>();
service.ShowDialog();
}
private void ButtonReplenishment_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormStoreReplenishment));
if (service is FormStoreReplenishment form)
{
form.ShowDialog();
}
var service = DependencyManager.Instance.Resolve<FormStoreReplenishment>();
service.ShowDialog();
}
private void ButtonSell_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormStoreSell));
if (service is FormStoreSell form)
{
form.ShowDialog();
}
var service = DependencyManager.Instance.Resolve<FormStoreSell>();
service.ShowDialog();
}
private void StoreListToolStripMenuItem_Click(object sender, EventArgs e)
@ -245,22 +233,14 @@ namespace SushiBar
private void StoreWorkloadToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormStoreWorkload));
if (service is FormStoreWorkload form)
{
form.ShowDialog();
}
var service = DependencyManager.Instance.Resolve<FormStoreWorkload>();
service.ShowDialog();
}
private void OrderListWithGroupByToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportOrdersGroupByDate));
if (service is FormReportOrdersGroupByDate form)
{
form.ShowDialog();
}
var service = DependencyManager.Instance.Resolve<FormReportOrdersGroupByDate>();
service.ShowDialog();
}
private void MailsToolStripMenuItem_Click(object sender, EventArgs e)

30
SushiBar/SushiBar/FormStores.cs
View File

@ -1,6 +1,7 @@
using Microsoft.Extensions.Logging;
using SushiBarContracts.BindingModels;
using SushiBarContracts.BusinessLogicsContracts;
using SushiBarContracts.DI;
namespace SushiBar
{
@ -41,14 +42,10 @@ namespace SushiBar
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormStore));
if (service is FormStore form)
var service = DependencyManager.Instance.Resolve<FormStore>();
if (service.ShowDialog() == DialogResult.OK)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
@ -84,19 +81,14 @@ namespace SushiBar
private void ButtonChange_Click(object sender, EventArgs e)
{
if (dataGridView.SelectedRows.Count == 1)
if (dataGridView.SelectedRows.Count != 1) return;
var service = DependencyManager.Instance.Resolve<FormStore>();
service.id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (service.ShowDialog() == DialogResult.OK)
{
var service = Program.ServiceProvider?.GetService(typeof(FormStore));
if (service is FormStore form)
{
form.id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
}
LoadData();
}
}

2
SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
View File

@ -75,7 +75,7 @@ public class Sushi : ISushiModel
}
context.SaveChanges();
}
var sushi = context.Sushi.First(x => x.Id == Id);
var sushi = context.Sushis.First(x => x.Id == Id);
foreach (var pc in model.SushiComponents)
{
context.SushiComponents.Add(new SushiComponent