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

@@ -90,7 +90,7 @@
Dim DEFVALUE As String = ""
If (control.Parent.GetType().Name = "GroupBox") Then
Dim ParentID As Integer = GetControlID_for_Name(control.Parent.Name, CURRENT_FORM_ID)
Dim ParentID As Integer = GetControlID_for_Name(control.Parent.Name, CURRENT_ENTITY_ID)
PARENT_CONTROL_ID = ParentID
End If
@@ -100,14 +100,14 @@
' SQL Befehl für CONTROL TABELLE
' SQL_COMMAND_1 auf leeren String setzen
SQL = "INSERT INTO TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES (" & CURRENT_FORM_ID & ", " & CONTROL_TYPE_ID & ", '', '" & NAME & "', '" & NAME & "', " & PARENT_CONTROL_ID & ", '')"
SQL = "INSERT INTO TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES (" & CURRENT_ENTITY_ID & ", " & CONTROL_TYPE_ID & ", '', '" & NAME & "', '" & NAME & "', " & PARENT_CONTROL_ID & ", '')"
If ClassDatabase.Execute_non_Query(SQL) = True Then
SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL"
Dim GUID = ClassDatabase.Execute_Scalar(SQL)
Return InsertControlScreen(GUID, control, CURRENT_FORM_ID)
Return InsertControlScreen(GUID, control, CURRENT_ENTITY_ID)
Else
Throw New Exception()
End If
@@ -119,7 +119,7 @@
End Try
End Function
Public Shared Function InsertControlScreen(guid As Integer, ByRef control As Control, CURRENT_FORM_ID As Integer)
Public Shared Function InsertControlScreen(guid As Integer, ByRef control As Control, CURRENT_ENTITY_ID As Integer)
Try
Dim CurrentType As String = control.GetType.ToString
Dim SQL As String
@@ -133,7 +133,7 @@
CONTROL_TEXT = control.Text
'Dim TAB_INDEX
'SQL = "SELECT MAX(TAB_INDEX) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID IN (SELECT GUID FROM TBPMO_CONTROL WHERE CURRENT_FORM_ID = " & CURRENT_FORM_ID & ")"
'SQL = "SELECT MAX(TAB_INDEX) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID IN (SELECT GUID FROM TBPMO_CONTROL WHERE CURRENT_ENTITY_ID = " & CURRENT_ENTITY_ID & ")"
'TAB_INDEX = ClassDatabase.Execute_Scalar(SQL)
'If Not TAB_INDEX Is Nothing Then
' If IsDBNull(TAB_INDEX) Then
@@ -172,7 +172,7 @@
Public Shared Function UpdateControlPosition(ByVal x As Integer, ByVal y As Integer, control As Control)
Try
Dim CONTROL_ID = GetControlID_for_Name(control.Name, CURRENT_FORM_ID)
Dim CONTROL_ID = GetControlID_for_Name(control.Name, CURRENT_ENTITY_ID)
'If (ParentIsGroupBox(control)) Then
' Console.WriteLine("Before:" & x & ":" & y)
@@ -436,14 +436,14 @@
Dim SubjectString, Subject2String, PlaceString, DescString As String
If propExists(properties, "FromDate") And Not String.IsNullOrWhiteSpace(properties.FromDate) Then
FromDateId = GetControlID_for_Name(properties.FromDate, CURRENT_FORM_ID)
FromDateId = GetControlID_for_Name(properties.FromDate, CURRENT_ENTITY_ID)
If FromDateId = -1 Then
Throw New Exception("Das Element für 'fromDate' mit dem Namen " & properties.FromDate & " existiert nicht!")
End If
End If
If propExists(properties, "ToDate") And Not String.IsNullOrWhiteSpace(properties.ToDate) Then
ToDateId = GetControlID_for_Name(properties.ToDate, CURRENT_FORM_ID)
ToDateId = GetControlID_for_Name(properties.ToDate, CURRENT_ENTITY_ID)
If ToDateId = -1 Then
Throw New Exception("Das Element für 'ToDate' mit dem Namen " & properties.ToDate & " existiert nicht!")
End If