From 39483efe4db7461006db0a9a7298841a14c5c515 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Thu, 9 Dec 2021 13:31:36 +0100
Subject: [PATCH] Zooflow: WIP globix

---
 GUIs.ZooFlow/ClassHelpers.vb           |  2 +-
 GUIs.ZooFlow/Globix/ClassValidator.vb  | 17 ++++++-----------
 GUIs.ZooFlow/Globix/frmGlobix_Index.vb |  2 ++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/GUIs.ZooFlow/ClassHelpers.vb b/GUIs.ZooFlow/ClassHelpers.vb
index 652d849e..78b33675 100644
--- a/GUIs.ZooFlow/ClassHelpers.vb
+++ b/GUIs.ZooFlow/ClassHelpers.vb
@@ -10,7 +10,7 @@ Public Class ClassHelpers
 
     Public Function GetValueFromDatatable(pDatatable As DataTable, pFilterString As String, pCheckColumn As String, pSortString As String) As Object
         Try
-            If pDatatable.Rows.Count = 0 Then
+            If pDatatable Is Nothing OrElse pDatatable.Rows.Count = 0 Then
                 Return Nothing
             End If
 
diff --git a/GUIs.ZooFlow/Globix/ClassValidator.vb b/GUIs.ZooFlow/Globix/ClassValidator.vb
index 5b8248d9..86e60696 100644
--- a/GUIs.ZooFlow/Globix/ClassValidator.vb
+++ b/GUIs.ZooFlow/Globix/ClassValidator.vb
@@ -52,10 +52,7 @@ Public Class ClassValidator
                             Return False
                         End If
                     End If
-                End If
-
-                ' ========================= COMBO BOX =========================
-                If oControl.Name.StartsWith("cmbSingle") Then
+                ElseIf oControl.Name.StartsWith("cmbSingle") Then
                     Dim cmbSingle As TextBox = oControl
 
                     If cmbSingle.Text = "" Then
@@ -68,9 +65,8 @@ Public Class ClassValidator
                             Return False
                         End If
                     End If
-                End If
 
-                If oControl.Name.StartsWith("cmb") Then
+                ElseIf oControl.Name.StartsWith("cmb") Then
                     Dim cmb As ComboBox = oControl
                     If cmb.Text = "" Then
                         Dim oIndexName = GetIndexName(cmb, "cmb")
@@ -82,6 +78,7 @@ Public Class ClassValidator
                             Return False
                         End If
                     End If
+
                 End If
 
                 ' ========================= DATE PICKER =========================
@@ -159,10 +156,9 @@ Public Class ClassValidator
                     .AttributeValues = WrapIndexValue(oValues),
                     .ControlName = oLookup.Name
                 })
-            End If
 
-            ' ========================= COMBO BOX =========================
-            If oControl.Name.StartsWith("cmbSingle") Then
+
+            ElseIf oControl.Name.StartsWith("cmbSingle") Then
                 Dim cmbSingle As TextBox = oControl
                 Dim oIndexName = GetIndexName(cmbSingle, "cmbSingle")
 
@@ -174,9 +170,8 @@ Public Class ClassValidator
                     .AttributeValues = WrapIndexValue(cmbSingle.Text),
                     .ControlName = cmbSingle.Name
                 })
-            End If
 
-            If oControl.Name.StartsWith("cmb") Then
+            ElseIf oControl.Name.StartsWith("cmb") Then
                 Dim cmb As ComboBox = oControl
                 Dim oIndexName = GetIndexName(cmb, "cmb")
 
diff --git a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb
index 0352f2d2..ed25ebd5 100644
--- a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb
@@ -12,6 +12,7 @@ Imports DigitalData.Controls.LookupGrid
 Imports Independentsoft
 Imports DevExpress.XtraEditors.Controls
 Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
+Imports DigitalData.Modules.Database
 
 Public Class frmGlobix_Index
 #Region "+++++ Variablen ++++++"
@@ -588,6 +589,7 @@ Public Class frmGlobix_Index
     End Sub
     Private Function GetLookupData(pLookup As LookupControl3, pSQLCommand As String, pConnectionId As Integer)
         Dim oConnectionString = GetConnectionString(pConnectionId)
+        oConnectionString = MSSQLServer.DecryptConnectionString(oConnectionString)
 
         If oConnectionString IsNot Nothing And pSQLCommand.Length > 0 Then
             _Logger.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30))