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

Merge pull request '~Added code to handle UI issues when selecting child nodes of a selected node' (#9) from C2023-010 into Development

Browse Source 
Reviewed-on: 7/6/2023.  Great documentation of the code change.  Feel this is ready for testing.
This commit is contained in:
John Jenko 2023-07-06 10:59:22 -04:00
commit 50d462e806
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -401,3 +401,4 @@ FodyWeavers.xsd
/fmtall /fmtall
/genmacall /genmacall
AssemblyInfo.cs

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

@ -2323,10 +2323,7 @@ namespace Volian.Controls.Library
{ {
foreach (Node tn in nodeCollection) foreach (Node tn in nodeCollection)
{ {
if (!tn.Checked) tn.Checked = tn.Parent.Checked;
tn.Checked = true;
else
tn.Checked = false;
if (tn.Nodes != null && tn.Nodes.Count > 0 && tn.Nodes[0].Text != DummyNodeText) if (tn.Nodes != null && tn.Nodes.Count > 0 && tn.Nodes[0].Text != DummyNodeText)
CheckTreeNodeChildren(tn.Nodes); CheckTreeNodeChildren(tn.Nodes);
@ -2559,10 +2556,15 @@ namespace Volian.Controls.Library
if (sd == null) if (sd == null)
{ {
if (!lstCheckedStepTypesStr.Contains("WORD Sections")) //C2023-010: Since the tag is null for Word Sections and HLS types, we need to determine which one has been selected. Word sections we need
//to process, but we need to ignore adding HLS types.
if (n.Text == "WORD Sections")
{ {
lstCheckedStepTypes.Add(0); //use zero to identify attachment search if (!lstCheckedStepTypesStr.Contains("WORD Sections"))
lstCheckedStepTypesStr.Add("WORD Sections"); {
lstCheckedStepTypes.Add(0); //use zero to identify attachment search
lstCheckedStepTypesStr.Add("WORD Sections");
}
} }
} }
else else
@ -2580,8 +2582,13 @@ namespace Volian.Controls.Library
if (sd == null) if (sd == null)
{ {
lstCheckedStepTypesStr.Remove("WORD Sections"); //C2023-010: Since the tag is null for Word Sections and HLS types, we need to determine which one has been selected. Word sections we need
lstCheckedStepTypes.Remove(0); //to process, but we need to ignore removing HLS types since they were not added in the previous process.
if (n.Text == "WORD Sections")
{
lstCheckedStepTypesStr.Remove("WORD Sections");
lstCheckedStepTypes.Remove(0);
}
} }
else else
{ {
@ -2590,6 +2597,17 @@ namespace Volian.Controls.Library
} }
} }
//C2023-010: Check if the node has children and if we need to process those children as well
if (n.HasChildNodes)
{
foreach (Node child in n.Nodes)
{
child.Checked = n.Checked;
advTreeStepTypes.SelectedNode = child;
advTreeStepTypes_AfterCheck(sender, null);
}
}
buildStepTypePannelTitle(); buildStepTypePannelTitle();
// B2021-100: Enable/disable the RNO Only checkbox & WORD Sections tree node in Step Elements to Search. // B2021-100: Enable/disable the RNO Only checkbox & WORD Sections tree node in Step Elements to Search.