MS_13.11_Final

2015-11-13 15:51:25 +01:00
parent 9f80eb5a3d
commit 365e92e98b
21 changed files with 619 additions and 355 deletions
--- a/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb
+++ b/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb
@@ -841,6 +841,10 @@ Partial Public Class DD_ECMAdmin

        Private columnSEARCH_PATTERN5 As Global.System.Data.DataColumn

+        Private columnLOAD_DIRECT As Global.System.Data.DataColumn
+
+        Private columnSQL_QUICK_VIEW As Global.System.Data.DataColumn
+
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
        Public Sub New()
@@ -1036,6 +1040,22 @@ Partial Public Class DD_ECMAdmin
            End Get
        End Property

+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+        Public ReadOnly Property LOAD_DIRECTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnLOAD_DIRECT
+            End Get
+        End Property
+
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+        Public ReadOnly Property SQL_QUICK_VIEWColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnSQL_QUICK_VIEW
+            End Get
+        End Property
+
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
         Global.System.ComponentModel.Browsable(False)> _
@@ -1092,9 +1112,11 @@ Partial Public Class DD_ECMAdmin
                    ByVal SEARCH_PATTERN2 As String, _
                    ByVal SEARCH_PATTERN3 As String, _
                    ByVal SEARCH_PATTERN4 As String, _
-                    ByVal SEARCH_PATTERN5 As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow
+                    ByVal SEARCH_PATTERN5 As String, _
+                    ByVal LOAD_DIRECT As Boolean, _
+                    ByVal SQL_QUICK_VIEW As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow
            Dim rowTBPMO_FORM_CONSTRUCTOR_DETAILRow As TBPMO_FORM_CONSTRUCTOR_DETAILRow = CType(Me.NewRow, TBPMO_FORM_CONSTRUCTOR_DETAILRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW}
            If (Not (parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID) Is Nothing) Then
                columnValuesArray(1) = parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID(0)
            End If
@@ -1146,6 +1168,8 @@ Partial Public Class DD_ECMAdmin
            Me.columnSEARCH_PATTERN3 = MyBase.Columns("SEARCH_PATTERN3")
            Me.columnSEARCH_PATTERN4 = MyBase.Columns("SEARCH_PATTERN4")
            Me.columnSEARCH_PATTERN5 = MyBase.Columns("SEARCH_PATTERN5")
+            Me.columnLOAD_DIRECT = MyBase.Columns("LOAD_DIRECT")
+            Me.columnSQL_QUICK_VIEW = MyBase.Columns("SQL_QUICK_VIEW")
        End Sub

        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@@ -1191,6 +1215,10 @@ Partial Public Class DD_ECMAdmin
            MyBase.Columns.Add(Me.columnSEARCH_PATTERN4)
            Me.columnSEARCH_PATTERN5 = New Global.System.Data.DataColumn("SEARCH_PATTERN5", GetType(String), Nothing, Global.System.Data.MappingType.Element)
            MyBase.Columns.Add(Me.columnSEARCH_PATTERN5)
+            Me.columnLOAD_DIRECT = New Global.System.Data.DataColumn("LOAD_DIRECT", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnLOAD_DIRECT)
+            Me.columnSQL_QUICK_VIEW = New Global.System.Data.DataColumn("SQL_QUICK_VIEW", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnSQL_QUICK_VIEW)
            Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, True))
            Me.columnGUID.AutoIncrement = True
            Me.columnGUID.AllowDBNull = False
@@ -1205,6 +1233,7 @@ Partial Public Class DD_ECMAdmin
            Me.columnSQL_SELECT_EBENE2.AllowDBNull = False
            Me.columnSQL_SELECT_EBENE2.MaxLength = 4000
            Me.columnADDED_WHO.MaxLength = 50
+            Me.columnADDED_WHEN.AllowDBNull = False
            Me.columnCHANGED_WHO.MaxLength = 50
            Me.columnCOLUMN_NAME1.AllowDBNull = False
            Me.columnCOLUMN_NAME1.MaxLength = 100
@@ -1216,6 +1245,9 @@ Partial Public Class DD_ECMAdmin
            Me.columnSEARCH_PATTERN3.MaxLength = 50
            Me.columnSEARCH_PATTERN4.MaxLength = 50
            Me.columnSEARCH_PATTERN5.MaxLength = 50
+            Me.columnLOAD_DIRECT.AllowDBNull = False
+            Me.columnSQL_QUICK_VIEW.AllowDBNull = False
+            Me.columnSQL_QUICK_VIEW.MaxLength = 2147483647
        End Sub

        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@@ -2701,12 +2733,7 @@ Partial Public Class DD_ECMAdmin
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
        Public Property ADDED_WHEN() As Date
            Get
-                Try
-                    Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn), Date)
-                Catch e As Global.System.InvalidCastException
-                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBPMO_FORM_CONSTRUCTOR_DETAIL ist DBNul" & _
-                            "l.", e)
-                End Try
+                Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn), Date)
            End Get
            Set(value As Date)
                Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn) = value
@@ -2863,6 +2890,28 @@ Partial Public Class DD_ECMAdmin
            End Set
        End Property

+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+        Public Property LOAD_DIRECT() As Boolean
+            Get
+                Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn), Boolean)
+            End Get
+            Set(value As Boolean)
+                Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn) = value
+            End Set
+        End Property
+
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
+        Public Property SQL_QUICK_VIEW() As String
+            Get
+                Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn), String)
+            End Get
+            Set(value As String)
+                Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn) = value
+            End Set
+        End Property
+
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
        Public Property TBPMO_FORM_CONSTRUCTORRow() As TBPMO_FORM_CONSTRUCTORRow
@@ -2898,18 +2947,6 @@ Partial Public Class DD_ECMAdmin
            Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHOColumn) = Global.System.Convert.DBNull
        End Sub

-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
-        Public Function IsADDED_WHENNull() As Boolean
-            Return Me.IsNull(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn)
-        End Function
-
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
-        Public Sub SetADDED_WHENNull()
-            Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn) = Global.System.Convert.DBNull
-        End Sub
-
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _
        Public Function IsCHANGED_WHONull() As Boolean
@@ -4184,6 +4221,8 @@ Namespace DD_ECMAdminTableAdapters
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN3", "SEARCH_PATTERN3")
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN4", "SEARCH_PATTERN4")
            tableMapping.ColumnMappings.Add("SEARCH_PATTERN5", "SEARCH_PATTERN5")
+            tableMapping.ColumnMappings.Add("LOAD_DIRECT", "LOAD_DIRECT")
+            tableMapping.ColumnMappings.Add("SQL_QUICK_VIEW", "SQL_QUICK_VIEW")
            Me._adapter.TableMappings.Add(tableMapping)
            Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -4231,11 +4270,12 @@ Namespace DD_ECMAdminTableAdapters
                "LUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTER" & _
                "N1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "                         SEARCH_PATTER" & _
                "N3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SE" & _
-                "ARCH_PATTERN5" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE        (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONSTRUCT_ID" & _
-                ", FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBE" & _
-                "NE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME" & _
-                "2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PA" & _
-                "TTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)"
+                "ARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE        (GUID = @Original_GUID);" & _
+                "  " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_" & _
+                "SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH" & _
+                "EN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN" & _
+                "2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR" & _
+                "_DETAIL WHERE (GUID = @GUID)"
            Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCT_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORM_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FORM_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
@@ -4253,6 +4293,7 @@ Namespace DD_ECMAdminTableAdapters
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN3", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN3", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN4", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN4", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN5", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN5", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_DIRECT", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", ""))
        End Sub
@@ -4270,8 +4311,12 @@ Namespace DD_ECMAdminTableAdapters
            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
            Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(0).Connection = Me.Connection
-            Me._commandCollection(0).CommandText = "SELECT        TBPMO_FORM_CONSTRUCTOR_DETAIL.*" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM            TBPMO_FORM_CONSTRU" & _
-                "CTOR_DETAIL where GUID = @ID"
+            Me._commandCollection(0).CommandText = "SELECT        GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQ" & _
+                "L_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_" & _
+                "WHEN, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "                         COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SE" & _
+                "ARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN" & _
+                "5, LOAD_DIRECT, SQL_QUICK_VIEW" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM            TBPMO_FORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "W" & _
+                "HERE        (GUID = @ID)"
            Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
        End Sub
@@ -4468,6 +4513,7 @@ Namespace DD_ECMAdminTableAdapters
                    ByVal SEARCH_PATTERN3 As String, _
                    ByVal SEARCH_PATTERN4 As String, _
                    ByVal SEARCH_PATTERN5 As String, _
+                    ByVal LOAD_DIRECT As Boolean, _
                    ByVal Original_GUID As Integer, _
                    ByVal GUID As Integer) As Integer
            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONSTRUCT_ID, Integer)
@@ -4530,8 +4576,9 @@ Namespace DD_ECMAdminTableAdapters
            Else
                Me.Adapter.UpdateCommand.Parameters(15).Value = CType(SEARCH_PATTERN5, String)
            End If
-            Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_GUID, Integer)
-            Me.Adapter.UpdateCommand.Parameters(17).Value = CType(GUID, Integer)
+            Me.Adapter.UpdateCommand.Parameters(16).Value = CType(LOAD_DIRECT, Boolean)
+            Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_GUID, Integer)
+            Me.Adapter.UpdateCommand.Parameters(18).Value = CType(GUID, Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
                        <> Global.System.Data.ConnectionState.Open) Then