Compare commits

...
10 Commits
27 changed files with 22 additions and 12 deletions

No files matched your search

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+16 -6
View File
@@ -128,16 +128,26 @@ namespace VEPROMS.CSLA.Library
int sibCount = SiblingCount(xmlNode);
return string.Format("{0}/{1}[{2}]", parentPath, xmlNode.Name, sibCount);
}
//B2026-077 – Update Format inheritance to use index id instead of position/order.
public static string PathByIndex(XmlNode xmlNode)
{
if (xmlNode.Name == "TransTypes" || xmlNode.Name == "Step")
{
string parentPath = xmlNode.ParentNode == xmlNode.OwnerDocument ? "" : Path(xmlNode.ParentNode);
string Indx = xmlNode.Attributes["Index"].Value;
return $@"{parentPath}/{xmlNode.Name}[@Index='{Indx}']";
}
else
{
return Path(xmlNode);
}
}
public static XmlNode InheritLookup(XmlNode xmlNode, string path, bool stepLookup)
{
//stepLookup = false; // 8/2 change for inheritance
if (xmlNode == null) return null;// No path to match
string xPath = Path(xmlNode);// Build xPath from xmlNode
if (xmlNode.Name == "TransTypes")
{
string TransIndex = xmlNode.Attributes["Index"].Value;
xPath = System.Text.RegularExpressions.Regex.Replace(xPath, @"\[[0-9]*\]$", @"[@Index='" + TransIndex + @"']");
}
string xPath = PathByIndex(xmlNode);// Build xPath from xmlNode
vlnFormatDocument fd = (vlnFormatDocument)xmlNode.OwnerDocument;//First Get the vlnFormatDocument - This also ties it to a FormatInfo object
while(fd.MyFormat.MyIParent != null)
{
@@ -29,8 +29,8 @@ namespace Volian.Controls.Library
public DisplayLibDocs()
{
InitializeComponent();
btnOpenLibDoc.Enabled = false;
btnDelLibDoc.Enabled = false;
btnOpenLibDoc.Visible = btnOpenLibDoc.Enabled = false;
btnDelLibDoc.Visible = btnDelLibDoc.Enabled = false;
btnPrint.Enabled = listBoxLibDocs.Items.Count > 0;
saveGroupPanelUsages = groupPanelUsages.Style.BackColor;
}
@@ -107,13 +107,13 @@ namespace Volian.Controls.Library
groupPanelUsages.Style.BackColor = dicnt.LibraryDocumentUsageList == null || dicnt.LibraryDocumentUsageList.Count == 0 ? this.saveGroupPanelUsages : Color.LightGreen;
if (iil == null)
{
btnDelLibDoc.Enabled = true;
btnOpenLibDoc.Enabled = true;
btnOpenLibDoc.Visible = btnOpenLibDoc.Enabled = true;
btnDelLibDoc.Visible = btnDelLibDoc.Enabled = true;
return;
}
// Put the usages in the usage list for the selected library document.
btnDelLibDoc.Enabled = false;
btnOpenLibDoc.Enabled = false;
btnOpenLibDoc.Visible = btnOpenLibDoc.Enabled = false;
btnDelLibDoc.Visible = btnDelLibDoc.Enabled = false;
foreach (ItemInfo ii in dicnt.LibraryDocumentUsageList)
{
if (ii.MyDocVersion != null)