fix 2

SoftwareInstallation/SoftwareInstallation/FormCreateOrder.Designer.cs

@@ -26,7 +26,7 @@
         /// Required method for Designer support - do not modify
         /// the contents of this method with the code editor.
         /// </summary>
-        private void InitializeSoftware()
+        private void InitializeComponent()
         {
             this.comboBoxPackage = new System.Windows.Forms.ComboBox();
             this.textBoxCount = new System.Windows.Forms.TextBox();

SoftwareInstallation/SoftwareInstallation/FormCreateOrder.cs

@@ -12,7 +12,7 @@ namespace SoftwareInstallationView
         private readonly IOrderLogic _logicO;
         public FormCreateOrder(ILogger<FormCreateOrder> logger, IPackageLogic logicP, IOrderLogic logicO)
         {
-            InitializeSoftware();
+            InitializeComponent();
             _logger = logger;
             _logicP = logicP;
             _logicO = logicO;

SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs

@@ -28,26 +28,25 @@ namespace SoftwareInstallationView
         /// Required method for Designer support - do not modify
         /// the contents of this method with the code editor.
         /// </summary>
-        private void InitializeSoftware()
+        private void InitializeComponent()
         {
             this.dataGridView = new System.Windows.Forms.DataGridView();
             this.buttonCreateOrder = new System.Windows.Forms.Button();
             this.buttonTakeOrderInWork = new System.Windows.Forms.Button();
-            this.buttonOrderReady = new System.Windows.Forms.Button();
             this.buttonIssuedOrder = new System.Windows.Forms.Button();
             this.buttonRef = new System.Windows.Forms.Button();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.guideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.packageToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.storageToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
             this.clientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.implementerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.storageToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.packagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.packageSoftwaresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.startWorksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-
+            this.buttonOrderReady = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -72,6 +71,13 @@ namespace SoftwareInstallationView
             this.buttonCreateOrder.UseVisualStyleBackColor = true;
             this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click);
             // 
+            // buttonTakeOrderInWork
+            // 
+            this.buttonTakeOrderInWork.Location = new System.Drawing.Point(628, 121);
+            this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
+            this.buttonTakeOrderInWork.Size = new System.Drawing.Size(75, 23);
+            this.buttonTakeOrderInWork.TabIndex = 8;
+            // 
             // buttonIssuedOrder
             // 
             this.buttonIssuedOrder.Location = new System.Drawing.Point(628, 171);
@@ -95,9 +101,9 @@ namespace SoftwareInstallationView
             // menuStrip1
             // 
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.guideToolStripMenuItem, this.reportsToolStripMenuItem,
+            this.guideToolStripMenuItem,
+            this.reportsToolStripMenuItem,
             this.startWorksToolStripMenuItem});
-            
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
             this.menuStrip1.Size = new System.Drawing.Size(803, 24);
@@ -108,11 +114,41 @@ namespace SoftwareInstallationView
             // 
             this.guideToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.packageToolStripMenuItem2,
-            this.storageToolStripMenuItem3, this.clientToolStripMenuItem, this.implementerToolStripMenuItem});
+            this.storageToolStripMenuItem3,
+            this.clientToolStripMenuItem,
+            this.implementerToolStripMenuItem});
             this.guideToolStripMenuItem.Name = "guideToolStripMenuItem";
             this.guideToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
             this.guideToolStripMenuItem.Text = "Справочники";
             // 
+            // packageToolStripMenuItem2
+            // 
+            this.packageToolStripMenuItem2.Name = "packageToolStripMenuItem2";
+            this.packageToolStripMenuItem2.Size = new System.Drawing.Size(148, 22);
+            this.packageToolStripMenuItem2.Text = "Пакеты";
+            this.packageToolStripMenuItem2.Click += new System.EventHandler(this.packageToolStripMenuItem_Click);
+            // 
+            // storageToolStripMenuItem3
+            // 
+            this.storageToolStripMenuItem3.Name = "storageToolStripMenuItem3";
+            this.storageToolStripMenuItem3.Size = new System.Drawing.Size(148, 22);
+            this.storageToolStripMenuItem3.Text = "ПО";
+            this.storageToolStripMenuItem3.Click += new System.EventHandler(this.softwareToolStripMenuItem_Click);
+            // 
+            // clientToolStripMenuItem
+            // 
+            this.clientToolStripMenuItem.Name = "clientToolStripMenuItem";
+            this.clientToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.clientToolStripMenuItem.Text = "Клиенты";
+            this.clientToolStripMenuItem.Click += new System.EventHandler(this.clientToolStripMenuItem_Click);
+            // 
+            // implementerToolStripMenuItem
+            // 
+            this.implementerToolStripMenuItem.Name = "implementerToolStripMenuItem";
+            this.implementerToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.implementerToolStripMenuItem.Text = "Исполнитель";
+            this.implementerToolStripMenuItem.Click += new System.EventHandler(this.implementerToolStripMenuItem_Click);
+            // 
             // reportsToolStripMenuItem
             // 
             this.reportsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -120,64 +156,43 @@ namespace SoftwareInstallationView
             this.packageSoftwaresToolStripMenuItem,
             this.ordersToolStripMenuItem});
             this.reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
-            this.reportsToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+            this.reportsToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
             this.reportsToolStripMenuItem.Text = "Отчеты";
             // 
-            // startWorksToolStripMenuItem
-            // 
-            this.startWorksToolStripMenuItem.Name = "startWorksToolStripMenuItem";
-            this.startWorksToolStripMenuItem.Size = new System.Drawing.Size(114, 24);
-            this.startWorksToolStripMenuItem.Text = "Запуск работ";
-            this.startWorksToolStripMenuItem.Click += new System.EventHandler(this.startWorksToolStripMenuItem_Click);
-            // 
             // packagesToolStripMenuItem
             // 
             this.packagesToolStripMenuItem.Name = "packagesToolStripMenuItem";
-            this.packagesToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+            this.packagesToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
             this.packagesToolStripMenuItem.Text = "Список пакетов";
             this.packagesToolStripMenuItem.Click += new System.EventHandler(this.packagesToolStripMenuItem_Click);
             // 
             // packageSoftwaresToolStripMenuItem
             // 
             this.packageSoftwaresToolStripMenuItem.Name = "packageSoftwaresToolStripMenuItem";
-            this.packageSoftwaresToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+            this.packageSoftwaresToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
             this.packageSoftwaresToolStripMenuItem.Text = "ПО по пакетам";
             this.packageSoftwaresToolStripMenuItem.Click += new System.EventHandler(this.packageSoftwaresToolStripMenuItem_Click);
             // 
             // ordersToolStripMenuItem
             // 
             this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
-            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+            this.ordersToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
             this.ordersToolStripMenuItem.Text = "Список заказов";
             this.ordersToolStripMenuItem.Click += new System.EventHandler(this.ordersToolStripMenuItem_Click);
             // 
-            // packageToolStripMenuItem2
+            // startWorksToolStripMenuItem
             // 
-            this.packageToolStripMenuItem2.Name = "packageToolStripMenuItem2";
-            this.packageToolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
-            this.packageToolStripMenuItem2.Text = "Пакеты";
-            this.packageToolStripMenuItem2.Click += new System.EventHandler(this.packageToolStripMenuItem_Click);
+            this.startWorksToolStripMenuItem.Name = "startWorksToolStripMenuItem";
+            this.startWorksToolStripMenuItem.Size = new System.Drawing.Size(92, 20);
+            this.startWorksToolStripMenuItem.Text = "Запуск работ";
+            this.startWorksToolStripMenuItem.Click += new System.EventHandler(this.startWorksToolStripMenuItem_Click);
             // 
-            // clientToolStripMenuItem
+            // buttonOrderReady
             // 
-            this.clientToolStripMenuItem.Name = "clientToolStripMenuItem";
-            this.clientToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.clientToolStripMenuItem.Text = "Клиенты";
-            this.clientToolStripMenuItem.Click += new System.EventHandler(this.clientToolStripMenuItem_Click);
-            // 
-            // implementerToolStripMenuItem
-            // 
-            this.implementerToolStripMenuItem.Name = "implementerToolStripMenuItem";
-            this.implementerToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.implementerToolStripMenuItem.Text = "Исполнитель";
-            this.implementerToolStripMenuItem.Click += new System.EventHandler(this.implementerToolStripMenuItem_Click);
-            // 
-            // storageToolStripMenuItem3
-            // 
-            this.storageToolStripMenuItem3.Name = "storageToolStripMenuItem3";
-            this.storageToolStripMenuItem3.Size = new System.Drawing.Size(180, 22);
-            this.storageToolStripMenuItem3.Text = "ПО";
-            this.storageToolStripMenuItem3.Click += new System.EventHandler(this.softwareToolStripMenuItem_Click);
+            this.buttonOrderReady.Location = new System.Drawing.Point(628, 76);
+            this.buttonOrderReady.Name = "buttonOrderReady";
+            this.buttonOrderReady.Size = new System.Drawing.Size(75, 23);
+            this.buttonOrderReady.TabIndex = 7;
             // 
             // FormMain
             // 
@@ -194,12 +209,13 @@ namespace SoftwareInstallationView
             this.MainMenuStrip = this.menuStrip1;
             this.Name = "FormMain";
             this.Text = "Магазин программного обеспечения";
+            this.Load += new System.EventHandler(this.FormMain_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
-            this.Load += new System.EventHandler(this.FormMain_Load);
+
         }
 
         #endregion
@@ -207,7 +223,6 @@ namespace SoftwareInstallationView
         private DataGridView dataGridView;
         private Button buttonCreateOrder;
         private Button buttonTakeOrderInWork;
-        private Button buttonOrderReady;
         private Button buttonIssuedOrder;
         private Button buttonRef;
         private MenuStrip menuStrip1;
@@ -221,5 +236,6 @@ namespace SoftwareInstallationView
         private ToolStripMenuItem ordersToolStripMenuItem;
         private ToolStripMenuItem implementerToolStripMenuItem;
         private ToolStripMenuItem startWorksToolStripMenuItem;
+        private Button buttonOrderReady;
     }
 }

SoftwareInstallation/SoftwareInstallation/FormMain.cs

@@ -22,7 +22,7 @@ namespace SoftwareInstallationView
 
         public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic , IReportLogic reportLogic)
         {
-            InitializeSoftware();
+            InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;

SoftwareInstallation/SoftwareInstallation/FormPackage.Designer.cs

@@ -26,7 +26,7 @@
         /// Required method for Designer support - do not modify
         /// the contents of this method with the code editor.
         /// </summary>
-        private void InitializeSoftware()
+        private void InitializeComponent()
         {
             this.textBoxName = new System.Windows.Forms.TextBox();
             this.textBoxPrice = new System.Windows.Forms.TextBox();

SoftwareInstallation/SoftwareInstallation/FormPackage.cs

@@ -17,7 +17,7 @@ namespace SoftwareInstallationView
 
         public FormPackage(ILogger<FormPackage> logger, IPackageLogic logic)
         {
-            InitializeSoftware();
+            InitializeComponent();
             _logger = logger;
             _logic = logic;
             _packageSoftwares = new Dictionary<int, (ISoftwareModel, int)>();

SoftwareInstallation/SoftwareInstallation/FormPackageSoftware.Designer.cs

@@ -26,7 +26,7 @@
         /// Required method for Designer support - do not modify
         /// the contents of this method with the code editor.
         /// </summary>
-        private void InitializeSoftware()
+        private void InitializeComponent()
         {
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.comboBoxSoftware = new System.Windows.Forms.ComboBox();

SoftwareInstallation/SoftwareInstallation/FormPackageSoftware.cs

@@ -46,7 +46,7 @@ namespace SoftwareInstallationView
 
         public FormPackageSoftware(ISoftwareLogic logic)
         {
-            InitializeSoftware();
+            InitializeComponent();
             _list = logic.ReadList(null);
             if (_list != null)
             {

SoftwareInstallation/SoftwareInstallation/FormPackages.Designer.cs

@@ -26,7 +26,7 @@
         /// Required method for Designer support - do not modify
         /// the contents of this method with the code editor.
         /// </summary>
-        private void InitializeSoftware()
+        private void InitializeComponent()
         {
             this.dataGridView = new System.Windows.Forms.DataGridView();
             this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn();

SoftwareInstallation/SoftwareInstallation/FormPackages.cs

@@ -11,7 +11,7 @@ namespace SoftwareInstallationView
         private readonly IPackageLogic _logic;
         public FormPackages(ILogger<FormPackages> logger, IPackageLogic logic)
         {
-            InitializeSoftware();
+            InitializeComponent();
             _logger = logger;
             _logic = logic;
             LoadData();

SoftwareInstallation/SoftwareInstallation/FormSoftware.Designer.cs

@@ -26,7 +26,7 @@
         ///  Required method for Designer support - do not modify
         ///  the contents of this method with the code editor.
         /// </summary>
-        private void InitializeSoftware()
+        private void InitializeComponent()
         {
             this.textBoxName = new System.Windows.Forms.TextBox();
             this.textBoxCost = new System.Windows.Forms.TextBox();

SoftwareInstallation/SoftwareInstallation/FormSoftware.cs

@@ -13,7 +13,7 @@ namespace SoftwareInstallation
         public int Id { set { _id = value; } }
         public FormSoftware(ILogger<FormSoftware> logger, ISoftwareLogic logic)
         {
-            InitializeSoftware();
+            InitializeComponent();
             _logger = logger;
             _logic = logic;
         }

SoftwareInstallation/SoftwareInstallation/FormSoftwares.Designer.cs

@@ -26,7 +26,7 @@
         /// Required method for Designer support - do not modify
         /// the contents of this method with the code editor.
         /// </summary>
-        private void InitializeSoftware()
+        private void InitializeComponent()
         {
             this.buttonAdd = new System.Windows.Forms.Button();
             this.buttonEdit = new System.Windows.Forms.Button();

SoftwareInstallation/SoftwareInstallation/FormSoftwares.cs

@@ -9,7 +9,7 @@ namespace SoftwareInstallationView
     {
         public FormSoftwares(ILogger<FormSoftwares> logger, ISoftwareLogic logic)
         {
-            InitializeSoftware();
+            InitializeComponent();
             _logger = logger;
             _logic = logic;
             LoadData();