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

B2020-154: Incorrect top continue message tab in RNO column if for substep with a Caution/Note

Browse Source 
B2020-154: Incorrect top continue message tab in RNO column if for substep with a Caution/Note (2nd fix)
This commit is contained in:
Kathy Ruffing 2020-11-19 17:15:03 +00:00
parent 1e4c42a9f5
commit 867281200d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -1008,7 +1008,8 @@ namespace VEPROMS.CSLA.Library
thisTab != null && thisTab != "" && thisTab.Length > 1 && char.IsLetterOrDigit(thisTab[1]); thisTab != null && thisTab != "" && thisTab.Length > 1 && char.IsLetterOrDigit(thisTab[1]);
// for supplemental information, bulleted tabs need to be included in the tab. The 'isletterordigit' should not occur for supinfo items - // for supplemental information, bulleted tabs need to be included in the tab. The 'isletterordigit' should not occur for supinfo items -
// and this includes the parent of the supinfo since that is the tab used for supinfo concatenated with its parent. (B2017-120) // and this includes the parent of the supinfo since that is the tab used for supinfo concatenated with its parent. (B2017-120)
if (thisTab != null && thisTab != "" && !char.IsLetterOrDigit(thisTab[0]) && !vcbHeaderCheck && !itemInfo.IsInSupInfo && (itemInfo.SupInfos == null || itemInfo.SupInfos.Count <= 0 )) return pTab; // // B2020-154: Added check for the tab to start with '(', tabs that started with this were not included in the combined tab
if (thisTab != null && thisTab != "" && (!char.IsLetterOrDigit(thisTab[0]) && thisTab[0] != '(') && !vcbHeaderCheck && !itemInfo.IsInSupInfo && (itemInfo.SupInfos == null || itemInfo.SupInfos.Count <= 0 )) return pTab;
if (itemInfo.FormatStepData.NumberWithLevel) pTab = itemInfo.MyHLS.MyTab.CleanText.Trim(); if (itemInfo.FormatStepData.NumberWithLevel) pTab = itemInfo.MyHLS.MyTab.CleanText.Trim();
// if the parent tab ends with a alphanumeric and this tab is alphanumeric, add a '.' to separate them // if the parent tab ends with a alphanumeric and this tab is alphanumeric, add a '.' to separate them
// also, include use the separator for bullets if doing the supplemental information tab (B2017-120) // also, include use the separator for bullets if doing the supplemental information tab (B2017-120)

12
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -2683,14 +2683,20 @@ namespace Volian.Print.Library
while (ip.IsRNOPart) ip = ip.MyParent; while (ip.IsRNOPart) ip = ip.MyParent;
myMsg = myMsg.Replace(@"%sR", ip.CombinedTab); myMsg = myMsg.Replace(@"%sR", ip.CombinedTab);
} }
// B2020-154: Incorrect top continue message tab in RNO column if for substep with a Caution/Note // B2020-154: Incorrect top continue message tab in RNO column if for single level substep with a Caution/Note
else if ((MyItemInfo.IsNote || MyItemInfo.IsCaution) && (MyItemInfo.MyParent.IsRNOPart || MyItemInfo.MyParent.MyParent.IsRNOPart)) else if ((MyItemInfo.IsNote || MyItemInfo.IsCaution) && MyItemInfo.MyParent.MyParent.IsRNOPart)
{ {
if (DebugPagination.IsOpen) DebugPagination.WriteLine("***===>,'Yes','Changed RNO Continue Message',{0},{1},,{3},'{4}'", MyItemInfo.ItemID, YSize, 0, 0, this); if (DebugPagination.IsOpen) DebugPagination.WriteLine("***===>,'Yes','Case 1:Changed RNO Continue Message',{0},{1},,{3},'{4}'", MyItemInfo.ItemID, YSize, 0, 0, this);
ItemInfo ip = MyItemInfo.MyParent; ItemInfo ip = MyItemInfo.MyParent;
while (!ip.IsRNOPart) ip = ip.MyParent; while (!ip.IsRNOPart) ip = ip.MyParent;
myMsg = myMsg.Replace(@"%sR", ip.CombinedTab); myMsg = myMsg.Replace(@"%sR", ip.CombinedTab);
} }
// B2020-154: Incorrect top continue message tab in RNO column for substep with a Caution/Note within parent substeps
else if ((MyItemInfo.IsNote || MyItemInfo.IsCaution) && MyItemInfo.MyParent.MyParent.IsInRNO)
{
if (DebugPagination.IsOpen) DebugPagination.WriteLine("***===>,'Yes','Case 2:Changed RNO Continue Message',{0},{1},,{3},'{4}'", MyItemInfo.ItemID, YSize, 0, 0, this);
myMsg = myMsg.Replace(@"%sR", MyItemInfo.MyParent.MyParent.CombinedTab);
}
else else
myMsg = myMsg.Replace(@"%sR", MyItemInfo.MyParent.CombinedTab); myMsg = myMsg.Replace(@"%sR", MyItemInfo.MyParent.CombinedTab);
float xor = MyTopRNO.MyTab.XOffset; float xor = MyTopRNO.MyTab.XOffset;