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

C2021-024: Wolf Creek Top/Bottom continue message, do not include bullet and bullet or bullet followed by sub-steps in tab

Browse Source 
C2021-024: Top/Bottom continue message, do not include bullet and bullet or bullet followed by sub-steps in tab
This commit is contained in:
Kathy Ruffing 2021-04-26 13:46:15 +00:00
parent 2a59f6b69e
commit d944fd635a
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/WCN1all.xml
View File

Binary file not shown.

16
PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
View File

@ -823,6 +823,14 @@ namespace VEPROMS.CSLA.Library
} }
#endregion #endregion
#region Message #region Message
private LazyLoad<bool> _RemoveBullet;
public bool RemoveBullet // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
{
get
{
return LazyLoad(ref _RemoveBullet, "@RemoveBullet");
}
}
private LazyLoad<string> _Message; private LazyLoad<string> _Message;
[Category("Continue Msg")] [Category("Continue Msg")]
[DisplayName("Top Continue Msg")] [DisplayName("Top Continue Msg")]
@ -921,6 +929,14 @@ namespace VEPROMS.CSLA.Library
} }
#endregion #endregion
#region Message #region Message
private LazyLoad<bool> _RemoveBullet;
public bool RemoveBullet // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
{
get
{
return LazyLoad(ref _RemoveBullet, "@RemoveBullet");
}
}
private LazyLoad<string> _Message; private LazyLoad<string> _Message;
[Category("Continue Msg")] [Category("Continue Msg")]
[DisplayName("Bottom Continue Msg")] [DisplayName("Bottom Continue Msg")]

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

@ -2727,10 +2727,15 @@ namespace Volian.Print.Library
else else
{ {
// F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level // F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level
if (MyItemInfo.IsCautionOrNotePart) string noBullet = MyItemInfo.IsCautionOrNotePart ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.MyParent.CombinedTab); // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
else if (docstyle.Continue.Top.RemoveBullet)
myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.CombinedTab); {
int ind = noBullet.IndexOf(".o");
if (ind < 0) ind = noBullet.IndexOf(".*");
if (ind > -1) noBullet = noBullet.Substring(0, ind);
}
myMsg = myMsg.Replace(@"%s", noBullet);
} }
} }
if (myMsg.IndexOf(@"%3d") > -1) if (myMsg.IndexOf(@"%3d") > -1)
@ -3034,10 +3039,14 @@ namespace Volian.Print.Library
string tmp = tb.Trim(); string tmp = tb.Trim();
if (!MyItemInfo.MyParent.IsHigh) if (!MyItemInfo.MyParent.IsHigh)
{ {
if (MyItemInfo.IsCautionOrNotePart) tmp = MyItemInfo.IsCautionOrNotePart ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
tmp = MyItemInfo.MyParent.MyParent.CombinedTab.Trim(); // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
else if (MyItemInfo.MyDocStyle.Continue.Top.RemoveBullet)
tmp = MyItemInfo.MyParent.CombinedTab.Trim(); {
int ind = tmp.IndexOf(".o");
if (ind < 0) ind = tmp.IndexOf(".*");
if (ind > -1) tmp = tmp.Substring(0, ind);
}
} }
myMsg = myMsg.Replace(@"%s", tmp); myMsg = myMsg.Replace(@"%s", tmp);
} }