diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormBusRepair.Designer.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormBusRepair.Designer.cs index dd7762b..aba4b47 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormBusRepair.Designer.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormBusRepair.Designer.cs @@ -42,11 +42,11 @@ // label1.AutoSize = true; label1.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 204); - label1.Location = new Point(26, 9); + label1.Location = new Point(50, 11); label1.Name = "label1"; - label1.Size = new Size(98, 21); + label1.Size = new Size(71, 21); label1.TabIndex = 0; - label1.Text = "ID Автобуса:"; + label1.Text = "Автобус:"; // // label2 // diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormBusRepair.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormBusRepair.cs index aaedc75..1d32999 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormBusRepair.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormBusRepair.cs @@ -11,7 +11,7 @@ public partial class FormBusRepair : Form _busRepairRepository = busRepairRepository ?? throw new ArgumentNullException(nameof(busRepairRepository)); comboBoxBus.DataSource = busRepository.ReadBuses(); - comboBoxBus.DisplayMember = "BusBrand"; + comboBoxBus.DisplayMember = "Brand"; comboBoxBus.ValueMember = "Id"; } private void ButtonSave_Click(object sender, EventArgs e) diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormItineraries.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormItineraries.cs index fe0b165..b8dfea4 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormItineraries.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormItineraries.cs @@ -65,7 +65,6 @@ public partial class FormItineraries : Form { dataGridViewData.DataSource = _itineraryRepository.ReadItinerary(); dataGridViewData.Columns["Id"].Visible = false; - dataGridViewData.Columns["RoutePoints"].Visible = false; } private bool TryGetIdentifierFromSelectedRow(out int id) diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRouteReport.Designer.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRouteReport.Designer.cs index 93ff445..7cd37aa 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRouteReport.Designer.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRouteReport.Designer.cs @@ -125,11 +125,11 @@ // label5.AutoSize = true; label5.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 204); - label5.Location = new Point(32, 45); + label5.Location = new Point(51, 47); label5.Name = "label5"; - label5.Size = new Size(96, 21); + label5.Size = new Size(71, 21); label5.TabIndex = 10; - label5.Text = "ID автобуса:"; + label5.Text = "Aвтобус:"; // // FormRouteReport // diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRouteReport.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRouteReport.cs index 6353ca5..36e8762 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRouteReport.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRouteReport.cs @@ -13,7 +13,7 @@ public partial class FormRouteReport : Form _container = container ?? throw new ArgumentNullException(nameof(container)); comboBoxBus.DataSource = busRepository.ReadBuses(); - comboBoxBus.DisplayMember = "Id"; + comboBoxBus.DisplayMember = "Brand"; comboBoxBus.ValueMember = "Id"; } private void ButtonSelectFilePath_Click(object sender, EventArgs e) diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRoutes.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRoutes.cs index 10f19c3..0e941eb 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRoutes.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Forms/FormRoutes.cs @@ -85,6 +85,7 @@ public partial class FormRoutes : Form { dataGridViewData.DataSource = _routeRepository.ReadRoutes(); dataGridViewData.Columns["Id"].Visible = false; + dataGridViewData.Columns["RoutePoints"].Visible = false; } private bool TryGetIdentifierFromSelectedRow(out int id) diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Reports/ExcelBuilder.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Reports/ExcelBuilder.cs index bec3562..04bf212 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Reports/ExcelBuilder.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Reports/ExcelBuilder.cs @@ -179,7 +179,7 @@ internal class ExcelBuilder { Horizontal = HorizontalAlignmentValues.Left, Vertical = VerticalAlignmentValues.Center, - WrapText = true + WrapText = false } }); cellFormats.Append(new CellFormat @@ -193,7 +193,7 @@ internal class ExcelBuilder { Horizontal = HorizontalAlignmentValues.Center, Vertical = VerticalAlignmentValues.Center, - WrapText = true + WrapText = false } }); @@ -208,7 +208,7 @@ internal class ExcelBuilder { Horizontal = HorizontalAlignmentValues.Center, Vertical = VerticalAlignmentValues.Center, - WrapText = true + WrapText = false } }); cellFormats.Append(new CellFormat @@ -222,7 +222,7 @@ internal class ExcelBuilder { Horizontal = HorizontalAlignmentValues.Center, Vertical = VerticalAlignmentValues.Center, - WrapText = true + WrapText = false } }); workbookStylesPart.Stylesheet.Append(cellFormats); diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Reports/TableReport.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Reports/TableReport.cs index f0b3e9e..d9a8731 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Reports/TableReport.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Reports/TableReport.cs @@ -9,7 +9,7 @@ internal class TableReport { private readonly IItineraryRepository _itineraryRepository; private readonly ILogger _logger; - internal static readonly string[] item = ["Дата", "Id Автобуса", "Id Водителя", "Id Кондуктора", "Кол-во маршрутов"]; + internal static readonly string[] item = ["Дата", "Автобус", "Водитель", "Кондуктор", "Кол-во маршрутов"]; public TableReport(IItineraryRepository itineraryRepository, IBusRepository busRepository, ILogger logger) { @@ -26,7 +26,7 @@ internal class TableReport new ExcelBuilder(filePath) .AddHeader("Сводка по поездкам автобуса", 0, 5) .AddParagraph($"за период c {startDate:dd.MM.yyyy} по { endDate: dd.MM.yyyy}", 0) - .AddTable([10, 10, 10, 10, 10], GetData(busId, startDate, endDate)) + .AddTable([10, 15, 15, 15, 10], GetData(busId, startDate, endDate)) .Build(); return true; } @@ -44,9 +44,9 @@ internal class TableReport .Select(x => new { Date = x.ItineraryDate, - BusId = x.BusId, - DriverId = x.DriverId, - ConductorId = x.ConductorId, + BusBrand = x.BusBrand, + DriverFullName = x.DriverFullName, + ConductorFullName = x.ConductorFullName, CountRoutes = (int?)x.ItineraryRoutes.Count() }) .OrderBy(x => x.Date); @@ -54,7 +54,7 @@ internal class TableReport new List() { item } .Union( data - .Select(x => new string[] { x.Date.ToString("dd.MM.yyyy"), x.BusId.ToString(), x.DriverId.ToString(), x.ConductorId.ToString(), x.CountRoutes.ToString()})) + .Select(x => new string[] { x.Date.ToString("dd.MM.yyyy"), x.BusBrand.ToString(), x.DriverFullName.ToString(), x.ConductorFullName.ToString(), x.CountRoutes.ToString()})) .Union( [["Всего", "", "", "", data.Sum(x => x.CountRoutes ?? 0).ToString()]]) .ToList(); diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Repositories/Implementations/ItineraryRepository.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Repositories/Implementations/ItineraryRepository.cs index e8b6af7..4e64c33 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Repositories/Implementations/ItineraryRepository.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Repositories/Implementations/ItineraryRepository.cs @@ -126,7 +126,7 @@ LEFT JOIN Routes r ON r.Id = ir.RouteId return itinerary; }, splitOn: "RouteId", - param: new { dateForm, dateTo, driverId, conductorId, routeId }); + param: new { dateForm, dateTo, busId, driverId, conductorId, routeId }); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(itineraries)); return itineraryDict.Select(x => @@ -141,17 +141,5 @@ LEFT JOIN Routes r ON r.Id = ir.RouteId _logger.LogError(ex, "Ошибка при чтении объектов"); throw; } - /* - var itineraries = connection.Query(querySelect); - _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(itineraries)); - - return itineraries.GroupBy(x => x.Id, y => y, (key, value) => Itinerary.CreateOpeartion( - value.First(), value.Select(z => ItineraryRoute.CreateElement(0, z.RouteId)) ) ).ToList(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка при чтении объектов"); - throw; - }*/ } } \ No newline at end of file