Fix Issue with hidden aggregate fields (#790)

* Added the option to keep showing aggregate fields on attributes even when the query is not aggregating.

* - variable name change
- text change
- fixed logic

Co-authored-by: Floris Schild <floris@2at.nl>
Co-authored-by: Jonas Rapp <jonas@jonasr.app>

FetchXmlBuilder/Controls/attributeControl.cs

@@ -32,7 +32,7 @@ public attributeControl(TreeNode node, AttributeMetadata[] attributes, FetchXmlB
         protected override void PopulateControls()
         {
             cmbAttribute.Items.Clear();
-            aggregate = Node.IsFetchAggregate();
+            aggregate = !fxb.settings.HideAggregationFieldsWhenNotAggregating || Node.IsFetchAggregate();
             panAggregate.Visible = aggregate;
             grpLayout.Visible = !aggregate;
             cmbAggregate.Enabled = aggregate;

FetchXmlBuilder/Forms/Settings.cs

@@ -48,6 +48,7 @@ private void PopulateSettings(FXBSettings settings)
             txtFetch.ConfigureForXml(settings);
             txtFetch.FormatXML(settings.QueryOptions.NewQueryTemplate, settings);
             chkTryMetadataCache.Checked = settings.TryMetadataCache;
+            chkHideFieldsOnAggregate.Checked = settings.HideAggregationFieldsWhenNotAggregating;
             if (chkTryMetadataCache.Checked)
             {
                 chkWaitUntilMetadataLoaded.Enabled = true;
@@ -100,6 +101,7 @@ internal FXBSettings GetSettings()
             settings.XmlColors = propXmlColors.SelectedObject as XmlColors;
             settings.TryMetadataCache = chkTryMetadataCache.Checked;
             settings.WaitUntilMetadataLoaded = chkWaitUntilMetadataLoaded.Checked;
+            settings.HideAggregationFieldsWhenNotAggregating = chkHideFieldsOnAggregate.Checked;
             return settings;
         }
 

FetchXmlBuilder/Settings/FXBSettings.cs

@@ -1,4 +1,4 @@
-using Rappen.XTB.FetchXmlBuilder.DockControls;
+using Rappen.XTB.FetchXmlBuilder.DockControls;
 using ScintillaNET;
 using System;
 using System.Collections.Generic;
@@ -46,6 +46,7 @@ public bool UseFriendlyNames
         public bool ShowRepository { get; set; } = false;
         public bool TryMetadataCache { get; set; } = true;
         public bool WaitUntilMetadataLoaded { get; set; } = false;
+        public bool HideAggregationFieldsWhenNotAggregating { get; set; } = true;
         public CodeGenerators CodeGenerators { get; set; } = new CodeGenerators();
     }