From 5be9daa01972fc67b8afd331804650e9b649ea77 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Thu, 25 Jan 2024 11:15:10 -0500 Subject: [PATCH] B2024-004 In the RO Editor, fixed the issue for when Child values have a length of zero, the parent value will now be displayed (as gray text) in the Child field. Also, when generating a RO.FST file, it will use the Parent value when the Child value length is zero. --- PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs | 2 +- PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs index 98647f8f..82cbd45f 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs @@ -746,7 +746,7 @@ namespace RODBInterface string csufx = string.Format("_PCCHILD{0}", pcChildIdx); //applicValues += ","; XmlNode cn = elmnode.SelectSingleNode(parentName + csufx); - if (cn == null) + if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default else { diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs index 6ade16c3..9e1c5208 100644 --- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs +++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs @@ -473,7 +473,7 @@ namespace ctlXMLEditLib nd = node.SelectSingleNode(str); // if not found with just the string, search the tree. if (nd==null)nd = node.SelectSingleNode("*/"+str); - if (nd == null) + if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value else { -- 2.47.2