diff --git a/FoodOrders/FoodOrders/FormMain.Designer.cs b/FoodOrders/FoodOrders/FormMain.Designer.cs index bbfc31b..396b330 100644 --- a/FoodOrders/FoodOrders/FormMain.Designer.cs +++ b/FoodOrders/FoodOrders/FormMain.Designer.cs @@ -28,320 +28,264 @@ /// private void InitializeComponent() { - this.menuStrip = new System.Windows.Forms.MenuStrip(); - this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.ингредиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.сушиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.shopsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.отчётыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.списокИнгредиентовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ингредиентыПоСушиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.списокМагазиновToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.магазинССушиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.БлюдаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.наборблюдToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dishesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.componentDishesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.buttonUpdate = new System.Windows.Forms.Button(); - this.buttonSetToFinish = new System.Windows.Forms.Button(); - this.buttonSetToDone = new System.Windows.Forms.Button(); - this.buttonSetToWork = new System.Windows.Forms.Button(); - this.buttonCreateOrder = new System.Windows.Forms.Button(); - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.buttonAddDishInShop = new System.Windows.Forms.Button(); - this.menuStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); + menuStrip = new MenuStrip(); + guidesToolStripMenuItem = new ToolStripMenuItem(); + componentToolStripMenuItem = new ToolStripMenuItem(); + dishToolStripMenuItem = new ToolStripMenuItem(); + clientToolStripMenuItem = new ToolStripMenuItem(); + shopsToolStripMenuItem = new ToolStripMenuItem(); + reportToolStripMenuItem = new ToolStripMenuItem(); + listDishesToolStripMenuItem = new ToolStripMenuItem(); + componentDishToolStripMenuItem = new ToolStripMenuItem(); + listOrdersToolStripMenuItem = new ToolStripMenuItem(); + listShopsToolStripMenuItem = new ToolStripMenuItem(); + shopDishToolStripMenuItem = new ToolStripMenuItem(); + listOrderToDateToolStripMenuItem = new ToolStripMenuItem(); + dishesToolStripMenuItem = new ToolStripMenuItem(); + componentDishesToolStripMenuItem = new ToolStripMenuItem(); + ordersToolStripMenuItem = new ToolStripMenuItem(); + buttonUpdate = new Button(); + buttonSetToFinish = new Button(); + buttonSetToDone = new Button(); + buttonSetToWork = new Button(); + buttonCreateOrder = new Button(); + dataGridView = new DataGridView(); + buttonAddDishInShop = new Button(); + menuStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); // - // menuStrip + // guidesToolStripMenuItem // - this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.справочникиToolStripMenuItem, - this.toolStripMenuItem1, - this.отчётыToolStripMenuItem, - this.отчетыToolStripMenuItem}); - this.menuStrip.Location = new System.Drawing.Point(0, 0); - this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(975, 24); - this.menuStrip.TabIndex = 0; - this.menuStrip.Text = "menuStrip1"; + guidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentToolStripMenuItem, dishToolStripMenuItem, clientToolStripMenuItem, shopsToolStripMenuItem }); + guidesToolStripMenuItem.Name = "guidesToolStripMenuItem"; + guidesToolStripMenuItem.Size = new Size(94, 20); + guidesToolStripMenuItem.Text = "Справочники"; // - // справочникиToolStripMenuItem + // componentToolStripMenuItem // - this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(12, 20); + componentToolStripMenuItem.Name = "componentToolStripMenuItem"; + componentToolStripMenuItem.Size = new Size(180, 22); + componentToolStripMenuItem.Text = "Компоненты"; + componentToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // - // toolStripMenuItem1 + // dishToolStripMenuItem // - this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ингредиентыToolStripMenuItem, - this.сушиToolStripMenuItem, - this.клиентыToolStripMenuItem, - this.shopsToolStripMenuItem}); - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(94, 20); - this.toolStripMenuItem1.Text = "Справочники"; + dishToolStripMenuItem.Name = "dishToolStripMenuItem"; + dishToolStripMenuItem.Size = new Size(180, 22); + dishToolStripMenuItem.Text = "Блюда"; + dishToolStripMenuItem.Click += DishToolStripMenuItem_Click; // - // ингредиентыToolStripMenuItem + // clientToolStripMenuItem // - this.ингредиентыToolStripMenuItem.Name = "ингредиентыToolStripMenuItem"; - this.ингредиентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.ингредиентыToolStripMenuItem.Text = "Компоненты"; - this.ингредиентыToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click); - // - // сушиToolStripMenuItem - // - this.сушиToolStripMenuItem.Name = "сушиToolStripMenuItem"; - this.сушиToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.сушиToolStripMenuItem.Text = "Блюда"; - this.сушиToolStripMenuItem.Click += new System.EventHandler(this.DishToolStripMenuItem_Click); - // - // клиентыToolStripMenuItem - // - this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.клиентыToolStripMenuItem.Text = "Клиенты"; - this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.ClientToolStripMenuItem_Click); + clientToolStripMenuItem.Name = "clientToolStripMenuItem"; + clientToolStripMenuItem.Size = new Size(180, 22); + clientToolStripMenuItem.Text = "Клиенты"; + clientToolStripMenuItem.Click += ClientToolStripMenuItem_Click; // // shopsToolStripMenuItem // - this.shopsToolStripMenuItem.Name = "shopsToolStripMenuItem"; - this.shopsToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.shopsToolStripMenuItem.Text = "Магазины"; - this.shopsToolStripMenuItem.Click += new System.EventHandler(this.ShopsToolStripMenuItem_Click); + shopsToolStripMenuItem.Name = "shopsToolStripMenuItem"; + shopsToolStripMenuItem.Size = new Size(180, 22); + shopsToolStripMenuItem.Text = "Магазины"; + shopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click; // - // отчётыToolStripMenuItem + // reportToolStripMenuItem // - this.отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; - this.отчётыToolStripMenuItem.Size = new System.Drawing.Size(12, 20); + reportToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { listDishesToolStripMenuItem, componentDishToolStripMenuItem, listOrdersToolStripMenuItem, listShopsToolStripMenuItem, shopDishToolStripMenuItem, listOrderToDateToolStripMenuItem }); + reportToolStripMenuItem.Name = "reportToolStripMenuItem"; + reportToolStripMenuItem.Size = new Size(60, 20); + reportToolStripMenuItem.Text = "Отчеты"; // - // отчетыToolStripMenuItem + // listDishesToolStripMenuItem // - this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.списокИнгредиентовToolStripMenuItem, - this.ингредиентыПоСушиToolStripMenuItem, - this.списокЗаказовToolStripMenuItem, - this.списокМагазиновToolStripMenuItem, - this.магазинССушиToolStripMenuItem, - this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem}); - this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(60, 20); - this.отчетыToolStripMenuItem.Text = "Отчеты"; + listDishesToolStripMenuItem.Name = "listDishesToolStripMenuItem"; + listDishesToolStripMenuItem.Size = new Size(310, 22); + listDishesToolStripMenuItem.Text = "Список блюд"; + listDishesToolStripMenuItem.Click += ToolStripMenuItem_Click; // - // списокИнгредиентовToolStripMenuItem + // componentDishToolStripMenuItem // - this.списокИнгредиентовToolStripMenuItem.Name = "списокИнгредиентовToolStripMenuItem"; - this.списокИнгредиентовToolStripMenuItem.Size = new System.Drawing.Size(310, 22); - this.списокИнгредиентовToolStripMenuItem.Text = "Список блюд"; - this.списокИнгредиентовToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); + componentDishToolStripMenuItem.Name = "componentDishToolStripMenuItem"; + componentDishToolStripMenuItem.Size = new Size(310, 22); + componentDishToolStripMenuItem.Text = "Блюда с компонентами"; + componentDishToolStripMenuItem.Click += ComponentDishesToolStripMenuItem_Click; // - // ингредиентыПоСушиToolStripMenuItem + // listOrdersToolStripMenuItem // - this.ингредиентыПоСушиToolStripMenuItem.Name = "ингредиентыПоСушиToolStripMenuItem"; - this.ингредиентыПоСушиToolStripMenuItem.Size = new System.Drawing.Size(310, 22); - this.ингредиентыПоСушиToolStripMenuItem.Text = "Блюда с компонентами"; - this.ингредиентыПоСушиToolStripMenuItem.Click += new System.EventHandler(this.ComponentDishesToolStripMenuItem_Click); + listOrdersToolStripMenuItem.Name = "listOrdersToolStripMenuItem"; + listOrdersToolStripMenuItem.Size = new Size(310, 22); + listOrdersToolStripMenuItem.Text = "Список заказов"; + listOrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // - // списокЗаказовToolStripMenuItem + // listShopsToolStripMenuItem // - this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(310, 22); - this.списокЗаказовToolStripMenuItem.Text = "Список заказов"; - this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click); + listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem"; + listShopsToolStripMenuItem.Size = new Size(310, 22); + listShopsToolStripMenuItem.Text = "Список магазинов"; + listShopsToolStripMenuItem.Click += ShopsReportToolStripMenuItem_Click; // - // списокМагазиновToolStripMenuItem + // shopDishToolStripMenuItem // - this.списокМагазиновToolStripMenuItem.Name = "списокМагазиновToolStripMenuItem"; - this.списокМагазиновToolStripMenuItem.Size = new System.Drawing.Size(310, 22); - this.списокМагазиновToolStripMenuItem.Text = "Список магазинов"; - this.списокМагазиновToolStripMenuItem.Click += new System.EventHandler(this.ShopsReportToolStripMenuItem_Click); + shopDishToolStripMenuItem.Name = "shopDishToolStripMenuItem"; + shopDishToolStripMenuItem.Size = new Size(310, 22); + shopDishToolStripMenuItem.Text = "Магазин с блюдо"; + shopDishToolStripMenuItem.Click += ShopDishToolStripMenuItem_Click; // - // магазинССушиToolStripMenuItem + // listOrderToDateToolStripMenuItem // - this.магазинССушиToolStripMenuItem.Name = "магазинССушиToolStripMenuItem"; - this.магазинССушиToolStripMenuItem.Size = new System.Drawing.Size(310, 22); - this.магазинССушиToolStripMenuItem.Text = "Магазин с блюдо"; - this.магазинССушиToolStripMenuItem.Click += new System.EventHandler(this.ShopDishToolStripMenuItem_Click); - // - // списокЗаказовОбъединенныхПоДатамToolStripMenuItem - // - this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem.Name = "списокЗаказовОбъединенныхПоДатамToolStripMenuItem"; - this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem.Size = new System.Drawing.Size(310, 22); - this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem.Text = "Список заказов, сгрупированных по датам"; - this.списокЗаказовОбъединенныхПоДатамToolStripMenuItem.Click += new System.EventHandler(this.OrdersGroupedByDateToolStripMenuItem_Click); - // - // БлюдаToolStripMenuItem - // - this.БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem"; - this.БлюдаToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.БлюдаToolStripMenuItem.Text = "Блюда"; - this.БлюдаToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click); - // - // наборблюдToolStripMenuItem - // - this.наборблюдToolStripMenuItem.Name = "наборблюдToolStripMenuItem"; - this.наборблюдToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.наборблюдToolStripMenuItem.Text = "Набор блюд"; - this.наборблюдToolStripMenuItem.Click += new System.EventHandler(this.DishToolStripMenuItem_Click); + listOrderToDateToolStripMenuItem.Name = "listOrderToDateToolStripMenuItem"; + listOrderToDateToolStripMenuItem.Size = new Size(310, 22); + listOrderToDateToolStripMenuItem.Text = "Список заказов, сгрупированных по датам"; + listOrderToDateToolStripMenuItem.Click += OrdersGroupedByDateToolStripMenuItem_Click; // // dishesToolStripMenuItem // - this.dishesToolStripMenuItem.Name = "dishesToolStripMenuItem"; - this.dishesToolStripMenuItem.Size = new System.Drawing.Size(310, 22); - this.dishesToolStripMenuItem.Text = "Список Блюд"; - this.dishesToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); + dishesToolStripMenuItem.Name = "dishesToolStripMenuItem"; + dishesToolStripMenuItem.Size = new Size(310, 22); + dishesToolStripMenuItem.Text = "Список Блюд"; + dishesToolStripMenuItem.Click += ToolStripMenuItem_Click; // // componentDishesToolStripMenuItem // - this.componentDishesToolStripMenuItem.Name = "componentDishesToolStripMenuItem"; - this.componentDishesToolStripMenuItem.Size = new System.Drawing.Size(218, 22); - this.componentDishesToolStripMenuItem.Text = "Компоненты по изделиям"; - this.componentDishesToolStripMenuItem.Click += new System.EventHandler(this.ComponentDishesToolStripMenuItem_Click); + componentDishesToolStripMenuItem.Name = "componentDishesToolStripMenuItem"; + componentDishesToolStripMenuItem.Size = new Size(218, 22); + componentDishesToolStripMenuItem.Text = "Компоненты по изделиям"; + componentDishesToolStripMenuItem.Click += ComponentDishesToolStripMenuItem_Click; // // ordersToolStripMenuItem // - this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem"; - this.ordersToolStripMenuItem.Size = new System.Drawing.Size(310, 22); - this.ordersToolStripMenuItem.Text = "Список заказов"; - this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click); + ordersToolStripMenuItem.Name = "ordersToolStripMenuItem"; + ordersToolStripMenuItem.Size = new Size(310, 22); + ordersToolStripMenuItem.Text = "Список заказов"; + ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // // buttonUpdate // - this.buttonUpdate.Location = new System.Drawing.Point(780, 314); - this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonUpdate.Name = "buttonUpdate"; - this.buttonUpdate.Size = new System.Drawing.Size(170, 58); - this.buttonUpdate.TabIndex = 12; - this.buttonUpdate.Text = "Обновить"; - this.buttonUpdate.UseVisualStyleBackColor = true; - this.buttonUpdate.Click += new System.EventHandler(this.ButtonRef_Click); + buttonUpdate.Location = new Point(780, 314); + buttonUpdate.Margin = new Padding(3, 2, 3, 2); + buttonUpdate.Name = "buttonUpdate"; + buttonUpdate.Size = new Size(170, 58); + buttonUpdate.TabIndex = 12; + buttonUpdate.Text = "Обновить"; + buttonUpdate.UseVisualStyleBackColor = true; + buttonUpdate.Click += ButtonRef_Click; // // buttonSetToFinish // - this.buttonSetToFinish.Location = new System.Drawing.Point(780, 252); - this.buttonSetToFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonSetToFinish.Name = "buttonSetToFinish"; - this.buttonSetToFinish.Size = new System.Drawing.Size(170, 58); - this.buttonSetToFinish.TabIndex = 11; - this.buttonSetToFinish.Text = "Заказ выдан"; - this.buttonSetToFinish.UseVisualStyleBackColor = true; - this.buttonSetToFinish.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); + buttonSetToFinish.Location = new Point(780, 252); + buttonSetToFinish.Margin = new Padding(3, 2, 3, 2); + buttonSetToFinish.Name = "buttonSetToFinish"; + buttonSetToFinish.Size = new Size(170, 58); + buttonSetToFinish.TabIndex = 11; + buttonSetToFinish.Text = "Заказ выдан"; + buttonSetToFinish.UseVisualStyleBackColor = true; + buttonSetToFinish.Click += ButtonIssuedOrder_Click; // // buttonSetToDone // - this.buttonSetToDone.Location = new System.Drawing.Point(780, 190); - this.buttonSetToDone.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonSetToDone.Name = "buttonSetToDone"; - this.buttonSetToDone.Size = new System.Drawing.Size(170, 58); - this.buttonSetToDone.TabIndex = 10; - this.buttonSetToDone.Text = "Заказ готов"; - this.buttonSetToDone.UseVisualStyleBackColor = true; - this.buttonSetToDone.Click += new System.EventHandler(this.ButtonOrderReady_Click); + buttonSetToDone.Location = new Point(780, 190); + buttonSetToDone.Margin = new Padding(3, 2, 3, 2); + buttonSetToDone.Name = "buttonSetToDone"; + buttonSetToDone.Size = new Size(170, 58); + buttonSetToDone.TabIndex = 10; + buttonSetToDone.Text = "Заказ готов"; + buttonSetToDone.UseVisualStyleBackColor = true; + buttonSetToDone.Click += ButtonOrderReady_Click; // // buttonSetToWork // - this.buttonSetToWork.Location = new System.Drawing.Point(780, 128); - this.buttonSetToWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonSetToWork.Name = "buttonSetToWork"; - this.buttonSetToWork.Size = new System.Drawing.Size(170, 58); - this.buttonSetToWork.TabIndex = 9; - this.buttonSetToWork.Text = "Отдать на выполнение"; - this.buttonSetToWork.UseVisualStyleBackColor = true; - this.buttonSetToWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); + buttonSetToWork.Location = new Point(780, 128); + buttonSetToWork.Margin = new Padding(3, 2, 3, 2); + buttonSetToWork.Name = "buttonSetToWork"; + buttonSetToWork.Size = new Size(170, 58); + buttonSetToWork.TabIndex = 9; + buttonSetToWork.Text = "Отдать на выполнение"; + buttonSetToWork.UseVisualStyleBackColor = true; + buttonSetToWork.Click += ButtonTakeOrderInWork_Click; // // buttonCreateOrder // - this.buttonCreateOrder.Location = new System.Drawing.Point(780, 66); - this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonCreateOrder.Name = "buttonCreateOrder"; - this.buttonCreateOrder.Size = new System.Drawing.Size(170, 58); - this.buttonCreateOrder.TabIndex = 8; - this.buttonCreateOrder.Text = "Создать заказ"; - this.buttonCreateOrder.UseVisualStyleBackColor = true; - this.buttonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click); + buttonCreateOrder.Location = new Point(780, 66); + buttonCreateOrder.Margin = new Padding(3, 2, 3, 2); + buttonCreateOrder.Name = "buttonCreateOrder"; + buttonCreateOrder.Size = new Size(170, 58); + buttonCreateOrder.TabIndex = 8; + buttonCreateOrder.Text = "Создать заказ"; + buttonCreateOrder.UseVisualStyleBackColor = true; + buttonCreateOrder.Click += ButtonCreateOrder_Click; // // dataGridView // - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; - this.dataGridView.Location = new System.Drawing.Point(0, 24); - this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowHeadersWidth = 51; - this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(755, 426); - this.dataGridView.TabIndex = 7; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Left; + dataGridView.Location = new Point(0, 24); + dataGridView.Margin = new Padding(3, 2, 3, 2); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(755, 426); + dataGridView.TabIndex = 7; // // buttonAddDishInShop // - this.buttonAddDishInShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonAddDishInShop.Location = new System.Drawing.Point(780, 377); - this.buttonAddDishInShop.Name = "buttonAddDishInShop"; - this.buttonAddDishInShop.Size = new System.Drawing.Size(170, 61); - this.buttonAddDishInShop.TabIndex = 13; - this.buttonAddDishInShop.Text = "Пополнение магазина"; - this.buttonAddDishInShop.UseVisualStyleBackColor = true; - this.buttonAddDishInShop.Click += new System.EventHandler(this.ButtonDeliveryDish_Click); + buttonAddDishInShop.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonAddDishInShop.Location = new Point(780, 377); + buttonAddDishInShop.Name = "buttonAddDishInShop"; + buttonAddDishInShop.Size = new Size(170, 61); + buttonAddDishInShop.TabIndex = 13; + buttonAddDishInShop.Text = "Пополнение магазина"; + buttonAddDishInShop.UseVisualStyleBackColor = true; + buttonAddDishInShop.Click += ButtonDeliveryDish_Click; // // FormMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(975, 450); - this.Controls.Add(this.buttonAddDishInShop); - this.Controls.Add(this.buttonUpdate); - this.Controls.Add(this.buttonSetToFinish); - this.Controls.Add(this.buttonSetToDone); - this.Controls.Add(this.buttonSetToWork); - this.Controls.Add(this.buttonCreateOrder); - this.Controls.Add(this.dataGridView); - this.Controls.Add(this.menuStrip); - this.MainMenuStrip = this.menuStrip; - this.Name = "FormMain"; - this.Text = "Набор блюд"; - this.Load += new System.EventHandler(this.FormMain_Load); - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(975, 450); + Controls.Add(buttonAddDishInShop); + Controls.Add(buttonUpdate); + Controls.Add(buttonSetToFinish); + Controls.Add(buttonSetToDone); + Controls.Add(buttonSetToWork); + Controls.Add(buttonCreateOrder); + Controls.Add(dataGridView); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; + Name = "FormMain"; + Text = "Набор блюд"; + Load += FormMain_Load; + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion private MenuStrip menuStrip; - private ToolStripMenuItem справочникиToolStripMenuItem; - private ToolStripMenuItem БлюдаToolStripMenuItem; - private ToolStripMenuItem наборблюдToolStripMenuItem; private Button buttonUpdate; private Button buttonSetToFinish; private Button buttonSetToDone; private Button buttonSetToWork; private Button buttonCreateOrder; private DataGridView dataGridView; - private ToolStripMenuItem отчётыToolStripMenuItem; private ToolStripMenuItem dishesToolStripMenuItem; private ToolStripMenuItem componentDishesToolStripMenuItem; private ToolStripMenuItem ordersToolStripMenuItem; - private ToolStripMenuItem toolStripMenuItem1; - private ToolStripMenuItem ингредиентыToolStripMenuItem; - private ToolStripMenuItem сушиToolStripMenuItem; - private ToolStripMenuItem клиентыToolStripMenuItem; + private ToolStripMenuItem guidesToolStripMenuItem; + private ToolStripMenuItem componentToolStripMenuItem; + private ToolStripMenuItem dishToolStripMenuItem; + private ToolStripMenuItem clientToolStripMenuItem; private ToolStripMenuItem shopsToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem списокИнгредиентовToolStripMenuItem; - private ToolStripMenuItem ингредиентыПоСушиToolStripMenuItem; - private ToolStripMenuItem списокЗаказовToolStripMenuItem; - private ToolStripMenuItem списокМагазиновToolStripMenuItem; - private ToolStripMenuItem магазинССушиToolStripMenuItem; - private ToolStripMenuItem списокЗаказовОбъединенныхПоДатамToolStripMenuItem; + private ToolStripMenuItem reportToolStripMenuItem; + private ToolStripMenuItem listDishesToolStripMenuItem; + private ToolStripMenuItem componentDishToolStripMenuItem; + private ToolStripMenuItem listOrdersToolStripMenuItem; + private ToolStripMenuItem listShopsToolStripMenuItem; + private ToolStripMenuItem shopDishToolStripMenuItem; + private ToolStripMenuItem listOrderToDateToolStripMenuItem; private Button buttonAddDishInShop; } } \ No newline at end of file diff --git a/FoodOrders/FoodOrders/FormMain.cs b/FoodOrders/FoodOrders/FormMain.cs index f45c9b2..6130d9b 100644 --- a/FoodOrders/FoodOrders/FormMain.cs +++ b/FoodOrders/FoodOrders/FormMain.cs @@ -100,7 +100,7 @@ namespace FoodOrdersView _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); try { - var operationResult = _logicO.FinishOrder(new OrderBindingModel + var operationResult = _logicO.FinishOrder(new OrderBindingModel { Id = id });