AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Zooflow: WIP globix

Browse Source
This commit is contained in:
Jonathan Jenne 2021-12-09 13:31:36 +01:00
parent 42db951c93
commit 39483efe4d
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GUIs.ZooFlow/ClassHelpers.vb
View File

@ -10,7 +10,7 @@ Public Class ClassHelpers
Public Function GetValueFromDatatable(pDatatable As DataTable, pFilterString As String, pCheckColumn As String, pSortString As String) As Object Public Function GetValueFromDatatable(pDatatable As DataTable, pFilterString As String, pCheckColumn As String, pSortString As String) As Object
Try Try
If pDatatable.Rows.Count = 0 Then If pDatatable Is Nothing OrElse pDatatable.Rows.Count = 0 Then
Return Nothing Return Nothing
End If End If

17
GUIs.ZooFlow/Globix/ClassValidator.vb
View File

@ -52,10 +52,7 @@ Public Class ClassValidator
Return False Return False
End If End If
End If End If
End If ElseIf oControl.Name.StartsWith("cmbSingle") Then
' ========================= COMBO BOX =========================
If oControl.Name.StartsWith("cmbSingle") Then
Dim cmbSingle As TextBox = oControl Dim cmbSingle As TextBox = oControl
If cmbSingle.Text = "" Then If cmbSingle.Text = "" Then
@ -68,9 +65,8 @@ Public Class ClassValidator
Return False Return False
End If End If
End If End If
End If
If oControl.Name.StartsWith("cmb") Then ElseIf oControl.Name.StartsWith("cmb") Then
Dim cmb As ComboBox = oControl Dim cmb As ComboBox = oControl
If cmb.Text = "" Then If cmb.Text = "" Then
Dim oIndexName = GetIndexName(cmb, "cmb") Dim oIndexName = GetIndexName(cmb, "cmb")
@ -82,6 +78,7 @@ Public Class ClassValidator
Return False Return False
End If End If
End If End If
End If End If
' ========================= DATE PICKER ========================= ' ========================= DATE PICKER =========================
@ -159,10 +156,9 @@ Public Class ClassValidator
.AttributeValues = WrapIndexValue(oValues), .AttributeValues = WrapIndexValue(oValues),
.ControlName = oLookup.Name .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 cmbSingle As TextBox = oControl
Dim oIndexName = GetIndexName(cmbSingle, "cmbSingle") Dim oIndexName = GetIndexName(cmbSingle, "cmbSingle")
@ -174,9 +170,8 @@ Public Class ClassValidator
.AttributeValues = WrapIndexValue(cmbSingle.Text), .AttributeValues = WrapIndexValue(cmbSingle.Text),
.ControlName = cmbSingle.Name .ControlName = cmbSingle.Name
}) })
End If
If oControl.Name.StartsWith("cmb") Then ElseIf oControl.Name.StartsWith("cmb") Then
Dim cmb As ComboBox = oControl Dim cmb As ComboBox = oControl
Dim oIndexName = GetIndexName(cmb, "cmb") Dim oIndexName = GetIndexName(cmb, "cmb")

2
GUIs.ZooFlow/Globix/frmGlobix_Index.vb
View File

@ -12,6 +12,7 @@ Imports DigitalData.Controls.LookupGrid
Imports Independentsoft Imports Independentsoft
Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.Controls
Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Imports DigitalData.Modules.Database
Public Class frmGlobix_Index Public Class frmGlobix_Index
#Region "+++++ Variablen ++++++" #Region "+++++ Variablen ++++++"
@ -588,6 +589,7 @@ Public Class frmGlobix_Index
End Sub End Sub
Private Function GetLookupData(pLookup As LookupControl3, pSQLCommand As String, pConnectionId As Integer) Private Function GetLookupData(pLookup As LookupControl3, pSQLCommand As String, pConnectionId As Integer)
Dim oConnectionString = GetConnectionString(pConnectionId) Dim oConnectionString = GetConnectionString(pConnectionId)
oConnectionString = MSSQLServer.DecryptConnectionString(oConnectionString)
If oConnectionString IsNot Nothing And pSQLCommand.Length > 0 Then If oConnectionString IsNot Nothing And pSQLCommand.Length > 0 Then
_Logger.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30)) _Logger.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30))