slavaxom9k/PIBD-23_Fomichev_V.S._FamilyBudget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Готовая работа, полностью работает

Browse Source
This commit is contained in:
xom9kxom9k 2024-12-17 17:08:05 +04:00
parent afeabbee26
commit c4597dc4f0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectFamilyBudget/Forms/FormPeopleExpenses.cs
View File

@ -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)

2
ProjectFamilyBudget/Reports/ChartReport.cs
View File

@ -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,

4
ProjectFamilyBudget/Reports/TableReport.cs
View File

@ -40,12 +40,12 @@ public class TableReport
private List<string[]> 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);

2
ProjectFamilyBudget/Repositories/Implementations/PeopleIncomeRepository.cs
View File

@ -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;