diff --git a/PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Implements/DealStorage.cs b/PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Implements/DealStorage.cs index 2c8814f..0c19260 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Implements/DealStorage.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Implements/DealStorage.cs @@ -18,12 +18,17 @@ namespace PersonnelDepartmentDatabaseImplement.Implements { using var context = new PersonnelDepartmentDatabase(); var element = context.Deals + .Include(x => x.Employee) + .Include(x => x.Department) + .Include(x => x.Type) + .Include(x => x.Position) .FirstOrDefault(x => x.Id == model.Id); if (element == null) { return null; } context.Deals.Remove(element); + context.SaveChanges(); return element.GetViewModel; } @@ -38,7 +43,7 @@ namespace PersonnelDepartmentDatabaseImplement.Implements .Include(x => x.Employee) .Include(x => x.Department) .Include(x => x.Type) - .Include(x => x.Employee) + .Include(x => x.Position) .FirstOrDefault(x => (model.Id.HasValue && model.Id == x.Id) || (model.DateFrom != null && x.DateFrom == model.DateFrom) || (model.DateTo != null && x.DateTo == model.DateTo) || @@ -55,7 +60,7 @@ namespace PersonnelDepartmentDatabaseImplement.Implements .Include(x => x.Employee) .Include(x => x.Department) .Include(x => x.Type) - .Include(x => x.Employee) + .Include(x => x.Position) .Where(x => (model.Id.HasValue && model.Id == x.Id) || (model.DateFrom != null && x.DateFrom == model.DateFrom) || (model.DateTo != null && x.DateTo == model.DateTo) || diff --git a/PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Models/Deal.cs b/PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Models/Deal.cs index 463f15e..a5e9731 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Models/Deal.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Models/Deal.cs @@ -68,7 +68,7 @@ namespace PersonnelDepartmentDatabaseImplement.Models TypeId = TypeId, PositionName = Position.Name, DepartmentName = Department.Name, - EmployeeName = Employee.LastName + Employee.FirstName + Employee.Patronymic, + EmployeeName = Employee.LastName + " " + Employee.FirstName[0] + "." + Employee.Patronymic[0] + ".", TypeName = Type.Name }; } diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormDeal.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormDeal.Designer.cs index 494045b..4315b45 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormDeal.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormDeal.Designer.cs @@ -194,6 +194,7 @@ Controls.Add(buttonCancel); Controls.Add(buttonSave); Name = "FormDeal"; + StartPosition = FormStartPosition.CenterScreen; Text = "Договор"; Load += FormDeal_Load; ResumeLayout(false); diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormDepartment.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormDepartment.Designer.cs index c4f8fee..1888f59 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormDepartment.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormDepartment.Designer.cs @@ -100,6 +100,7 @@ Controls.Add(label1); Controls.Add(textBoxName); Name = "FormDepartment"; + StartPosition = FormStartPosition.CenterScreen; Text = "Отдел"; Load += FormDepartment_Load; ResumeLayout(false); diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormDepartments.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormDepartments.Designer.cs index f7e462c..31c1c65 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormDepartments.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormDepartments.Designer.cs @@ -96,6 +96,7 @@ Controls.Add(buttonAdd); Controls.Add(dataGridView); Name = "FormDepartments"; + StartPosition = FormStartPosition.CenterScreen; Text = "Таблица Отделов"; Load += FormDepartments_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormEmployee.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormEmployee.Designer.cs index 6ed411f..5e8cb68 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormEmployee.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormEmployee.Designer.cs @@ -120,6 +120,7 @@ Controls.Add(label1); Controls.Add(textBoxFirstName); Name = "FormEmployee"; + StartPosition = FormStartPosition.CenterScreen; Text = "Сотрудник"; Load += FormEmployee_Load; ResumeLayout(false); diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormEmployees.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormEmployees.Designer.cs index 6d4d353..6a0aaec 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormEmployees.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormEmployees.Designer.cs @@ -96,6 +96,7 @@ Controls.Add(buttonAdd); Controls.Add(dataGridView); Name = "FormEmployees"; + StartPosition = FormStartPosition.CenterScreen; Text = "Таблица Сотрудников"; Load += FormEmployees_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormPosition.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormPosition.Designer.cs index 2cdb1fa..2900ddd 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormPosition.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormPosition.Designer.cs @@ -80,6 +80,7 @@ Controls.Add(label1); Controls.Add(textBoxName); Name = "FormPosition"; + StartPosition = FormStartPosition.CenterScreen; Text = "Должность"; Load += FormPosition_Load; ResumeLayout(false); diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormPositions.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormPositions.Designer.cs index 4591bcf..8aeab07 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormPositions.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormPositions.Designer.cs @@ -96,6 +96,7 @@ Controls.Add(buttonAdd); Controls.Add(dataGridView); Name = "FormPositions"; + StartPosition = FormStartPosition.CenterScreen; Text = "Таблица Должностей"; Load += FormPositions_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormType.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormType.Designer.cs index 7dcd38b..dfb8a56 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormType.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormType.Designer.cs @@ -80,6 +80,7 @@ Controls.Add(label1); Controls.Add(textBoxName); Name = "FormType"; + StartPosition = FormStartPosition.CenterScreen; Text = "Тип договора"; Load += FormType_Load; ResumeLayout(false); diff --git a/PersonnelDepartmentView/PersonnelDepartmentView/FormTypes.Designer.cs b/PersonnelDepartmentView/PersonnelDepartmentView/FormTypes.Designer.cs index 7c56856..128d21f 100644 --- a/PersonnelDepartmentView/PersonnelDepartmentView/FormTypes.Designer.cs +++ b/PersonnelDepartmentView/PersonnelDepartmentView/FormTypes.Designer.cs @@ -96,6 +96,7 @@ Controls.Add(buttonAdd); Controls.Add(dataGridView); Name = "FormTypes"; + StartPosition = FormStartPosition.CenterScreen; Text = "Таблица Типов"; Load += FormTypes_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();