надеюсь это последний коммит

This commit is contained in:
Данияр Аглиуллов 2023-03-19 17:46:57 +04:00
parent 56df31e696
commit 537d5840d6
2 changed files with 53 additions and 44 deletions

View File

@ -38,25 +38,26 @@
reportsToolStripMenuItem = new ToolStripMenuItem(); reportsToolStripMenuItem = new ToolStripMenuItem();
reportShopsToolStripMenuItem = new ToolStripMenuItem(); reportShopsToolStripMenuItem = new ToolStripMenuItem();
ShopPastriesToolStripMenuItem = new ToolStripMenuItem(); ShopPastriesToolStripMenuItem = new ToolStripMenuItem();
groupOrdersToolStripMenuItem = new ToolStripMenuItem(); groupOrdersToolStripMenuItem = new ToolStripMenuItem();
pastriesToolStripMenuItem = new ToolStripMenuItem(); pastriesToolStripMenuItem = new ToolStripMenuItem();
pastryComponentsToolStripMenuItem = new ToolStripMenuItem(); pastryComponentsToolStripMenuItem = new ToolStripMenuItem();
ordersToolStripMenuItem = new ToolStripMenuItem(); ordersToolStripMenuItem = new ToolStripMenuItem();
mailToolStripMenuItem = new ToolStripMenuItem(); DoWorkToolStripMenuItem = new ToolStripMenuItem();
dataGridView = new DataGridView(); mailToolStripMenuItem = new ToolStripMenuItem();
dataGridView = new DataGridView();
buttonCreateOrder = new Button(); buttonCreateOrder = new Button();
button3 = new Button(); button3 = new Button();
button4 = new Button(); button4 = new Button();
buttonAddPastryInShop = new Button(); buttonAddPastryInShop = new Button();
DoWorkToolStripMenuItem = new ToolStripMenuItem();
buttonSellPastry = new Button(); buttonSellPastry = new Button();
createBackupToolStripMenuItem = new ToolStripMenuItem();
menuStrip1.SuspendLayout(); menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// menuStrip1 // menuStrip1
// //
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, reportsToolStripMenuItem, DoWorkToolStripMenuItem, mailToolStripMenuItem }); menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, reportsToolStripMenuItem, DoWorkToolStripMenuItem, mailToolStripMenuItem, createBackupToolStripMenuItem });
menuStrip1.Location = new Point(0, 0); menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1"; menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(783, 24); menuStrip1.Size = new Size(783, 24);
@ -161,6 +162,13 @@
DoWorkToolStripMenuItem.Text = "Запуск работ"; DoWorkToolStripMenuItem.Text = "Запуск работ";
DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click; DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
// //
// mailToolStripMenuItem
//
mailToolStripMenuItem.Name = "mailToolStripMenuItem";
mailToolStripMenuItem.Size = new Size(62, 20);
mailToolStripMenuItem.Text = "Письма";
mailToolStripMenuItem.Click += MailToolStripMenuItem_Click;
//
// dataGridView // dataGridView
// //
dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
@ -182,13 +190,6 @@
buttonCreateOrder.UseVisualStyleBackColor = true; buttonCreateOrder.UseVisualStyleBackColor = true;
buttonCreateOrder.Click += ButtonCreateOrder_Click; buttonCreateOrder.Click += ButtonCreateOrder_Click;
// //
// mailToolStripMenuItem
//
mailToolStripMenuItem.Name = "mailToolStripMenuItem";
mailToolStripMenuItem.Size = new Size(62, 20);
mailToolStripMenuItem.Text = "Письма";
mailToolStripMenuItem.Click += MailToolStripMenuItem_Click;
//
// button3 // button3
// //
button3.Anchor = AnchorStyles.Top | AnchorStyles.Right; button3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@ -233,6 +234,13 @@
buttonSellPastry.UseVisualStyleBackColor = true; buttonSellPastry.UseVisualStyleBackColor = true;
buttonSellPastry.Click += ButtonSellPastry_Click; buttonSellPastry.Click += ButtonSellPastry_Click;
// //
// createBackupToolStripMenuItem
//
createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem";
createBackupToolStripMenuItem.Size = new Size(97, 20);
createBackupToolStripMenuItem.Text = "Создать бекап";
createBackupToolStripMenuItem.Click += CreateBackupToolStripMenuItem_Click;
//
// FormMain // FormMain
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
@ -277,8 +285,9 @@
private ToolStripMenuItem clientsToolStripMenuItem; private ToolStripMenuItem clientsToolStripMenuItem;
private Button buttonAddPastryInShop; private Button buttonAddPastryInShop;
private Button buttonSellPastry; private Button buttonSellPastry;
private ToolStripMenuItem ImplementersToolStripMenuItem; private ToolStripMenuItem ImplementersToolStripMenuItem;
private ToolStripMenuItem DoWorkToolStripMenuItem; private ToolStripMenuItem DoWorkToolStripMenuItem;
private ToolStripMenuItem mailToolStripMenuItem; private ToolStripMenuItem mailToolStripMenuItem;
} private ToolStripMenuItem createBackupToolStripMenuItem;
}
} }

View File

@ -61,7 +61,7 @@ namespace ConfectioneryView
var form = DependencyManager.Instance.Resolve<FormCreateOrder>(); var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
form.ShowDialog(); form.ShowDialog();
LoadData(); LoadData();
} }
private void ButtonIssuedOrder_Click(object sender, EventArgs e) private void ButtonIssuedOrder_Click(object sender, EventArgs e)
@ -116,21 +116,21 @@ namespace ConfectioneryView
} }
} }
private void ShopPastriesToolStripMenuItem_Click(object sender, EventArgs e) private void ShopPastriesToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var form = DependencyManager.Instance.Resolve<FormReportShopPastries>(); var form = DependencyManager.Instance.Resolve<FormReportShopPastries>();
form.ShowDialog(); form.ShowDialog();
} }
private void PastryComponentsToolStripMenuItem_Click(object sender, EventArgs e) private void PastryComponentsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var form = DependencyManager.Instance.Resolve<FormReportPastryComponents>(); var form = DependencyManager.Instance.Resolve<FormReportPastryComponents>();
form.ShowDialog(); form.ShowDialog();
} }
private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e) private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var form = DependencyManager.Instance.Resolve<FormReportGroupOrders>(); var form = DependencyManager.Instance.Resolve<FormReportGroupOrders>();
form.ShowDialog(); form.ShowDialog();
} }
@ -138,28 +138,28 @@ namespace ConfectioneryView
{ {
var form = DependencyManager.Instance.Resolve<FormReportOrders>(); var form = DependencyManager.Instance.Resolve<FormReportOrders>();
form.ShowDialog(); form.ShowDialog();
} }
private void ShopsToolStripMenuItem_Click(object sender, EventArgs e) private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var form = DependencyManager.Instance.Resolve<FormViewShops>(); var form = DependencyManager.Instance.Resolve<FormViewShops>();
form.ShowDialog(); form.ShowDialog();
} }
private void ButtonAddPastryInShop_Click(object sender, EventArgs e) private void ButtonAddPastryInShop_Click(object sender, EventArgs e)
{ {
var form = DependencyManager.Instance.Resolve<FormAddPastryInShop>(); var form = DependencyManager.Instance.Resolve<FormAddPastryInShop>();
form.ShowDialog();
}
private void ButtonSellPastry_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormSellPastry>();
form.ShowDialog(); form.ShowDialog();
} }
private void ButtonSellPastry_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormSellPastry>();
form.ShowDialog();
}
private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var form = DependencyManager.Instance.Resolve<FormViewClients>(); var form = DependencyManager.Instance.Resolve<FormViewClients>();
@ -184,7 +184,7 @@ namespace ConfectioneryView
private void MailToolStripMenuItem_Click(object sender, EventArgs e) private void MailToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var form = DependencyManager.Instance.Resolve<FormViewMail>(); var form = DependencyManager.Instance.Resolve<FormViewMail>();
form.ShowDialog(); form.ShowDialog();
} }
private void CreateBackupToolStripMenuItem_Click(object sender, EventArgs e) private void CreateBackupToolStripMenuItem_Click(object sender, EventArgs e)