From d8e8a7d2c4e32cf7d1e150207d3dfdfd9796c49b Mon Sep 17 00:00:00 2001 From: GokaPek Date: Wed, 28 Feb 2024 09:04:02 +0400 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=5F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LawFirm/LawFirmView/FormComponent.designer.cs | 116 +++---- LawFirm/LawFirmView/FormComponent.resx | 62 +++- .../LawFirmView/FormCreateOrder.designer.cs | 153 ++++----- LawFirm/LawFirmView/FormCreateOrder.resx | 62 +++- LawFirm/LawFirmView/FormDocument.cs | 6 +- LawFirm/LawFirmView/FormDocument.designer.cs | 308 +++++++++--------- LawFirm/LawFirmView/FormDocument.resx | 71 +++- .../FormDocumentComponent.designer.cs | 118 +++---- .../LawFirmView/FormDocumentComponent.resx | 62 +++- 9 files changed, 607 insertions(+), 351 deletions(-) diff --git a/LawFirm/LawFirmView/FormComponent.designer.cs b/LawFirm/LawFirmView/FormComponent.designer.cs index 2704664..b3a55fb 100644 --- a/LawFirm/LawFirmView/FormComponent.designer.cs +++ b/LawFirm/LawFirmView/FormComponent.designer.cs @@ -28,83 +28,87 @@ /// private void InitializeComponent() { - this.textBoxName = new System.Windows.Forms.TextBox(); - this.textBoxCost = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.SuspendLayout(); + textBoxName = new TextBox(); + textBoxCost = new TextBox(); + label1 = new Label(); + label2 = new Label(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); // // textBoxName // - this.textBoxName.Location = new System.Drawing.Point(72, 12); - this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(267, 23); - this.textBoxName.TabIndex = 0; + textBoxName.Location = new Point(82, 16); + textBoxName.Margin = new Padding(3, 4, 3, 4); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(305, 27); + textBoxName.TabIndex = 0; // // textBoxCost // - this.textBoxCost.Location = new System.Drawing.Point(72, 55); - this.textBoxCost.Name = "textBoxCost"; - this.textBoxCost.Size = new System.Drawing.Size(143, 23); - this.textBoxCost.TabIndex = 1; + textBoxCost.Location = new Point(82, 73); + textBoxCost.Margin = new Padding(3, 4, 3, 4); + textBoxCost.Name = "textBoxCost"; + textBoxCost.Size = new Size(163, 27); + textBoxCost.TabIndex = 1; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(2, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(62, 15); - this.label1.TabIndex = 2; - this.label1.Text = "Название:"; + label1.AutoSize = true; + label1.Location = new Point(2, 16); + label1.Name = "label1"; + label1.Size = new Size(80, 20); + label1.TabIndex = 2; + label1.Text = "Название:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 55); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(38, 15); - this.label2.TabIndex = 3; - this.label2.Text = "Цена:"; + label2.AutoSize = true; + label2.Location = new Point(14, 73); + label2.Name = "label2"; + label2.Size = new Size(48, 20); + label2.TabIndex = 3; + label2.Text = "Цена:"; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(159, 101); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(75, 23); - this.buttonSave.TabIndex = 4; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + buttonSave.Location = new Point(182, 135); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(92, 31); + buttonSave.TabIndex = 4; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(264, 101); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 5; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + buttonCancel.Location = new Point(302, 135); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(86, 31); + buttonCancel.TabIndex = 5; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // // FormComponent // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(456, 139); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonSave); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.textBoxCost); - this.Controls.Add(this.textBoxName); - this.Name = "FormComponent"; - this.Text = "Компонент"; - this.Load += new System.EventHandler(this.FormComponent_Load); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(521, 185); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(textBoxCost); + Controls.Add(textBoxName); + Margin = new Padding(3, 4, 3, 4); + Name = "FormComponent"; + Text = "Компонент"; + Load += FormComponent_Load; + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/LawFirm/LawFirmView/FormComponent.resx b/LawFirm/LawFirmView/FormComponent.resx index f298a7b..af32865 100644 --- a/LawFirm/LawFirmView/FormComponent.resx +++ b/LawFirm/LawFirmView/FormComponent.resx @@ -1,4 +1,64 @@ - + + + diff --git a/LawFirm/LawFirmView/FormCreateOrder.designer.cs b/LawFirm/LawFirmView/FormCreateOrder.designer.cs index 4145c5f..8837e68 100644 --- a/LawFirm/LawFirmView/FormCreateOrder.designer.cs +++ b/LawFirm/LawFirmView/FormCreateOrder.designer.cs @@ -28,107 +28,112 @@ /// private void InitializeComponent() { - this.comboBoxDocument = new System.Windows.Forms.ComboBox(); - this.textBoxCount = new System.Windows.Forms.TextBox(); - this.textBoxSum = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.SuspendLayout(); + comboBoxDocument = new ComboBox(); + textBoxCount = new TextBox(); + textBoxSum = new TextBox(); + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); // // comboBoxDocument // - this.comboBoxDocument.FormattingEnabled = true; - this.comboBoxDocument.Location = new System.Drawing.Point(116, 12); - this.comboBoxDocument.Name = "comboBoxDocument"; - this.comboBoxDocument.Size = new System.Drawing.Size(198, 23); - this.comboBoxDocument.TabIndex = 0; - this.comboBoxDocument.SelectedIndexChanged += new System.EventHandler(this.comboBoxDocument_SelectedIndexChanged); + comboBoxDocument.FormattingEnabled = true; + comboBoxDocument.Location = new Point(133, 16); + comboBoxDocument.Margin = new Padding(3, 4, 3, 4); + comboBoxDocument.Name = "comboBoxDocument"; + comboBoxDocument.Size = new Size(226, 28); + comboBoxDocument.TabIndex = 0; + comboBoxDocument.SelectedIndexChanged += comboBoxDocument_SelectedIndexChanged; // // textBoxCount // - this.textBoxCount.Location = new System.Drawing.Point(116, 41); - this.textBoxCount.Name = "textBoxCount"; - this.textBoxCount.Size = new System.Drawing.Size(198, 23); - this.textBoxCount.TabIndex = 1; - this.textBoxCount.TextChanged += new System.EventHandler(this.textBoxCount_TextChanged); + textBoxCount.Location = new Point(133, 55); + textBoxCount.Margin = new Padding(3, 4, 3, 4); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(226, 27); + textBoxCount.TabIndex = 1; + textBoxCount.TextChanged += textBoxCount_TextChanged; // // textBoxSum // - this.textBoxSum.Location = new System.Drawing.Point(116, 70); - this.textBoxSum.Name = "textBoxSum"; - this.textBoxSum.Size = new System.Drawing.Size(198, 23); - this.textBoxSum.TabIndex = 2; - this.textBoxSum.TextChanged += new System.EventHandler(this.textBoxSum_TextChanged); + textBoxSum.Location = new Point(133, 93); + textBoxSum.Margin = new Padding(3, 4, 3, 4); + textBoxSum.Name = "textBoxSum"; + textBoxSum.Size = new Size(226, 27); + textBoxSum.TabIndex = 2; + textBoxSum.TextChanged += textBoxSum_TextChanged; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(110, 15); - this.label1.TabIndex = 3; - this.label1.Text = "Пакет документов:"; + label1.AutoSize = true; + label1.Location = new Point(3, 16); + label1.Name = "label1"; + label1.Size = new Size(138, 20); + label1.TabIndex = 3; + label1.Text = "Пакет документов:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 44); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(75, 15); - this.label2.TabIndex = 4; - this.label2.Text = "Количество:"; + label2.AutoSize = true; + label2.Location = new Point(3, 59); + label2.Name = "label2"; + label2.Size = new Size(93, 20); + label2.TabIndex = 4; + label2.Text = "Количество:"; // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 70); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(48, 15); - this.label3.TabIndex = 5; - this.label3.Text = "Сумма:"; + label3.AutoSize = true; + label3.Location = new Point(3, 93); + label3.Name = "label3"; + label3.Size = new Size(58, 20); + label3.TabIndex = 5; + label3.Text = "Сумма:"; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(180, 122); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(75, 23); - this.buttonSave.TabIndex = 6; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + buttonSave.Location = new Point(206, 163); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(91, 31); + buttonSave.TabIndex = 6; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(282, 122); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 7; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + buttonCancel.Location = new Point(322, 163); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(86, 31); + buttonCancel.TabIndex = 7; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // // FormCreateOrder // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(445, 158); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonSave); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.textBoxSum); - this.Controls.Add(this.textBoxCount); - this.Controls.Add(this.comboBoxDocument); - this.Name = "FormCreateOrder"; - this.Text = "Заказ"; - this.Load += new System.EventHandler(this.FormCreateOrder_Load); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(509, 211); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(textBoxSum); + Controls.Add(textBoxCount); + Controls.Add(comboBoxDocument); + Margin = new Padding(3, 4, 3, 4); + Name = "FormCreateOrder"; + Text = "Заказ"; + Load += FormCreateOrder_Load; + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/LawFirm/LawFirmView/FormCreateOrder.resx b/LawFirm/LawFirmView/FormCreateOrder.resx index f298a7b..af32865 100644 --- a/LawFirm/LawFirmView/FormCreateOrder.resx +++ b/LawFirm/LawFirmView/FormCreateOrder.resx @@ -1,4 +1,64 @@ - + + + diff --git a/LawFirm/LawFirmView/FormDocument.cs b/LawFirm/LawFirmView/FormDocument.cs index 62697b2..f73ea35 100644 --- a/LawFirm/LawFirmView/FormDocument.cs +++ b/LawFirm/LawFirmView/FormDocument.cs @@ -90,7 +90,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); if (service is FormDocumentComponent form) { - if (form.ShowDialog() == DialogResult.OK) + if (form.ShowDialog() == DialogResult.OK) { if (form.ComponentModel == null) { @@ -132,7 +132,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); return; } _logger.LogInformation("Изменение компонента:{ ComponentName - { Count}", form.ComponentModel.ComponentName, form.Count); - _documentComponents[form.Id] = (form.ComponentModel,form.Count); + _documentComponents[form.Id] = (form.ComponentModel, form.Count); LoadData(); } } @@ -150,7 +150,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); try { _logger.LogInformation("Удаление компонента: { ComponentName} - { Count} ", dataGridView.SelectedRows[0].Cells[1].Value); - + _documentComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); } catch (Exception ex) diff --git a/LawFirm/LawFirmView/FormDocument.designer.cs b/LawFirm/LawFirmView/FormDocument.designer.cs index 106d77a..54caefc 100644 --- a/LawFirm/LawFirmView/FormDocument.designer.cs +++ b/LawFirm/LawFirmView/FormDocument.designer.cs @@ -28,181 +28,193 @@ /// private void InitializeComponent() { - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.buttonAdd = new System.Windows.Forms.Button(); - this.buttonUpd = new System.Windows.Forms.Button(); - this.buttonDel = new System.Windows.Forms.Button(); - this.buttonRef = new System.Windows.Forms.Button(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.textBoxName = new System.Windows.Forms.TextBox(); - this.textBoxPrice = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); + groupBox1 = new GroupBox(); + buttonRef = new Button(); + buttonDel = new Button(); + buttonUpd = new Button(); + buttonAdd = new Button(); + dataGridView = new DataGridView(); + Column1 = new DataGridViewTextBoxColumn(); + Column2 = new DataGridViewTextBoxColumn(); + Column3 = new DataGridViewTextBoxColumn(); + buttonSave = new Button(); + buttonCancel = new Button(); + textBoxName = new TextBox(); + textBoxPrice = new TextBox(); + label1 = new Label(); + label2 = new Label(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); // // groupBox1 // - this.groupBox1.Controls.Add(this.buttonRef); - this.groupBox1.Controls.Add(this.buttonDel); - this.groupBox1.Controls.Add(this.buttonUpd); - this.groupBox1.Controls.Add(this.buttonAdd); - this.groupBox1.Controls.Add(this.dataGridView); - this.groupBox1.Location = new System.Drawing.Point(58, 98); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(605, 288); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Компоненты"; - // - // dataGridView - // - this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column1, - this.Column2, - this.Column3}); - this.dataGridView.Location = new System.Drawing.Point(3, 19); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(413, 254); - this.dataGridView.TabIndex = 0; - // - // Column1 - // - this.Column1.HeaderText = "id"; - this.Column1.Name = "Column1"; - this.Column1.Visible = false; - // - // Column2 - // - this.Column2.HeaderText = "Компонент"; - this.Column2.Name = "Column2"; - // - // Column3 - // - this.Column3.HeaderText = "Количество"; - this.Column3.Name = "Column3"; - // - // buttonAdd - // - this.buttonAdd.Location = new System.Drawing.Point(476, 19); - this.buttonAdd.Name = "buttonAdd"; - this.buttonAdd.Size = new System.Drawing.Size(75, 23); - this.buttonAdd.TabIndex = 1; - this.buttonAdd.Text = "Добавить"; - this.buttonAdd.UseVisualStyleBackColor = true; - this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); - // - // buttonUpd - // - this.buttonUpd.Location = new System.Drawing.Point(476, 61); - this.buttonUpd.Name = "buttonUpd"; - this.buttonUpd.Size = new System.Drawing.Size(75, 23); - this.buttonUpd.TabIndex = 2; - this.buttonUpd.Text = "Изменить"; - this.buttonUpd.UseVisualStyleBackColor = true; - this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click); - // - // buttonDel - // - this.buttonDel.Location = new System.Drawing.Point(476, 108); - this.buttonDel.Name = "buttonDel"; - this.buttonDel.Size = new System.Drawing.Size(75, 23); - this.buttonDel.TabIndex = 3; - this.buttonDel.Text = "Удалить"; - this.buttonDel.UseVisualStyleBackColor = true; - this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click); + groupBox1.Controls.Add(buttonRef); + groupBox1.Controls.Add(buttonDel); + groupBox1.Controls.Add(buttonUpd); + groupBox1.Controls.Add(buttonAdd); + groupBox1.Controls.Add(dataGridView); + groupBox1.Location = new Point(66, 131); + groupBox1.Margin = new Padding(3, 4, 3, 4); + groupBox1.Name = "groupBox1"; + groupBox1.Padding = new Padding(3, 4, 3, 4); + groupBox1.Size = new Size(691, 384); + groupBox1.TabIndex = 0; + groupBox1.TabStop = false; + groupBox1.Text = "Компоненты"; // // buttonRef // - this.buttonRef.Location = new System.Drawing.Point(476, 156); - this.buttonRef.Name = "buttonRef"; - this.buttonRef.Size = new System.Drawing.Size(75, 23); - this.buttonRef.TabIndex = 4; - this.buttonRef.Text = "Обновить"; - this.buttonRef.UseVisualStyleBackColor = true; - this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click); + buttonRef.Location = new Point(544, 208); + buttonRef.Margin = new Padding(3, 4, 3, 4); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(86, 31); + buttonRef.TabIndex = 4; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; + // + // buttonDel + // + buttonDel.Location = new Point(544, 144); + buttonDel.Margin = new Padding(3, 4, 3, 4); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(86, 31); + buttonDel.TabIndex = 3; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; + // + // buttonUpd + // + buttonUpd.Location = new Point(544, 81); + buttonUpd.Margin = new Padding(3, 4, 3, 4); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(86, 31); + buttonUpd.TabIndex = 2; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += buttonUpd_Click; + // + // buttonAdd + // + buttonAdd.Location = new Point(544, 25); + buttonAdd.Margin = new Padding(3, 4, 3, 4); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(86, 31); + buttonAdd.TabIndex = 1; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // dataGridView + // + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { Column1, Column2, Column3 }); + dataGridView.Location = new Point(3, 25); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(472, 339); + dataGridView.TabIndex = 0; + // + // Column1 + // + Column1.HeaderText = "id"; + Column1.MinimumWidth = 6; + Column1.Name = "Column1"; + Column1.Visible = false; + // + // Column2 + // + Column2.HeaderText = "Компонент"; + Column2.MinimumWidth = 6; + Column2.Name = "Column2"; + // + // Column3 + // + Column3.HeaderText = "Количество"; + Column3.MinimumWidth = 6; + Column3.Name = "Column3"; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(427, 403); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(75, 23); - this.buttonSave.TabIndex = 1; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + buttonSave.Location = new Point(488, 537); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(94, 31); + buttonSave.TabIndex = 1; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(534, 403); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 2; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + buttonCancel.Location = new Point(610, 537); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(86, 31); + buttonCancel.TabIndex = 2; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // // textBoxName // - this.textBoxName.Location = new System.Drawing.Point(102, 12); - this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(205, 23); - this.textBoxName.TabIndex = 3; + textBoxName.Location = new Point(117, 16); + textBoxName.Margin = new Padding(3, 4, 3, 4); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(234, 27); + textBoxName.TabIndex = 3; // // textBoxPrice // - this.textBoxPrice.Location = new System.Drawing.Point(102, 41); - this.textBoxPrice.Name = "textBoxPrice"; - this.textBoxPrice.Size = new System.Drawing.Size(151, 23); - this.textBoxPrice.TabIndex = 4; + textBoxPrice.Location = new Point(117, 55); + textBoxPrice.Margin = new Padding(3, 4, 3, 4); + textBoxPrice.Name = "textBoxPrice"; + textBoxPrice.Size = new Size(172, 27); + textBoxPrice.TabIndex = 4; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(62, 15); - this.label1.TabIndex = 5; - this.label1.Text = "Название:"; + label1.AutoSize = true; + label1.Location = new Point(14, 16); + label1.Name = "label1"; + label1.Size = new Size(80, 20); + label1.TabIndex = 5; + label1.Text = "Название:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 41); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(70, 15); - this.label2.TabIndex = 6; - this.label2.Text = "Стоимость:"; + label2.AutoSize = true; + label2.Location = new Point(14, 55); + label2.Name = "label2"; + label2.Size = new Size(86, 20); + label2.TabIndex = 6; + label2.Text = "Стоимость:"; // // FormDocument // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(691, 450); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.textBoxPrice); - this.Controls.Add(this.textBoxName); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonSave); - this.Controls.Add(this.groupBox1); - this.Name = "FormDocument"; - this.Text = "Пакет документов"; - this.Load += new System.EventHandler(this.FormDocument_Load); - this.groupBox1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(790, 600); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(textBoxPrice); + Controls.Add(textBoxName); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(groupBox1); + Margin = new Padding(3, 4, 3, 4); + Name = "FormDocument"; + Text = "Пакет документов"; + Load += FormDocument_Load; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/LawFirm/LawFirmView/FormDocument.resx b/LawFirm/LawFirmView/FormDocument.resx index a9dc853..dbdd69b 100644 --- a/LawFirm/LawFirmView/FormDocument.resx +++ b/LawFirm/LawFirmView/FormDocument.resx @@ -1,4 +1,64 @@ - + + + @@ -66,13 +126,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormDocumentComponent.designer.cs b/LawFirm/LawFirmView/FormDocumentComponent.designer.cs index 0fa5f66..6380b7d 100644 --- a/LawFirm/LawFirmView/FormDocumentComponent.designer.cs +++ b/LawFirm/LawFirmView/FormDocumentComponent.designer.cs @@ -28,83 +28,87 @@ /// private void InitializeComponent() { - this.comboBoxComponent = new System.Windows.Forms.ComboBox(); - this.textBoxCount = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.SuspendLayout(); + comboBoxComponent = new ComboBox(); + textBoxCount = new TextBox(); + label1 = new Label(); + label2 = new Label(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); // // comboBoxComponent // - this.comboBoxComponent.FormattingEnabled = true; - this.comboBoxComponent.Location = new System.Drawing.Point(93, 12); - this.comboBoxComponent.Name = "comboBoxComponent"; - this.comboBoxComponent.Size = new System.Drawing.Size(215, 23); - this.comboBoxComponent.TabIndex = 0; + comboBoxComponent.FormattingEnabled = true; + comboBoxComponent.Location = new Point(106, 16); + comboBoxComponent.Margin = new Padding(3, 4, 3, 4); + comboBoxComponent.Name = "comboBoxComponent"; + comboBoxComponent.Size = new Size(245, 28); + comboBoxComponent.TabIndex = 0; // // textBoxCount // - this.textBoxCount.Location = new System.Drawing.Point(93, 50); - this.textBoxCount.Name = "textBoxCount"; - this.textBoxCount.Size = new System.Drawing.Size(146, 23); - this.textBoxCount.TabIndex = 1; + textBoxCount.Location = new Point(106, 67); + textBoxCount.Margin = new Padding(3, 4, 3, 4); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(166, 27); + textBoxCount.TabIndex = 1; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(72, 15); - this.label1.TabIndex = 2; - this.label1.Text = "Компонент:"; + label1.AutoSize = true; + label1.Location = new Point(14, 16); + label1.Name = "label1"; + label1.Size = new Size(91, 20); + label1.TabIndex = 2; + label1.Text = "Компонент:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 50); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(75, 15); - this.label2.TabIndex = 3; - this.label2.Text = "Количество:"; + label2.AutoSize = true; + label2.Location = new Point(14, 67); + label2.Name = "label2"; + label2.Size = new Size(93, 20); + label2.TabIndex = 3; + label2.Text = "Количество:"; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(164, 91); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(75, 23); - this.buttonSave.TabIndex = 4; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + buttonSave.Location = new Point(187, 121); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(95, 31); + buttonSave.TabIndex = 4; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(259, 91); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 5; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + buttonCancel.Location = new Point(296, 121); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(86, 31); + buttonCancel.TabIndex = 5; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // - // FormProductComponent + // FormDocumentComponent // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(384, 136); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonSave); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.textBoxCount); - this.Controls.Add(this.comboBoxComponent); - this.Name = "FormProductComponent"; - this.Text = "Компонент пакета документов"; - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(439, 181); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(textBoxCount); + Controls.Add(comboBoxComponent); + Margin = new Padding(3, 4, 3, 4); + Name = "FormDocumentComponent"; + Text = "Компонент пакета документов"; + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/LawFirm/LawFirmView/FormDocumentComponent.resx b/LawFirm/LawFirmView/FormDocumentComponent.resx index f298a7b..af32865 100644 --- a/LawFirm/LawFirmView/FormDocumentComponent.resx +++ b/LawFirm/LawFirmView/FormDocumentComponent.resx @@ -1,4 +1,64 @@ - + + +