Better order of parameters of fetch node UI

rappen · rappen · commit 32294501176a · 2025-11-27T11:06:18.000+01:00
diff --git a/FetchXmlBuilder/Builder/TreeNodeHelper.cs b/FetchXmlBuilder/Builder/TreeNodeHelper.cs
@@ -127,9 +127,9 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                     {
                         text += " top:" + attributes["top"];
                     }
-                    if (attributes.ContainsKey("count"))
+                    if (attributes.ContainsKey("distinct") && attributes["distinct"] == "true")
                     {
-                        text += " cnt:" + attributes["count"];
+                        text += " dist";
                     }
                     if (attributes.ContainsKey("returntotalrecordcount") && attributes["returntotalrecordcount"] == "true")
                     {
@@ -139,9 +139,9 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                     {
                         text += " aggr";
                     }
-                    if (attributes.ContainsKey("distinct") && attributes["distinct"] == "true")
+                    if (attributes.ContainsKey("count"))
                     {
-                        text += " dist";
+                        text += " cnt:" + attributes["count"];
                     }
                     if (attributes.ContainsKey("page"))
                     {
@@ -579,16 +579,16 @@ internal static void AddXmlNode(TreeNode currentNode, XmlNode parentXmlNode)
             else
             {
                 newNode = parentXmlNode.OwnerDocument.CreateElement(currentNode.Name);
-                foreach (string key in collec.Keys)
+                foreach (var key in collec.Keys)
                 {
                     if (key == "#text")
                     {
-                        XmlText newText = parentXmlNode.OwnerDocument.CreateTextNode(collec[key]);
+                        var newText = parentXmlNode.OwnerDocument.CreateTextNode(collec[key]);
                         newNode.AppendChild(newText);
                     }
                     else
                     {
-                        XmlAttribute attr = parentXmlNode.OwnerDocument.CreateAttribute(key);
+                        var attr = parentXmlNode.OwnerDocument.CreateAttribute(key);
                         attr.Value = collec[key];
                         newNode.Attributes.Append(attr);
                     }
@@ -601,7 +601,7 @@ internal static void AddXmlNode(TreeNode currentNode, XmlNode parentXmlNode)
                     others.Add(childNode);
                 }
 
-                foreach (TreeNode otherNode in others)
+                foreach (var otherNode in others)
                 {
                     AddXmlNode(otherNode, newNode);
                 }

Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,9 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate`
`127`	`127`	`{`
`128`	`128`	`text += " top:" + attributes["top"];`
`129`	`129`	`}`
`130`		`- if (attributes.ContainsKey("count"))`
	`130`	`+ if (attributes.ContainsKey("distinct") && attributes["distinct"] == "true")`
`131`	`131`	`{`
`132`		`- text += " cnt:" + attributes["count"];`
	`132`	`+ text += " dist";`
`133`	`133`	`}`
`134`	`134`	`if (attributes.ContainsKey("returntotalrecordcount") && attributes["returntotalrecordcount"] == "true")`
`135`	`135`	`{`
`@@ -139,9 +139,9 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate`
`139`	`139`	`{`
`140`	`140`	`text += " aggr";`
`141`	`141`	`}`
`142`		`- if (attributes.ContainsKey("distinct") && attributes["distinct"] == "true")`
	`142`	`+ if (attributes.ContainsKey("count"))`
`143`	`143`	`{`
`144`		`- text += " dist";`
	`144`	`+ text += " cnt:" + attributes["count"];`
`145`	`145`	`}`
`146`	`146`	`if (attributes.ContainsKey("page"))`
`147`	`147`	`{`
`@@ -579,16 +579,16 @@ internal static void AddXmlNode(TreeNode currentNode, XmlNode parentXmlNode)`
`579`	`579`	`else`
`580`	`580`	`{`
`581`	`581`	`newNode = parentXmlNode.OwnerDocument.CreateElement(currentNode.Name);`
`582`		`- foreach (string key in collec.Keys)`
	`582`	`+ foreach (var key in collec.Keys)`
`583`	`583`	`{`
`584`	`584`	`if (key == "#text")`
`585`	`585`	`{`
`586`		`- XmlText newText = parentXmlNode.OwnerDocument.CreateTextNode(collec[key]);`
	`586`	`+ var newText = parentXmlNode.OwnerDocument.CreateTextNode(collec[key]);`
`587`	`587`	`newNode.AppendChild(newText);`
`588`	`588`	`}`
`589`	`589`	`else`
`590`	`590`	`{`
`591`		`- XmlAttribute attr = parentXmlNode.OwnerDocument.CreateAttribute(key);`
	`591`	`+ var attr = parentXmlNode.OwnerDocument.CreateAttribute(key);`
`592`	`592`	`attr.Value = collec[key];`
`593`	`593`	`newNode.Attributes.Append(attr);`
`594`	`594`	`}`
`@@ -601,7 +601,7 @@ internal static void AddXmlNode(TreeNode currentNode, XmlNode parentXmlNode)`
`601`	`601`	`others.Add(childNode);`
`602`	`602`	`}`
`603`	`603`
`604`		`- foreach (TreeNode otherNode in others)`
	`604`	`+ foreach (var otherNode in others)`
`605`	`605`	`{`
`606`	`606`	`AddXmlNode(otherNode, newNode);`
`607`	`607`	`}`