sheym/PIbd-23_Sheymuhov_A.I._ProjectPassengerTransportation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PIbd-23 SheymuhovA.I. LabWork03 #3

Closed
sheym wants to merge 5 commits from LabWork3 into LabWork2
pull from: LabWork3
merge into: sheym:LabWork2
Conversation 1 Commits 5 Files Changed 26 +11 -9
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8e37dd9918 - Show all commits

3
.gitignore vendored
View File

@ -407,3 +407,6 @@ FodyWeavers.xsd
/docBuses1.docx
/excel1.xlsx
/pdf1.pdf
*.docx
*.xlsx
*.pdf

8
ProjectPassengerTransportation/ProjectPassengerTransportation/FormPassengerTransportation.Designer.cs generated
View File

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

8
ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/ExcelBuilder.cs
View File

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

1
ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs
View File

@ -1,6 +1,5 @@
using Microsoft.Extensions.Logging;
using ProjectPassengerTransportation.Repositories;
using System.Linq;
namespace ProjectPassengerTransportation.Reports;