This commit is contained in:
SchreiberM
2016-12-09 10:23:42 +01:00
parent 481e767a99
commit 30a6c6b9fb
35 changed files with 1449 additions and 3454 deletions

View File

@@ -185,7 +185,7 @@ Public Class ClassControlBuilder
If CtrlCommandUI.IsEdit Then
Dim expression As String
expression = "ENTITY_ID = " & CURRENT_FORM_ID
expression = "ENTITY_ID = " & CURRENT_ENTITY_ID
Dim foundControls() As DataRow
' Use the Select method to find all rows matching the filter.
foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
@@ -437,7 +437,7 @@ Public Class ClassControlBuilder
Select row1.Item("VALUE")).ToList()
'ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, dependingControlId, dependingControl, values, CURRENT_FORM_ID)
'ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, dependingControlId, dependingControl, values, CURRENT_ENTITY_ID)
ControlLoader.CheckedListBox.LoadValue(checkedlistbox, values)
Case "Label"
@@ -559,7 +559,7 @@ Public Class ClassControlBuilder
CONTROL_ID = controlId
If CtrlCommandUI.IsEdit Then
Dim expression As String
expression = "ENTITY_ID = " & CURRENT_FORM_ID
expression = "ENTITY_ID = " & CURRENT_ENTITY_ID
Dim foundControls() As DataRow
' Use the Select method to find all rows matching the filter.
foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
@@ -588,7 +588,7 @@ Public Class ClassControlBuilder
End If
Next
End If
Dim onRecordChangedHandler As EventHandler = CType(Me.Events(_onRecordChangedName), EventHandler)
If Not ControlsChanged.Contains(controlId) Then
@@ -655,7 +655,7 @@ Public Class ClassControlBuilder
If CtrlCommandUI.IsEdit Then
Dim expression As String
expression = "ENTITY_ID = " & CURRENT_FORM_ID
expression = "ENTITY_ID = " & CURRENT_ENTITY_ID
Dim foundControls() As DataRow
' Use the Select method to find all rows matching the filter.
foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
@@ -678,20 +678,20 @@ Public Class ClassControlBuilder
Where row.Item("CONTROL_ID") = controlId
Select row.Item("VALUE")).ToList()
ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, CONTROL_ID, control, loadedValues, CURRENT_FORM_ID)
ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_RECORD_ID, CONTROL_ID, control, loadedValues, CURRENT_ENTITY_ID)
RECORD_CHANGED = False
Exit Sub
End If
End If
Next
End If
'SQL für abhängige Auswahllisten
Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
'SQL für enable control
Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
'If CtrlCommandUI.IsInsert = True Then
' CtrlCommandUI.SaveRecord(0, CURRENT_FORM_ID, CURRENT_PARENT_ID)
' CtrlCommandUI.SaveRecord(0, CURRENT_ENTITY_ID, CURRENT_PARENT_ID)
'End If
Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control)
@@ -746,7 +746,7 @@ Public Class ClassControlBuilder
'SQL für enable control
Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
'If CtrlCommandUI.IsInsert = True Then
' CtrlCommandUI.SaveRecord(0, CURRENT_FORM_ID, CURRENT_PARENT_ID)
' CtrlCommandUI.SaveRecord(0, CURRENT_ENTITY_ID, CURRENT_PARENT_ID)
'End If
Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control)