michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes: (1) OnePerMeter : 'WaterMeters[0]' used instead of 'wm', (2) Printers.Table : last vertical line, ver. 2.18.877

Browse Source
This commit is contained in:
Milan Hanajik
2018-04-15 12:19:06 +02:00
parent b17d710044
commit 5769b6ad48
6 changed files with 59 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs
+7 -7
View File
@@ -195,7 +195,7 @@ namespace Results.Output.Printers.OnePerMeter
Table table1 = new Table(2) { Style = commonTableStyle };
foreach (var item in commonItems1)
{
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
table1.AddRow(row, horizAlgn, vertAlgn);
}
float bodyTop1 = table1.Draw(e, leftMarginCommon1, commonTop);
@@ -204,7 +204,7 @@ namespace Results.Output.Printers.OnePerMeter
table1 = new Table(2) { Style = commonTableStyle };
foreach (var item in commonItems2)
{
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
table1.AddRow(row, horizAlgn, vertAlgn);
}
float bodyTop2 = table1.Draw(e, leftMarginCommon2, commonTop);
@@ -213,7 +213,7 @@ namespace Results.Output.Printers.OnePerMeter
table1 = new Table(2) { Style = commonTableStyle };
foreach (var item in commonItems3)
{
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
table1.AddRow(row, horizAlgn, vertAlgn);
}
float bodyTop3 = table1.Draw(e, leftMarginCommon3, commonTop);
@@ -244,7 +244,7 @@ namespace Results.Output.Printers.OnePerMeter
LineWidth = 1,
TopHeadersCount = 1,
HorizLines = TableLines.All,
VertLines = TableLines.FirstSecondAndLast
VertLines = TableLines.All
};
table = Table.Create_TestsAreRows(wm, (pageNr == 1) ? testItems : testItems2, style);
break;
@@ -303,7 +303,7 @@ namespace Results.Output.Printers.OnePerMeter
Table table2 = new Table(2) { Style = commonTableStyle };
foreach (var item in belowItems1)
{
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
table2.AddRow(row, horizAlgn, vertAlgn);
}
table2.Draw(e, leftMarginBelow1, belowTop);
@@ -312,7 +312,7 @@ namespace Results.Output.Printers.OnePerMeter
table2 = new Table(2) { Style = commonTableStyle };
foreach (var item in belowItems2)
{
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
table2.AddRow(row, horizAlgn, vertAlgn);
}
table2.Draw(e, leftMarginBelow2, belowTop);
@@ -321,7 +321,7 @@ namespace Results.Output.Printers.OnePerMeter
table2 = new Table(2) { Style = commonTableStyle };
foreach (var item in belowItems3)
{
string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty };
string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
table2.AddRow(row, horizAlgn, vertAlgn);
}
table2.Draw(e, leftMarginBelow3, belowTop);