DAtabase integriert

app/DD-Record-Organizer/Classes/Controls/ClassControlCommands.vb

@@ -54,7 +54,7 @@
 
     Public Shared Function GetParentRecordId(RecordId As Integer) As Integer
         Try
-            Dim parentId = ClassDatabase.Execute_Scalar("SELECT RECORD1_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & RecordId, True)
+            Dim parentId = MYDB_ECM.ExecuteNonQuery("SELECT RECORD1_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & RecordId)
             If IsNothing(parentId) Then
                 Return 0
             Else
@@ -67,7 +67,7 @@
 
     Public Shared Function GetFormId(RecordId As Integer) As Integer
         Try
-            Dim FormId = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & RecordId, True)
+            Dim FormId = MYDB_ECM.ExecuteNonQuery("SELECT FORM_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & RecordId)
             Return FormId
         Catch ex As Exception
             MsgBox("Error in GetFormId:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -77,7 +77,7 @@
     Public Shared Function GetControlGuid(name As String)
         Try
             Dim sql = "SELECT GUID FROM TBPMO_CONTROL WHERE UPPER(NAME) = UPPER('" & name & "')"
-            Return ClassDatabase.Execute_Scalar(sql, True)
+            Return MYDB_ECM.ExecuteNonQuery(sql)
         Catch ex As Exception
             Return -1
         End Try
@@ -107,9 +107,9 @@
             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}, '')"
 
             'LOGGER.Debug(SQL)
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                 SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL"
-                Dim GUID = ClassDatabase.Execute_Scalar(SQL)
+                Dim GUID = MYDB_ECM.GetScalarValue(SQL)
 
                 Return InsertControlScreen(GUID, control, CURRENT_ENTITY_ID)
             Else
@@ -138,7 +138,7 @@
 
             'Dim TAB_INDEX
             '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)
+            'TAB_INDEX = MYDB_ECM.GetScalarValue(SQL)
             'If Not TAB_INDEX Is Nothing Then
             '    If IsDBNull(TAB_INDEX) Then
             '         TAB_INDEX = 1
@@ -152,16 +152,16 @@
 
             SQL = "INSERT TBPMO_CONTROL_SCREEN (CONTROL_ID, SCREEN_ID, CONTROL_TEXT, X_LOC, Y_LOC, HEIGHT, WIDTH) VALUES (" & guid & ", 1, '" & CONTROL_TEXT & "', " & X_LOC & ", " & Y_LOC & ", " & HEIGHT & ", " & WIDTH & ")"
 
-            If ClassDatabase.Execute_non_Query(SQL) Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) Then
                 ' Die Guid in die Metadaten des Controls zurückschreiben
                 Dim metadata = DirectCast(control.Tag, ClassControlMetadata)
                 metadata.Id = guid
                 control.Tag = metadata
 
                 SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & guid & " AND SCREEN_ID = " & CURRENT_SCREEN_ID
-                Dim ctrl_screen_Id = ClassDatabase.Execute_Scalar(SQL)
+                Dim ctrl_screen_Id = MYDB_ECM.GetScalarValue(SQL)
                 SQL = String.Format("INSERT INTO TBPMO_CONTROL_LANGUAGE (LANGUAGE_TYPE,CONTROL_SCREEN_ID,CAPTION,ADDED_WHO) VALUES ('{0}',{1},'{2}','{3}')", USER_LANGUAGE, ctrl_screen_Id, CONTROL_TEXT, USER_USERNAME)
-                ClassDatabase.Execute_non_Query(SQL)
+                MYDB_ECM.ExecuteNonQuery(SQL)
                 Return True
             Else
                 Throw New Exception()
@@ -187,7 +187,7 @@
 
             Dim SQL = "UPDATE TBPMO_CONTROL_SCREEN SET X_LOC = " & x & ", Y_LOC = " & y & ", CHANGED_WHO = '" & USER_USERNAME & "' WHERE CONTROL_ID = " & CONTROL_ID
 
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                 Return True
             Else
                 Throw New Exception()
@@ -365,7 +365,7 @@
                     AUTO_SUGGEST = {AUTO_SUGGEST} 
                     WHERE GUID = {CURRENT_CONTROL_ID}"
 
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                 Return UpdateControlScreen(control, properties)
             Else
                 Throw New Exception()
@@ -444,11 +444,11 @@
             End If
 
             SQL = "UPDATE TBPMO_CONTROL_SCREEN SET TAB_INDEX = " & TAB_INDEX & ", TAB_STOP = " & TAB_STOP & ", X_LOC = " & X_LOC & ", Y_LOC = " & Y_LOC & ", HEIGHT = " & HEIGHT & ", WIDTH = " & WIDTH & ", CONTROL_TEXT = '" & CONTROL_TEXT & "', CHANGED_WHO = '" & CHANGED_WHO & "', FONT_COLOR = " & FONT_COLOR & ", FONT_SIZE = " & FONT_SIZE & ", FONT_STYLE = " & FONT_STYLE & ", FONT_FAMILY = '" & FONT_FAMILY & "' , BACK_COLOR = " & BACK_COLOR & " WHERE CONTROL_ID = " & CURRENT_CONTROL_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
-                Dim upd = String.Format("UPDATE TBPMO_CONTROL_LANGUAGE SET CAPTION = '{0}', HINT = '{1}' WHERE LANGUAGE_TYPE = '{2}' AND " & _
-                                        "CONTROL_SCREEN_ID = (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & _
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
+                Dim upd = String.Format("UPDATE TBPMO_CONTROL_LANGUAGE SET CAPTION = '{0}', HINT = '{1}' WHERE LANGUAGE_TYPE = '{2}' AND " &
+                                        "CONTROL_SCREEN_ID = (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " &
                                         CURRENT_CONTROL_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID & ")", CONTROL_TEXT, HINT, USER_LANGUAGE)
-                ClassDatabase.Execute_non_Query(upd)
+                MYDB_ECM.ExecuteNonQuery(upd)
                 If CurrentType.Contains("Button") Then
                     'If control.Tag = "ADDAPPOINTMENT" Then
                     If control.Name.Contains("f_addappointment") Then
@@ -528,7 +528,7 @@
     Public Shared Function DeleteControl(ID As Integer)
         Try
             Dim del = "EXEC [dbo].[PRPMO_DELETE_CONTROL] " & ID.ToString
-            If ClassDatabase.Execute_non_Query(del) = True Then
+            If MYDB_ECM.ExecuteNonQuery(del) = True Then
                 Return True
             Else
                 Return False
@@ -542,9 +542,9 @@
     Public Shared Function DeleteControlScreen(id As Integer)
         Try
             Dim SQL = "DELETE FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID IN (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & id & ")"
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                 SQL = "DELETE FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = " & id
-                If ClassDatabase.Execute_non_Query(SQL) = True Then
+                If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                     Return True
                 Else
                     Throw New Exception()
@@ -564,7 +564,7 @@
         Try
             Dim SQL = "DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & id
 
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
+            If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
                 Return True
             Else
                 Throw New Exception()