Nikolay-Raspaev/PIbd-21_Raspaev_N.I._FoodOrders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Николай 2023-04-30 14:20:08 +04:00
parent 3dab961951
commit a2c2573beb
7 changed files with 51 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FoodOrders/FoodOrders/FormMails.cs
View File

@ -2,6 +2,7 @@
using FoodOrdersContracts.BusinessLogicsContracts; using FoodOrdersContracts.BusinessLogicsContracts;
using FoodOrdersView; using FoodOrdersView;
using FoodOrdersContracts.ViewModels; using FoodOrdersContracts.ViewModels;
using FoodOrdersContracts.DI;
namespace FoodOrdersView namespace FoodOrdersView
{ {
@ -89,13 +90,10 @@ namespace FoodOrdersView
private void dataGridView_RowHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) private void dataGridView_RowHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormReplyMail)); var form = DependencyManager.Instance.Resolve<FormReplyMail>();
if (service is FormReplyMail form) form.MessageId = (string)dataGridView.Rows[e.RowIndex].Cells["MessageId"].Value;
{ form.ShowDialog();
form.MessageId = (string)dataGridView.Rows[e.RowIndex].Cells["MessageId"].Value; MailLoad();
form.ShowDialog();
MailLoad();
}
} }
} }
} }

139
FoodOrders/FoodOrders/FormMain.Designer.cs generated
View File

@ -29,12 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
menuStrip = new MenuStrip(); menuStrip = new MenuStrip();
guidesToolStripMenuItem = new ToolStripMenuItem(); createBackupToolStripMenuItem = new ToolStripMenuItem();
componentToolStripMenuItem = new ToolStripMenuItem();
dishToolStripMenuItem = new ToolStripMenuItem();
clientToolStripMenuItem = new ToolStripMenuItem();
shopsToolStripMenuItem = new ToolStripMenuItem();
исполнителиToolStripMenuItem1 = new ToolStripMenuItem();
reportToolStripMenuItem = new ToolStripMenuItem(); reportToolStripMenuItem = new ToolStripMenuItem();
listDishesToolStripMenuItem = new ToolStripMenuItem(); listDishesToolStripMenuItem = new ToolStripMenuItem();
componentDishToolStripMenuItem = new ToolStripMenuItem(); componentDishToolStripMenuItem = new ToolStripMenuItem();
@ -42,78 +37,39 @@
listShopsToolStripMenuItem = new ToolStripMenuItem(); listShopsToolStripMenuItem = new ToolStripMenuItem();
shopDishToolStripMenuItem = new ToolStripMenuItem(); shopDishToolStripMenuItem = new ToolStripMenuItem();
listOrderToDateToolStripMenuItem = new ToolStripMenuItem(); listOrderToDateToolStripMenuItem = new ToolStripMenuItem();
DoWorkToolStripMenuItem = new ToolStripMenuItem();
справочникиToolStripMenuItem = new ToolStripMenuItem(); справочникиToolStripMenuItem = new ToolStripMenuItem();
БлюдаToolStripMenuItem = new ToolStripMenuItem(); БлюдаToolStripMenuItem = new ToolStripMenuItem();
наборблюдToolStripMenuItem = new ToolStripMenuItem(); наборблюдToolStripMenuItem = new ToolStripMenuItem();
clientToolStripMenuItem = new ToolStripMenuItem();
исполнителиToolStripMenuItem = new ToolStripMenuItem(); исполнителиToolStripMenuItem = new ToolStripMenuItem();
отчётыToolStripMenuItem = new ToolStripMenuItem();
componentsToolStripMenuItem = new ToolStripMenuItem();
componentDishesToolStripMenuItem = new ToolStripMenuItem();
ordersToolStripMenuItem = new ToolStripMenuItem();
DoWorkToolStripMenuItem = new ToolStripMenuItem(); DoWorkToolStripMenuItem = new ToolStripMenuItem();
письмаToolStripMenuItem = new ToolStripMenuItem(); письмаToolStripMenuItem = new ToolStripMenuItem();
dishesToolStripMenuItem = new ToolStripMenuItem(); dishesToolStripMenuItem = new ToolStripMenuItem();
buttonUpdate = new Button(); buttonUpdate = new Button();
buttonCreateOrder = new Button(); buttonCreateOrder = new Button();
dataGridView = new DataGridView(); dataGridView = new DataGridView();
createBackupToolStripMenuItem = new ToolStripMenuItem();
buttonAddDishInShop = new Button(); buttonAddDishInShop = new Button();
buttonSetToFinish = new Button(); buttonSetToFinish = new Button();
this.shopsToolStripMenuItem = new ToolStripMenuItem();
menuStrip.SuspendLayout(); menuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// menuStrip // menuStrip
// //
menuStrip.Items.AddRange(new ToolStripItem[] { createBackupToolStripMenuItem, guidesToolStripMenuItem, reportToolStripMenuItem, справочникиToolStripMenuItem, отчётыToolStripMenuItem, DoWorkToolStripMenuItem, письмаToolStripMenuItem }); menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, reportToolStripMenuItem, DoWorkToolStripMenuItem, письмаToolStripMenuItem, createBackupToolStripMenuItem });
menuStrip.Location = new Point(0, 0); menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip"; menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1157, 24); menuStrip.Size = new Size(1157, 24);
menuStrip.TabIndex = 0; menuStrip.TabIndex = 0;
menuStrip.Text = "menuStrip1"; menuStrip.Text = "menuStrip1";
// //
// guidesToolStripMenuItem // createBackupToolStripMenuItem
// //
guidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentToolStripMenuItem, dishToolStripMenuItem, shopsToolStripMenuItem, исполнителиToolStripMenuItem1 }); createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem";
guidesToolStripMenuItem.Name = "guidesToolStripMenuItem"; createBackupToolStripMenuItem.Size = new Size(97, 20);
guidesToolStripMenuItem.Size = new Size(94, 20); createBackupToolStripMenuItem.Text = "Создать бекап";
guidesToolStripMenuItem.Text = "Справочники"; createBackupToolStripMenuItem.Click += createBackupToolStripMenuItem_Click;
//
// componentToolStripMenuItem
//
componentToolStripMenuItem.Name = "componentToolStripMenuItem";
componentToolStripMenuItem.Size = new Size(149, 22);
componentToolStripMenuItem.Text = "Компоненты";
componentToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
//
// dishToolStripMenuItem
//
dishToolStripMenuItem.Name = "dishToolStripMenuItem";
dishToolStripMenuItem.Size = new Size(149, 22);
dishToolStripMenuItem.Text = "Блюда";
dishToolStripMenuItem.Click += DishToolStripMenuItem_Click;
//
// clientToolStripMenuItem
//
clientToolStripMenuItem.Name = "clientToolStripMenuItem";
clientToolStripMenuItem.Size = new Size(149, 22);
clientToolStripMenuItem.Text = "Клиенты";
clientToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
//
// shopsToolStripMenuItem
//
shopsToolStripMenuItem.Name = "shopsToolStripMenuItem";
shopsToolStripMenuItem.Size = new Size(149, 22);
shopsToolStripMenuItem.Text = "Магазины";
shopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
//
// исполнителиToolStripMenuItem1
//
исполнителиToolStripMenuItem1.Name = "исполнителиToolStripMenuItem1";
исполнителиToolStripMenuItem1.Size = new Size(149, 22);
исполнителиToolStripMenuItem1.Text = "Исполнители";
исполнителиToolStripMenuItem1.Click += ImplementersToolStripMenuItem_Click;
// //
// reportToolStripMenuItem // reportToolStripMenuItem
// //
@ -164,16 +120,9 @@
listOrderToDateToolStripMenuItem.Text = "Список заказов, сгрупированных по датам"; listOrderToDateToolStripMenuItem.Text = "Список заказов, сгрупированных по датам";
listOrderToDateToolStripMenuItem.Click += OrdersGroupedByDateToolStripMenuItem_Click; listOrderToDateToolStripMenuItem.Click += OrdersGroupedByDateToolStripMenuItem_Click;
// //
// DoWorkToolStripMenuItem
//
DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
DoWorkToolStripMenuItem.Size = new Size(92, 20);
DoWorkToolStripMenuItem.Text = "Запуск работ";
DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
//
// справочникиToolStripMenuItem // справочникиToolStripMenuItem
// //
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { БлюдаToolStripMenuItem, наборблюдToolStripMenuItem, clientToolStripMenuItem, исполнителиToolStripMenuItem }); справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { БлюдаToolStripMenuItem, наборблюдToolStripMenuItem, clientToolStripMenuItem, исполнителиToolStripMenuItem, this.shopsToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
справочникиToolStripMenuItem.Size = new Size(94, 20); справочникиToolStripMenuItem.Size = new Size(94, 20);
справочникиToolStripMenuItem.Text = "Справочники"; справочникиToolStripMenuItem.Text = "Справочники";
@ -181,58 +130,37 @@
// БлюдаToolStripMenuItem // БлюдаToolStripMenuItem
// //
БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem"; БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem";
БлюдаToolStripMenuItem.Size = new Size(149, 22); БлюдаToolStripMenuItem.Size = new Size(180, 22);
БлюдаToolStripMenuItem.Text = "Блюда"; БлюдаToolStripMenuItem.Text = "Блюда";
БлюдаToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; БлюдаToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
// //
// наборблюдToolStripMenuItem // наборблюдToolStripMenuItem
// //
наборблюдToolStripMenuItem.Name = "наборблюдToolStripMenuItem"; наборблюдToolStripMenuItem.Name = "наборблюдToolStripMenuItem";
наборблюдToolStripMenuItem.Size = new Size(149, 22); наборблюдToolStripMenuItem.Size = new Size(180, 22);
наборблюдToolStripMenuItem.Text = "Набор блюд"; наборблюдToolStripMenuItem.Text = "Набор блюд";
наборблюдToolStripMenuItem.Click += DishToolStripMenuItem_Click; наборблюдToolStripMenuItem.Click += DishToolStripMenuItem_Click;
// //
// clientToolStripMenuItem
//
clientToolStripMenuItem.Name = "clientToolStripMenuItem";
clientToolStripMenuItem.Size = new Size(180, 22);
clientToolStripMenuItem.Text = "Клиенты";
clientToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
//
// исполнителиToolStripMenuItem // исполнителиToolStripMenuItem
// //
исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
исполнителиToolStripMenuItem.Size = new Size(149, 22); исполнителиToolStripMenuItem.Size = new Size(180, 22);
исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Text = "Исполнители";
исполнителиToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click; исполнителиToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
// //
// отчётыToolStripMenuItem // DoWorkToolStripMenuItem
// //
отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, componentDishesToolStripMenuItem, ordersToolStripMenuItem }); DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; DoWorkToolStripMenuItem.Size = new Size(92, 20);
отчётыToolStripMenuItem.Size = new Size(60, 20); DoWorkToolStripMenuItem.Text = "Запуск работ";
отчётыToolStripMenuItem.Text = "Отчёты"; DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
//
// componentsToolStripMenuItem
//
componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
componentsToolStripMenuItem.Size = new Size(210, 22);
componentsToolStripMenuItem.Text = "Список Компонентов";
componentsToolStripMenuItem.Click += ToolStripMenuItem_Click;
//
// componentDishesToolStripMenuItem
//
componentDishesToolStripMenuItem.Name = "componentDishesToolStripMenuItem";
componentDishesToolStripMenuItem.Size = new Size(210, 22);
componentDishesToolStripMenuItem.Text = "Компоненты по блюдам";
componentDishesToolStripMenuItem.Click += ComponentDishesToolStripMenuItem_Click;
//
// ordersToolStripMenuItem
//
ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
ordersToolStripMenuItem.Size = new Size(210, 22);
ordersToolStripMenuItem.Text = "Список заказов";
ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
//
// письмаToolStripMenuItem
//
письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
письмаToolStripMenuItem.Size = new Size(62, 20);
письмаToolStripMenuItem.Text = "Письма";
письмаToolStripMenuItem.Click += MailsToolStripMenuItem_Click;
// //
// письмаToolStripMenuItem // письмаToolStripMenuItem
// //
@ -304,12 +232,12 @@
buttonSetToFinish.UseVisualStyleBackColor = true; buttonSetToFinish.UseVisualStyleBackColor = true;
buttonSetToFinish.Click += ButtonIssuedOrder_Click; buttonSetToFinish.Click += ButtonIssuedOrder_Click;
// //
// createBackupToolStripMenuItem // shopsToolStripMenuItem
// //
createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem"; this.shopsToolStripMenuItem.Name = "shopsToolStripMenuItem";
createBackupToolStripMenuItem.Size = new Size(97, 20); this.shopsToolStripMenuItem.Size = new Size(180, 22);
createBackupToolStripMenuItem.Text = "Создать бекап"; this.shopsToolStripMenuItem.Text = "Магазины";
createBackupToolStripMenuItem.Click += createBackupToolStripMenuItem_Click; this.shopsToolStripMenuItem.Click += this.ShopsToolStripMenuItem_Click;
// //
// FormMain // FormMain
// //
@ -342,14 +270,8 @@
private ToolStripMenuItem справочникиToolStripMenuItem; private ToolStripMenuItem справочникиToolStripMenuItem;
private ToolStripMenuItem БлюдаToolStripMenuItem; private ToolStripMenuItem БлюдаToolStripMenuItem;
private ToolStripMenuItem наборблюдToolStripMenuItem; private ToolStripMenuItem наборблюдToolStripMenuItem;
private ToolStripMenuItem отчётыToolStripMenuItem;
private ToolStripMenuItem componentsToolStripMenuItem;
private ToolStripMenuItem dishesToolStripMenuItem; private ToolStripMenuItem dishesToolStripMenuItem;
private ToolStripMenuItem componentDishesToolStripMenuItem;
private ToolStripMenuItem ordersToolStripMenuItem;
private ToolStripMenuItem guidesToolStripMenuItem; private ToolStripMenuItem guidesToolStripMenuItem;
private ToolStripMenuItem componentToolStripMenuItem;
private ToolStripMenuItem dishToolStripMenuItem;
private ToolStripMenuItem clientToolStripMenuItem; private ToolStripMenuItem clientToolStripMenuItem;
private ToolStripMenuItem shopsToolStripMenuItem; private ToolStripMenuItem shopsToolStripMenuItem;
private ToolStripMenuItem reportToolStripMenuItem; private ToolStripMenuItem reportToolStripMenuItem;
@ -363,7 +285,6 @@
private ToolStripMenuItem ClientToolStripMenuItem; private ToolStripMenuItem ClientToolStripMenuItem;
private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem;
private ToolStripMenuItem DoWorkToolStripMenuItem; private ToolStripMenuItem DoWorkToolStripMenuItem;
private ToolStripMenuItem исполнителиToolStripMenuItem1;
private Button buttonSetToFinish; private Button buttonSetToFinish;
private ToolStripMenuItem письмаToolStripMenuItem; private ToolStripMenuItem письмаToolStripMenuItem;
private ToolStripMenuItem createBackupToolStripMenuItem; private ToolStripMenuItem createBackupToolStripMenuItem;

31
FoodOrders/FoodOrders/FormShops.cs
View File

@ -1,5 +1,6 @@
using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.BindingModels;
using FoodOrdersContracts.BusinessLogicsContracts; using FoodOrdersContracts.BusinessLogicsContracts;
using FoodOrdersContracts.DI;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace FoodOrdersView namespace FoodOrdersView
{ {
@ -71,39 +72,27 @@ namespace FoodOrdersView
} }
private void ButtonAdd_Click(object sender, EventArgs e) private void ButtonAdd_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormShop)); var form = DependencyManager.Instance.Resolve<FormShop>();
if (service is FormShop form) if (form.ShowDialog() == DialogResult.OK)
{ {
if (form.ShowDialog() == DialogResult.OK) LoadData();
{
LoadData();
}
} }
} }
private void ButtonEdit_Click(object sender, EventArgs e) private void ButtonEdit_Click(object sender, EventArgs e)
{ {
if (dataGridView.SelectedRows.Count == 1) if (dataGridView.SelectedRows.Count == 1)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormShop)); var form = DependencyManager.Instance.Resolve<FormShop>();
if (service is FormShop form) form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
{ LoadData();
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
}
} }
} }
private void ButtonSellDishes_Click(object sender, EventArgs e) private void ButtonSellDishes_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormSellDishes)); var form = DependencyManager.Instance.Resolve<FormSellDishes>();
if (service is FormSellDishes form) if (form.ShowDialog() == DialogResult.OK)
{ {
if (form.ShowDialog() == DialogResult.OK) LoadData();
{
LoadData();
}
} }
} }
} }

2
FoodOrders/FoodOrdersFileImplement/Models/MessageInfo.cs
View File

@ -100,6 +100,8 @@ namespace FoodOrdersFileImplement.Models
new XAttribute("SenderName", SenderName), new XAttribute("SenderName", SenderName),
new XAttribute("DateDelivery", DateDelivery) new XAttribute("DateDelivery", DateDelivery)
); );
public int Id => throw new NotImplementedException();
} }
} }

2
FoodOrders/FoodOrdersListImplement/Models/MessageInfo.cs
View File

@ -62,6 +62,8 @@ namespace FoodOrdersListImplement.Models
SenderName = SenderName, SenderName = SenderName,
DateDelivery = DateDelivery, DateDelivery = DateDelivery,
}; };
public int Id => throw new NotImplementedException();
} }
} }

BIN
FoodOrders/ImplementationExtensions/FoodOrdersFileImplement.dll
View File

Binary file not shown.

BIN
FoodOrders/ImplementationExtensions/FoodOrdersListImplement.dll
View File

Binary file not shown.