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

Development #217

Merged
djankowski merged 9 commits from Development into master 2024-01-31 08:34:01 -05:00
Conversation 0 Commits 9 Files Changed 13 +2 -2
10 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5be9daa019 - Show all commits

2
PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs
View File

@@ -746,7 +746,7 @@ namespace RODBInterface
string csufx = string.Format("_PCCHILD{0}", pcChildIdx); string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
//applicValues += ","; //applicValues += ",";
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx); 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 applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
else else
{ {

2
PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs
View File

@@ -473,7 +473,7 @@ namespace ctlXMLEditLib
nd = node.SelectSingleNode(str); nd = node.SelectSingleNode(str);
// if not found with just the string, search the tree. // if not found with just the string, search the tree.
if (nd==null)nd = node.SelectSingleNode("*/"+str); 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 GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
else else
{ {