New option to show *both* Friendly and Raw in results. Closing #882

rappen · Aug 10, 2023 · 743dcdd · 743dcdd
1 parent 1d5bc5b
commit 743dcdd
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 69 deletions.
diff --git a/FetchXmlBuilder/DockControls/ResultGrid.Designer.cs b/FetchXmlBuilder/DockControls/ResultGrid.Designer.cs
diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs
@@ -79,6 +79,7 @@ internal void SetData(QueryInfo queryinfo)
         internal void ApplySettingsToGrid()
         {
             mnuFriendly.Checked = form.settings.Results.Friendly;
+            mnuBothNames.Checked = form.settings.Results.BothNames;
             mnuIdCol.Checked = form.settings.Results.WorkWithLayout ? false : form.settings.Results.Id;
             mnuIndexCol.Checked = form.settings.Results.WorkWithLayout ? false : form.settings.Results.Index;
             mnuNullCol.Checked = form.settings.Results.WorkWithLayout ? true : form.settings.Results.NullColumns;
@@ -94,6 +95,7 @@ internal void ApplySettingsToGrid()
             mnuSysCol.Enabled = !form.settings.Results.WorkWithLayout;
 
             crmGridView1.ShowFriendlyNames = mnuFriendly.Checked;
+            crmGridView1.ShowBothNames = mnuBothNames.Checked;
             crmGridView1.ShowIdColumn = mnuIdCol.Checked;
             crmGridView1.ShowIndexColumn = mnuIndexCol.Checked;
             crmGridView1.ShowAllColumnsInColumnOrder = mnuNullCol.Checked;
@@ -111,6 +113,7 @@ internal void ApplySettingsToGrid()
         private void UpdateSettingsFromSelectedOptions()
         {
             form.settings.Results.Friendly = mnuFriendly.Checked;
+            form.settings.Results.BothNames = mnuBothNames.Checked;
             form.settings.Results.Index = mnuIndexCol.Checked;
             form.settings.Results.NullColumns = mnuNullCol.Checked;
             form.settings.Results.SysColumns = mnuSysCol.Checked;
@@ -168,27 +171,8 @@ internal void SetLayoutToGrid()
                 return;
             }
             reloaded = true;
-            foreach (var cell in form.dockControlBuilder.LayoutXML.Cells)
-            {
-                var col = crmGridView1.Columns[cell.Name];
-                if (col != null)
-                {
-                    try
-                    {
-                        col.DisplayIndex = Math.Min(cell.DisplayIndex, crmGridView1.Columns.Count - 1);
-                        col.Width = cell.Width;
-                        col.Visible = cell.Width > 0;
-                    }
-                    catch (Exception ex)
-                    {
-                        if (lasterrormessage < DateTime.Now.AddMinutes(-1))
-                        {
-                            MessageBox.Show($"Oops - unexpcted error. But never mind, just try again...\n\n{ex}");
-                            lasterrormessage = DateTime.Now;
-                        }
-                    }
-                }
-            }
+            crmGridView1.LayoutXML = form.dockControlBuilder?.LayoutXML?.ToXML();
+            crmGridView1.Refresh();
             reloaded = false;
         }
 
@@ -205,7 +189,7 @@ private void GetLayoutFromGrid()
                 form.dockControlBuilder.LayoutXML = new LayoutXML(entity, form);
             }
             var columns = crmGridView1.Columns.Cast<DataGridViewColumn>()
-                .Where(c => !c.Name.StartsWith("#") && c.Visible && c.Width > 5)
+                .Where(c => !c.Name.StartsWith("#") && !c.Name.EndsWith("|both") && c.Visible && c.Width > 5)
                 .OrderBy(c => c.DisplayIndex)
                 .ToDictionary(c => c.Name, c => c.Width);
             form.dockControlBuilder.LayoutXML.MakeSureAllCellsExistForColumns(columns);

diff --git a/FetchXmlBuilder/FXBInterfaces.cs b/FetchXmlBuilder/FXBInterfaces.cs
@@ -148,6 +148,11 @@ public void ReceiveKeyDownShortcut(KeyEventArgs e)
                 settings.Results.Friendly = !settings.Results.Friendly;
                 dockControlGrid?.ApplySettingsToGrid();
             }
+            else if (e.KeyDown(Keys.B, true, true, false))
+            {
+                settings.Results.BothNames = !settings.Results.BothNames;
+                dockControlGrid?.ApplySettingsToGrid();
+            }
         }
 
         public void ReceiveKeyPressShortcut(KeyPressEventArgs e)

diff --git a/FetchXmlBuilder/Forms/Settings.Designer.cs b/FetchXmlBuilder/Forms/Settings.Designer.cs
diff --git a/FetchXmlBuilder/Forms/Settings.cs b/FetchXmlBuilder/Forms/Settings.cs
@@ -26,6 +26,7 @@ private void PopulateSettings(FXBSettings settings)
             }
             chkAppFriendly.Checked = settings.UseFriendlyNames;
             chkAppFriendlyResults.Checked = settings.Results.Friendly;
+            chkAppBothNamesResults.Checked = settings.Results.BothNames;
             chkAppSingle.Checked = settings.QueryOptions.UseSingleQuotation;
             chkAppNoSavePrompt.Checked = settings.DoNotPromptToSave;
             chkAppResultsNewWindow.Checked = settings.Results.AlwaysNewWindow;
@@ -81,6 +82,7 @@ internal FXBSettings GetSettings()
             var settings = fxb.settings;
             settings.UseFriendlyNames = chkAppFriendly.Checked;
             settings.Results.Friendly = chkAppFriendlyResults.Checked;
+            settings.Results.BothNames = chkAppBothNamesResults.Checked;
             settings.QueryOptions.UseSingleQuotation = chkAppSingle.Checked;
             settings.QueryOptions.NewQueryTemplate = txtFetch.Text;
             settings.DoNotPromptToSave = chkAppNoSavePrompt.Checked;

diff --git a/FetchXmlBuilder/Settings/FXBSettings.cs b/FetchXmlBuilder/Settings/FXBSettings.cs
@@ -55,6 +55,7 @@ public bool UseFriendlyNames
     public class ResultOptions
     {
         public bool Friendly { get; set; }
+        public bool BothNames { get; set; }
         public bool Id { get; set; }
         public bool Index { get; set; }
         public bool NullColumns { get; set; }

diff --git a/Rappen.XTB.Helper b/Rappen.XTB.Helper