diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 685eb638..c966fc98 100644 Binary files a/PROMS/Formats/fmtall/VEGPAlrall.xml and b/PROMS/Formats/fmtall/VEGPAlrall.xml differ diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index f3fee107..dd07f3fa 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -3624,25 +3624,27 @@ namespace Volian.Controls.Library string eopnum = section.MyProcedure.MyContent.Number; if (eopnum.ToUpper().Contains(@", , , , , , , , - eopnum = Regex.Replace(eopnum, @"\", "", RegexOptions.IgnoreCase); - eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)ID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); - eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); - eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)TEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); - eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); - // B2021-148 remove space character after "OTHER" - eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); - eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); - eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERTEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); - eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); - } - else - eopnum = section.MyProcedure.DisplayNumber;// B2021-066: found and fixed during proc pc/pc work + // C2021-064 If we are processing the EOP number or an ROLookUp in the pagelist, then strip out the Parent/Child unit tokens + // so that we are left with just the EOP number. This is used along with Parent/Child RO Values (in RO Editor) + if ((token.Equals("{EOPNUMROLU}") || token.Equals("[EOPNUMROLU]"))) + { + // copied Rgex from DisplayText and modifed to remove the Parent/Child Unit information + // i.e. , , , , , , , , + // F2023-078 - for Vogtle Units 3 & 4 Alarms - also remove dash after unit number + eopnum = Regex.Replace(eopnum, @"\(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)ID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)TEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + // B2021-148 remove space character after "OTHER" + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERTEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + } + else + eopnum = section.MyProcedure.DisplayNumber;// B2021-066: found and fixed during proc pc/pc work } // B2022-066 the "{PREDELIMEOPNUM}" token was not being processed because there was a space after the "{" if (token.Equals("{PREDELIMEOPNUM}")) @@ -3747,8 +3749,10 @@ namespace Volian.Controls.Library // Note that each Alarm is defined as its own RO in the Referenced Object database, with multiple return values // to define the Window ID, Alarm, Source, Setpoint, etc. for example. string pltok = pageItem.Token; + bool bDoUnderline = true; // F2023-078 new logic to also support Vogtle Units 3 & 4 Alarms - flag to underline pagelist text used as a tag/title while (pltok.Contains("RO_Lookup(")) { + bDoUnderline = false; int idxstart = pltok.IndexOf("RO_Lookup("); int idxend = pltok.Substring(idxstart).IndexOf(")"); string ROLookupstr = pltok.Substring(idxstart, idxend + 1); @@ -3814,11 +3818,14 @@ namespace Volian.Controls.Library // Nothing else is on this page list item, so use "continue" to jump to the next pagelist item as nothing gets printed for this item if (!pageItem.ROLkUpMatch && pageItem.ROLkUpInEditor) { - if (lastRow < pageItem.Row) + // F2023-078 (displaying Alarm Point Table RO information on the edit screen) + // New logic is simplified to support both BNPP and Vogtle Units 3 & 4 alarms + if (bDoUnderline) { if (lastRow != -1) strAlrmPtTableInfo.Append("\r\n"); - strAlrmPtTableInfo.Append(string.Format("\\ul {0}\\ulnone : ",pltok)); + pltok = pltok.TrimEnd(':'); + strAlrmPtTableInfo.Append(string.Format("\\ul {0}\\ulnone : ", pltok)); lastRow = (int)pageItem.Row; } else diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 04033a63..6b24b34b 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1913,6 +1913,8 @@ i = 0; { // copied Rgex from DisplayText and modifed to remove the Parent/Child Unit information // i.e. , , , , , , , , + // F2023-078 - for Vogtle Units 3 & 4 Alarms - also remove dash after unit number + eopnum = Regex.Replace(eopnum, @"\(-|\\u8209\?)", string.Empty, RegexOptions.IgnoreCase); eopnum = Regex.Replace(eopnum, @"\", string.Empty, RegexOptions.IgnoreCase); eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)ID)\>(-|\\u8209\?)", string.Empty, RegexOptions.IgnoreCase); eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NAME)\>(-|\\u8209\?)", string.Empty, RegexOptions.IgnoreCase);