diff --git a/project/ProjectTourAgency/Forms/FormAddMoneys.cs b/project/ProjectTourAgency/Forms/FormAddMoneys.cs index 8b9ae68..a7233a6 100644 --- a/project/ProjectTourAgency/Forms/FormAddMoneys.cs +++ b/project/ProjectTourAgency/Forms/FormAddMoneys.cs @@ -51,7 +51,13 @@ namespace ProjectTourAgency.Forms } - private void LoadList() => dataGridViewData.DataSource = _addMoneyRepository.ReadAddMoneys(); + private void LoadList() + { + dataGridViewData.DataSource = _addMoneyRepository.ReadAddMoneys(); + dataGridViewData.Columns["Date"].DefaultCellStyle.Format = "dd.MM.yy"; + + } + private bool TryGetIdentifierFromSelectedRow(out int id) { diff --git a/project/ProjectTourAgency/Forms/FormClients.cs b/project/ProjectTourAgency/Forms/FormClients.cs index b557f14..4eb7ed2 100644 --- a/project/ProjectTourAgency/Forms/FormClients.cs +++ b/project/ProjectTourAgency/Forms/FormClients.cs @@ -1,4 +1,5 @@ -using ProjectTourAgency.Repositories; +using ProjectTourAgency.Implementations; +using ProjectTourAgency.Repositories; using System; using System.Collections.Generic; using System.ComponentModel; @@ -93,8 +94,13 @@ namespace ProjectTourAgency.Forms } } - private void LoadList() => dataGridViewData.DataSource = _clientRepository.ReadClients(); + private void LoadList() + { + dataGridViewData.DataSource = _clientRepository.ReadClients(); + dataGridViewData.Columns["Id"].Visible = false; + + } private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; diff --git a/project/ProjectTourAgency/Forms/FormEmployees.cs b/project/ProjectTourAgency/Forms/FormEmployees.cs index 2e8bdae..c4cc86d 100644 --- a/project/ProjectTourAgency/Forms/FormEmployees.cs +++ b/project/ProjectTourAgency/Forms/FormEmployees.cs @@ -95,8 +95,13 @@ namespace ProjectTourAgency.Forms } } - private void LoadList() => dataGridViewData.DataSource = _employeeRepository.ReadEmployees(); + private void LoadList() + { + dataGridViewData.DataSource = _employeeRepository.ReadEmployees(); + dataGridViewData.Columns["Id"].Visible = false; + dataGridViewData.Columns["EmployeeName"].Visible = false; + } private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; diff --git a/project/ProjectTourAgency/Forms/FormRoutes.cs b/project/ProjectTourAgency/Forms/FormRoutes.cs index e9ce87e..b0bbfac 100644 --- a/project/ProjectTourAgency/Forms/FormRoutes.cs +++ b/project/ProjectTourAgency/Forms/FormRoutes.cs @@ -1,4 +1,5 @@ using ProjectRouteAgency.Repositories; +using ProjectTourAgency.Implementations; using ProjectTourAgency.Repositories; using System; using System.Collections.Generic; @@ -94,8 +95,13 @@ namespace ProjectTourAgency.Forms } } - private void LoadList() => dataGridViewData.DataSource = _routeRepository.ReadRoutes(); + private void LoadList() + { + dataGridViewData.DataSource = _routeRepository.ReadRoutes(); + dataGridViewData.Columns["Id"].Visible = false; + dataGridViewData.Columns["DepartureDestination"].Visible = false; + } private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; diff --git a/project/ProjectTourAgency/Implementations/TourRepository.cs b/project/ProjectTourAgency/Implementations/TourRepository.cs index bb23682..80477ce 100644 --- a/project/ProjectTourAgency/Implementations/TourRepository.cs +++ b/project/ProjectTourAgency/Implementations/TourRepository.cs @@ -114,7 +114,7 @@ LEFT JOIN } ct.Add(tours); return clientTour; - }, splitOn: "ClientId", param: new { dateFrom, dateTo, tourId, clientId }); + }, splitOn: "ClientId"); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(tours)); return clientTourDict.Select(x =>