MS Rework
This commit is contained in:
@@ -326,8 +326,10 @@ Public Class ClassControlValues
|
||||
|
||||
' Zuerst alle SQL Commands für FormID finden
|
||||
' CONTROL_SQLCOMMAND_1 wird als SQL gealiast
|
||||
Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_CONNID_1,CONTROL_SQLCOMMAND_1 AS SQL FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 NOT LIKE '%@%'", FormID)
|
||||
Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL, True)
|
||||
'Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_CONNID_1,CONTROL_SQLCOMMAND_1 AS SQL FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 NOT LIKE '%@%'", FormID)
|
||||
Dim Sql = String.Format("FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 NOT LIKE '%@%'", FormID)
|
||||
|
||||
Dim dt As DataTable = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, Sql, "") 'ClassDatabase.Return_Datatable(SQL, True)
|
||||
sw.Done()
|
||||
|
||||
|
||||
@@ -350,7 +352,7 @@ Public Class ClassControlValues
|
||||
PerfomanceHelper.ResumeDraw(Ctrl)
|
||||
Continue For
|
||||
End If
|
||||
Dim sqlcommand As String = row.Item("SQL")
|
||||
Dim sqlcommand As String = row.Item("CONTROL_SQLCOMMAND_1")
|
||||
Dim ConnID = row.Item("CONTROL_CONNID_1")
|
||||
Select Case Ctrl.GetType()
|
||||
Case GetType(CustomComboBox)
|
||||
@@ -390,10 +392,12 @@ Public Class ClassControlValues
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_CONNID_1, CONTROL_SQLCOMMAND_1 AS SQL FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 <> '' AND CONTROL_SQLCOMMAND_1 LIKE '%@%'", FormId)
|
||||
' Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_CONNID_1, CONTROL_SQLCOMMAND_1 AS SQL FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 <> '' AND CONTROL_SQLCOMMAND_1 LIKE '%@%'", FormId)
|
||||
Dim sw As New SW("LoadControlValuesListWithPlaceholders")
|
||||
Dim commands As New List(Of String)
|
||||
Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL, True)
|
||||
Dim expression As String = String.Format("FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 <> '' AND CONTROL_SQLCOMMAND_1 LIKE '%@%'", FormId)
|
||||
|
||||
Dim dt As DataTable = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, expression, "") 'ClassDatabase.Return_Datatable(SQL, True)
|
||||
|
||||
If dt.Rows.Count = 0 Then
|
||||
Exit Sub
|
||||
@@ -408,7 +412,7 @@ Public Class ClassControlValues
|
||||
End If
|
||||
|
||||
Dim connID = row.Item("CONTROL_CONNID_1")
|
||||
Dim sqlcommand As String = row.Item("SQL")
|
||||
Dim sqlcommand As String = row.Item("CONTROL_SQLCOMMAND_1")
|
||||
|
||||
If ParentRecordId = 0 And CURRENT_ACT_LEVEL > 1 Then
|
||||
'eigentlich sollte eine Parent_RecordID da sein
|
||||
|
||||
Reference in New Issue
Block a user