diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index 09f6eace..3d639fbc 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -1592,7 +1592,7 @@ namespace VEPROMS.CSLA.Library if (ti.TransitionID == transitionID) { string path = ti.ResolvePathTo(_MyFormat, _MyItemInfo, ti.TranType, ti.MyItemToID, ti.MyItemRangeID); - return path; + if (!path.Contains("(Page ~)"))return path; // B2020-089, don't change back to a Page ~ if page number already set. } } return text; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index d1f26e82..d00781c4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -773,7 +773,7 @@ namespace VEPROMS.CSLA.Library string pattern = string.Format(@"( [0-9]*){{1,2}}\[END>"); //string pattern = string.Format(@".*\\v ( [0-9]*){{1,2}}\[END>"); Match m = Regex.Match(fromInfo.MyContent.Text, pattern); - if (m.Groups.Count > 1 && m.Groups[1].Value.Contains("(Page ~)")) + if (m.Groups.Count > 1 && m.Groups[1].Value.ToUpper().Contains("(PAGE ~)")) // B2020-089, check for upper case Page ~ in case step was upper cased pagenum = true; } } diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs index e2f7cc1a..7d62d072 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs @@ -592,7 +592,7 @@ namespace VEPROMS.CSLA.Library SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"]; string pattern = string.Format(@"( [0-9]*){{1,2}}\[END>", _TransitionID); Match m = Regex.Match(myContent.Text, pattern); - if (m.Groups.Count > 1 && m.Groups[1].Value.Contains("(Page ~)")) + if (m.Groups.Count > 1 && m.Groups[1].Value.ToUpper().Contains("(PAGE ~)")) // B2020-089, check for upper case Page ~ in case step was upper cased _Config = ""; else _Config = string.Empty; diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs index 12e0aa3f..287ebb5b 100644 --- a/PROMS/Volian.Controls.Library/GridItem.cs +++ b/PROMS/Volian.Controls.Library/GridItem.cs @@ -573,7 +573,7 @@ namespace Volian.Controls.Library myLength += m.Groups[3].Length; } string gg = ((string)MyFlexGrid[r, c]).Substring(myIndex, myLength); - if (gg.Contains("(Page ~)")) RtfTransPageNumList.Add(tid); + if (gg.ToUpper().Contains("(PAGE ~)")) RtfTransPageNumList.Add(tid); // B2020-089, check for upper case Page ~ in case step was upper cased } } }