Merge pull request #1184 from HicServices/dont-expand-cic

Adds user setting ExpandAllInCohortBuilder

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added `CrashAtEnd` system for DLE that allows Attachers to flag a load as a failure without halting execution [#1157](https://github.com/HicServices/RDMP/issues/1157)
 - Added `SimpleTicketingSystem` which simply opens the given URL+ticket [#775](https://github.com/HicServices/RDMP/issues/775)
 - Added UserSettings editing UI to Console Gui
+- Added ability to suppress tree expansion when opening Cohort Builder configurations
 
 ## [7.0.12] - 2022-05-16
 

Rdmp.UI/SimpleDialogs/UserSettingsUI.cs

@@ -100,6 +100,7 @@ public UserSettingsFileUI(IActivateItems activator)
             RegisterCheckbox(cbSelectiveRefresh, nameof(UserSettings.SelectiveRefresh));
             RegisterCheckbox(cbAlwaysJoinEverything,nameof(UserSettings.AlwaysJoinEverything));
             RegisterCheckbox(cbAutoRunSqlQueries, nameof(UserSettings.AutoRunSqlQueries));
+            RegisterCheckbox(cbExpandAllInCohortBuilder, nameof(UserSettings.ExpandAllInCohortBuilder));
 
             AddTooltip(label7, nameof(UserSettings.CreateDatabaseTimeout));
             AddTooltip(tbCreateDatabaseTimeout, nameof(UserSettings.CreateDatabaseTimeout));
@@ -190,9 +191,9 @@ private void CheckboxCheckedChanged(object sender, EventArgs e)
         {
             if (!_bLoaded)
                 return;
-            
+
             var cb = (CheckBox)sender;
-            checkboxDictionary[cb].SetValue(null,cb.Checked);
+            checkboxDictionary[cb].SetValue(null, cb.Checked);
         }
 
         private void ddTheme_SelectedIndexChanged(object sender, EventArgs e)

Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs

@@ -34,6 +34,7 @@
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
 using ReusableLibraryCode;
 using ReusableLibraryCode.Icons.IconProvision;
+using ReusableLibraryCode.Settings;
 using Timer = System.Windows.Forms.Timer;
 
 
@@ -247,7 +248,9 @@ public override void SetDatabaseObject(IActivateItems activator, CohortIdentific
                 });
                 _commonFunctionality.MenuBuilt += MenuBuilt;
                 tlvCic.AddObject(_configuration);
-                tlvCic.ExpandAll();
+
+                if(UserSettings.ExpandAllInCohortBuilder)
+                    tlvCic.ExpandAll();
             }
 
             CommonFunctionality.AddToMenu(cbIncludeCumulative);

Reusable/ReusableLibraryCode/Settings/UserSettings.cs

@@ -378,6 +378,16 @@ public static bool AutoRunSqlQueries
             set { AppSettings.AddOrUpdateValue("AutoRunSqlQueries", value); }
         }
 
+        /// <summary>
+        /// Enable to automatically expand the tree when opening or creating cohorts in
+        /// Cohort Builder
+        /// </summary>
+        public static bool ExpandAllInCohortBuilder
+        {
+            get { return AppSettings.GetValueOrDefault("ExpandAllInCohortBuilder", true); }
+            set { AppSettings.AddOrUpdateValue("ExpandAllInCohortBuilder", value); }
+        }
+
 
         #endregion