MS 04.09.2015 1

app/DD-Record-Organiser/ClassFormCommands.vb

@@ -74,12 +74,14 @@
 
     Public Shared Function DeleteFormView(guid)
         Try
-            Dim SQL As String = "DELETE FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & guid
+            Dim SQL As String = "DELETE FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID in (SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & guid & ")"
+            If ClassDatabase.Execute_non_Query(SQL) = False Then Return False
 
-            If ClassDatabase.Execute_non_Query(SQL) = True Then
-                Return True
+            SQL = "DELETE FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & guid
+            If ClassDatabase.Execute_non_Query(SQL) = False Then
+                Return False
             Else
-                Throw New Exception()
+                Return True
             End If
         Catch ex As Exception
             MsgBox("Fehler beim Löschen der Anzeigeeigenschaften der Form: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -95,14 +97,16 @@
             If dt.Rows.Count > 0 Then
                 For Each row As DataRow In dt.Rows
                     Dim controlid As Integer = row.Item(0)
-                    Console.WriteLine("deleting control: " & controlid)
                     CURRENT_CONTROL_ID = controlid
                     ClassControlCommands.DeleteControl()
+
                 Next
             End If
-
+            Return True
         Catch ex As Exception
-
+            MsgBox("Fehler beim Löschen der FormControls: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            Return False
         End Try
     End Function
+    
 End Class