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

Development #356

Merged
djankowski merged 11 commits from Development into master 2024-07-18 09:51:55 -04:00
Conversation 0 Commits 11 Files Changed 10 +23 -5
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5255080291 - Show all commits

28
PROMS/Volian.Controls.Library/DisplaySearch.cs
View File

@@ -346,10 +346,11 @@ namespace Volian.Controls.Library
ch = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag; ch = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
chld = ch.children; chld = ch.children;
// build a list of ROs to search // build a list of ROs to search
return _MyRODbID.ToString() + ":" + GetROsToSearch(chld); // B2022-118: remove the ending comma otherwise query will fail
//return _MyRODbID.ToString() + ":" + ch.roid + "0000," + GetROsToSearch(chld); string strRtnStr = _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
//if (strRtnStr.EndsWith(",")) if (strRtnStr.EndsWith(","))
// strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1); strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
return strRtnStr;
} }
} }
} }
@@ -1939,6 +1940,13 @@ namespace Volian.Controls.Library
private string GetROsToSearch(ROFSTLookup.rochild[] chld) private string GetROsToSearch(ROFSTLookup.rochild[] chld)
{ {
string rtnstr = string.Empty; string rtnstr = string.Empty;
// B2022-118: If the ro has child nodes in tree view but they aren't loaded, load them
if ((chld == null || chld.Length <= 0) && (cmboTreeROs.SelectedNode.Nodes != null || cmboTreeROs.SelectedNode.Nodes.Count >= 1))
{
ROFSTLookup.rochild ro = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
MyROFSTLookup.LoadChildren(ref ro);
chld = ro.children;
}
// B2022-026 RO Memory Reduction code - check children length // B2022-026 RO Memory Reduction code - check children length
if (chld == null || chld.Length <= 0) // get a single ROID if (chld == null || chld.Length <= 0) // get a single ROID
@@ -1956,7 +1964,17 @@ namespace Volian.Controls.Library
if (roc.children != null && roc.children.Length > 0) if (roc.children != null && roc.children.Length > 0)
rtnstr += GetROsToSearch(roc.children); rtnstr += GetROsToSearch(roc.children);
else else
rtnstr += ROFSTLookup.FormatRoidKey(roc.roid, false); {
// B2022-118: If the ro has child nodes in tree view but they aren't loaded, load them
ROFSTLookup.rochild rot = roc;
MyROFSTLookup.LoadChildren(ref rot);
chld = rot.children;
if (rot.children != null && rot.children.Length > 0)
rtnstr += GetROsToSearch(rot.children);
else
rtnstr += string.Format("{0},", ROFSTLookup.FormatRoidKey(roc.roid, false));
}
} }
} }