From fbde5f42375e08f059cff0e7e4754ac08bac659c Mon Sep 17 00:00:00 2001
From: xom9kxom9k <vfomicev586@gmail.com>
Date: Tue, 19 Nov 2024 18:47:06 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=B8=D0=B5=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectFamilyBudget/Entities/ExpensePeopleExpense.cs      | 6 +++---
 ProjectFamilyBudget/Entities/IncomePeopleIncome.cs        | 6 +++---
 ProjectFamilyBudget/Entities/PeopleExpense.cs             | 4 ++--
 ProjectFamilyBudget/Entities/PeopleIncome.cs              | 4 ++--
 ProjectFamilyBudget/Forms/FormPeopleExpense.cs            | 2 +-
 ProjectFamilyBudget/Forms/FormPeopleIncome.Designer.cs    | 1 -
 ProjectFamilyBudget/Forms/FormPeopleIncome.cs             | 2 +-
 ProjectFamilyBudget/Forms/FormPeopleIncome.resx           | 4 ++--
 ProjectFamilyBudget/Forms/FormPeoples.Designer.cs         | 1 +
 .../Repositories/Implementations/ConnectionString.cs      | 2 +-
 .../Repositories/Implementations/ExpenseRepository.cs     | 2 +-
 .../Repositories/Implementations/IncomeRepository.cs      | 2 +-
 .../Implementations/PeopleExpenseRepository.cs            | 8 ++++----
 .../Implementations/PeopleIncomeRepository.cs             | 7 +++++--
 14 files changed, 27 insertions(+), 24 deletions(-)

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<ExpensePeopleExpense> ExpensePeopleExpenses { get; private set; } = [];
-    public static PeopleExpense CreateOperation(int id, int peopleId, IEnumerable<ExpensePeopleExpense> expensePeopleExpenses)
+    public static PeopleExpense CreateOperation(int id, int peopleId, DateTime dataReceipt,IEnumerable<ExpensePeopleExpense> 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<IncomePeopleIncome> IncomePeopleIncomes { get; private set; } = [];
-    public static PeopleIncome CreateOperation(int id, int peopleId,IEnumerable<IncomePeopleIncome> incomePeopleIncomes)
+    public static PeopleIncome CreateOperation(int id, int peopleId,DateTime dataReciept,IEnumerable<IncomePeopleIncome> 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/ProjectFamilyBudget/Forms/FormPeoples.Designer.cs b/ProjectFamilyBudget/Forms/FormPeoples.Designer.cs
index 74200a5..04f52e7 100644
--- a/ProjectFamilyBudget/Forms/FormPeoples.Designer.cs
+++ b/ProjectFamilyBudget/Forms/FormPeoples.Designer.cs
@@ -95,6 +95,7 @@
             dataGridViewData.Name = "dataGridViewData";
             dataGridViewData.ReadOnly = true;
             dataGridViewData.RowHeadersVisible = false;
+            dataGridViewData.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
             dataGridViewData.Size = new Size(609, 450);
             dataGridViewData.TabIndex = 1;
             // 
diff --git a/ProjectFamilyBudget/Repositories/Implementations/ConnectionString.cs b/ProjectFamilyBudget/Repositories/Implementations/ConnectionString.cs
index 8a23c5a..bce14cc 100644
--- a/ProjectFamilyBudget/Repositories/Implementations/ConnectionString.cs
+++ b/ProjectFamilyBudget/Repositories/Implementations/ConnectionString.cs
@@ -8,5 +8,5 @@ namespace ProjectFamilyBudget.Repositories.Implementations;
 
 public class ConnectionString : IConnectionString
 {
-    string IConnectionString.ConnectionString => "Host=localhost;Port=5432;Username=postgres;Password=postgres;Database=otp";
+    string IConnectionString.ConnectionString => "Host=localhost;Port=5432;Username=postgres;Password=postgres;Database=otp2";
 }
diff --git a/ProjectFamilyBudget/Repositories/Implementations/ExpenseRepository.cs b/ProjectFamilyBudget/Repositories/Implementations/ExpenseRepository.cs
index a381f36..bd0a14f 100644
--- a/ProjectFamilyBudget/Repositories/Implementations/ExpenseRepository.cs
+++ b/ProjectFamilyBudget/Repositories/Implementations/ExpenseRepository.cs
@@ -53,7 +53,7 @@ public class ExpenseRepository : IExpense
                 SET
                 ExpenseType=@ExpenseType,
                 Name=@Name,
-                ExpenseCategory=@ExpenseCategory,
+                ExpenseCategory=@ExpenseCategory
                 WHERE Id=@Id";
             connection.Execute(queryUpdate, expense);
         }
diff --git a/ProjectFamilyBudget/Repositories/Implementations/IncomeRepository.cs b/ProjectFamilyBudget/Repositories/Implementations/IncomeRepository.cs
index 779a3d5..3a41b6c 100644
--- a/ProjectFamilyBudget/Repositories/Implementations/IncomeRepository.cs
+++ b/ProjectFamilyBudget/Repositories/Implementations/IncomeRepository.cs
@@ -52,7 +52,7 @@ public class IncomeRepository : IIncome
                 SET
                 IncomeType=@IncomeType,
                 Name=@Name,
-                IncomeCategory=@IncomeCategory,
+                IncomeCategory=@IncomeCategory
                 WHERE Id=@Id";
             connection.Execute(queryUpdate, income);
         }
diff --git a/ProjectFamilyBudget/Repositories/Implementations/PeopleExpenseRepository.cs b/ProjectFamilyBudget/Repositories/Implementations/PeopleExpenseRepository.cs
index bbb5708..1a3c4c1 100644
--- a/ProjectFamilyBudget/Repositories/Implementations/PeopleExpenseRepository.cs
+++ b/ProjectFamilyBudget/Repositories/Implementations/PeopleExpenseRepository.cs
@@ -33,14 +33,14 @@ public class PeopleExpenseRepository : IPeopleExpense
             connection.Open();
             using var transaction = connection.BeginTransaction();
             var queryInsert = @"
-                INSERT INTO PeopleExpense (PeopleId, Date)
-                VALUES (@PeopleId, @Date);
-                SELECT MAX(Id) FROM PeopleIncome";
+                INSERT INTO PeopleExpense (Date,PeopleId)
+                VALUES (@Date, @PeopleId);
+                SELECT MAX(Id) FROM PeopleExpense";
             var peopleExpenseId =
             connection.QueryFirst<int>(queryInsert, peopleExpense, transaction);
             var querySubInsert = @"
                 INSERT INTO ExpensePeopleExpense (ExpenseId, PeopleExpenseId, Sum)
-                VALUES (@IncomeId, @PeopleIncomeId, @Sum)";
+                VALUES (@ExpenseId, @PeopleExpenseId, @Sum)";
             foreach (var elem in peopleExpense.ExpensePeopleExpenses)
             {
                 connection.Execute(querySubInsert, new
diff --git a/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs b/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs
index 5bec837..708ccb5 100644
--- a/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs
+++ b/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs
@@ -8,6 +8,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static System.Runtime.InteropServices.JavaScript.JSType;
+using System.Windows.Forms;
+using Unity;
 
 namespace ProjectFamilyBudget.Repositories.Implementations;
 
@@ -32,8 +35,8 @@ public class PeopleIncomeRepository : IPeopleIncome
             connection.Open();
             using var transaction = connection.BeginTransaction();
             var queryInsert = @"
-                INSERT INTO PeopleIncome (PeopleId, Date)
-                VALUES (@PeopleId, @Date);
+                INSERT INTO PeopleIncome (DateReciept,PeopleId)
+                VALUES (@DateReciept, @PeopleId);
                 SELECT MAX(Id) FROM PeopleIncome";
             var peopleIncomeId =
             connection.QueryFirst<int>(queryInsert, peopleIncome, transaction);