Merge branch 'LabWork07_hard' into Lab08_hard

IceCreamShop/IceCreamShop/FormMain.Designer.cs

@@ -28,242 +28,582 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            buttonUpdate = new Button();
+            this.buttonUpdate = new System.Windows.Forms.Button();
-            buttonSetToFinish = new Button();
+            this.buttonSetToFinish = new System.Windows.Forms.Button();
-            buttonCreateOrder = new Button();
+            this.buttonCreateOrder = new System.Windows.Forms.Button();
-            dataGridView = new DataGridView();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
-            menuStrip = new MenuStrip();
+            this.menuStrip = new System.Windows.Forms.MenuStrip();
-            справочникиToolStripMenuItem = new ToolStripMenuItem();
+            this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            компонентыToolStripMenuItem = new ToolStripMenuItem();
+            this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            мороженоеToolStripMenuItem = new ToolStripMenuItem();
+            this.мороженоеToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            клиентыToolStripMenuItem = new ToolStripMenuItem();
+            this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            ImplementersToolStripMenuItem = new ToolStripMenuItem();
+            this.ImplementersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            магазиныToolStripMenuItem = new ToolStripMenuItem();
+            this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            отчетыToolStripMenuItem = new ToolStripMenuItem();
+            this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            iceCreamComponentsToolStripMenuItem = new ToolStripMenuItem();
+            this.iceCreamComponentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            iceCreamToolStripMenuItem = new ToolStripMenuItem();
+            this.iceCreamToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            ordersToolStripMenuItem = new ToolStripMenuItem();
+            this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            listShopsToolStripMenuItem = new ToolStripMenuItem();
+            this.listShopsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            shopWorkloadToolStripMenuItem = new ToolStripMenuItem();
+            this.shopWorkloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            ordersByDateToolStripMenuItem = new ToolStripMenuItem();
+            this.ordersByDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            DoWorkToolStripMenuItem = new ToolStripMenuItem();
+            this.DoWorkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            MailToolStripMenuItem = new ToolStripMenuItem();
+            this.MailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            createBackupToolStripMenuItem = new ToolStripMenuItem();
+            this.buttonSupplyShop = new System.Windows.Forms.Button();
-            buttonSupplyShop = new Button();
+            this.SellIceCreamButton = new System.Windows.Forms.Button();
-            SellIceCreamButton = new Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            this.menuStrip.SuspendLayout();
-            menuStrip.SuspendLayout();
+            this.SuspendLayout();
-            SuspendLayout();
             // 
             // buttonUpdate
             // 
-            buttonUpdate.Location = new Point(1081, 112);
+            this.buttonUpdate.Location = new System.Drawing.Point(1235, 149);
-            buttonUpdate.Margin = new Padding(3, 2, 3, 2);
+            this.buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Name = "buttonUpdate";
+            this.buttonUpdate.Size = new System.Drawing.Size(194, 49);
-            buttonUpdate.Size = new Size(170, 37);
+            this.buttonUpdate.TabIndex = 13;
-            buttonUpdate.TabIndex = 13;
+            this.buttonUpdate.Text = "Обновить";
-            buttonUpdate.Text = "Обновить";
+            this.buttonUpdate.UseVisualStyleBackColor = true;
-            buttonUpdate.UseVisualStyleBackColor = true;
+            this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click);
-            buttonUpdate.Click += buttonUpdate_Click;
             // 
             // buttonSetToFinish
             // 
-            buttonSetToFinish.Location = new Point(1081, 70);
+            this.buttonSetToFinish.Location = new System.Drawing.Point(1235, 93);
-            buttonSetToFinish.Margin = new Padding(3, 2, 3, 2);
+            this.buttonSetToFinish.Name = "buttonSetToFinish";
-            buttonSetToFinish.Name = "buttonSetToFinish";
+            this.buttonSetToFinish.Size = new System.Drawing.Size(194, 49);
-            buttonSetToFinish.Size = new Size(170, 37);
+            this.buttonSetToFinish.TabIndex = 12;
-            buttonSetToFinish.TabIndex = 12;
+            this.buttonSetToFinish.Text = "Заказ выдан";
-            buttonSetToFinish.Text = "Заказ выдан";
+            this.buttonSetToFinish.UseVisualStyleBackColor = true;
-            buttonSetToFinish.UseVisualStyleBackColor = true;
+            this.buttonSetToFinish.Click += new System.EventHandler(this.buttonSetToFinish_Click);
-            buttonSetToFinish.Click += buttonSetToFinish_Click;
             // 
             // buttonCreateOrder
             // 
-            buttonCreateOrder.Location = new Point(1081, 29);
+            this.buttonCreateOrder.Location = new System.Drawing.Point(1235, 39);
-            buttonCreateOrder.Margin = new Padding(3, 2, 3, 2);
+            this.buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonCreateOrder.Name = "buttonCreateOrder";
+            this.buttonCreateOrder.Size = new System.Drawing.Size(194, 49);
-            buttonCreateOrder.Size = new Size(170, 37);
+            this.buttonCreateOrder.TabIndex = 9;
-            buttonCreateOrder.TabIndex = 9;
+            this.buttonCreateOrder.Text = "Создать заказ";
-            buttonCreateOrder.Text = "Создать заказ";
+            this.buttonCreateOrder.UseVisualStyleBackColor = true;
-            buttonCreateOrder.UseVisualStyleBackColor = true;
+            this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click);
-            buttonCreateOrder.Click += buttonCreateOrder_Click;
             // 
             // dataGridView
             // 
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(12, 26);
+            this.dataGridView.Location = new System.Drawing.Point(14, 35);
-            dataGridView.Margin = new Padding(3, 2, 3, 2);
+            this.dataGridView.Name = "dataGridView";
-            dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 51;
-            dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
-            dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(1215, 407);
-            dataGridView.Size = new Size(1063, 305);
+            this.dataGridView.TabIndex = 8;
-            dataGridView.TabIndex = 8;
             // 
             // menuStrip
             // 
-            menuStrip.ImageScalingSize = new Size(20, 20);
+            this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, DoWorkToolStripMenuItem, MailToolStripMenuItem, createBackupToolStripMenuItem });
+            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            menuStrip.Location = new Point(0, 0);
+            this.справочникиToolStripMenuItem,
-            menuStrip.Name = "menuStrip";
+            this.отчетыToolStripMenuItem,
-            menuStrip.Padding = new Padding(5, 2, 0, 2);
+            this.DoWorkToolStripMenuItem,
-            menuStrip.Size = new Size(1261, 24);
+            this.MailToolStripMenuItem});
-            menuStrip.TabIndex = 7;
+            this.menuStrip.Location = new System.Drawing.Point(0, 0);
-            menuStrip.Text = "Справочники";
+            this.menuStrip.Name = "menuStrip";
+            this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 3, 0, 3);
+            this.menuStrip.Size = new System.Drawing.Size(1441, 30);
+            this.menuStrip.TabIndex = 7;
+            this.menuStrip.Text = "Справочники";
             // 
             // справочникиToolStripMenuItem
             // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, мороженоеToolStripMenuItem, клиентыToolStripMenuItem, ImplementersToolStripMenuItem, магазиныToolStripMenuItem });
+            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            this.компонентыToolStripMenuItem,
-            справочникиToolStripMenuItem.Size = new Size(94, 20);
+            this.мороженоеToolStripMenuItem,
-            справочникиToolStripMenuItem.Text = "Справочники";
+            this.клиентыToolStripMenuItem,
+            this.ImplementersToolStripMenuItem,
+            this.магазиныToolStripMenuItem});
+            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
+            this.справочникиToolStripMenuItem.Text = "Справочники";
             // 
             // компонентыToolStripMenuItem
             // 
-            компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+            this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            компонентыToolStripMenuItem.Size = new Size(149, 22);
+            this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            компонентыToolStripMenuItem.Text = "Компоненты";
+            this.компонентыToolStripMenuItem.Text = "Компоненты";
-            компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
+            this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
             // 
             // мороженоеToolStripMenuItem
             // 
-            мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem";
+            this.мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem";
-            мороженоеToolStripMenuItem.Size = new Size(149, 22);
+            this.мороженоеToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            мороженоеToolStripMenuItem.Text = "Мороженое";
+            this.мороженоеToolStripMenuItem.Text = "Мороженое";
-            мороженоеToolStripMenuItem.Click += мороженоеToolStripMenuItem_Click;
+            this.мороженоеToolStripMenuItem.Click += new System.EventHandler(this.мороженоеToolStripMenuItem_Click);
             // 
             // клиентыToolStripMenuItem
             // 
-            клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+            this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            клиентыToolStripMenuItem.Size = new Size(149, 22);
+            this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            клиентыToolStripMenuItem.Text = "Клиенты";
+            this.клиентыToolStripMenuItem.Text = "Клиенты";
-            клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
+            this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
             // 
             // ImplementersToolStripMenuItem
             // 
-            ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
+            this.ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
-            ImplementersToolStripMenuItem.Size = new Size(149, 22);
+            this.ImplementersToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            ImplementersToolStripMenuItem.Text = "Исполнители";
+            this.ImplementersToolStripMenuItem.Text = "Исполнители";
-            ImplementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
+            this.ImplementersToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click);
             // 
             // магазиныToolStripMenuItem
             // 
-            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            магазиныToolStripMenuItem.Size = new Size(149, 22);
+            this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-            магазиныToolStripMenuItem.Text = "Магазины";
+            this.магазиныToolStripMenuItem.Text = "Магазины";
-            магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
+            this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
             // 
             // отчетыToolStripMenuItem
             // 
-            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { iceCreamComponentsToolStripMenuItem, iceCreamToolStripMenuItem, ordersToolStripMenuItem, listShopsToolStripMenuItem, shopWorkloadToolStripMenuItem, ordersByDateToolStripMenuItem });
+            this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+            this.iceCreamComponentsToolStripMenuItem,
-            отчетыToolStripMenuItem.Size = new Size(60, 20);
+            this.iceCreamToolStripMenuItem,
-            отчетыToolStripMenuItem.Text = "Отчеты";
+            this.ordersToolStripMenuItem,
+            this.listShopsToolStripMenuItem,
+            this.shopWorkloadToolStripMenuItem,
+            this.ordersByDateToolStripMenuItem});
+            this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+            this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+            this.отчетыToolStripMenuItem.Text = "Отчеты";
             // 
             // iceCreamComponentsToolStripMenuItem
             // 
-            iceCreamComponentsToolStripMenuItem.Name = "iceCreamComponentsToolStripMenuItem";
+            this.iceCreamComponentsToolStripMenuItem.Name = "iceCreamComponentsToolStripMenuItem";
-            iceCreamComponentsToolStripMenuItem.Size = new Size(238, 22);
+            this.iceCreamComponentsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            iceCreamComponentsToolStripMenuItem.Text = "Список мороженых";
+            this.iceCreamComponentsToolStripMenuItem.Text = "Список мороженых";
-            iceCreamComponentsToolStripMenuItem.Click += IceCreamsToolStripMenuItem_Click;
             // 
             // iceCreamToolStripMenuItem
             // 
-            iceCreamToolStripMenuItem.Name = "iceCreamToolStripMenuItem";
+            this.iceCreamToolStripMenuItem.Name = "iceCreamToolStripMenuItem";
-            iceCreamToolStripMenuItem.Size = new Size(238, 22);
+            this.iceCreamToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            iceCreamToolStripMenuItem.Text = "Мороженые с компонентами";
+            this.iceCreamToolStripMenuItem.Text = "Мороженые с компонентами";
-            iceCreamToolStripMenuItem.Click += IceCreamComponentsToolStripMenuItem_Click;
             // 
             // ordersToolStripMenuItem
             // 
-            ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+            this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
-            ordersToolStripMenuItem.Size = new Size(238, 22);
+            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            ordersToolStripMenuItem.Text = "Список заказов";
+            this.ordersToolStripMenuItem.Text = "Список заказов";
-            ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
             // 
             // listShopsToolStripMenuItem
             // 
-            listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem";
+            this.listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem";
-            listShopsToolStripMenuItem.Size = new Size(238, 22);
+            this.listShopsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            listShopsToolStripMenuItem.Text = "Список магазинов";
+            this.listShopsToolStripMenuItem.Text = "Список магазинов";
-            listShopsToolStripMenuItem.Click += listShopsToolStripMenuItem_Click;
+            this.listShopsToolStripMenuItem.Click += new System.EventHandler(this.listShopsToolStripMenuItem_Click);
             // 
             // shopWorkloadToolStripMenuItem
             // 
-            shopWorkloadToolStripMenuItem.Name = "shopWorkloadToolStripMenuItem";
+            this.shopWorkloadToolStripMenuItem.Name = "shopWorkloadToolStripMenuItem";
-            shopWorkloadToolStripMenuItem.Size = new Size(238, 22);
+            this.shopWorkloadToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            shopWorkloadToolStripMenuItem.Text = "Загруженность магазинов";
+            this.shopWorkloadToolStripMenuItem.Text = "Загруженность магазинов";
-            shopWorkloadToolStripMenuItem.Click += shopWorkloadToolStripMenuItem_Click;
+            this.shopWorkloadToolStripMenuItem.Click += new System.EventHandler(this.shopWorkloadToolStripMenuItem_Click);
             // 
             // ordersByDateToolStripMenuItem
             // 
-            ordersByDateToolStripMenuItem.Name = "ordersByDateToolStripMenuItem";
+            this.ordersByDateToolStripMenuItem.Name = "ordersByDateToolStripMenuItem";
-            ordersByDateToolStripMenuItem.Size = new Size(238, 22);
+            this.ordersByDateToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
-            ordersByDateToolStripMenuItem.Text = "Заказы по дате";
+            this.ordersByDateToolStripMenuItem.Text = "Заказы по дате";
-            ordersByDateToolStripMenuItem.Click += ordersByDateToolStripMenuItem_Click;
+            this.ordersByDateToolStripMenuItem.Click += new System.EventHandler(this.ordersByDateToolStripMenuItem_Click);
             // 
             // DoWorkToolStripMenuItem
             // 
-            DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
+            this.DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
-            DoWorkToolStripMenuItem.Size = new Size(92, 20);
+            this.DoWorkToolStripMenuItem.Size = new System.Drawing.Size(114, 24);
-            DoWorkToolStripMenuItem.Text = "Запуск работ";
+            this.DoWorkToolStripMenuItem.Text = "Запуск работ";
-            DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
+            this.DoWorkToolStripMenuItem.Click += new System.EventHandler(this.DoWorkToolStripMenuItem_Click);
             // 
             // MailToolStripMenuItem
             // 
-            MailToolStripMenuItem.Name = "MailToolStripMenuItem";
+            this.MailToolStripMenuItem.Name = "MailToolStripMenuItem";
-            MailToolStripMenuItem.Size = new Size(62, 20);
+            this.MailToolStripMenuItem.Size = new System.Drawing.Size(77, 24);
-            MailToolStripMenuItem.Text = "Письма";
+            this.MailToolStripMenuItem.Text = "Письма";
-            MailToolStripMenuItem.Click += MailToolStripMenuItem_Click;
+            this.MailToolStripMenuItem.Click += new System.EventHandler(this.MailToolStripMenuItem_Click);
-            // 
-            // createBackupToolStripMenuItem
-            // 
-            createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem";
-            createBackupToolStripMenuItem.Size = new Size(97, 20);
-            createBackupToolStripMenuItem.Text = "Создать бекап";
-            createBackupToolStripMenuItem.Click += createBackupToolStripMenuItem_Click;
             // 
             // buttonSupplyShop
             // 
-            buttonSupplyShop.Location = new Point(1081, 243);
+            this.buttonSupplyShop.Location = new System.Drawing.Point(1235, 303);
-            buttonSupplyShop.Margin = new Padding(3, 2, 3, 2);
+            this.buttonSupplyShop.Name = "buttonSupplyShop";
-            buttonSupplyShop.Name = "buttonSupplyShop";
+            this.buttonSupplyShop.Size = new System.Drawing.Size(194, 49);
-            buttonSupplyShop.Size = new Size(170, 37);
+            this.buttonSupplyShop.TabIndex = 14;
-            buttonSupplyShop.TabIndex = 14;
+            this.buttonSupplyShop.Text = "Пополнение магазина";
-            buttonSupplyShop.Text = "Пополнение магазина";
+            this.buttonSupplyShop.UseVisualStyleBackColor = true;
-            buttonSupplyShop.UseVisualStyleBackColor = true;
+            this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
-            buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
             // 
             // SellIceCreamButton
             // 
-            SellIceCreamButton.Location = new Point(1081, 284);
+            this.SellIceCreamButton.Location = new System.Drawing.Point(1235, 358);
-            SellIceCreamButton.Margin = new Padding(3, 2, 3, 2);
+            this.SellIceCreamButton.Name = "SellIceCreamButton";
-            SellIceCreamButton.Name = "SellIceCreamButton";
+            this.SellIceCreamButton.Size = new System.Drawing.Size(194, 49);
-            SellIceCreamButton.Size = new Size(170, 37);
+            this.SellIceCreamButton.TabIndex = 15;
-            SellIceCreamButton.TabIndex = 15;
+            this.SellIceCreamButton.Text = "Продажа мороженого";
-            SellIceCreamButton.Text = "Продажа мороженого";
+            this.SellIceCreamButton.UseVisualStyleBackColor = true;
-            SellIceCreamButton.UseVisualStyleBackColor = true;
+            this.SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click);
-            SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click);
             // 
             // FormMain
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            ClientSize = new Size(1261, 347);
+            this.ClientSize = new System.Drawing.Size(1441, 463);
-            Controls.Add(SellIceCreamButton);
+            this.Controls.Add(this.SellIceCreamButton);
-            Controls.Add(buttonSupplyShop);
+            this.Controls.Add(this.buttonSupplyShop);
-            Controls.Add(buttonUpdate);
+            this.Controls.Add(this.buttonUpdate);
-            Controls.Add(buttonSetToFinish);
+            this.Controls.Add(this.buttonSetToFinish);
-            Controls.Add(buttonCreateOrder);
+            this.Controls.Add(this.buttonCreateOrder);
-            Controls.Add(dataGridView);
+            this.Controls.Add(this.dataGridView);
-            Controls.Add(menuStrip);
+            this.Controls.Add(this.menuStrip);
-            Name = "FormMain";
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            Text = "Магазин мороженого";
+            this.Name = "FormMain";
-            Load += FormMain_Load;
+            this.Text = "Магазин мороженого";
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            this.Load += new System.EventHandler(this.FormMain_Load);
-            menuStrip.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            menuStrip.PerformLayout();
+            this.menuStrip.ResumeLayout(false);
-            ResumeLayout(false);
+            this.menuStrip.PerformLayout();
-            PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+            this.dataGridView.RowHeadersWidth = 51;
+		#endregion
+            this.dataGridView.Size = new System.Drawing.Size(1202, 407);
+		private Button buttonUpdate;
+		private Button buttonSetToFinish;
+		private Button buttonCreateOrder;
+		private DataGridView dataGridView;
+		private MenuStrip menuStrip;
+		private ToolStripMenuItem справочникиToolStripMenuItem;
+		private ToolStripMenuItem компонентыToolStripMenuItem;
+		private ToolStripMenuItem мороженоеToolStripMenuItem;
+		private ToolStripMenuItem отчетыToolStripMenuItem;
+		private ToolStripMenuItem iceCreamComponentsToolStripMenuItem;
+		private ToolStripMenuItem iceCreamToolStripMenuItem;
+		private ToolStripMenuItem ordersToolStripMenuItem;
+		private ToolStripMenuItem клиентыToolStripMenuItem;
+		private ToolStripMenuItem ImplementersToolStripMenuItem;
+		private ToolStripMenuItem DoWorkToolStripMenuItem;
+		private ToolStripMenuItem магазиныToolStripMenuItem;
+		private ToolStripMenuItem listShopsToolStripMenuItem;
+		private ToolStripMenuItem shopWorkloadToolStripMenuItem;
+		private ToolStripMenuItem ordersByDateToolStripMenuItem;
+        private ToolStripMenuItem MailToolStripMenuItem;
+        private Button buttonSupplyShop;
+        private Button SellIceCreamButton;
+            this.магазиныToolStripMenuItem});
+}            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
+            this.справочникиToolStripMenuItem.Text = "Справочники";
+            // 
+            // компонентыToolStripMenuItem
+            // 
+            this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+            this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.компонентыToolStripMenuItem.Text = "Компоненты";
+            this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
+            // 
+            // мороженоеToolStripMenuItem
+            // 
+            this.мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem";
+            this.мороженоеToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.мороженоеToolStripMenuItem.Text = "Мороженое";
+            this.мороженоеToolStripMenuItem.Click += new System.EventHandler(this.мороженоеToolStripMenuItem_Click);
+            // 
+            // клиентыToolStripMenuItem
+            // 
+            this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+            this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.клиентыToolStripMenuItem.Text = "Клиенты";
+            this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
+            // 
+            // ImplementersToolStripMenuItem
+            // 
+            this.ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
+            this.ImplementersToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.ImplementersToolStripMenuItem.Text = "Исполнители";
+            this.ImplementersToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click);
+            // 
+            // магазиныToolStripMenuItem
+            // 
+            this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.магазиныToolStripMenuItem.Text = "Магазины";
+            this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
+            // 
+            // отчетыToolStripMenuItem
+            // 
+            this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.iceCreamComponentsToolStripMenuItem,
+            this.iceCreamToolStripMenuItem,
+            this.ordersToolStripMenuItem,
+            this.listShopsToolStripMenuItem,
+            this.shopWorkloadToolStripMenuItem,
+            this.ordersByDateToolStripMenuItem});
+            this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+            this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+            this.отчетыToolStripMenuItem.Text = "Отчеты";
+            // 
+            // iceCreamComponentsToolStripMenuItem
+            // 
+            this.iceCreamComponentsToolStripMenuItem.Name = "iceCreamComponentsToolStripMenuItem";
+            this.iceCreamComponentsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.iceCreamComponentsToolStripMenuItem.Text = "Список мороженых";
+            this.iceCreamComponentsToolStripMenuItem.Click += new System.EventHandler(this.IceCreamsToolStripMenuItem_Click);
+            // 
+            // iceCreamToolStripMenuItem
+            // 
+            this.iceCreamToolStripMenuItem.Name = "iceCreamToolStripMenuItem";
+            this.iceCreamToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.iceCreamToolStripMenuItem.Text = "Мороженые с компонентами";
+            this.iceCreamToolStripMenuItem.Click += new System.EventHandler(this.IceCreamComponentsToolStripMenuItem_Click);
+            // 
+            // ordersToolStripMenuItem
+            // 
+            this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.ordersToolStripMenuItem.Text = "Список заказов";
+            this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
+            // 
+            // listShopsToolStripMenuItem
+            // 
+            this.listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem";
+            this.listShopsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.listShopsToolStripMenuItem.Text = "Список магазинов";
+            this.listShopsToolStripMenuItem.Click += new System.EventHandler(this.listShopsToolStripMenuItem_Click);
+            // 
+            // shopWorkloadToolStripMenuItem
+            // 
+            this.shopWorkloadToolStripMenuItem.Name = "shopWorkloadToolStripMenuItem";
+            this.shopWorkloadToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.shopWorkloadToolStripMenuItem.Text = "Загруженность магазинов";
+            this.shopWorkloadToolStripMenuItem.Click += new System.EventHandler(this.shopWorkloadToolStripMenuItem_Click);
+            // 
+            // ordersByDateToolStripMenuItem
+            // 
+            this.ordersByDateToolStripMenuItem.Name = "ordersByDateToolStripMenuItem";
+            this.ordersByDateToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.ordersByDateToolStripMenuItem.Text = "Заказы по дате";
+            this.ordersByDateToolStripMenuItem.Click += new System.EventHandler(this.ordersByDateToolStripMenuItem_Click);
+            // 
+            // DoWorkToolStripMenuItem
+            // 
+            this.DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
+            this.DoWorkToolStripMenuItem.Size = new System.Drawing.Size(114, 24);
+            this.DoWorkToolStripMenuItem.Text = "Запуск работ";
+            this.DoWorkToolStripMenuItem.Click += new System.EventHandler(this.DoWorkToolStripMenuItem_Click);
+            // 
+            // buttonSupplyShop
+            // 
+            this.buttonSupplyShop.Location = new System.Drawing.Point(1231, 292);
+            this.buttonSupplyShop.Name = "buttonSupplyShop";
+            this.buttonSupplyShop.Size = new System.Drawing.Size(194, 44);
+            this.buttonSupplyShop.TabIndex = 14;
+            this.buttonSupplyShop.Text = "Пополнение магазина";
+            this.buttonSupplyShop.UseVisualStyleBackColor = true;
+            this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
+            // 
+            // SellIceCreamButton
+            // 
+            this.SellIceCreamButton.Location = new System.Drawing.Point(1231, 248);
+            this.SellIceCreamButton.Name = "SellIceCreamButton";
+            this.SellIceCreamButton.Size = new System.Drawing.Size(194, 40);
+            this.SellIceCreamButton.TabIndex = 15;
+            this.SellIceCreamButton.Text = "Продажа мороженого";
+            this.SellIceCreamButton.UseVisualStyleBackColor = true;
+            this.SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click);
+            // 
+            // FormMain
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1433, 467);
+            this.Controls.Add(this.SellIceCreamButton);
+            this.Controls.Add(this.buttonSupplyShop);
+            this.Controls.Add(this.buttonUpdate);
+            this.Controls.Add(this.buttonSetToFinish);
+            this.Controls.Add(this.buttonCreateOrder);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.menuStrip);
+            this.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.Name = "FormMain";
+            this.Text = "Магазин мороженого";
+            this.Load += new System.EventHandler(this.FormMain_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.menuStrip.ResumeLayout(false);
+            this.menuStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(1202, 407);
+            this.dataGridView.TabIndex = 8;
+            // 
+            // menuStrip
+            // 
+            this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.справочникиToolStripMenuItem,
+            this.отчетыToolStripMenuItem,
+            this.DoWorkToolStripMenuItem});
+            this.menuStrip.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip.Name = "menuStrip";
+            this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 3, 0, 3);
+            this.menuStrip.Size = new System.Drawing.Size(1433, 30);
+            this.menuStrip.TabIndex = 7;
+            this.menuStrip.Text = "Справочники";
+            // 
+            // справочникиToolStripMenuItem
+            // 
+            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.компонентыToolStripMenuItem,
+            this.мороженоеToolStripMenuItem,
+            this.клиентыToolStripMenuItem,
+            this.ImplementersToolStripMenuItem,
+            this.магазиныToolStripMenuItem});
+            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
+            this.справочникиToolStripMenuItem.Text = "Справочники";
+            // 
+            // компонентыToolStripMenuItem
+            // 
+            this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+            this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.компонентыToolStripMenuItem.Text = "Компоненты";
+            this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
+            // 
+            // мороженоеToolStripMenuItem
+            // 
+            this.мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem";
+            this.мороженоеToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.мороженоеToolStripMenuItem.Text = "Мороженое";
+            this.мороженоеToolStripMenuItem.Click += new System.EventHandler(this.мороженоеToolStripMenuItem_Click);
+            // 
+            // клиентыToolStripMenuItem
+            // 
+            this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+            this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.клиентыToolStripMenuItem.Text = "Клиенты";
+            this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
+            // 
+            // ImplementersToolStripMenuItem
+            // 
+            this.ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
+            this.ImplementersToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.ImplementersToolStripMenuItem.Text = "Исполнители";
+            this.ImplementersToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click);
+            // 
+            // магазиныToolStripMenuItem
+            // 
+            this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
+            this.магазиныToolStripMenuItem.Text = "Магазины";
+            this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
+            // 
+            // отчетыToolStripMenuItem
+            // 
+            this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.iceCreamComponentsToolStripMenuItem,
+            this.iceCreamToolStripMenuItem,
+            this.ordersToolStripMenuItem,
+            this.listShopsToolStripMenuItem,
+            this.shopWorkloadToolStripMenuItem,
+            this.ordersByDateToolStripMenuItem});
+            this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+            this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+            this.отчетыToolStripMenuItem.Text = "Отчеты";
+            // 
+            // iceCreamComponentsToolStripMenuItem
+            // 
+            this.iceCreamComponentsToolStripMenuItem.Name = "iceCreamComponentsToolStripMenuItem";
+            this.iceCreamComponentsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.iceCreamComponentsToolStripMenuItem.Text = "Список мороженых";
+            this.iceCreamComponentsToolStripMenuItem.Click += new System.EventHandler(this.IceCreamsToolStripMenuItem_Click);
+            // 
+            // iceCreamToolStripMenuItem
+            // 
+            this.iceCreamToolStripMenuItem.Name = "iceCreamToolStripMenuItem";
+            this.iceCreamToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.iceCreamToolStripMenuItem.Text = "Мороженые с компонентами";
+            this.iceCreamToolStripMenuItem.Click += new System.EventHandler(this.IceCreamComponentsToolStripMenuItem_Click);
+            // 
+            // ordersToolStripMenuItem
+            // 
+            this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.ordersToolStripMenuItem.Text = "Список заказов";
+            this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
+            // 
+            // listShopsToolStripMenuItem
+            // 
+            this.listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem";
+            this.listShopsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.listShopsToolStripMenuItem.Text = "Список магазинов";
+            this.listShopsToolStripMenuItem.Click += new System.EventHandler(this.listShopsToolStripMenuItem_Click);
+            // 
+            // shopWorkloadToolStripMenuItem
+            // 
+            this.shopWorkloadToolStripMenuItem.Name = "shopWorkloadToolStripMenuItem";
+            this.shopWorkloadToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.shopWorkloadToolStripMenuItem.Text = "Загруженность магазинов";
+            this.shopWorkloadToolStripMenuItem.Click += new System.EventHandler(this.shopWorkloadToolStripMenuItem_Click);
+            // 
+            // ordersByDateToolStripMenuItem
+            // 
+            this.ordersByDateToolStripMenuItem.Name = "ordersByDateToolStripMenuItem";
+            this.ordersByDateToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+            this.ordersByDateToolStripMenuItem.Text = "Заказы по дате";
+            this.ordersByDateToolStripMenuItem.Click += new System.EventHandler(this.ordersByDateToolStripMenuItem_Click);
+            // 
+            // DoWorkToolStripMenuItem
+            // 
+            this.DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
+            this.DoWorkToolStripMenuItem.Size = new System.Drawing.Size(114, 24);
+            this.DoWorkToolStripMenuItem.Text = "Запуск работ";
+            this.DoWorkToolStripMenuItem.Click += new System.EventHandler(this.DoWorkToolStripMenuItem_Click);
+            // 
+            // buttonSupplyShop
+            // 
+            this.buttonSupplyShop.Location = new System.Drawing.Point(1231, 292);
+            this.buttonSupplyShop.Name = "buttonSupplyShop";
+            this.buttonSupplyShop.Size = new System.Drawing.Size(194, 44);
+            this.buttonSupplyShop.TabIndex = 14;
+            this.buttonSupplyShop.Text = "Пополнение магазина";
+            this.buttonSupplyShop.UseVisualStyleBackColor = true;
+            this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
+            // 
+            // SellIceCreamButton
+            // 
+            this.SellIceCreamButton.Location = new System.Drawing.Point(1231, 248);
+            this.SellIceCreamButton.Name = "SellIceCreamButton";
+            this.SellIceCreamButton.Size = new System.Drawing.Size(194, 40);
+            this.SellIceCreamButton.TabIndex = 15;
+            this.SellIceCreamButton.Text = "Продажа мороженого";
+            this.SellIceCreamButton.UseVisualStyleBackColor = true;
+            this.SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click);
+            // 
+            // FormMain
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1433, 467);
+            this.Controls.Add(this.SellIceCreamButton);
+            this.Controls.Add(this.buttonSupplyShop);
+            this.Controls.Add(this.buttonUpdate);
+            this.Controls.Add(this.buttonSetToFinish);
+            this.Controls.Add(this.buttonCreateOrder);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.menuStrip);
+            this.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.Name = "FormMain";
+            this.Text = "Магазин мороженого";
+            this.Load += new System.EventHandler(this.FormMain_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.menuStrip.ResumeLayout(false);
+            this.menuStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
         }
 
         #endregion
@@ -284,12 +624,42 @@
 		private ToolStripMenuItem ImplementersToolStripMenuItem;
 		private ToolStripMenuItem DoWorkToolStripMenuItem;
 		private ToolStripMenuItem MailToolStripMenuItem;
-        private ToolStripMenuItem createBackupToolStripMenuItem;
+	}
+        private Button buttonUpdate;
+        private Button buttonSetToFinish;
+        private Button buttonCreateOrder;
+        private DataGridView dataGridView;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem справочникиToolStripMenuItem;
+        private ToolStripMenuItem компонентыToolStripMenuItem;
+        private ToolStripMenuItem мороженоеToolStripMenuItem;
+        private ToolStripMenuItem отчетыToolStripMenuItem;
+        private ToolStripMenuItem iceCreamComponentsToolStripMenuItem;
+        private ToolStripMenuItem iceCreamToolStripMenuItem;
+        private ToolStripMenuItem ordersToolStripMenuItem;
+        private ToolStripMenuItem клиентыToolStripMenuItem;
+        private ToolStripMenuItem ImplementersToolStripMenuItem;
+        private ToolStripMenuItem DoWorkToolStripMenuItem;
         private ToolStripMenuItem магазиныToolStripMenuItem;
+        private Button buttonSupplyShop;
+        private Button SellIceCreamButton;
         private ToolStripMenuItem listShopsToolStripMenuItem;
         private ToolStripMenuItem shopWorkloadToolStripMenuItem;
         private ToolStripMenuItem ordersByDateToolStripMenuItem;
+        private ToolStripMenuItem компонентыToolStripMenuItem;
+        private ToolStripMenuItem мороженоеToolStripMenuItem;
+        private ToolStripMenuItem отчетыToolStripMenuItem;
+        private ToolStripMenuItem iceCreamComponentsToolStripMenuItem;
+        private ToolStripMenuItem iceCreamToolStripMenuItem;
+        private ToolStripMenuItem ordersToolStripMenuItem;
+        private ToolStripMenuItem клиентыToolStripMenuItem;
+        private ToolStripMenuItem ImplementersToolStripMenuItem;
+        private ToolStripMenuItem DoWorkToolStripMenuItem;
+        private ToolStripMenuItem магазиныToolStripMenuItem;
         private Button buttonSupplyShop;
         private Button SellIceCreamButton;
+        private ToolStripMenuItem listShopsToolStripMenuItem;
+        private ToolStripMenuItem shopWorkloadToolStripMenuItem;
+        private ToolStripMenuItem ordersByDateToolStripMenuItem;
     }
 }

IceCreamShop/IceCreamShop/FormMain.resx

@@ -60,4 +60,7 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>53</value>
+  </metadata>
 </root>

IceCreamShop/IceCreamShopClientApp/Controllers/HomeController.cs

@@ -152,7 +152,7 @@ namespace IceCreamShopClientApp.Controllers
 			{
 				return Redirect("~/Home/Enter");
 			}
-			return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
+			return View();
 		}
 
 		[HttpGet]

IceCreamShop/IceCreamShopClientApp/Views/Shared/_Layout.cshtml

@@ -10,6 +10,7 @@
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
 </head>
 <body>
     <header>

IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230411104402_LabWork07_mail.Designer.cs

@@ -1,298 +0,0 @@
-// <auto-generated />
-using System;
-using IceCreamShopDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace IceCreamShopDatabaseImplement.Migrations
-{
-    [DbContext(typeof(IceCreamShopDatabase))]
-    [Migration("20230411104402_LabWork07_mail")]
-    partial class LabWork07_mail
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.IceCream", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("IceCreamName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("IceCreams");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.IceCreamComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("IceCreamId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("IceCreamId");
-
-                    b.ToTable("IceCreamComponents");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Messages");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("IceCreamId")
-                        .HasColumnType("int");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("IceCreamId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.IceCreamComponent", b =>
-                {
-                    b.HasOne("IceCreamShopDatabaseImplement.Models.Component", "Component")
-                        .WithMany("IceCreamComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", "IceCream")
-                        .WithMany("Components")
-                        .HasForeignKey("IceCreamId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("IceCream");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("IceCreamShopDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Messages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("IceCreamShopDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", "IceCream")
-                        .WithMany("Orders")
-                        .HasForeignKey("IceCreamId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("IceCreamShopDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("IceCream");
-
-                    b.Navigation("Implementer");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Messages");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("IceCreamComponents");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.IceCream", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230411104402_LabWork07_mail.cs

@@ -1,48 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace IceCreamShopDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class LabWork07_mail : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Messages",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: true),
-                    SenderName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    Subject = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Body = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Messages", x => x.MessageId);
-                    table.ForeignKey(
-                        name: "FK_Messages_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Messages_ClientId",
-                table: "Messages",
-                column: "ClientId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Messages");
-        }
-    }
-}

IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230504152801_addsToMessage.Designer.cs

@@ -12,15 +12,15 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace IceCreamShopDatabaseImplement.Migrations
 {
     [DbContext(typeof(IceCreamShopDatabase))]
-    [Migration("20230425055945_lab6_migr")]
+    [Migration("20230504152801_addsToMessage")]
-    partial class lab6_migr
+    partial class addsToMessage
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("ProductVersion", "7.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -143,6 +143,42 @@ namespace IceCreamShopDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
+            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.Property<string>("MessageId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasRead")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Reply")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Messages");
+                });
+
             modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -263,6 +299,15 @@ namespace IceCreamShopDatabaseImplement.Migrations
                     b.Navigation("IceCream");
                 });
 
+            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("IceCreamShopDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Messages")
+                        .HasForeignKey("ClientId");
+
+                    b.Navigation("Client");
+                });
+
             modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("IceCreamShopDatabaseImplement.Models.Client", "Client")
@@ -316,6 +361,8 @@ namespace IceCreamShopDatabaseImplement.Migrations
 
             modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Client", b =>
                 {
+                    b.Navigation("Messages");
+
                     b.Navigation("Orders");
                 });
 

IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230504152801_addsToMessage.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace IceCreamShopDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class lab6_migr : Migration
+    public partial class addsToMessage : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -70,6 +70,29 @@ namespace IceCreamShopDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Implementers", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "Messages",
+                columns: table => new
+                {
+                    MessageId = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    ClientId = table.Column<int>(type: "int", nullable: true),
+                    SenderName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    DateDelivery = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    Subject = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Body = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    HasRead = table.Column<bool>(type: "bit", nullable: false),
+                    Reply = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Messages", x => x.MessageId);
+                    table.ForeignKey(
+                        name: "FK_Messages_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id");
+                });
+
             migrationBuilder.CreateTable(
                 name: "IceCreamComponents",
                 columns: table => new
@@ -193,6 +216,11 @@ namespace IceCreamShopDatabaseImplement.Migrations
                 table: "IceCreamComponents",
                 column: "IceCreamId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_Messages_ClientId",
+                table: "Messages",
+                column: "ClientId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_ClientId",
                 table: "Orders",
@@ -230,6 +258,9 @@ namespace IceCreamShopDatabaseImplement.Migrations
             migrationBuilder.DropTable(
                 name: "IceCreamComponents");
 
+            migrationBuilder.DropTable(
+                name: "Messages");
+
             migrationBuilder.DropTable(
                 name: "Orders");
 

IceCreamShop/IceCreamShopDatabaseImplement/Migrations/IceCreamShopDatabaseModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace IceCreamShopDatabaseImplement.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("ProductVersion", "7.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -155,6 +155,12 @@ namespace IceCreamShopDatabaseImplement.Migrations
                     b.Property<DateTime>("DateDelivery")
                         .HasColumnType("datetime2");
 
+                    b.Property<bool>("HasRead")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Reply")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("SenderName")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
@@ -320,6 +326,15 @@ namespace IceCreamShopDatabaseImplement.Migrations
                     b.Navigation("Client");
 
                     b.Navigation("IceCream");
+
+                    b.Navigation("Implementer");
+                });
+
+            modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Shop", b =>
+                {
+                    b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", null)
+                        .WithMany("Shops")
+                        .HasForeignKey("IceCreamId");
                 });
 
             modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.ShopIcecream", b =>

IceCreamShop/IceCreamShopRestApi/Controllers/ClientController.cs

@@ -16,6 +16,8 @@ namespace IceCreamShopRestApi.Controllers
 
         private readonly IMessageInfoLogic _mailLogic;
 
+        public int pageSize = 4;
+
         public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger<ClientController> logger)
         {
             _logger = logger;
@@ -70,13 +72,15 @@ namespace IceCreamShopRestApi.Controllers
         }
 
         [HttpGet]
-        public List<MessageInfoViewModel>? GetMessages(int clientId)
+        public List<MessageInfoViewModel>? GetMessages(int clientId, int page)
         {
             try
             {
                 return _mailLogic.ReadList(new MessageInfoSearchModel
                 {
-                    ClientId = clientId
+                    ClientId = clientId,
+                    Page = page,
+                    PageSize = pageSize
                 });
             }
             catch (Exception ex)