GenDocEdit Updates

ljlclark · Jan 14, 2024 · 963980c · 963980c
1 parent 741b363
commit 963980c
Show file tree

Hide file tree

Showing 8 changed files with 214 additions and 69 deletions.
diff --git a/CoreUtilities/LJCGenDoc/UpdateGenDoc.cmd b/CoreUtilities/LJCGenDoc/UpdateGenDoc.cmd
@@ -32,6 +32,10 @@ set src=%assmRoot%LJCNetCommon\LJCNetCommon\%bin%
 echo copy %src%\LJCNetCommon.dll %to%
 copy %src%\LJCNetCommon.dll %to%
 
+set src=%assmRoot%LJCNetCommon\LJCNetCommon\%bin%
+echo copy %src%\LJCNetCommon.dll %to%
+copy %src%\LJCNetCommon.dll %to%
+
 rem *****************************
 rem *** Runtime-only Binaries ***
 
@@ -68,10 +72,18 @@ set src=%assmRoot%LJCDBServiceLib\LJCDBServiceLib\%bin%
 echo copy %src%\LJCDBServiceLib.dll %to%
 copy %src%\LJCDBServiceLib.dll %to%
 
+set src=%assmRoot%LJCDBViewControls\LJCDBViewControls\%bin%
+echo copy %src%\LJCDBViewControls.dll %to%
+copy %src%\LJCDBViewControls.dll %to%
+
 set src=%utilRoot%LJCGenDoc\LJCGenDocDAL\%bin%
 echo copy %src%\LJCGenDocDAL.dll %to%
 copy %src%\LJCGenDocDAL.dll %to%
 
+set src=LJCViewEditor\LJCViewEditor\%bin%
+echo copy %utilRoot%%src%\LJCViewEditor.exe %to%
+copy %utilRoot%%src%\LJCViewEditor.exe %to%
+
 rem ---------------------------
 set to=%toRoot%LJCGenDocLib\%bin%
 echo.
@@ -86,6 +98,7 @@ echo copy %src%\LJCDataAccess.dll %to%
 copy %src%\LJCDataAccess.dll %to%
 
 set src=%assmRoot%LJCDataAccessConfig\LJCDataAccessConfig\%bin%
+echo copy %src%\LJCDataAccessConfig.dll %to%%
 copy %src%\LJCDataAccessConfig.dll %to%
 
 set src=%assmRoot%LJCDBClientLib\LJCDBClientLib\%bin%
@@ -94,6 +107,7 @@ copy %src%\LJCDBClientLib.dll %to%
 
 set src=%assmRoot%LJCDBMessage\LJCDBMessage\%bin%
 echo copy %src%\LJCDBMessage.dll %to%
+echo copy %src%\LJCDBMessage.dll %to%
 copy %src%\LJCDBMessage.dll %to%
 
 set src=%assmRoot%LJCDBServiceLib\LJCDBServiceLib\%bin%

diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/AssemblyTab/AssemblyGroupGridCode.cs b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/AssemblyTab/AssemblyGroupGridCode.cs
@@ -15,7 +15,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using LJCViewEditor;
 
 namespace LJCGenDocEdit
 {
@@ -323,29 +322,32 @@ internal void SetupGrid(ViewInfo viewInfo)
 
       // Get the view grid columns
       var gridColumns = mDataDbView.GetGridColumns(viewInfo.DataID);
-      if (null == gridColumns)
+      if (gridColumns != null)
+      {
+        // Setup the grid columns.
+        AssemblyGroupGrid.LJCAddColumns(gridColumns);
+        //AssemblyGroupGrid.LJCRestoreColumnValues(ControlValues);
+      }
+      else
       {
         // Did not load any Grid Columns.
         var viewCombo = DocList.AssemblyGroupViewCombo;
         var dataID = viewCombo.LJCSelectedItemID();
         viewInfo.DataID = dataID;
-        ViewCommon.DoViewEdit(viewInfo);
+        ViewCommon.DoViewEdit(viewInfo, DocList.ConfigFileName);
 
         string title = "Reload Confirmation";
         string message = "Reload View Combo?";
         if (DialogResult.Yes == MessageBox.Show(message, title
           , MessageBoxButtons.YesNo, MessageBoxIcon.Question))
         {
+          gridColumns = mDataDbView.GetGridColumns(viewInfo.DataID);
+          AssemblyGroupGrid.LJCAddColumns(gridColumns);
+          //AssemblyGroupGrid.LJCRestoreColumnValues(ControlValues);
           viewCombo.Items.Clear();
           viewCombo.LJCLoad();
         }
       }
-      else
-      {
-        // Setup the grid columns.
-        AssemblyGroupGrid.LJCAddColumns(gridColumns);
-        //AssemblyGroupGrid.LJCRestoreColumnValues(ControlValues);
-      }
       // *** End   *** Change - Data Views
       FormCommon.NotSortable(AssemblyGroupGrid);
       AssemblyGroupGrid.LJCDragDataName = "DocAssemblyGroup";

diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.Designer.cs b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.Designer.cs
diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.cs b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.cs
@@ -1,6 +1,7 @@
 // Copyright(c) Lester J.Clark and Contributors.
 // Licensed under the MIT License.
 // LJCGenDocList.cs
+using LJCDBViewControls;
 using LJCGenDocDAL;
 using LJCWinFormCommon;
 using System;
@@ -70,6 +71,11 @@ private void TileTabsMove_Click(object sender, EventArgs e)
 
     #region Assembly Group
 
+    private void AssemblyGroupComboEdit_Click(object sender, EventArgs e)
+    {
+      ViewCommon.DoViewEdit(AssemblyGroupViewInfo, ConfigFileName);
+    }
+
     // Displays a detail dialog for a new record.
     private void AssemblyGroupNew_Click(object sender, EventArgs e)
     {
@@ -984,6 +990,7 @@ private void MethodItemGrid_SelectionChanged(object sender, EventArgs e)
       MethodItemGrid.LJCAllowSelectionChange = true;
     }
     #endregion
+
     #endregion
   }
 }
diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.resx b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocList.resx
@@ -135,6 +135,9 @@
   <metadata name="AssemblyGroupViewCombo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="AssemblyGroupComboMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>190, 69</value>
+  </metadata>
   <metadata name="AssemblyGroupGrid.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -168,6 +171,33 @@
   <metadata name="ClassSplit.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MethodTab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ClassCombo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ClassLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MethodSplit.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="TileTabs.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="TileTabsMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 69</value>
+  </metadata>
+  <metadata name="AssemblyCombo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="AssemblyLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ClassSplit.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ClassGroupViewCombo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -192,9 +222,6 @@
   <metadata name="ClassItemHeader.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="MethodTab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="ClassCombo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -228,12 +255,6 @@
   <metadata name="MethodItemHeader.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="TileTabs.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="TileTabsMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 69</value>
-  </metadata>
   <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

diff --git a/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocListCode.cs b/CoreUtilities/LJCGenDocEdit/LJCGenDocEdit/Forms/LJCGenDocListCode.cs
@@ -6,7 +6,6 @@
 using LJCDBViewControls;
 using LJCGenDocDAL;
 using LJCNetCommon;
-using LJCViewEditor;
 using LJCWinFormCommon;
 using LJCWinFormControls;
 using System;
@@ -218,6 +217,8 @@ private void InitializeClassData()
     {
       var values = ValuesGenDocEdit.Instance;
       mSettings = values.StandardSettings;
+      //*** Next Statement *** External Config
+      ConfigFileName = values.ConfigFileName;
 
       Managers = new ManagersGenDoc();
       Managers.SetDBProperties(mSettings.DbServiceRef
@@ -360,7 +361,8 @@ private void LoadComboAssemblyGroup()
         var viewCombo = AssemblyGroupViewCombo;
         var dataID = viewCombo.LJCSelectedItemID();
         AssemblyGroupViewInfo.DataID = dataID;
-        ViewCommon.DoViewEdit(AssemblyGroupViewInfo);
+        //*** Next Statement *** External Config
+        ViewCommon.DoViewEdit(AssemblyGroupViewInfo, ConfigFileName);
 
         string title = "Reload Confirmation";
         string message = "Reload Asesembly Group View Combo?";
@@ -472,6 +474,10 @@ private void SetFocusTab(MouseEventArgs e)
 
     #region Properties
 
+    /// <summary>The ConfigFile name.</summary>
+    //*** New Property *** External Config
+    public string ConfigFileName { get; set; }
+
     /// <summary>The Managers object.</summary>
     internal ManagersGenDoc Managers { get; set; }
 

diff --git a/CoreUtilities/LJCGenDocEdit/UpdateGenDocEdit.cmd b/CoreUtilities/LJCGenDocEdit/UpdateGenDocEdit.cmd
@@ -36,6 +36,10 @@ set src=%assmRoot%LJCDBViewControls\LJCDBViewControls\%bin%
 echo copy %src%\LJCDBViewControls.dll %to%
 copy %src%\LJCDBViewControls.dll %to%
 
+set src=%assmRoot%LJCDBViewDAL\LJCDBViewDAL\%bin%
+echo copy %src%\LJCDBViewDAL.dll %to%
+copy %src%\LJCDBViewDAL.dll %to%
+
 set src=%utilRoot%LJCGenDoc\LJCDocObjLib\%bin%
 echo copy %src%\LJCDocObjLib.dll %to%
 copy %src%\LJCDocObjLib.dll %to%
@@ -100,6 +104,10 @@ set src=%utilRoot%LJCViewEditor\LJCViewEditor\%bin%
 echo copy %src%\LJCViewEditor.exe %to%
 copy %src%\LJCViewEditor.exe %to%
 
+set src=%utilRoot%LJCViewEditor\LJCViewEditorDAL\%bin%
+echo copy %src%\LJCViewEditorDAL.dll %to%
+copy %src%\LJCViewEditorDAL.dll %to%
+
 if %1%. == BuildAll. goto End
 if %1%. == nopause. goto End
 pause

diff --git a/CoreUtilities/LJCViewEditor/LJCViewEditor/Forms/ViewEditorListCode.cs b/CoreUtilities/LJCViewEditor/LJCViewEditor/Forms/ViewEditorListCode.cs
@@ -242,6 +242,12 @@ private void InitialControlValues()
     private void InitializeClassData()
     {
       var values = ValuesViewEditor.Instance;
+      //*** Begin *** External Config
+      if (NetString.HasValue(ConfigFileName))
+      {
+        values.SetConfigFile(ConfigFileName);
+      }
+      //*** Begin *** External Config
       mSettings = values.StandardSettings;
       Text += $" - {mSettings.DataConfigName}";
       BeginColor = mSettings.BeginColor;
@@ -520,6 +526,10 @@ private void FilterSetFocusTab(TabPage tabPage)
 
     #region Properties
 
+    /// <summary>The ConfigFile name.</summary>
+    //*** New Property *** External Config
+    public string ConfigFileName { get; set; }
+
     // The Managers object.
     internal ManagersDbView Managers { get; set; }