diff --git a/PROMS/Formats/fmtall/CWEall.xml b/PROMS/Formats/fmtall/CWEall.xml index 283fa476..15b519a8 100644 Binary files a/PROMS/Formats/fmtall/CWEall.xml and b/PROMS/Formats/fmtall/CWEall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index 1ac5c516..09f6eace 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -270,6 +270,9 @@ namespace VEPROMS.CSLA.Library private string CreateRtf(bool colorLinks, string text, bool tableShouldBeOutlined, bool wordsShouldBeReplaced, bool numbersShouldBeFormated, bool tableHasBorder, bool ROsShouldBeAdjusted, bool underlineAfterDashSpace, E_EditPrintMode epMode) { int profileDepth = ProfileTimer.Push(">>>> CreateRtf"); + // F2019-065: Upper case if step format has flag + if (_MyItemInfo != null && wordsShouldBeReplaced && _MyItemInfo.IsStep && _MyItemInfo.FormatStepData.UpperCase) + text = UpCaseStep(text); // Adjust RO display if (ROsShouldBeAdjusted) { @@ -426,7 +429,27 @@ namespace VEPROMS.CSLA.Library ProfileTimer.Pop(profileDepth); return text; } - + // F2019-065: Upper case if step format has flag + private string UpCaseStep(string text) + { + // upper case all text except in links/symbols + RtfToDisplayTextElements(text); + StringBuilder sret = new StringBuilder(); + foreach (displayTextElement vte in DisplayTextElementList) + { + if (vte.Type == E_TextElementType.Text) + sret.Append(vte.Text.ToUpper()); + else if (vte.Type == E_TextElementType.Symbol) + sret.Append(vte.Text); + else + { + displayLinkElement dle = vte as displayLinkElement; + sret.Append(dle.TextAndLink); + } + } + string mdtxt = sret.ToString(); + return mdtxt; + } private string FixDiffUnitROReplaceWords(string text) { if (_MyFormat == null) return text; diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 3913e11d..c56881f1 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -5034,6 +5034,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UnderlineAfterDashSpace, "@UnderlineAfterDashSpace"); } } + // F2019-065: Allow uppercase of high level steps to be defined in the format + private LazyLoad _UpperCase; + public bool UpperCase + { + get + { + return LazyLoad(ref _UpperCase, "@UpperCase"); + } + } private LazyLoad _SpaceIn; public bool SpaceIn {