diff --git a/.gitignore b/.gitignore index 2977950..e931806 100644 --- a/.gitignore +++ b/.gitignore @@ -407,3 +407,6 @@ FodyWeavers.xsd /docBuses1.docx /excel1.xlsx /pdf1.pdf +*.docx +*.xlsx +*.pdf diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs index 6d34c46..1c6c4c6 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs @@ -113,7 +113,7 @@ // directoryReportToolStripMenuItem.Name = "directoryReportToolStripMenuItem"; directoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W; - directoryReportToolStripMenuItem.Size = new Size(490, 40); + directoryReportToolStripMenuItem.Size = new Size(517, 40); directoryReportToolStripMenuItem.Text = "Документ со справочниками"; directoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click; // @@ -121,15 +121,15 @@ // busesReportToolStripMenuItem.Name = "busesReportToolStripMenuItem"; busesReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E; - busesReportToolStripMenuItem.Size = new Size(490, 40); - busesReportToolStripMenuItem.Text = "Работа автобусов"; + busesReportToolStripMenuItem.Size = new Size(517, 40); + busesReportToolStripMenuItem.Text = "Работа сотрудников и автобусов"; busesReportToolStripMenuItem.Click += BusesReportToolStripMenuItem_Click; // // serviceReportToolStripMenuItem // serviceReportToolStripMenuItem.Name = "serviceReportToolStripMenuItem"; serviceReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P; - serviceReportToolStripMenuItem.Size = new Size(490, 40); + serviceReportToolStripMenuItem.Size = new Size(517, 40); serviceReportToolStripMenuItem.Text = "Сломанные элементы"; serviceReportToolStripMenuItem.Click += ServiceReportToolStripMenuItem_Click; // diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs index a4a134c..d008dd5 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs @@ -37,7 +37,7 @@ public class ExcelBuilder public ExcelBuilder AddHeader(string header, int startIndex, int count) { - CreateCell(startIndex, _rowIndex, header, StyleIndex.SimpleTextWithoutBorder); + CreateCell(startIndex, _rowIndex, header, StyleIndex.BoldTextWithoutBorder); for (int i = startIndex + 1; i < startIndex + count; ++i) { CreateCell(i, _rowIndex, "", StyleIndex.SimpleTextWithoutBorder); @@ -88,7 +88,7 @@ public class ExcelBuilder for (var j = 0; j < data.First().Length; ++j) { - CreateCell(j, _rowIndex, data.First()[j], StyleIndex.SimpleTextWithoutBorder); + CreateCell(j, _rowIndex, data.First()[j], StyleIndex.BoldTextWithBorder); } _rowIndex++; @@ -96,7 +96,7 @@ public class ExcelBuilder { for (var j = 0; j < data[i].Length; ++j) { - CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithoutBorder); + CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithBorder); } _rowIndex++; @@ -104,7 +104,7 @@ public class ExcelBuilder for (var j = 0; j < data.Last().Length; ++j) { - CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.SimpleTextWithoutBorder); + CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.BoldTextWithBorder); } _rowIndex++; diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs index 458b474..eeb4f76 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.Logging; using ProjectPassengerTransportation.Repositories; -using System.Linq; namespace ProjectPassengerTransportation.Reports;