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

Point Beach backgrounds: Added support for continue message; don’t add posadjust to children of same type; add support for LimitWidToPageWid

Browse Source 
Added support for ProcDescr2 pagelist item & support for ProcDescr1 = {null} (inheritance was causing it to print when it shouldn’t have)
This commit is contained in:
Kathy Ruffing
2014-03-18 12:13:54 +00:00
parent 97c4d4d941
commit fdeb055bde
2 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@@ -1219,7 +1219,10 @@ namespace Volian.Print.Library
string matchStr = (pd.MatchProcNumber.StartsWith("*}")) ? pd.MatchProcNumber.Substring(2) : pd.MatchProcNumber;
if (procnum.Contains(matchStr))
{
plstr = pd.ProcDescr1;
if (pd.ProcDescr1 == "{null}") // used to override fmt file inheritance & set null/empty string
plstr = "";
else
plstr = pd.ProcDescr1;
break;
}
if (pd.MatchProcNumber == "@")
@@ -1236,6 +1239,35 @@ namespace Volian.Print.Library
}
}
break;
case "{PROCDES2}":
ProcDescrList pdl2 = section.ActiveFormat.PlantFormat.FormatData.PrintData.ProcDescrList;
if (pdl2 != null && pdl2.Count > 0)
{
string procnum = section.MyProcedure.MyContent.Number;
foreach (ProcDescr pd in pdl2)
{
if (pd.MatchProcNumber != null)
{
string matchStr = (pd.MatchProcNumber.StartsWith("*}")) ? pd.MatchProcNumber.Substring(2) : pd.MatchProcNumber;
if (procnum.Contains(matchStr))
{
plstr = pd.ProcDescr2;
break;
}
if (pd.MatchProcNumber == "@")
{
if (Regex.IsMatch(procnum, "^[A-Za-z]+$"))
plstr = pd.ProcDescr2;
else
plstr = "";
break;
}
}
else
plstr = "UNKNOWN";
}
}
break;
case "{CURDATE}":
DateTime thisDate1 = DateTime.Today;
plstr = plstr.Replace(token, thisDate1.ToString("MMMM dd, yyyy"));