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

F2017-036: For VCB: Additional Proprietary statement

Browse Source
This commit is contained in:
Kathy Ruffing 2017-07-26 13:18:01 +00:00
parent cb54fd2fe3
commit acec23a280
2 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs
View File

@ -84,6 +84,14 @@ namespace VEPROMS.CSLA.Library
return (_Font == null) ?_Font = new VE_Font(XmlNode): _Font; return (_Font == null) ?_Font = new VE_Font(XmlNode): _Font;
} }
} }
private RelatedItem _RelatedItem;
public RelatedItem RelatedItem
{
get
{
return (_RelatedItem == null) ? _RelatedItem = new RelatedItem(SelectSingleNode("RelatedItem")) : _RelatedItem;
}
}
private LazyLoad<string> _Token; private LazyLoad<string> _Token;
[Category("Content")] [Category("Content")]
[DisplayName("Content")] [DisplayName("Content")]
@ -146,6 +154,7 @@ namespace VEPROMS.CSLA.Library
} }
} }
#endregion #endregion
#region Override ToString #region Override ToString
public override string ToString() public override string ToString()
{ {
@ -157,4 +166,60 @@ namespace VEPROMS.CSLA.Library
#endregion #endregion
} }
#endregion #endregion
#region RelatedItem
// RelatedItem was added to allow a PSI logical to have an associated PSI item, and if both are
// selected the RelatedItem data changes where the item prints. This was implemented for
// F2017-036 - VCS.
[TypeConverter(typeof(ExpandableObjectConverter))]
public class RelatedItem : vlnFormatItem
{
#region Constructor
public RelatedItem(XmlNode xmlNode) : base(xmlNode) { }
public RelatedItem() : base() { }
#endregion
#region Business Methods
private LazyLoad<string> _Token;
[Category("RelatedContent")]
[DisplayName("RelatedContent")]
[Description("Item RelatedContent")]
public string Token
{
get
{
return LazyLoad(ref _Token, "@Token");
}
}
private LazyLoad<float?> _Row;
[Category("Location")]
[DisplayName("Vertical Position")]
[Description("Vertical Position")]
public float? Row
{
get
{
return LazyLoad(ref _Row, "@Row");
}
}
private LazyLoad<float?> _Col;
[Category("Location")]
[DisplayName("Horizontal Position")]
[Description("Horizontal Position")]
public float? Col
{
get
{
return LazyLoad(ref _Col, "@Col");
}
}
private LazyLoad<E_Justify?> _Justify;
public E_Justify? Justify
{
get
{
return LazyLoad<E_Justify>(ref _Justify, "@Justify");
}
}
#endregion
}
#endregion
} }

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

@ -1309,7 +1309,23 @@ namespace Volian.Print.Library
string val = procConfig.GetValue("PSI", pstok); string val = procConfig.GetValue("PSI", pstok);
int bindx = token.IndexOf("|", indx); int bindx = token.IndexOf("|", indx);
if (val == "Y") if (val == "Y")
{
val = token.Substring(qindx + 1, bindx - qindx - 1); val = token.Substring(qindx + 1, bindx - qindx - 1);
// F2017-036: see if there is a RelatedItem in this page item. RelatedItem allows for repositioning
// this current item if both items are set to be printed from the Procedure Specific Information. If both are printed
// the location of this item is defined in the RelatedItem xml.
if (pageItem.RelatedItem.Token != null)
{
// see if the related item is on this page also, if so, use the new row/col/justify:
string reltoken = pageItem.RelatedItem.Token;
string relval = procConfig.GetValue("PSI", reltoken);
if (relval == "Y")
{
svgGroup.Add(PageItemToSvgText(pageItem.Token, (float)pageItem.RelatedItem.Row, (float)pageItem.RelatedItem.Col, pageItem.RelatedItem.Justify ?? VEPROMS.CSLA.Library.E_Justify.PSLeft, pageItem.Font, val, MySection));
plstr = ""; // Clear it so it isn't put out twice (used below)
}
}
}
else else
{ {
int eindx = token.IndexOf("}", bindx); int eindx = token.IndexOf("}", bindx);