diff --git a/LawFirm/LawFirmView/FormImplementer.Designer.cs b/LawFirm/LawFirmView/FormImplementer.Designer.cs index 56d2d09..bb94bbb 100644 --- a/LawFirm/LawFirmView/FormImplementer.Designer.cs +++ b/LawFirm/LawFirmView/FormImplementer.Designer.cs @@ -1,6 +1,6 @@ namespace LawFirmView { - partial class FormImplementer + partial class Исполнитель { /// /// Required designer variable. @@ -28,127 +28,133 @@ /// private void InitializeComponent() { - this.textBoxFIO = new System.Windows.Forms.TextBox(); - this.textBoxPasswd = new System.Windows.Forms.TextBox(); - this.numericUpDownQualif = new System.Windows.Forms.NumericUpDown(); - this.numericUpDownWorkExp = new System.Windows.Forms.NumericUpDown(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualif)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExp)).BeginInit(); - this.SuspendLayout(); + textBoxFIO = new TextBox(); + textBoxPasswd = new TextBox(); + numericUpDownQualif = new NumericUpDown(); + numericUpDownWorkExp = new NumericUpDown(); + buttonSave = new Button(); + buttonCancel = new Button(); + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + label4 = new Label(); + ((System.ComponentModel.ISupportInitialize)numericUpDownQualif).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWorkExp).BeginInit(); + SuspendLayout(); // // textBoxFIO // - this.textBoxFIO.Location = new System.Drawing.Point(155, 25); - this.textBoxFIO.Name = "textBoxFIO"; - this.textBoxFIO.Size = new System.Drawing.Size(231, 23); - this.textBoxFIO.TabIndex = 0; + textBoxFIO.Location = new Point(177, 33); + textBoxFIO.Margin = new Padding(3, 4, 3, 4); + textBoxFIO.Name = "textBoxFIO"; + textBoxFIO.Size = new Size(263, 27); + textBoxFIO.TabIndex = 0; // // textBoxPasswd // - this.textBoxPasswd.Location = new System.Drawing.Point(155, 65); - this.textBoxPasswd.Name = "textBoxPasswd"; - this.textBoxPasswd.Size = new System.Drawing.Size(231, 23); - this.textBoxPasswd.TabIndex = 1; + textBoxPasswd.Location = new Point(177, 87); + textBoxPasswd.Margin = new Padding(3, 4, 3, 4); + textBoxPasswd.Name = "textBoxPasswd"; + textBoxPasswd.Size = new Size(263, 27); + textBoxPasswd.TabIndex = 1; // // numericUpDownQualif // - this.numericUpDownQualif.Location = new System.Drawing.Point(155, 105); - this.numericUpDownQualif.Name = "numericUpDownQualif"; - this.numericUpDownQualif.Size = new System.Drawing.Size(120, 23); - this.numericUpDownQualif.TabIndex = 2; + numericUpDownQualif.Location = new Point(177, 140); + numericUpDownQualif.Margin = new Padding(3, 4, 3, 4); + numericUpDownQualif.Name = "numericUpDownQualif"; + numericUpDownQualif.Size = new Size(137, 27); + numericUpDownQualif.TabIndex = 2; // // numericUpDownWorkExp // - this.numericUpDownWorkExp.Location = new System.Drawing.Point(155, 143); - this.numericUpDownWorkExp.Name = "numericUpDownWorkExp"; - this.numericUpDownWorkExp.Size = new System.Drawing.Size(120, 23); - this.numericUpDownWorkExp.TabIndex = 3; + numericUpDownWorkExp.Location = new Point(177, 191); + numericUpDownWorkExp.Margin = new Padding(3, 4, 3, 4); + numericUpDownWorkExp.Name = "numericUpDownWorkExp"; + numericUpDownWorkExp.Size = new Size(137, 27); + numericUpDownWorkExp.TabIndex = 3; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(60, 202); - 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(69, 269); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(86, 31); + buttonSave.TabIndex = 4; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(355, 202); - 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(406, 269); + 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; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(80, 25); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(37, 15); - this.label1.TabIndex = 6; - this.label1.Text = "ФИО:"; + label1.AutoSize = true; + label1.Location = new Point(91, 33); + label1.Name = "label1"; + label1.Size = new Size(45, 20); + label1.TabIndex = 6; + label1.Text = "ФИО:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(80, 65); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 15); - this.label2.TabIndex = 7; - this.label2.Text = "Пароль:"; + label2.AutoSize = true; + label2.Location = new Point(91, 87); + label2.Name = "label2"; + label2.Size = new Size(65, 20); + label2.TabIndex = 7; + label2.Text = "Пароль:"; // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(41, 107); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(91, 15); - this.label3.TabIndex = 8; - this.label3.Text = "Квалификация:"; + label3.AutoSize = true; + label3.Location = new Point(47, 143); + label3.Name = "label3"; + label3.Size = new Size(114, 20); + label3.TabIndex = 8; + label3.Text = "Квалификация:"; // // label4 // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 151); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(84, 15); - this.label4.TabIndex = 9; - this.label4.Text = "Опыт работы:"; + label4.AutoSize = true; + label4.Location = new Point(55, 201); + label4.Name = "label4"; + label4.Size = new Size(105, 20); + label4.TabIndex = 9; + label4.Text = "Опыт работы:"; // - // FormImplementer + // Исполнитель // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(513, 237); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonSave); - this.Controls.Add(this.numericUpDownWorkExp); - this.Controls.Add(this.numericUpDownQualif); - this.Controls.Add(this.textBoxPasswd); - this.Controls.Add(this.textBoxFIO); - this.Name = "FormImplementer"; - this.Text = "FormImplementer"; - this.Load += new System.EventHandler(this.FormImplementer_Load); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualif)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExp)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(586, 316); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(numericUpDownWorkExp); + Controls.Add(numericUpDownQualif); + Controls.Add(textBoxPasswd); + Controls.Add(textBoxFIO); + Margin = new Padding(3, 4, 3, 4); + Name = "Исполнитель"; + Text = "FormImplementer"; + Load += FormImplementer_Load; + ((System.ComponentModel.ISupportInitialize)numericUpDownQualif).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWorkExp).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/LawFirm/LawFirmView/FormImplementer.cs b/LawFirm/LawFirmView/FormImplementer.cs index 220ccb4..7832ac4 100644 --- a/LawFirm/LawFirmView/FormImplementer.cs +++ b/LawFirm/LawFirmView/FormImplementer.cs @@ -14,13 +14,13 @@ using System.Windows.Forms; namespace LawFirmView { - public partial class FormImplementer : Form + public partial class Исполнитель : Form { private readonly ILogger _logger; private readonly IImplementerLogic _logic; private int? _id; public int Id { set { _id = value; } } - public FormImplementer(ILogger logger, IImplementerLogic logic) + public Исполнитель(ILogger<Исполнитель> logger, IImplementerLogic logic) { InitializeComponent(); _logger = logger; diff --git a/LawFirm/LawFirmView/FormImplementer.resx b/LawFirm/LawFirmView/FormImplementer.resx index 1af7de1..af32865 100644 --- a/LawFirm/LawFirmView/FormImplementer.resx +++ b/LawFirm/LawFirmView/FormImplementer.resx @@ -1,17 +1,17 @@  - diff --git a/LawFirm/LawFirmView/FormImplementers.Designer.cs b/LawFirm/LawFirmView/FormImplementers.Designer.cs index c36a4f5..828444b 100644 --- a/LawFirm/LawFirmView/FormImplementers.Designer.cs +++ b/LawFirm/LawFirmView/FormImplementers.Designer.cs @@ -1,6 +1,6 @@ namespace LawFirmView { - partial class FormImplementers + partial class Исполнители { /// /// Required designer variable. @@ -28,79 +28,85 @@ /// private void InitializeComponent() { - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.buttonCreate = new System.Windows.Forms.Button(); - this.buttonUpdate = new System.Windows.Forms.Button(); - this.buttonDelete = new System.Windows.Forms.Button(); - this.buttonRef = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); + dataGridView = new DataGridView(); + buttonCreate = new Button(); + buttonUpdate = new Button(); + buttonDelete = new Button(); + buttonRef = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); // // dataGridView // - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(0, 0); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(419, 428); - this.dataGridView.TabIndex = 0; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(0, 0); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(479, 571); + dataGridView.TabIndex = 0; // // buttonCreate // - this.buttonCreate.Location = new System.Drawing.Point(476, 12); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(75, 23); - this.buttonCreate.TabIndex = 1; - this.buttonCreate.Text = "Добавить"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); + buttonCreate.Location = new Point(544, 16); + buttonCreate.Margin = new Padding(3, 4, 3, 4); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(86, 31); + buttonCreate.TabIndex = 1; + buttonCreate.Text = "Добавить"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += buttonCreate_Click; // // buttonUpdate // - this.buttonUpdate.Location = new System.Drawing.Point(476, 58); - this.buttonUpdate.Name = "buttonUpdate"; - this.buttonUpdate.Size = new System.Drawing.Size(75, 23); - this.buttonUpdate.TabIndex = 2; - this.buttonUpdate.Text = "Изменить"; - this.buttonUpdate.UseVisualStyleBackColor = true; - this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click); + buttonUpdate.Location = new Point(544, 77); + buttonUpdate.Margin = new Padding(3, 4, 3, 4); + buttonUpdate.Name = "buttonUpdate"; + buttonUpdate.Size = new Size(86, 31); + buttonUpdate.TabIndex = 2; + buttonUpdate.Text = "Изменить"; + buttonUpdate.UseVisualStyleBackColor = true; + buttonUpdate.Click += buttonUpdate_Click; // // buttonDelete // - this.buttonDelete.Location = new System.Drawing.Point(476, 102); - this.buttonDelete.Name = "buttonDelete"; - this.buttonDelete.Size = new System.Drawing.Size(75, 23); - this.buttonDelete.TabIndex = 3; - this.buttonDelete.Text = "Удалить"; - this.buttonDelete.UseVisualStyleBackColor = true; - this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); + buttonDelete.Location = new Point(544, 136); + buttonDelete.Margin = new Padding(3, 4, 3, 4); + buttonDelete.Name = "buttonDelete"; + buttonDelete.Size = new Size(86, 31); + buttonDelete.TabIndex = 3; + buttonDelete.Text = "Удалить"; + buttonDelete.UseVisualStyleBackColor = true; + buttonDelete.Click += buttonDelete_Click; // // buttonRef // - this.buttonRef.Location = new System.Drawing.Point(476, 146); - 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, 195); + 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; // - // FormImplementers + // Исполнители // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(596, 440); - this.Controls.Add(this.buttonRef); - this.Controls.Add(this.buttonDelete); - this.Controls.Add(this.buttonUpdate); - this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.dataGridView); - this.Name = "FormImplementers"; - this.Text = "FormImplementers"; - this.Load += new System.EventHandler(this.FormImplementers_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(681, 587); + Controls.Add(buttonRef); + Controls.Add(buttonDelete); + Controls.Add(buttonUpdate); + Controls.Add(buttonCreate); + Controls.Add(dataGridView); + Margin = new Padding(3, 4, 3, 4); + Name = "Исполнители"; + Text = "FormImplementers"; + Load += FormImplementers_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); } #endregion diff --git a/LawFirm/LawFirmView/FormImplementers.cs b/LawFirm/LawFirmView/FormImplementers.cs index 3146713..e92eff1 100644 --- a/LawFirm/LawFirmView/FormImplementers.cs +++ b/LawFirm/LawFirmView/FormImplementers.cs @@ -13,11 +13,11 @@ using System.Windows.Forms; namespace LawFirmView { - public partial class FormImplementers : Form + public partial class Исполнители : Form { private readonly ILogger _logger; private readonly IImplementerLogic _logic; - public FormImplementers(ILogger logger, IImplementerLogic logic) + public Исполнители(ILogger<Исполнители> logger, IImplementerLogic logic) { InitializeComponent(); _logger = logger; @@ -51,8 +51,8 @@ namespace LawFirmView private void buttonCreate_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var service = Program.ServiceProvider?.GetService(typeof(Исполнитель)); + if (service is Исполнитель form) { if (form.ShowDialog() == DialogResult.OK) { @@ -65,8 +65,8 @@ namespace LawFirmView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var service = Program.ServiceProvider?.GetService(typeof(Исполнитель)); + if (service is Исполнитель form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) diff --git a/LawFirm/LawFirmView/FormImplementers.resx b/LawFirm/LawFirmView/FormImplementers.resx index 1af7de1..af32865 100644 --- a/LawFirm/LawFirmView/FormImplementers.resx +++ b/LawFirm/LawFirmView/FormImplementers.resx @@ -1,17 +1,17 @@  - diff --git a/LawFirm/LawFirmView/FormMain.cs b/LawFirm/LawFirmView/FormMain.cs index 76689d2..e29d5e5 100644 --- a/LawFirm/LawFirmView/FormMain.cs +++ b/LawFirm/LawFirmView/FormMain.cs @@ -219,8 +219,8 @@ namespace LawFirmView } private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); - if (service is FormImplementers form) + var service = Program.ServiceProvider?.GetService(typeof(Исполнители)); + if (service is Исполнители form) { form.ShowDialog(); } diff --git a/LawFirm/LawFirmView/Program.cs b/LawFirm/LawFirmView/Program.cs index 5bc46d2..12b0a8a 100644 --- a/LawFirm/LawFirmView/Program.cs +++ b/LawFirm/LawFirmView/Program.cs @@ -62,8 +62,8 @@ namespace LawFirmView services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient<>(); + services.AddTransient<>(); } }