2023-09-25

EnvelopeGenerator.Form/frmMain.vb

@@ -1,5 +1,4 @@
-Imports System.IO
-Imports DevExpress.XtraSplashScreen
+Imports DevExpress.XtraSplashScreen
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
@@ -13,7 +12,6 @@ Public Class frmMain
     Private Logger As Logger
     Private Database As MSSQLServer
     Private ConfigManager As ConfigManager(Of Config)
-    Private DbConfig As DbConfig
     Private TempFiles As TempFiles
 
     Private GridBuilder As GridBuilder
@@ -33,22 +31,25 @@ Public Class frmMain
             ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath)
             Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
             Database = New MSSQLServer(LogConfig, oConnectionString)
-            Dim oUserId = 0
-
-            If Database.DBInitialized = True Then
-                DbConfig = GetDatabaseConfig()
-
-                oUserId = Database.GetScalarValue($"SELECT GUID FROM TBDD_USER WHERE USERNAME = '{Environment.UserName}'")
-            End If
 
             State = New State With {
-                .UserId = CInt(oUserId),
+                .UserId = 0,
                 .Config = ConfigManager.Config,
-                .DbConfig = DbConfig,
+                .DbConfig = New DbConfig(),
                 .LogConfig = LogConfig,
                 .Database = Database
             }
 
+            If Database.DBInitialized = True Then
+                Dim ConfigModel = New ConfigModel(State)
+                State.DbConfig = ConfigModel.LoadConfiguration()
+                State.UserId = ConfigModel.GetUserId()
+            End If
+
+            If Not String.IsNullOrEmpty(State.DbConfig.ExternalProgramName) Then
+                Me.Text = State.DbConfig.ExternalProgramName
+            End If
+
             Controller = New EnvelopeListController(State)
 
             GridBuilder = New GridBuilder(ViewEnvelopes)
@@ -64,22 +65,6 @@ Public Class frmMain
 
     End Sub
 
-    Private Function GetDatabaseConfig() As DbConfig
-        Try
-            Dim oSql As String = "SELECT TOP 1 * FROM TBSIG_CONFIG"
-            Dim oTable As DataTable = Database.GetDatatable(oSql)
-            Dim oRow = oTable.Rows.Item(0)
-
-            Return New DbConfig() With {
-                .DocumentPath = oRow.ItemEx("DOCUMENT_PATH", ""),
-                .SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0),
-                .SignatureHost = oRow.ItemEx("SIGNATURE_HOST", "")
-            }
-        Catch ex As Exception
-            Return New DbConfig()
-        End Try
-    End Function
-
     Private Sub btnCreateEnvelope_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCreateEnvelope.ItemClick
         Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
         Try