From 98d8a174fb13585b38e4002242550f99f997e66a Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Thu, 25 Jul 2013 03:38:16 +0000
Subject: [PATCH] Changed how DoBeforeTransFlagSupport located replace words
 string in step text from first location to last location Added and used new
 method IncludesParentToHLS to PDFReport to correct how step tab data is
 displayed in PDF report

---
 PROMS/Volian.Controls.Library/DisplayText.cs |  3 ++-
 PROMS/Volian.Print.Library/PDFReport.cs      | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs
index 35e468e2..1ffb2427 100644
--- a/PROMS/Volian.Controls.Library/DisplayText.cs
+++ b/PROMS/Volian.Controls.Library/DisplayText.cs
@@ -476,7 +476,8 @@ namespace Volian.Controls.Library
 						string findit = beforeTran.Substring(0, beforeTran.LastIndexOf(@"\v <START]\v0"));
 						if (findit != null && findit.Trim().ToUpper().EndsWith(repstr.ReplaceWord.ToUpper()))
 						{
-							int rindx = findit.Trim().ToUpper().IndexOf(repstr.ReplaceWord.ToUpper());
+//							int rindx = findit.Trim().ToUpper().IndexOf(repstr.ReplaceWord.ToUpper());
+							int rindx = findit.Trim().ToUpper().LastIndexOf(repstr.ReplaceWord.ToUpper());
 							// don't replace string because case of words may be match replace with string.
 							beforeTran = findit.Substring(0, rindx) + @"\b " + findit.Substring(rindx) + @"\b0" + beforeTran.Substring(indx);
 							return beforeTran;
diff --git a/PROMS/Volian.Print.Library/PDFReport.cs b/PROMS/Volian.Print.Library/PDFReport.cs
index 00f24298..0a753881 100644
--- a/PROMS/Volian.Print.Library/PDFReport.cs
+++ b/PROMS/Volian.Print.Library/PDFReport.cs
@@ -877,6 +877,8 @@ namespace Volian.Print.Library
 					{
 						StepInfo stpinfo = StepInfo.Get(pitem.ItemID);
 						string thisTab = stpinfo.MyTab.CleanText; //StepInfo.Get(pitem.ItemID).MyTab.CleanText;
+						if (IncludesParentToHLS(stpinfo))
+							return thisTab;
 						string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;//stpinfo.FormatStepData.ToString();
 						// remove delimiters of '.' and ')' in tab.
 						//if (thisTab != null && !hasDelim)
@@ -958,6 +960,16 @@ namespace Volian.Print.Library
 			return sret;
 		}
 
+		private static bool IncludesParentToHLS(StepInfo stpinfo)
+		{
+			if (stpinfo.IsHigh)
+				return true;
+			StepInfo parent = StepInfo.Get((stpinfo.ActiveParent as ItemInfo).ItemID);
+			if (stpinfo.MyTab.CleanText.StartsWith(parent.MyTab.CleanText.Trim()) && stpinfo.MyTab.CleanText.Length > parent.MyTab.CleanText.Length)
+				return IncludesParentToHLS(parent);
+			return false;
+		}
+
 		private void BuildROUsageTableByProcedure(iTextSharp.text.Document document)
 		{
 			Dictionary<string, List<ItemInfo>> roUse = new Dictionary<string, List<ItemInfo>>();