diff --git a/project/ProjectTourAgency/Forms/FormClientTour.cs b/project/ProjectTourAgency/Forms/FormClientTour.cs index bca1e98..f1cfe34 100644 --- a/project/ProjectTourAgency/Forms/FormClientTour.cs +++ b/project/ProjectTourAgency/Forms/FormClientTour.cs @@ -77,7 +77,8 @@ namespace ProjectTourAgency.Forms list.Add(ClientTour.CreateEntity(0, Convert.ToInt32(row.Cells["ColumnClient"].Value), 0, Convert.ToInt32(row.Cells["ColumnCost"].Value))); } - return list; + return list.GroupBy(x => x.ClientId, x => x.Cost, (id, costs) => + ClientTour.CreateEntity(0, id, 0, costs.Sum())).ToList(); } } diff --git a/project/ProjectTourAgency/Forms/FormTours.cs b/project/ProjectTourAgency/Forms/FormTours.cs index 64529f2..7a972b4 100644 --- a/project/ProjectTourAgency/Forms/FormTours.cs +++ b/project/ProjectTourAgency/Forms/FormTours.cs @@ -84,7 +84,7 @@ namespace ProjectTourAgency.Forms MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } - id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["ID"].Value); + id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value); return true; } } diff --git a/project/ProjectTourAgency/Reports/TableReportcs.cs b/project/ProjectTourAgency/Reports/TableReportcs.cs index ac4b82a..8bff658 100644 --- a/project/ProjectTourAgency/Reports/TableReportcs.cs +++ b/project/ProjectTourAgency/Reports/TableReportcs.cs @@ -16,7 +16,7 @@ internal class TableReport private readonly ILogger _logger; - internal static readonly string[] item = ["Клиент","Дата","Списания","Пополнения"]; + internal static readonly string[] item = ["Клиент","Дата","Пополнения","Списания"]; public TableReport(IAddMoneyRepository addMoneyRepository, ITourRepository tourRepository, ILogger logger) @@ -52,16 +52,16 @@ internal class TableReport endDate) { var data = _tourRepository.ReadTours().Select(x => new { - ClientId = 73, + ClientId = (int ?)x.ClientTours.Sum(x => x.ClientId), Date = x.DepartureDate, CountIn = (int?)null, - CountOut = (int?)null + CountOut = (int?)x.ClientTours.Sum(x => x.Cost) }) .Union( _addMoneyRepository.ReadAddMoneys().Select(x => new { - ClientId = x.ClientId, + ClientId = (int?)x.ClientId, Date = x.Date, - CountIn = (int?)null, + CountIn = (int?)x.MoneyAmount, CountOut= (int?)null }) ) .OrderBy(x => x.Date);