Решен конфликт при удалении кнопок
This commit is contained in:
commit
05f7855a11
210
Confectionery/FormMain.Designer.cs
generated
210
Confectionery/FormMain.Designer.cs
generated
@ -1,26 +1,26 @@
|
|||||||
namespace ConfectioneryView
|
namespace ConfectioneryView
|
||||||
{
|
{
|
||||||
partial class FormMain
|
partial class FormMain
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Required designer variable.
|
/// Required designer variable.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private System.ComponentModel.IContainer components = null;
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Clean up any resources being used.
|
/// Clean up any resources being used.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
protected override void Dispose(bool disposing)
|
protected override void Dispose(bool disposing)
|
||||||
{
|
{
|
||||||
if (disposing && (components != null))
|
if (disposing && (components != null))
|
||||||
{
|
{
|
||||||
components.Dispose();
|
components.Dispose();
|
||||||
}
|
}
|
||||||
base.Dispose(disposing);
|
base.Dispose(disposing);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Windows Form Designer generated code
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Required method for Designer support - do not modify
|
/// Required method for Designer support - do not modify
|
||||||
@ -33,6 +33,8 @@
|
|||||||
pastryToolStripMenuItem = new ToolStripMenuItem();
|
pastryToolStripMenuItem = new ToolStripMenuItem();
|
||||||
componentToolStripMenuItem = new ToolStripMenuItem();
|
componentToolStripMenuItem = new ToolStripMenuItem();
|
||||||
ShopsToolStripMenuItem = new ToolStripMenuItem();
|
ShopsToolStripMenuItem = new ToolStripMenuItem();
|
||||||
|
clientsToolStripMenuItem = new ToolStripMenuItem();
|
||||||
|
ImplementersToolStripMenuItem = new ToolStripMenuItem();
|
||||||
reportsToolStripMenuItem = new ToolStripMenuItem();
|
reportsToolStripMenuItem = new ToolStripMenuItem();
|
||||||
reportShopsToolStripMenuItem = new ToolStripMenuItem();
|
reportShopsToolStripMenuItem = new ToolStripMenuItem();
|
||||||
ShopPastriesToolStripMenuItem = new ToolStripMenuItem();
|
ShopPastriesToolStripMenuItem = new ToolStripMenuItem();
|
||||||
@ -43,15 +45,11 @@
|
|||||||
mailToolStripMenuItem = new ToolStripMenuItem();
|
mailToolStripMenuItem = new ToolStripMenuItem();
|
||||||
dataGridView = new DataGridView();
|
dataGridView = new DataGridView();
|
||||||
buttonCreateOrder = new Button();
|
buttonCreateOrder = new Button();
|
||||||
buttonTakeOrderInWork = new Button();
|
|
||||||
button2 = new Button();
|
|
||||||
button3 = new Button();
|
button3 = new Button();
|
||||||
button4 = new Button();
|
button4 = new Button();
|
||||||
buttonAddPastryInShop = new Button();
|
buttonAddPastryInShop = new Button();
|
||||||
ImplementersToolStripMenuItem = new ToolStripMenuItem();
|
DoWorkToolStripMenuItem = new ToolStripMenuItem();
|
||||||
DoWorkToolStripMenuItem = new ToolStripMenuItem();
|
buttonSellPastry = new Button();
|
||||||
buttonSellPastry = new Button();
|
|
||||||
clientsToolStripMenuItem = new ToolStripMenuItem();
|
|
||||||
menuStrip1.SuspendLayout();
|
menuStrip1.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
|
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
|
||||||
SuspendLayout();
|
SuspendLayout();
|
||||||
@ -75,73 +73,94 @@
|
|||||||
// pastryToolStripMenuItem
|
// pastryToolStripMenuItem
|
||||||
//
|
//
|
||||||
pastryToolStripMenuItem.Name = "pastryToolStripMenuItem";
|
pastryToolStripMenuItem.Name = "pastryToolStripMenuItem";
|
||||||
pastryToolStripMenuItem.Size = new Size(180, 22);
|
pastryToolStripMenuItem.Size = new Size(149, 22);
|
||||||
pastryToolStripMenuItem.Text = "Изделия";
|
pastryToolStripMenuItem.Text = "Изделия";
|
||||||
pastryToolStripMenuItem.Click += PastryToolStripMenuItem_Click;
|
pastryToolStripMenuItem.Click += PastryToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// componentToolStripMenuItem
|
// componentToolStripMenuItem
|
||||||
//
|
//
|
||||||
componentToolStripMenuItem.Name = "componentToolStripMenuItem";
|
componentToolStripMenuItem.Name = "componentToolStripMenuItem";
|
||||||
componentToolStripMenuItem.Size = new Size(180, 22);
|
componentToolStripMenuItem.Size = new Size(149, 22);
|
||||||
componentToolStripMenuItem.Text = "Компоненты";
|
componentToolStripMenuItem.Text = "Компоненты";
|
||||||
componentToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
|
componentToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// ShopsToolStripMenuItem
|
// ShopsToolStripMenuItem
|
||||||
//
|
//
|
||||||
ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
|
ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
|
||||||
ShopsToolStripMenuItem.Size = new Size(145, 22);
|
ShopsToolStripMenuItem.Size = new Size(149, 22);
|
||||||
ShopsToolStripMenuItem.Text = "Магазины";
|
ShopsToolStripMenuItem.Text = "Магазины";
|
||||||
ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
|
ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// reportsToolStripMenuItem
|
// clientsToolStripMenuItem
|
||||||
//
|
//
|
||||||
reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { reportShopsToolStripMenuItem, ShopPastriesToolStripMenuItem, groupOrdersToolStripMenuItem, pastriesToolStripMenuItem, pastryComponentsToolStripMenuItem, ordersToolStripMenuItem });
|
clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
|
||||||
reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
|
clientsToolStripMenuItem.Size = new Size(149, 22);
|
||||||
|
clientsToolStripMenuItem.Text = "Клиенты";
|
||||||
|
clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// ImplementersToolStripMenuItem
|
||||||
|
//
|
||||||
|
ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
|
||||||
|
ImplementersToolStripMenuItem.Size = new Size(149, 22);
|
||||||
|
ImplementersToolStripMenuItem.Text = "Исполнители";
|
||||||
|
ImplementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// reportsToolStripMenuItem
|
||||||
|
//
|
||||||
|
reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { reportShopsToolStripMenuItem, ShopPastriesToolStripMenuItem, groupOrdersToolStripMenuItem, pastriesToolStripMenuItem, pastryComponentsToolStripMenuItem, ordersToolStripMenuItem });
|
||||||
|
reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
|
||||||
reportsToolStripMenuItem.Size = new Size(60, 20);
|
reportsToolStripMenuItem.Size = new Size(60, 20);
|
||||||
reportsToolStripMenuItem.Text = "Отчеты";
|
reportsToolStripMenuItem.Text = "Отчеты";
|
||||||
//
|
//
|
||||||
// reportShopsToolStripMenuItem
|
// reportShopsToolStripMenuItem
|
||||||
//
|
//
|
||||||
reportShopsToolStripMenuItem.Name = "reportShopsToolStripMenuItem";
|
reportShopsToolStripMenuItem.Name = "reportShopsToolStripMenuItem";
|
||||||
reportShopsToolStripMenuItem.Size = new Size(202, 22);
|
reportShopsToolStripMenuItem.Size = new Size(215, 22);
|
||||||
reportShopsToolStripMenuItem.Text = "Список магазинов";
|
reportShopsToolStripMenuItem.Text = "Список магазинов";
|
||||||
reportShopsToolStripMenuItem.Click += ReportShopsToolStripMenuItem_Click;
|
reportShopsToolStripMenuItem.Click += ReportShopsToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// ShopPastriesToolStripMenuItem
|
// ShopPastriesToolStripMenuItem
|
||||||
//
|
//
|
||||||
ShopPastriesToolStripMenuItem.Name = "ShopPastriesToolStripMenuItem";
|
ShopPastriesToolStripMenuItem.Name = "ShopPastriesToolStripMenuItem";
|
||||||
ShopPastriesToolStripMenuItem.Size = new Size(202, 22);
|
ShopPastriesToolStripMenuItem.Size = new Size(215, 22);
|
||||||
ShopPastriesToolStripMenuItem.Text = "Магазины с изделиями";
|
ShopPastriesToolStripMenuItem.Text = "Магазины с изделиями";
|
||||||
ShopPastriesToolStripMenuItem.Click += ShopPastriesToolStripMenuItem_Click;
|
ShopPastriesToolStripMenuItem.Click += ShopPastriesToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// groupOrdersToolStripMenuItem
|
// groupOrdersToolStripMenuItem
|
||||||
//
|
//
|
||||||
groupOrdersToolStripMenuItem.Name = "groupOrdersToolStripMenuItem";
|
groupOrdersToolStripMenuItem.Name = "groupOrdersToolStripMenuItem";
|
||||||
groupOrdersToolStripMenuItem.Size = new Size(215, 22);
|
groupOrdersToolStripMenuItem.Size = new Size(215, 22);
|
||||||
groupOrdersToolStripMenuItem.Text = "Список групп заказов";
|
groupOrdersToolStripMenuItem.Text = "Список групп заказов";
|
||||||
groupOrdersToolStripMenuItem.Click += GroupOrdersToolStripMenuItem_Click;
|
groupOrdersToolStripMenuItem.Click += GroupOrdersToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// pastriesToolStripMenuItem
|
// pastriesToolStripMenuItem
|
||||||
//
|
//
|
||||||
pastriesToolStripMenuItem.Name = "pastriesToolStripMenuItem";
|
pastriesToolStripMenuItem.Name = "pastriesToolStripMenuItem";
|
||||||
pastriesToolStripMenuItem.Size = new Size(215, 22);
|
pastriesToolStripMenuItem.Size = new Size(215, 22);
|
||||||
pastriesToolStripMenuItem.Text = "Список изделий";
|
pastriesToolStripMenuItem.Text = "Список изделий";
|
||||||
pastriesToolStripMenuItem.Click += PastriesToolStripMenuItem_Click;
|
pastriesToolStripMenuItem.Click += PastriesToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// pastryComponentsToolStripMenuItem
|
// pastryComponentsToolStripMenuItem
|
||||||
//
|
//
|
||||||
pastryComponentsToolStripMenuItem.Name = "pastryComponentsToolStripMenuItem";
|
pastryComponentsToolStripMenuItem.Name = "pastryComponentsToolStripMenuItem";
|
||||||
pastryComponentsToolStripMenuItem.Size = new Size(215, 22);
|
pastryComponentsToolStripMenuItem.Size = new Size(215, 22);
|
||||||
pastryComponentsToolStripMenuItem.Text = "Изделия с компонентами";
|
pastryComponentsToolStripMenuItem.Text = "Изделия с компонентами";
|
||||||
pastryComponentsToolStripMenuItem.Click += PastryComponentsToolStripMenuItem_Click;
|
pastryComponentsToolStripMenuItem.Click += PastryComponentsToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// ordersToolStripMenuItem
|
// ordersToolStripMenuItem
|
||||||
//
|
//
|
||||||
ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
|
ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
|
||||||
ordersToolStripMenuItem.Size = new Size(202, 22);
|
ordersToolStripMenuItem.Size = new Size(215, 22);
|
||||||
ordersToolStripMenuItem.Text = "Список заказов";
|
ordersToolStripMenuItem.Text = "Список заказов";
|
||||||
ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
|
ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
|
// DoWorkToolStripMenuItem
|
||||||
|
//
|
||||||
|
DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
|
||||||
|
DoWorkToolStripMenuItem.Size = new Size(92, 20);
|
||||||
|
DoWorkToolStripMenuItem.Text = "Запуск работ";
|
||||||
|
DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
// dataGridView
|
// dataGridView
|
||||||
//
|
//
|
||||||
dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
|
dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
|
||||||
@ -163,39 +182,17 @@
|
|||||||
buttonCreateOrder.UseVisualStyleBackColor = true;
|
buttonCreateOrder.UseVisualStyleBackColor = true;
|
||||||
buttonCreateOrder.Click += ButtonCreateOrder_Click;
|
buttonCreateOrder.Click += ButtonCreateOrder_Click;
|
||||||
//
|
//
|
||||||
// buttonTakeOrderInWork
|
|
||||||
//
|
|
||||||
buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
|
||||||
buttonTakeOrderInWork.Location = new Point(624, 98);
|
|
||||||
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
|
|
||||||
buttonTakeOrderInWork.Size = new Size(147, 32);
|
|
||||||
buttonTakeOrderInWork.TabIndex = 3;
|
|
||||||
buttonTakeOrderInWork.Text = "Отдать на выполнение";
|
|
||||||
buttonTakeOrderInWork.UseVisualStyleBackColor = true;
|
|
||||||
buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
|
|
||||||
//
|
|
||||||
// mailToolStripMenuItem
|
// mailToolStripMenuItem
|
||||||
//
|
//
|
||||||
mailToolStripMenuItem.Name = "mailToolStripMenuItem";
|
mailToolStripMenuItem.Name = "mailToolStripMenuItem";
|
||||||
mailToolStripMenuItem.Size = new Size(62, 20);
|
mailToolStripMenuItem.Size = new Size(62, 20);
|
||||||
mailToolStripMenuItem.Text = "Письма";
|
mailToolStripMenuItem.Text = "Письма";
|
||||||
mailToolStripMenuItem.Click += MailToolStripMenuItem_Click;
|
mailToolStripMenuItem.Click += MailToolStripMenuItem_Click;
|
||||||
//
|
|
||||||
// button2
|
|
||||||
//
|
|
||||||
button2.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
|
||||||
button2.Location = new Point(624, 157);
|
|
||||||
button2.Name = "button2";
|
|
||||||
button2.Size = new Size(147, 32);
|
|
||||||
button2.TabIndex = 4;
|
|
||||||
button2.Text = "Заказ готов";
|
|
||||||
button2.UseVisualStyleBackColor = true;
|
|
||||||
button2.Click += ButtonOrderReady_Click;
|
|
||||||
//
|
//
|
||||||
// button3
|
// button3
|
||||||
//
|
//
|
||||||
button3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
button3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
||||||
button3.Location = new Point(624, 215);
|
button3.Location = new Point(624, 95);
|
||||||
button3.Name = "button3";
|
button3.Name = "button3";
|
||||||
button3.Size = new Size(147, 32);
|
button3.Size = new Size(147, 32);
|
||||||
button3.TabIndex = 5;
|
button3.TabIndex = 5;
|
||||||
@ -206,7 +203,7 @@
|
|||||||
// button4
|
// button4
|
||||||
//
|
//
|
||||||
button4.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
button4.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
||||||
button4.Location = new Point(624, 274);
|
button4.Location = new Point(624, 154);
|
||||||
button4.Name = "button4";
|
button4.Name = "button4";
|
||||||
button4.Size = new Size(147, 32);
|
button4.Size = new Size(147, 32);
|
||||||
button4.TabIndex = 6;
|
button4.TabIndex = 6;
|
||||||
@ -224,24 +221,10 @@
|
|||||||
buttonAddPastryInShop.Text = "Пополнение магазина";
|
buttonAddPastryInShop.Text = "Пополнение магазина";
|
||||||
buttonAddPastryInShop.UseVisualStyleBackColor = true;
|
buttonAddPastryInShop.UseVisualStyleBackColor = true;
|
||||||
buttonAddPastryInShop.Click += ButtonAddPastryInShop_Click;
|
buttonAddPastryInShop.Click += ButtonAddPastryInShop_Click;
|
||||||
//
|
//
|
||||||
// ImplementersToolStripMenuItem
|
// buttonSellPastry
|
||||||
//
|
//
|
||||||
ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
|
buttonSellPastry.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
|
||||||
ImplementersToolStripMenuItem.Size = new Size(180, 22);
|
|
||||||
ImplementersToolStripMenuItem.Text = "Исполнители";
|
|
||||||
ImplementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
|
|
||||||
//
|
|
||||||
// DoWorkToolStripMenuItem
|
|
||||||
//
|
|
||||||
DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
|
|
||||||
DoWorkToolStripMenuItem.Size = new Size(92, 20);
|
|
||||||
DoWorkToolStripMenuItem.Text = "Запуск работ";
|
|
||||||
DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
|
|
||||||
//
|
|
||||||
// buttonSellPastry
|
|
||||||
//
|
|
||||||
buttonSellPastry.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
|
||||||
buttonSellPastry.Location = new Point(624, 331);
|
buttonSellPastry.Location = new Point(624, 331);
|
||||||
buttonSellPastry.Name = "buttonSellPastry";
|
buttonSellPastry.Name = "buttonSellPastry";
|
||||||
buttonSellPastry.Size = new Size(147, 31);
|
buttonSellPastry.Size = new Size(147, 31);
|
||||||
@ -250,13 +233,6 @@
|
|||||||
buttonSellPastry.UseVisualStyleBackColor = true;
|
buttonSellPastry.UseVisualStyleBackColor = true;
|
||||||
buttonSellPastry.Click += ButtonSellPastry_Click;
|
buttonSellPastry.Click += ButtonSellPastry_Click;
|
||||||
//
|
//
|
||||||
// clientsToolStripMenuItem
|
|
||||||
//
|
|
||||||
clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
|
|
||||||
clientsToolStripMenuItem.Size = new Size(180, 22);
|
|
||||||
clientsToolStripMenuItem.Text = "Клиенты";
|
|
||||||
clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
|
|
||||||
//
|
|
||||||
// FormMain
|
// FormMain
|
||||||
//
|
//
|
||||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||||
@ -266,8 +242,6 @@
|
|||||||
Controls.Add(buttonAddPastryInShop);
|
Controls.Add(buttonAddPastryInShop);
|
||||||
Controls.Add(button4);
|
Controls.Add(button4);
|
||||||
Controls.Add(button3);
|
Controls.Add(button3);
|
||||||
Controls.Add(button2);
|
|
||||||
Controls.Add(buttonTakeOrderInWork);
|
|
||||||
Controls.Add(buttonCreateOrder);
|
Controls.Add(buttonCreateOrder);
|
||||||
Controls.Add(dataGridView);
|
Controls.Add(dataGridView);
|
||||||
Controls.Add(menuStrip1);
|
Controls.Add(menuStrip1);
|
||||||
@ -282,14 +256,12 @@
|
|||||||
PerformLayout();
|
PerformLayout();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private MenuStrip menuStrip1;
|
private MenuStrip menuStrip1;
|
||||||
private ToolStripMenuItem справочникиToolStripMenuItem;
|
private ToolStripMenuItem справочникиToolStripMenuItem;
|
||||||
private DataGridView dataGridView;
|
private DataGridView dataGridView;
|
||||||
private Button buttonCreateOrder;
|
private Button buttonCreateOrder;
|
||||||
private Button buttonTakeOrderInWork;
|
|
||||||
private Button button2;
|
|
||||||
private Button button3;
|
private Button button3;
|
||||||
private Button button4;
|
private Button button4;
|
||||||
private ToolStripMenuItem pastryToolStripMenuItem;
|
private ToolStripMenuItem pastryToolStripMenuItem;
|
||||||
@ -299,10 +271,10 @@
|
|||||||
private ToolStripMenuItem ShopPastriesToolStripMenuItem;
|
private ToolStripMenuItem ShopPastriesToolStripMenuItem;
|
||||||
private ToolStripMenuItem groupOrdersToolStripMenuItem;
|
private ToolStripMenuItem groupOrdersToolStripMenuItem;
|
||||||
private ToolStripMenuItem ShopsToolStripMenuItem;
|
private ToolStripMenuItem ShopsToolStripMenuItem;
|
||||||
private ToolStripMenuItem pastriesToolStripMenuItem;
|
private ToolStripMenuItem pastriesToolStripMenuItem;
|
||||||
private ToolStripMenuItem pastryComponentsToolStripMenuItem;
|
private ToolStripMenuItem pastryComponentsToolStripMenuItem;
|
||||||
private ToolStripMenuItem ordersToolStripMenuItem;
|
private ToolStripMenuItem ordersToolStripMenuItem;
|
||||||
private ToolStripMenuItem clientsToolStripMenuItem;
|
private ToolStripMenuItem clientsToolStripMenuItem;
|
||||||
private Button buttonAddPastryInShop;
|
private Button buttonAddPastryInShop;
|
||||||
private Button buttonSellPastry;
|
private Button buttonSellPastry;
|
||||||
private ToolStripMenuItem ImplementersToolStripMenuItem;
|
private ToolStripMenuItem ImplementersToolStripMenuItem;
|
||||||
|
@ -7,260 +7,210 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace ConfectioneryView
|
namespace ConfectioneryView
|
||||||
{
|
{
|
||||||
public partial class FormMain : Form
|
public partial class FormMain : Form
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private readonly IOrderLogic _orderLogic;
|
private readonly IOrderLogic _orderLogic;
|
||||||
private readonly IReportLogic _reportLogic;
|
private readonly IReportLogic _reportLogic;
|
||||||
private readonly IWorkProcess _workProcess;
|
private readonly IWorkProcess _workProcess;
|
||||||
|
|
||||||
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
|
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_orderLogic = orderLogic;
|
_orderLogic = orderLogic;
|
||||||
_reportLogic = reportLogic;
|
_reportLogic = reportLogic;
|
||||||
_workProcess = workProcess;
|
_workProcess = workProcess;
|
||||||
}
|
}
|
||||||
private void FormMain_Load(object sender, EventArgs e)
|
private void FormMain_Load(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
LoadData();
|
LoadData();
|
||||||
}
|
}
|
||||||
private void LoadData()
|
private void LoadData()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var list = _orderLogic.ReadList(null);
|
var list = _orderLogic.ReadList(null);
|
||||||
if (list != null)
|
if (list != null)
|
||||||
{
|
{
|
||||||
dataGridView.DataSource = list;
|
dataGridView.DataSource = list;
|
||||||
dataGridView.Columns["Id"].HeaderText = "Íîìåð çàêàçà";
|
dataGridView.Columns["Id"].HeaderText = "Íîìåð çàêàçà";
|
||||||
dataGridView.Columns["PastryId"].Visible = false;
|
dataGridView.Columns["PastryId"].Visible = false;
|
||||||
dataGridView.Columns["ClientId"].Visible = false;
|
dataGridView.Columns["ClientId"].Visible = false;
|
||||||
dataGridView.Columns["ImplementerId"].Visible = false;
|
dataGridView.Columns["ImplementerId"].Visible = false;
|
||||||
dataGridView.Columns["PastryName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
dataGridView.Columns["PastryName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
||||||
dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
||||||
dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
||||||
}
|
}
|
||||||
_logger.LogInformation("Çàãðóçêà çàêàçîâ");
|
_logger.LogInformation("Çàãðóçêà çàêàçîâ");
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Îøèáêà çàãðóçêè çàêàçîâ");
|
_logger.LogError(ex, "Îøèáêà çàãðóçêè çàêàçîâ");
|
||||||
MessageBox.Show(ex.Message, "Îøèáêà", MessageBoxButtons.OK,
|
MessageBox.Show(ex.Message, "Îøèáêà", MessageBoxButtons.OK,
|
||||||
MessageBoxIcon.Error);
|
MessageBoxIcon.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void ComponentsToolStripMenuItem_Click(object sender, EventArgs
|
private void ComponentsToolStripMenuItem_Click(object sender, EventArgs
|
||||||
e)
|
e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
|
var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
|
||||||
if (service is FormComponents form)
|
if (service is FormComponents form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void PastryToolStripMenuItem_Click(object sender, EventArgs e)
|
private void PastryToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormViewPastry));
|
var service = Program.ServiceProvider?.GetService(typeof(FormViewPastry));
|
||||||
if (service is FormViewPastry form)
|
if (service is FormViewPastry form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ButtonCreateOrder_Click(object sender, EventArgs e)
|
private void ButtonCreateOrder_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
|
var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
|
||||||
if (service is FormCreateOrder form)
|
if (service is FormCreateOrder form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
LoadData();
|
LoadData();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ButtonTakeOrderInWork_Click(object sender, EventArgs e)
|
private void ButtonIssuedOrder_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (dataGridView.SelectedRows.Count == 1)
|
if (dataGridView.SelectedRows.Count == 1)
|
||||||
{
|
{
|
||||||
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
|
int id =
|
||||||
_logger.LogInformation("Çàêàç No{id}. Ìåíÿåòñÿ ñòàòóñ íà 'Â ðàáîòå'", id);
|
Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
|
||||||
try
|
_logger.LogInformation("Çàêàç No{id}. Ìåíÿåòñÿ ñòàòóñ íà 'Âûäàí'", id);
|
||||||
{
|
try
|
||||||
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id });
|
{
|
||||||
if (!operationResult)
|
var operationResult = _orderLogic.DeliveryOrder(new
|
||||||
{
|
OrderBindingModel
|
||||||
throw new Exception("Îøèáêà ïðè ñîõðàíåíèè. Äîïîëíèòåëüíàÿ èíôîðìàöèÿ â ëîãàõ.");
|
{ Id = id });
|
||||||
}
|
if (!operationResult)
|
||||||
LoadData();
|
{
|
||||||
}
|
throw new Exception("Îøèáêà ïðè ñîõðàíåíèè.Äîïîëíèòåëüíàÿ èíôîðìàöèÿ â ëîãàõ.");
|
||||||
catch (Exception ex)
|
}
|
||||||
{
|
_logger.LogInformation("Çàêàç No{id} âûäàí", id);
|
||||||
_logger.LogError(ex, "Îøèáêà ïåðåäà÷è çàêàçà â ðàáîòó");
|
LoadData();
|
||||||
MessageBox.Show(ex.Message, "Îøèáêà", MessageBoxButtons.OK,
|
}
|
||||||
MessageBoxIcon.Error);
|
catch (Exception ex)
|
||||||
}
|
{
|
||||||
}
|
_logger.LogError(ex, "Îøèáêà îòìåòêè î âûäà÷è çàêàçà");
|
||||||
}
|
MessageBox.Show(ex.Message, "Îøèáêà", MessageBoxButtons.OK,
|
||||||
private void ButtonOrderReady_Click(object sender, EventArgs e)
|
MessageBoxIcon.Error);
|
||||||
{
|
}
|
||||||
if (dataGridView.SelectedRows.Count == 1)
|
}
|
||||||
{
|
}
|
||||||
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
|
private void ButtonRef_Click(object sender, EventArgs e)
|
||||||
OrderStatus orderStatus = (OrderStatus)dataGridView.SelectedRows[0].Cells["Status"].Value;
|
{
|
||||||
_logger.LogInformation("Çàêàç No{id}. Ìåíÿåòñÿ ñòàòóñ íà 'Ãîòîâ'", id);
|
LoadData();
|
||||||
try
|
}
|
||||||
{
|
|
||||||
var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
|
|
||||||
{
|
|
||||||
Id = id,
|
|
||||||
Status = orderStatus
|
|
||||||
});
|
|
||||||
if (!operationResult)
|
|
||||||
{
|
|
||||||
throw new Exception("Îøèáêà ïðè ñîõðàíåíèè. Äîïîëíèòåëüíàÿ èíôîðìàöèÿ â ëîãàõ.");
|
|
||||||
}
|
|
||||||
LoadData();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Îøèáêà îòìåòêè î ãîòîâíîñòè çàêàçà");
|
|
||||||
MessageBox.Show(ex.Message, "Îøèáêà", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
private void ButtonIssuedOrder_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
if (dataGridView.SelectedRows.Count == 1)
|
|
||||||
{
|
|
||||||
int id =
|
|
||||||
Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
|
|
||||||
_logger.LogInformation("Çàêàç No{id}. Ìåíÿåòñÿ ñòàòóñ íà 'Âûäàí'", id);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var operationResult = _orderLogic.DeliveryOrder(new
|
|
||||||
OrderBindingModel
|
|
||||||
{ Id = id });
|
|
||||||
if (!operationResult)
|
|
||||||
{
|
|
||||||
throw new Exception("Îøèáêà ïðè ñîõðàíåíèè.Äîïîëíèòåëüíàÿ èíôîðìàöèÿ â ëîãàõ.");
|
|
||||||
}
|
|
||||||
_logger.LogInformation("Çàêàç No{id} âûäàí", id);
|
|
||||||
LoadData();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Îøèáêà îòìåòêè î âûäà÷è çàêàçà");
|
|
||||||
MessageBox.Show(ex.Message, "Îøèáêà", MessageBoxButtons.OK,
|
|
||||||
MessageBoxIcon.Error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
private void ButtonRef_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
LoadData();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ReportShopsToolStripMenuItem_Click(object sender, EventArgs e)
|
private void ReportShopsToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
|
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
|
||||||
if (dialog.ShowDialog() == DialogResult.OK)
|
if (dialog.ShowDialog() == DialogResult.OK)
|
||||||
{
|
{
|
||||||
_reportLogic.SaveShopsTableToWordFile(new ReportBindingModel { FileName = dialog.FileName });
|
_reportLogic.SaveShopsTableToWordFile(new ReportBindingModel { FileName = dialog.FileName });
|
||||||
MessageBox.Show("Âûïîëíåíî", "Óñïåõ", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
MessageBox.Show("Âûïîëíåíî", "Óñïåõ", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PastriesToolStripMenuItem_Click(object sender, EventArgs e)
|
private void PastriesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
|
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
|
||||||
if (dialog.ShowDialog() == DialogResult.OK)
|
if (dialog.ShowDialog() == DialogResult.OK)
|
||||||
{
|
{
|
||||||
_reportLogic.SavePastriesToWordFile(new ReportBindingModel { FileName = dialog.FileName });
|
_reportLogic.SavePastriesToWordFile(new ReportBindingModel { FileName = dialog.FileName });
|
||||||
MessageBox.Show("Âûïîëíåíî", "Óñïåõ", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
MessageBox.Show("Âûïîëíåíî", "Óñïåõ", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShopPastriesToolStripMenuItem_Click(object sender, EventArgs e)
|
private void ShopPastriesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormReportShopPastries));
|
var service = Program.ServiceProvider?.GetService(typeof(FormReportShopPastries));
|
||||||
if (service is FormReportShopPastries form)
|
if (service is FormReportShopPastries form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PastryComponentsToolStripMenuItem_Click(object sender, EventArgs e)
|
private void PastryComponentsToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormReportPastryComponents));
|
var service = Program.ServiceProvider?.GetService(typeof(FormReportPastryComponents));
|
||||||
if (service is FormReportPastryComponents form)
|
if (service is FormReportPastryComponents form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e)
|
private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupOrders));
|
var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupOrders));
|
||||||
if (service is FormReportGroupOrders form)
|
if (service is FormReportGroupOrders form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
|
private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
|
var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
|
||||||
if (service is FormReportOrders form)
|
if (service is FormReportOrders form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
|
private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormViewShops));
|
var service = Program.ServiceProvider?.GetService(typeof(FormViewShops));
|
||||||
if (service is FormViewShops form)
|
if (service is FormViewShops form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ButtonAddPastryInShop_Click(object sender, EventArgs e)
|
private void ButtonAddPastryInShop_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormAddPastryInShop));
|
var service = Program.ServiceProvider?.GetService(typeof(FormAddPastryInShop));
|
||||||
if (service is FormAddPastryInShop form)
|
if (service is FormAddPastryInShop form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ButtonSellPastry_Click(object sender, EventArgs e)
|
private void ButtonSellPastry_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormSellPastry));
|
var service = Program.ServiceProvider?.GetService(typeof(FormSellPastry));
|
||||||
if (service is FormSellPastry form)
|
if (service is FormSellPastry form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
|
private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormViewClients));
|
var service = Program.ServiceProvider?.GetService(typeof(FormViewClients));
|
||||||
if (service is FormViewClients form)
|
if (service is FormViewClients form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e)
|
private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormViewImplementers));
|
var service = Program.ServiceProvider?.GetService(typeof(FormViewImplementers));
|
||||||
if (service is FormViewImplementers form)
|
if (service is FormViewImplementers form)
|
||||||
{
|
{
|
||||||
form.ShowDialog();
|
form.ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DoWorkToolStripMenuItem_Click(object sender, EventArgs e)
|
private void DoWorkToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user