Edit dependencies

This commit is contained in:
Viltskaa 2023-05-05 09:36:49 +04:00
parent a35d2e05c7
commit cf431df304
3 changed files with 22 additions and 50 deletions

View File

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

View File

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

View File

@ -75,7 +75,7 @@ public class Sushi : ISushiModel
} }
context.SaveChanges(); 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) foreach (var pc in model.SushiComponents)
{ {
context.SushiComponents.Add(new SushiComponent context.SushiComponents.Add(new SushiComponent