From c4597dc4f06d5e305101822a32bed6662ac3f077 Mon Sep 17 00:00:00 2001 From: xom9kxom9k Date: Tue, 17 Dec 2024 17:08:05 +0400 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0,=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=8E=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectFamilyBudget/Forms/FormPeopleExpenses.cs | 2 +- ProjectFamilyBudget/Reports/ChartReport.cs | 2 +- ProjectFamilyBudget/Reports/TableReport.cs | 4 ++-- .../Repositories/Implementations/PeopleIncomeRepository.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ProjectFamilyBudget/Forms/FormPeopleExpenses.cs b/ProjectFamilyBudget/Forms/FormPeopleExpenses.cs index f2f21c5..a8fdf14 100644 --- a/ProjectFamilyBudget/Forms/FormPeopleExpenses.cs +++ b/ProjectFamilyBudget/Forms/FormPeopleExpenses.cs @@ -80,7 +80,7 @@ namespace ProjectFamilyBudget.Forms { dataGridViewData.DataSource = _peopleExpense.ReadPeopleExpense(); dataGridViewData.Columns["Id"].Visible = false; - dataGridViewData.Columns["DataReciept"].DefaultCellStyle.Format = "dd MMMM yyyy hh:mm"; + dataGridViewData.Columns["DataReciept"].DefaultCellStyle.Format = "dd MMMM yyyy"; } private bool TryGetIdentifierFromSelectedRow(out int id) diff --git a/ProjectFamilyBudget/Reports/ChartReport.cs b/ProjectFamilyBudget/Reports/ChartReport.cs index 16408fa..ef0490c 100644 --- a/ProjectFamilyBudget/Reports/ChartReport.cs +++ b/ProjectFamilyBudget/Reports/ChartReport.cs @@ -38,7 +38,7 @@ public class ChartReport private List<(string Caption, double Value)> GetData(int expenseId, DateTime dateTime) { return _peopleExpense - .ReadPeopleExpense(dateTime.Date, dateTime.Date.AddDays(1), expenseId) + .ReadPeopleExpense(dateForm: dateTime.Date, dateTo: dateTime.Date.AddDays(1),expenseId: expenseId) .GroupBy(x => x.PeopleName, (key, group) => new { PeopleName = key, diff --git a/ProjectFamilyBudget/Reports/TableReport.cs b/ProjectFamilyBudget/Reports/TableReport.cs index 14e54a4..9d015e0 100644 --- a/ProjectFamilyBudget/Reports/TableReport.cs +++ b/ProjectFamilyBudget/Reports/TableReport.cs @@ -40,12 +40,12 @@ public class TableReport private List GetData(int incomeId,int expenseId, DateTime startDate, DateTime endDate) { var data = _peopleIncomeRepository - .ReadPeopleIncome(dateForm: startDate, dateTo: endDate, incomeId, expenseId) + .ReadPeopleIncome(dateForm: startDate, dateTo: endDate, incomeId: incomeId) .Select(x => new { x.PeopleName, Date = x.DataReciept, CountIn = x.IncomePeopleIncomes.FirstOrDefault(y => y.IncomeId == incomeId)?.Sum, CountOut = (int?)null }) .Union( _peopleExpenseRepository - .ReadPeopleExpense(dateForm: startDate, dateTo: endDate, incomeId, expenseId) + .ReadPeopleExpense(dateForm: startDate, dateTo: endDate, expenseId: expenseId) .Select(x => new { x.PeopleName, Date = x.DataReciept, CountIn = (int?)null, CountOut = x.ExpensePeopleExpenses.FirstOrDefault(y => y.ExpenseId == expenseId)?.Sum })) .OrderBy(x => x.Date); diff --git a/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs b/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs index 89f1ce6..3bf094a 100644 --- a/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs +++ b/ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using static System.Runtime.InteropServices.JavaScript.JSType; -using System.Windows.Forms; +using System.Windows.Forms; using Unity; namespace ProjectFamilyBudget.Repositories.Implementations;