maxnes3/PIbd-22_Bondarenko_M.S_SUBD
maxnes3/PIbd-22_Bondarenko_M.S_SUBD
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Работает через жопу

Browse Source
This commit is contained in:
maxnes3 2023-05-02 23:10:47 +04:00
parent 422eba9d32
commit 681a92d13f
11 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Implements/DealStorage.cs
View File

@ -18,12 +18,17 @@ namespace PersonnelDepartmentDatabaseImplement.Implements
{ {
using var context = new PersonnelDepartmentDatabase(); using var context = new PersonnelDepartmentDatabase();
var element = context.Deals 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); .FirstOrDefault(x => x.Id == model.Id);
if (element == null) if (element == null)
{ {
return null; return null;
} }
context.Deals.Remove(element); context.Deals.Remove(element);
context.SaveChanges();
return element.GetViewModel; return element.GetViewModel;
} }
@ -38,7 +43,7 @@ namespace PersonnelDepartmentDatabaseImplement.Implements
.Include(x => x.Employee) .Include(x => x.Employee)
.Include(x => x.Department) .Include(x => x.Department)
.Include(x => x.Type) .Include(x => x.Type)
.Include(x => x.Employee) .Include(x => x.Position)
.FirstOrDefault(x => (model.Id.HasValue && model.Id == x.Id) || .FirstOrDefault(x => (model.Id.HasValue && model.Id == x.Id) ||
(model.DateFrom != null && x.DateFrom == model.DateFrom) || (model.DateFrom != null && x.DateFrom == model.DateFrom) ||
(model.DateTo != null && x.DateTo == model.DateTo) || (model.DateTo != null && x.DateTo == model.DateTo) ||
@ -55,7 +60,7 @@ namespace PersonnelDepartmentDatabaseImplement.Implements
.Include(x => x.Employee) .Include(x => x.Employee)
.Include(x => x.Department) .Include(x => x.Department)
.Include(x => x.Type) .Include(x => x.Type)
.Include(x => x.Employee) .Include(x => x.Position)
.Where(x => (model.Id.HasValue && model.Id == x.Id) || .Where(x => (model.Id.HasValue && model.Id == x.Id) ||
(model.DateFrom != null && x.DateFrom == model.DateFrom) || (model.DateFrom != null && x.DateFrom == model.DateFrom) ||
(model.DateTo != null && x.DateTo == model.DateTo) || (model.DateTo != null && x.DateTo == model.DateTo) ||

2
PersonnelDepartmentView/PersonnelDepartmentDatabaseImplement/Models/Deal.cs
View File

@ -68,7 +68,7 @@ namespace PersonnelDepartmentDatabaseImplement.Models
TypeId = TypeId, TypeId = TypeId,
PositionName = Position.Name, PositionName = Position.Name,
DepartmentName = Department.Name, DepartmentName = Department.Name,
EmployeeName = Employee.LastName + Employee.FirstName + Employee.Patronymic, EmployeeName = Employee.LastName + " " + Employee.FirstName[0] + "." + Employee.Patronymic[0] + ".",
TypeName = Type.Name TypeName = Type.Name
}; };
} }

1
PersonnelDepartmentView/PersonnelDepartmentView/FormDeal.Designer.cs generated
View File

@ -194,6 +194,7 @@
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
Controls.Add(buttonSave); Controls.Add(buttonSave);
Name = "FormDeal"; Name = "FormDeal";
StartPosition = FormStartPosition.CenterScreen;
Text = "Договор"; Text = "Договор";
Load += FormDeal_Load; Load += FormDeal_Load;
ResumeLayout(false); ResumeLayout(false);

1
PersonnelDepartmentView/PersonnelDepartmentView/FormDepartment.Designer.cs generated
View File

@ -100,6 +100,7 @@
Controls.Add(label1); Controls.Add(label1);
Controls.Add(textBoxName); Controls.Add(textBoxName);
Name = "FormDepartment"; Name = "FormDepartment";
StartPosition = FormStartPosition.CenterScreen;
Text = "Отдел"; Text = "Отдел";
Load += FormDepartment_Load; Load += FormDepartment_Load;
ResumeLayout(false); ResumeLayout(false);

1
PersonnelDepartmentView/PersonnelDepartmentView/FormDepartments.Designer.cs generated
View File

@ -96,6 +96,7 @@
Controls.Add(buttonAdd); Controls.Add(buttonAdd);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Name = "FormDepartments"; Name = "FormDepartments";
StartPosition = FormStartPosition.CenterScreen;
Text = "Таблица Отделов"; Text = "Таблица Отделов";
Load += FormDepartments_Load; Load += FormDepartments_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();

1
PersonnelDepartmentView/PersonnelDepartmentView/FormEmployee.Designer.cs generated
View File

@ -120,6 +120,7 @@
Controls.Add(label1); Controls.Add(label1);
Controls.Add(textBoxFirstName); Controls.Add(textBoxFirstName);
Name = "FormEmployee"; Name = "FormEmployee";
StartPosition = FormStartPosition.CenterScreen;
Text = "Сотрудник"; Text = "Сотрудник";
Load += FormEmployee_Load; Load += FormEmployee_Load;
ResumeLayout(false); ResumeLayout(false);

1
PersonnelDepartmentView/PersonnelDepartmentView/FormEmployees.Designer.cs generated
View File

@ -96,6 +96,7 @@
Controls.Add(buttonAdd); Controls.Add(buttonAdd);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Name = "FormEmployees"; Name = "FormEmployees";
StartPosition = FormStartPosition.CenterScreen;
Text = "Таблица Сотрудников"; Text = "Таблица Сотрудников";
Load += FormEmployees_Load; Load += FormEmployees_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();

1
PersonnelDepartmentView/PersonnelDepartmentView/FormPosition.Designer.cs generated
View File

@ -80,6 +80,7 @@
Controls.Add(label1); Controls.Add(label1);
Controls.Add(textBoxName); Controls.Add(textBoxName);
Name = "FormPosition"; Name = "FormPosition";
StartPosition = FormStartPosition.CenterScreen;
Text = "Должность"; Text = "Должность";
Load += FormPosition_Load; Load += FormPosition_Load;
ResumeLayout(false); ResumeLayout(false);

1
PersonnelDepartmentView/PersonnelDepartmentView/FormPositions.Designer.cs generated
View File

@ -96,6 +96,7 @@
Controls.Add(buttonAdd); Controls.Add(buttonAdd);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Name = "FormPositions"; Name = "FormPositions";
StartPosition = FormStartPosition.CenterScreen;
Text = "Таблица Должностей"; Text = "Таблица Должностей";
Load += FormPositions_Load; Load += FormPositions_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();

1
PersonnelDepartmentView/PersonnelDepartmentView/FormType.Designer.cs generated
View File

@ -80,6 +80,7 @@
Controls.Add(label1); Controls.Add(label1);
Controls.Add(textBoxName); Controls.Add(textBoxName);
Name = "FormType"; Name = "FormType";
StartPosition = FormStartPosition.CenterScreen;
Text = "Тип договора"; Text = "Тип договора";
Load += FormType_Load; Load += FormType_Load;
ResumeLayout(false); ResumeLayout(false);

1
PersonnelDepartmentView/PersonnelDepartmentView/FormTypes.Designer.cs generated
View File

@ -96,6 +96,7 @@
Controls.Add(buttonAdd); Controls.Add(buttonAdd);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Name = "FormTypes"; Name = "FormTypes";
StartPosition = FormStartPosition.CenterScreen;
Text = "Таблица Типов"; Text = "Таблица Типов";
Load += FormTypes_Load; Load += FormTypes_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();