Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2020-006: search print-procedure title doesn’t print when section is only instance found and ‘\u160?’ prints in procedure titles

Browse Source
This commit is contained in:
Kathy Ruffing 2020-01-24 15:47:08 +00:00
parent 4eb6b63680
commit eacd97f0fa
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PROMS/Volian.Print.Library/PDFReport.cs
View File

@ -154,7 +154,8 @@ namespace Volian.Print.Library
} }
if (n == 0) if (n == 0)
{ {
sb.Append(dvPath); // B2020-006: 'clean-up' the output string by making string replaces as in 'else' below.
sb.Append(dvPath.Replace("\x11", " ").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace(@"\u9586?", @"\"));
} }
else else
{ {
@ -162,7 +163,8 @@ namespace Volian.Print.Library
{ {
if (NewPath[j] != "" && (foundMisMatch || OldPath.Length < j + 1 || NewPath[j] != OldPath[j])) if (NewPath[j] != "" && (foundMisMatch || OldPath.Length < j + 1 || NewPath[j] != OldPath[j]))
{ {
sb.Append(sep + "".PadLeft(2 * level) + NewPath[j].Replace("\x11", " ")).Replace(@"\u8209?", "-").Replace(@"\u9586?",@"\"); // B2020-006: Add hard space '\u160?'
sb.Append(sep + "".PadLeft(2 * level) + NewPath[j].Replace("\x11", " ")).Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace(@"\u9586?",@"\");
sep = "\r\n"; sep = "\r\n";
foundMisMatch = true; foundMisMatch = true;
} }
@ -546,7 +548,8 @@ namespace Volian.Print.Library
subTable = new PdfPTable(headerwidths); subTable = new PdfPTable(headerwidths);
//} //}
lastProcNum = curProcNum; lastProcNum = curProcNum;
string stepPath = AddGroup(subTable, item.SearchPath ?? item.ShortPath, lastPath, f2, true, new Color(0xC0, 0xFF, 0xC0), true); // B2020-006: When doing a section, don't remove the last item or the procedure title won't print (if section is only item found w/ search string)
string stepPath = AddGroup(subTable, item.SearchPath ?? item.ShortPath, lastPath, f2, item.IsSection ? false : true, new Color(0xC0, 0xFF, 0xC0), true);
lastPath = item.SearchPath ?? item.ShortPath; lastPath = item.SearchPath ?? item.ShortPath;
stepPath = BuildStepTab(item); stepPath = BuildStepTab(item);
AddCell(subTable, stepPath, f2, (item.IsSection ? SectColor : TextColor)); AddCell(subTable, stepPath, f2, (item.IsSection ? SectColor : TextColor));