diff --git a/ProjectFamilyBudget/Entities/ExpensePeopleExpense.cs b/ProjectFamilyBudget/Entities/ExpensePeopleExpense.cs index bf2126b..2f5facf 100644 --- a/ProjectFamilyBudget/Entities/ExpensePeopleExpense.cs +++ b/ProjectFamilyBudget/Entities/ExpensePeopleExpense.cs @@ -8,14 +8,14 @@ namespace ProjectFamilyBudget.Entities; public class ExpensePeopleExpense { - public int Id { get; private set; } + public int PeopleExpenseId { get; private set; } public int ExpenseId { get; private set; } public int Sum { get; private set; } - public static ExpensePeopleExpense CreateElement(int id, int expenseId, int sum) + public static ExpensePeopleExpense CreateElement(int peopleExpenseId, int expenseId, int sum) { return new ExpensePeopleExpense { - Id = id, + PeopleExpenseId = peopleExpenseId, ExpenseId = expenseId, Sum = sum }; diff --git a/ProjectFamilyBudget/Entities/IncomePeopleIncome.cs b/ProjectFamilyBudget/Entities/IncomePeopleIncome.cs index 071e904..45e8273 100644 --- a/ProjectFamilyBudget/Entities/IncomePeopleIncome.cs +++ b/ProjectFamilyBudget/Entities/IncomePeopleIncome.cs @@ -8,14 +8,14 @@ namespace ProjectFamilyBudget.Entities; public class IncomePeopleIncome { - public int Id { get; private set; } + public int PeopleIncomeId { get; private set; } public int IncomeId { get; private set; } public int Sum { get; private set; } - public static IncomePeopleIncome CreateElement(int id,int incomeId, int sum) + public static IncomePeopleIncome CreateElement(int peopleIncomeId,int incomeId, int sum) { return new IncomePeopleIncome { - Id = id, + PeopleIncomeId = peopleIncomeId, IncomeId = incomeId, Sum = sum }; diff --git a/ProjectFamilyBudget/Entities/PeopleExpense.cs b/ProjectFamilyBudget/Entities/PeopleExpense.cs index 57a5734..c0cb6f5 100644 --- a/ProjectFamilyBudget/Entities/PeopleExpense.cs +++ b/ProjectFamilyBudget/Entities/PeopleExpense.cs @@ -12,13 +12,13 @@ public class PeopleExpense public int PeopleId { get; private set; } public DateTime DataReceipt { get; private set; } public IEnumerable ExpensePeopleExpenses { get; private set; } = []; - public static PeopleExpense CreateOperation(int id, int peopleId, IEnumerable expensePeopleExpenses) + public static PeopleExpense CreateOperation(int id, int peopleId, DateTime dataReceipt,IEnumerable expensePeopleExpenses) { return new PeopleExpense { Id = id, PeopleId = peopleId, - DataReceipt = DateTime.Now, + DataReceipt = dataReceipt, ExpensePeopleExpenses = expensePeopleExpenses }; } diff --git a/ProjectFamilyBudget/Entities/PeopleIncome.cs b/ProjectFamilyBudget/Entities/PeopleIncome.cs index 127ed20..e482b69 100644 --- a/ProjectFamilyBudget/Entities/PeopleIncome.cs +++ b/ProjectFamilyBudget/Entities/PeopleIncome.cs @@ -13,13 +13,13 @@ public class PeopleIncome public int PeopleId { get; private set; } public DateTime DataReceipt { get; private set; } public IEnumerable IncomePeopleIncomes { get; private set; } = []; - public static PeopleIncome CreateOperation(int id, int peopleId,IEnumerable incomePeopleIncomes) + public static PeopleIncome CreateOperation(int id, int peopleId,DateTime dataReciept,IEnumerable incomePeopleIncomes) { return new PeopleIncome { Id = id, PeopleId = peopleId, - DataReceipt = DateTime.Now, + DataReceipt = dataReciept, IncomePeopleIncomes = incomePeopleIncomes }; } diff --git a/ProjectFamilyBudget/Forms/FormPeopleExpense.cs b/ProjectFamilyBudget/Forms/FormPeopleExpense.cs index 28df318..01d3f3c 100644 --- a/ProjectFamilyBudget/Forms/FormPeopleExpense.cs +++ b/ProjectFamilyBudget/Forms/FormPeopleExpense.cs @@ -39,7 +39,7 @@ namespace ProjectFamilyBudget.Forms { throw new Exception("Имеются незаполненные поля"); } - _peopleEpxense.CreatePeopleExpense(PeopleExpense.CreateOperation(0, (int)comboBoxPeople.SelectedValue!, + _peopleEpxense.CreatePeopleExpense(PeopleExpense.CreateOperation(0, (int)comboBoxPeople.SelectedValue!, dateTimePicker.Value, CreateListPeopleExpenseFromDataGrid())); Close(); } diff --git a/ProjectFamilyBudget/Forms/FormPeopleIncome.Designer.cs b/ProjectFamilyBudget/Forms/FormPeopleIncome.Designer.cs index f383518..3d458eb 100644 --- a/ProjectFamilyBudget/Forms/FormPeopleIncome.Designer.cs +++ b/ProjectFamilyBudget/Forms/FormPeopleIncome.Designer.cs @@ -131,7 +131,6 @@ // // dateTimePicker // - dateTimePicker.Enabled = false; dateTimePicker.Location = new Point(127, 62); dateTimePicker.Name = "dateTimePicker"; dateTimePicker.Size = new Size(216, 23); diff --git a/ProjectFamilyBudget/Forms/FormPeopleIncome.cs b/ProjectFamilyBudget/Forms/FormPeopleIncome.cs index 27a9f17..d9c210c 100644 --- a/ProjectFamilyBudget/Forms/FormPeopleIncome.cs +++ b/ProjectFamilyBudget/Forms/FormPeopleIncome.cs @@ -39,7 +39,7 @@ namespace ProjectFamilyBudget.Forms { throw new Exception("Имеются незаполненные поля"); } - _peopleIncome.CreatePeopleIncome(PeopleIncome.CreateOperation(0, (int)comboBoxPeople.SelectedValue!, + _peopleIncome.CreatePeopleIncome(PeopleIncome.CreateOperation(0, (int)comboBoxPeople.SelectedValue!, dateTimePicker.Value, CreateListPeopleIncomeFromDataGrid())); Close(); } diff --git a/ProjectFamilyBudget/Forms/FormPeopleIncome.resx b/ProjectFamilyBudget/Forms/FormPeopleIncome.resx index 118dd0b..ff7d1b9 100644 --- a/ProjectFamilyBudget/Forms/FormPeopleIncome.resx +++ b/ProjectFamilyBudget/Forms/FormPeopleIncome.resx @@ -1,7 +1,7 @@