From 906019a63d6f5d5de2b4f725a5c0e62f1b1e02fb Mon Sep 17 00:00:00 2001 From: Zakharov_Rostislav Date: Tue, 7 May 2024 17:58:51 +0400 Subject: [PATCH 1/5] preparing for pr --- .../FormCreateOrder.Designer.cs | 51 ++++++++----------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs index 0ff4191..64c9e47 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs @@ -43,36 +43,35 @@ // labelName // labelName.AutoSize = true; - labelName.Location = new Point(25, 23); + labelName.Location = new Point(22, 17); labelName.Name = "labelName"; - labelName.Size = new Size(71, 20); + labelName.Size = new Size(56, 15); labelName.TabIndex = 0; labelName.Text = "Изделие:"; // // labelCount // labelCount.AutoSize = true; - labelCount.Location = new Point(25, 61); + labelCount.Location = new Point(22, 46); labelCount.Name = "labelCount"; - labelCount.Size = new Size(93, 20); + labelCount.Size = new Size(75, 15); labelCount.TabIndex = 1; labelCount.Text = "Количество:"; // // labelSum // labelSum.AutoSize = true; - labelSum.Location = new Point(25, 139); + labelSum.Location = new Point(22, 104); labelSum.Name = "labelSum"; - labelSum.Size = new Size(58, 20); + labelSum.Size = new Size(48, 15); labelSum.TabIndex = 2; labelSum.Text = "Сумма:"; // // TextBoxCount // - TextBoxCount.Location = new Point(143, 57); - TextBoxCount.Margin = new Padding(3, 4, 3, 4); + TextBoxCount.Location = new Point(125, 43); TextBoxCount.Name = "TextBoxCount"; - TextBoxCount.Size = new Size(244, 27); + TextBoxCount.Size = new Size(214, 23); TextBoxCount.TabIndex = 3; TextBoxCount.TextChanged += TextBoxCount_TextChanged; // @@ -80,29 +79,26 @@ // ComboBoxManufacture.DropDownStyle = ComboBoxStyle.DropDownList; ComboBoxManufacture.FormattingEnabled = true; - ComboBoxManufacture.Location = new Point(143, 19); - ComboBoxManufacture.Margin = new Padding(3, 4, 3, 4); + ComboBoxManufacture.Location = new Point(125, 14); ComboBoxManufacture.Name = "ComboBoxManufacture"; - ComboBoxManufacture.Size = new Size(244, 28); + ComboBoxManufacture.Size = new Size(214, 23); ComboBoxManufacture.TabIndex = 4; ComboBoxManufacture.SelectedIndexChanged += ComboBoxManufacture_SelectedIndexChanged; // // TextBoxSum // - TextBoxSum.Location = new Point(143, 135); - TextBoxSum.Margin = new Padding(3, 4, 3, 4); + TextBoxSum.Location = new Point(125, 101); TextBoxSum.Name = "TextBoxSum"; TextBoxSum.ReadOnly = true; - TextBoxSum.Size = new Size(244, 27); + TextBoxSum.Size = new Size(214, 23); TextBoxSum.TabIndex = 5; TextBoxSum.TextChanged += TextBoxSum_TextChanged; // // buttonCancel // - buttonCancel.Location = new Point(299, 173); - buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Location = new Point(262, 130); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(88, 32); + buttonCancel.Size = new Size(77, 24); buttonCancel.TabIndex = 6; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; @@ -110,10 +106,9 @@ // // buttonSave // - buttonSave.Location = new Point(200, 173); - buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Location = new Point(175, 130); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(93, 32); + buttonSave.Size = new Size(81, 24); buttonSave.TabIndex = 7; buttonSave.Text = "Сохранить"; buttonSave.UseVisualStyleBackColor = true; @@ -122,9 +117,9 @@ // labelClient // labelClient.AutoSize = true; - labelClient.Location = new Point(25, 100); + labelClient.Location = new Point(22, 75); labelClient.Name = "labelClient"; - labelClient.Size = new Size(61, 20); + labelClient.Size = new Size(49, 15); labelClient.TabIndex = 8; labelClient.Text = "Клиент:"; // @@ -132,17 +127,16 @@ // ComboBoxClient.DropDownStyle = ComboBoxStyle.DropDownList; ComboBoxClient.FormattingEnabled = true; - ComboBoxClient.Location = new Point(143, 96); - ComboBoxClient.Margin = new Padding(3, 4, 3, 4); + ComboBoxClient.Location = new Point(125, 72); ComboBoxClient.Name = "ComboBoxClient"; - ComboBoxClient.Size = new Size(244, 28); + ComboBoxClient.Size = new Size(214, 23); ComboBoxClient.TabIndex = 9; // // FormCreateOrder // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(399, 221); + ClientSize = new Size(349, 166); Controls.Add(ComboBoxClient); Controls.Add(labelClient); Controls.Add(buttonSave); @@ -153,7 +147,6 @@ Controls.Add(labelSum); Controls.Add(labelCount); Controls.Add(labelName); - Margin = new Padding(3, 4, 3, 4); Name = "FormCreateOrder"; StartPosition = FormStartPosition.CenterParent; Text = "Заказ"; From 611b301f3dc02ec2c4d3ce5579d8dbacaa57a7e7 Mon Sep 17 00:00:00 2001 From: Zakharov_Rostislav Date: Tue, 7 May 2024 18:02:28 +0400 Subject: [PATCH 2/5] preparing for pr p.2 --- .../FormCreateOrder.Designer.cs | 270 +++++++++--------- 1 file changed, 135 insertions(+), 135 deletions(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs index 64c9e47..16b3838 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs @@ -20,144 +20,144 @@ base.Dispose(disposing); } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - labelName = new Label(); - labelCount = new Label(); - labelSum = new Label(); - TextBoxCount = new TextBox(); - ComboBoxManufacture = new ComboBox(); - TextBoxSum = new TextBox(); - buttonCancel = new Button(); - buttonSave = new Button(); - labelClient = new Label(); - ComboBoxClient = new ComboBox(); - SuspendLayout(); - // - // labelName - // - labelName.AutoSize = true; - labelName.Location = new Point(22, 17); - labelName.Name = "labelName"; - labelName.Size = new Size(56, 15); - labelName.TabIndex = 0; - labelName.Text = "Изделие:"; - // - // labelCount - // - labelCount.AutoSize = true; - labelCount.Location = new Point(22, 46); - labelCount.Name = "labelCount"; - labelCount.Size = new Size(75, 15); - labelCount.TabIndex = 1; - labelCount.Text = "Количество:"; - // - // labelSum - // - labelSum.AutoSize = true; - labelSum.Location = new Point(22, 104); - labelSum.Name = "labelSum"; - labelSum.Size = new Size(48, 15); - labelSum.TabIndex = 2; - labelSum.Text = "Сумма:"; - // - // TextBoxCount - // - TextBoxCount.Location = new Point(125, 43); - TextBoxCount.Name = "TextBoxCount"; - TextBoxCount.Size = new Size(214, 23); - TextBoxCount.TabIndex = 3; - TextBoxCount.TextChanged += TextBoxCount_TextChanged; - // - // ComboBoxManufacture - // - ComboBoxManufacture.DropDownStyle = ComboBoxStyle.DropDownList; - ComboBoxManufacture.FormattingEnabled = true; - ComboBoxManufacture.Location = new Point(125, 14); - ComboBoxManufacture.Name = "ComboBoxManufacture"; - ComboBoxManufacture.Size = new Size(214, 23); - ComboBoxManufacture.TabIndex = 4; - ComboBoxManufacture.SelectedIndexChanged += ComboBoxManufacture_SelectedIndexChanged; - // - // TextBoxSum - // - TextBoxSum.Location = new Point(125, 101); - TextBoxSum.Name = "TextBoxSum"; - TextBoxSum.ReadOnly = true; - TextBoxSum.Size = new Size(214, 23); - TextBoxSum.TabIndex = 5; - TextBoxSum.TextChanged += TextBoxSum_TextChanged; - // - // buttonCancel - // - buttonCancel.Location = new Point(262, 130); - buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(77, 24); - buttonCancel.TabIndex = 6; - buttonCancel.Text = "Отмена"; - buttonCancel.UseVisualStyleBackColor = true; - buttonCancel.Click += CancelButton_Click; - // - // buttonSave - // - buttonSave.Location = new Point(175, 130); - buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(81, 24); - buttonSave.TabIndex = 7; - buttonSave.Text = "Сохранить"; - buttonSave.UseVisualStyleBackColor = true; - buttonSave.Click += SaveButton_Click; - // - // labelClient - // - labelClient.AutoSize = true; - labelClient.Location = new Point(22, 75); - labelClient.Name = "labelClient"; - labelClient.Size = new Size(49, 15); - labelClient.TabIndex = 8; - labelClient.Text = "Клиент:"; - // - // ComboBoxClient - // - ComboBoxClient.DropDownStyle = ComboBoxStyle.DropDownList; - ComboBoxClient.FormattingEnabled = true; - ComboBoxClient.Location = new Point(125, 72); - ComboBoxClient.Name = "ComboBoxClient"; - ComboBoxClient.Size = new Size(214, 23); - ComboBoxClient.TabIndex = 9; - // - // FormCreateOrder - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(349, 166); - Controls.Add(ComboBoxClient); - Controls.Add(labelClient); - Controls.Add(buttonSave); - Controls.Add(buttonCancel); - Controls.Add(TextBoxSum); - Controls.Add(ComboBoxManufacture); - Controls.Add(TextBoxCount); - Controls.Add(labelSum); - Controls.Add(labelCount); - Controls.Add(labelName); - Name = "FormCreateOrder"; - StartPosition = FormStartPosition.CenterParent; - Text = "Заказ"; - Load += FormCreateOrder_Load; - ResumeLayout(false); - PerformLayout(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + labelName = new Label(); + labelCount = new Label(); + labelSum = new Label(); + TextBoxCount = new TextBox(); + ComboBoxManufacture = new ComboBox(); + TextBoxSum = new TextBox(); + buttonCancel = new Button(); + buttonSave = new Button(); + labelClient = new Label(); + ComboBoxClient = new ComboBox(); + SuspendLayout(); + // + // labelName + // + labelName.AutoSize = true; + labelName.Location = new Point(22, 17); + labelName.Name = "labelName"; + labelName.Size = new Size(56, 15); + labelName.TabIndex = 0; + labelName.Text = "Изделие:"; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(22, 46); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(75, 15); + labelCount.TabIndex = 1; + labelCount.Text = "Количество:"; + // + // labelSum + // + labelSum.AutoSize = true; + labelSum.Location = new Point(22, 104); + labelSum.Name = "labelSum"; + labelSum.Size = new Size(48, 15); + labelSum.TabIndex = 2; + labelSum.Text = "Сумма:"; + // + // TextBoxCount + // + TextBoxCount.Location = new Point(125, 43); + TextBoxCount.Name = "TextBoxCount"; + TextBoxCount.Size = new Size(214, 23); + TextBoxCount.TabIndex = 3; + TextBoxCount.TextChanged += TextBoxCount_TextChanged; + // + // ComboBoxManufacture + // + ComboBoxManufacture.DropDownStyle = ComboBoxStyle.DropDownList; + ComboBoxManufacture.FormattingEnabled = true; + ComboBoxManufacture.Location = new Point(125, 14); + ComboBoxManufacture.Name = "ComboBoxManufacture"; + ComboBoxManufacture.Size = new Size(214, 23); + ComboBoxManufacture.TabIndex = 4; + ComboBoxManufacture.SelectedIndexChanged += ComboBoxManufacture_SelectedIndexChanged; + // + // TextBoxSum + // + TextBoxSum.Location = new Point(125, 101); + TextBoxSum.Name = "TextBoxSum"; + TextBoxSum.ReadOnly = true; + TextBoxSum.Size = new Size(214, 23); + TextBoxSum.TabIndex = 5; + TextBoxSum.TextChanged += TextBoxSum_TextChanged; + // + // buttonCancel + // + buttonCancel.Location = new Point(262, 130); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(77, 24); + buttonCancel.TabIndex = 6; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += CancelButton_Click; + // + // buttonSave + // + buttonSave.Location = new Point(175, 130); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(81, 24); + buttonSave.TabIndex = 7; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += SaveButton_Click; + // + // labelClient + // + labelClient.AutoSize = true; + labelClient.Location = new Point(22, 75); + labelClient.Name = "labelClient"; + labelClient.Size = new Size(49, 15); + labelClient.TabIndex = 8; + labelClient.Text = "Клиент:"; + // + // ComboBoxClient + // + ComboBoxClient.DropDownStyle = ComboBoxStyle.DropDownList; + ComboBoxClient.FormattingEnabled = true; + ComboBoxClient.Location = new Point(125, 72); + ComboBoxClient.Name = "ComboBoxClient"; + ComboBoxClient.Size = new Size(214, 23); + ComboBoxClient.TabIndex = 9; + // + // FormCreateOrder + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(349, 166); + Controls.Add(ComboBoxClient); + Controls.Add(labelClient); + Controls.Add(buttonSave); + Controls.Add(buttonCancel); + Controls.Add(TextBoxSum); + Controls.Add(ComboBoxManufacture); + Controls.Add(TextBoxCount); + Controls.Add(labelSum); + Controls.Add(labelCount); + Controls.Add(labelName); + Name = "FormCreateOrder"; + StartPosition = FormStartPosition.CenterParent; + Text = "Заказ"; + Load += FormCreateOrder_Load; + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private Label labelName; + private Label labelName; private Label labelCount; private Label labelSum; private TextBox TextBoxCount; From 821d25241c5cc5484442950a1a7de5aca2a9137e Mon Sep 17 00:00:00 2001 From: Zakharov_Rostislav Date: Tue, 7 May 2024 18:05:03 +0400 Subject: [PATCH 3/5] preparing for pr p.3 --- .../BlacksmithWorkshop/FormCreateOrder.Designer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs index 16b3838..ae847b7 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs @@ -106,9 +106,9 @@ // // buttonSave // - buttonSave.Location = new Point(175, 130); + buttonSave.Location = new Point(179, 130); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(81, 24); + buttonSave.Size = new Size(77, 24); buttonSave.TabIndex = 7; buttonSave.Text = "Сохранить"; buttonSave.UseVisualStyleBackColor = true; From 3366feb37614850e32af94f47d9322119d9745c2 Mon Sep 17 00:00:00 2001 From: Zakharov_Rostislav Date: Tue, 7 May 2024 18:09:16 +0400 Subject: [PATCH 4/5] preparing for pr p.4 --- .../BlacksmithWorkshopRestApi.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj b/BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj index d41ceab..349291b 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj +++ b/BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj @@ -21,6 +21,11 @@ + + + + + From 82c15131d08f137db12bb4dd26402542379bcf83 Mon Sep 17 00:00:00 2001 From: Zakharov_Rostislav Date: Tue, 7 May 2024 18:10:07 +0400 Subject: [PATCH 5/5] preparing for pr p.5 --- .../BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj b/BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj index 349291b..4be2400 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj +++ b/BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj @@ -25,7 +25,6 @@ -