From c596fcdc6e15da0178a75507ecfab806071e5647 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 5 Jun 2018 12:30:47 +0200 Subject: [PATCH] jj: defaultValue, fix pattern bug --- app/DD_PM_WINDREAM/ClassControl_Properties.vb | 58 - .../DD_DMSLiteDataSet.Designer.vb | 792 ++++++--- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 204 ++- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 24 +- app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj | 1 - app/DD_PM_WINDREAM/ModuleControlProperties.vb | 11 + app/DD_PM_WINDREAM/ModuleHelperMethods.vb | 2 +- app/DD_PM_WINDREAM/frmFormDesigner.vb | 4 + .../frmProfileDesigner.Designer.vb | 188 ++ app/DD_PM_WINDREAM/frmProfileDesigner.resx | 1530 +++++++++++------ app/DD_PM_WINDREAM/frmValidator.vb | 58 +- 11 files changed, 1958 insertions(+), 914 deletions(-) delete mode 100644 app/DD_PM_WINDREAM/ClassControl_Properties.vb diff --git a/app/DD_PM_WINDREAM/ClassControl_Properties.vb b/app/DD_PM_WINDREAM/ClassControl_Properties.vb deleted file mode 100644 index 0590e67..0000000 --- a/app/DD_PM_WINDREAM/ClassControl_Properties.vb +++ /dev/null @@ -1,58 +0,0 @@ -Imports System.ComponentModel -''' - _ -Public Class ClassControl_Properties - ''' - Private _Bez As String - Private _Show As Boolean - Private _Number As Short - ''' - _ - Public Property CtrlName() As String - Get - Return _Bez - End Get - Set(ByVal Value As String) - _Bez = Value - End Set - End Property - ''' - _ - Public Property Show() As Boolean - Get - Return _Show - End Get - Set(ByVal Value As Boolean) - _Show = Value - End Set - End Property - ''' - _ - Public Property Number() As Short - Get - Return _Number - End Get - Set(ByVal Value As Short) - _Number = Value - End Set - End Property - ''' -End Class diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 4ee3e41..9b51bca 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -3356,6 +3356,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnLOG_INDEX As Global.System.Data.DataColumn + Private columnDEFAULT_VALUE As Global.System.Data.DataColumn + _ Public Sub New() @@ -3575,6 +3577,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property DEFAULT_VALUEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDEFAULT_VALUE + End Get + End Property + _ @@ -3635,9 +3645,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal HEIGHT As Short, _ ByVal READ_ONLY As Boolean, _ ByVal LOAD_IDX_VALUE As Boolean, _ - ByVal LOG_INDEX As String) As VWPM_CONTROL_INDEXRow + ByVal LOG_INDEX As String, _ + ByVal DEFAULT_VALUE As String) As VWPM_CONTROL_INDEXRow Dim rowVWPM_CONTROL_INDEXRow As VWPM_CONTROL_INDEXRow = CType(Me.NewRow,VWPM_CONTROL_INDEXRow) - Dim columnValuesArray() As Object = New Object() {GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, INDEX_NAME, VALIDATION, TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, CHOICE_LIST, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX} + Dim columnValuesArray() As Object = New Object() {GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, INDEX_NAME, VALIDATION, TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, CHOICE_LIST, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE} rowVWPM_CONTROL_INDEXRow.ItemArray = columnValuesArray Me.Rows.Add(rowVWPM_CONTROL_INDEXRow) Return rowVWPM_CONTROL_INDEXRow @@ -3689,6 +3700,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnREAD_ONLY = MyBase.Columns("READ_ONLY") Me.columnLOAD_IDX_VALUE = MyBase.Columns("LOAD_IDX_VALUE") Me.columnLOG_INDEX = MyBase.Columns("LOG_INDEX") + Me.columnDEFAULT_VALUE = MyBase.Columns("DEFAULT_VALUE") End Sub _ Public Sub New() @@ -6535,6 +6553,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property DEFAULT_VALUEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDEFAULT_VALUE + End Get + End Property + _ @@ -6596,9 +6622,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal FONT_FAMILY As String, _ ByVal FONT_COLOR As Long, _ ByVal READ_ONLY As Boolean, _ - ByVal LOAD_IDX_VALUE As Boolean) As TBPM_PROFILE_CONTROLSRow + ByVal LOAD_IDX_VALUE As Boolean, _ + ByVal DEFAULT_VALUE As String) As TBPM_PROFILE_CONTROLSRow Dim rowTBPM_PROFILE_CONTROLSRow As TBPM_PROFILE_CONTROLSRow = CType(Me.NewRow,TBPM_PROFILE_CONTROLSRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE} If (Not (parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE1) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE1(0) End If @@ -6655,6 +6682,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnFONT_COLOR = MyBase.Columns("FONT_COLOR") Me.columnREAD_ONLY = MyBase.Columns("READ_ONLY") Me.columnLOAD_IDX_VALUE = MyBase.Columns("LOAD_IDX_VALUE") + Me.columnDEFAULT_VALUE = MyBase.Columns("DEFAULT_VALUE") End Sub _ Public Property WIDTH() As Short Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.WIDTHColumn),Short) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte WIDTH in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try + Return CType(Me(Me.tableVWPM_CONTROL_INDEX.WIDTHColumn),Short) End Get Set Me(Me.tableVWPM_CONTROL_INDEX.WIDTHColumn) = value @@ -9308,11 +9337,7 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Property HEIGHT() As Short Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.HEIGHTColumn),Short) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte HEIGHT in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try + Return CType(Me(Me.tableVWPM_CONTROL_INDEX.HEIGHTColumn),Short) End Get Set Me(Me.tableVWPM_CONTROL_INDEX.HEIGHTColumn) = value @@ -9352,6 +9377,21 @@ Partial Public Class DD_DMSLiteDataSet End Set End Property + _ + Public Property DEFAULT_VALUE() As String + Get + Try + Return CType(Me(Me.tableVWPM_CONTROL_INDEX.DEFAULT_VALUEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DEFAULT_VALUE in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableVWPM_CONTROL_INDEX.DEFAULT_VALUEColumn) = value + End Set + End Property + _ Public Function IsINDEX_NAMENull() As Boolean @@ -9462,26 +9502,14 @@ Partial Public Class DD_DMSLiteDataSet _ - Public Function IsWIDTHNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.WIDTHColumn) + Public Function IsDEFAULT_VALUENull() As Boolean + Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.DEFAULT_VALUEColumn) End Function _ - Public Sub SetWIDTHNull() - Me(Me.tableVWPM_CONTROL_INDEX.WIDTHColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsHEIGHTNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.HEIGHTColumn) - End Function - - _ - Public Sub SetHEIGHTNull() - Me(Me.tableVWPM_CONTROL_INDEX.HEIGHTColumn) = Global.System.Convert.DBNull + Public Sub SetDEFAULT_VALUENull() + Me(Me.tableVWPM_CONTROL_INDEX.DEFAULT_VALUEColumn) = Global.System.Convert.DBNull End Sub End Class @@ -10835,11 +10863,7 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Property ADDED_WHEN() As Date Get - Try - Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.ADDED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBPM_PROFILE_CONTROLS ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.ADDED_WHENColumn),Date) End Get Set Me(Me.tableTBPM_PROFILE_CONTROLS.ADDED_WHENColumn) = value @@ -10967,11 +10991,7 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Property HEIGHT() As Short Get - Try - Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.HEIGHTColumn),Short) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte HEIGHT in Tabelle TBPM_PROFILE_CONTROLS ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.HEIGHTColumn),Short) End Get Set Me(Me.tableTBPM_PROFILE_CONTROLS.HEIGHTColumn) = value @@ -10982,11 +11002,7 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Property WIDTH() As Short Get - Try - Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.WIDTHColumn),Short) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte WIDTH in Tabelle TBPM_PROFILE_CONTROLS ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.WIDTHColumn),Short) End Get Set Me(Me.tableTBPM_PROFILE_CONTROLS.WIDTHColumn) = value @@ -11077,26 +11093,29 @@ Partial Public Class DD_DMSLiteDataSet _ - Public Property TBPM_PROFILERow() As TBPM_PROFILERow + Public Property DEFAULT_VALUE() As String Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPM_PROFILE_CONTROLS_PROFILE1")),TBPM_PROFILERow) + Try + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.DEFAULT_VALUEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DEFAULT_VALUE in Tabelle TBPM_PROFILE_CONTROLS ist DBNull.", e) + End Try End Get Set - Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPM_PROFILE_CONTROLS_PROFILE1")) + Me(Me.tableTBPM_PROFILE_CONTROLS.DEFAULT_VALUEColumn) = value End Set End Property _ - Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBPM_PROFILE_CONTROLS.ADDED_WHENColumn) - End Function - - _ - Public Sub SetADDED_WHENNull() - Me(Me.tableTBPM_PROFILE_CONTROLS.ADDED_WHENColumn) = Global.System.Convert.DBNull - End Sub + Public Property TBPM_PROFILERow() As TBPM_PROFILERow + Get + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPM_PROFILE_CONTROLS_PROFILE1")),TBPM_PROFILERow) + End Get + Set + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPM_PROFILE_CONTROLS_PROFILE1")) + End Set + End Property _ @@ -11182,30 +11201,6 @@ Partial Public Class DD_DMSLiteDataSet Me(Me.tableTBPM_PROFILE_CONTROLS.SQL_UEBERPRUEFUNGColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsHEIGHTNull() As Boolean - Return Me.IsNull(Me.tableTBPM_PROFILE_CONTROLS.HEIGHTColumn) - End Function - - _ - Public Sub SetHEIGHTNull() - Me(Me.tableTBPM_PROFILE_CONTROLS.HEIGHTColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsWIDTHNull() As Boolean - Return Me.IsNull(Me.tableTBPM_PROFILE_CONTROLS.WIDTHColumn) - End Function - - _ - Public Sub SetWIDTHNull() - Me(Me.tableTBPM_PROFILE_CONTROLS.WIDTHColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsFONT_STYLENull() As Boolean @@ -11254,6 +11249,18 @@ Partial Public Class DD_DMSLiteDataSet Me(Me.tableTBPM_PROFILE_CONTROLS.FONT_COLORColumn) = Global.System.Convert.DBNull End Sub + _ + Public Function IsDEFAULT_VALUENull() As Boolean + Return Me.IsNull(Me.tableTBPM_PROFILE_CONTROLS.DEFAULT_VALUEColumn) + End Function + + _ + Public Sub SetDEFAULT_VALUENull() + Me(Me.tableTBPM_PROFILE_CONTROLS.DEFAULT_VALUEColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function GetTBPM_CONTROL_TABLERows() As TBPM_CONTROL_TABLERow() @@ -15139,6 +15146,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("READ_ONLY", "READ_ONLY") tableMapping.ColumnMappings.Add("LOAD_IDX_VALUE", "LOAD_IDX_VALUE") tableMapping.ColumnMappings.Add("LOG_INDEX", "LOG_INDEX") + tableMapping.ColumnMappings.Add("DEFAULT_VALUE", "DEFAULT_VALUE") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -15158,8 +15166,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(0).CommandText = "SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LO"& _ "C, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_N"& _ "AME, VALIDATION, CHOICE_LIST, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TYP, CONNECTION_ID, SQL"& _ - "_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTR"& _ - "OL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL_NAME = @Profil)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" + "_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL_NAME = @Profil)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X"& _ + "_LOC" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Profil", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() @@ -17292,10 +17301,10 @@ Namespace DD_DMSLiteDataSetTableAdapters ",@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@FINAL_PROFILE,@FINAL_TEXT,@MOVE"& _ "2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@WORK_HISTORY_ENTR"& _ "Y,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY); "& _ - " "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOC"& _ - "UMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_T"& _ - "EXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE (G"& _ - "UID = SCOPE_IDENTITY())" + " "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DO"& _ + "CUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_"& _ + "TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE ("& _ + "GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -17327,10 +17336,10 @@ Namespace DD_DMSLiteDataSetTableAdapters "INDEX, LOG_INDEX = @LOG_INDEX, WORK_HISTORY_ENTRY = @WORK_HISTORY_ENTRY, SQL_VIE"& _ "W = @SQL_VIEW, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" ANNOTATE_ALL_WORK_HISTORY_ENTRIES = @A"& _ "NNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY = @ANNOTATE_WORK_H"& _ - "ISTORY_ENTRY"&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, NAME, TIT"& _ - "LE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_"& _ - "WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, W"& _ - "D_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE (GUID = @GUID)" + "ISTORY_ENTRY"&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, NAME, TI"& _ + "TLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED"& _ + "_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, "& _ + "WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -17604,7 +17613,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.InsertCommand.Parameters(15).Value = CType(WORK_HISTORY_ENTRY,String) End If If (SQL_VIEW Is Nothing) Then - Throw New Global.System.ArgumentNullException("SQL_VIEW") + Me.Adapter.InsertCommand.Parameters(16).Value = Global.System.DBNull.Value Else Me.Adapter.InsertCommand.Parameters(16).Value = CType(SQL_VIEW,String) End If @@ -17714,7 +17723,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.UpdateCommand.Parameters(16).Value = CType(WORK_HISTORY_ENTRY,String) End If If (SQL_VIEW Is Nothing) Then - Throw New Global.System.ArgumentNullException("SQL_VIEW") + Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(17).Value = CType(SQL_VIEW,String) End If @@ -18337,6 +18346,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("FONT_COLOR", "FONT_COLOR") tableMapping.ColumnMappings.Add("READ_ONLY", "READ_ONLY") tableMapping.ColumnMappings.Add("LOAD_IDX_VALUE", "LOAD_IDX_VALUE") + tableMapping.ColumnMappings.Add("DEFAULT_VALUE", "DEFAULT_VALUE") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -18345,77 +18355,145 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.DeleteCommand.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.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PROFIL_ID, NAME, CTR"& _ - "L_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, INDEX_NAME, TYP, VALIDAT"& _ - "ION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@P"& _ - "ROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@INDEX"& _ - "_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@W"& _ - "IDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID,"& _ - " NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C"& _ - "HANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERP"& _ - "RUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONL"& _ - "Y, LOAD_IDX_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBPM_PROFILE_CONTROLS] ([PROFIL_ID], [NAME], [CTRL_TYPE], [CTRL_TEXT"& _ + "], [X_LOC], [Y_LOC], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], ["& _ + "INDEX_NAME], [TYP], [VALIDATION], [CHOICE_LIST], [CONNECTION_ID], [SQL_UEBERPRUE"& _ + "FUNG], [HEIGHT], [WIDTH], [FONT_STYLE], [FONT_SIZE], [FONT_FAMILY], [FONT_COLOR]"& _ + ", [READ_ONLY], [LOAD_IDX_VALUE], [DEFAULT_VALUE]) VALUES (@PROFIL_ID, @NAME, @CT"& _ + "RL_TYPE, @CTRL_TEXT, @X_LOC, @Y_LOC, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHA"& _ + "NGED_WHEN, @INDEX_NAME, @TYP, @VALIDATION, @CHOICE_LIST, @CONNECTION_ID, @SQL_UE"& _ + "BERPRUEFUNG, @HEIGHT, @WIDTH, @FONT_STYLE, @FONT_SIZE, @FONT_FAMILY, @FONT_COLOR"& _ + ", @READ_ONLY, @LOAD_IDX_VALUE, @DEFAULT_VALUE);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, C"& _ + "TRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_W"& _ + "HEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG,"& _ + " HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_"& _ + "IDX_VALUE, DEFAULT_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY"& _ + "()) ORDER BY Y_LOC, X_LOC" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEX_NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEX_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYP", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "TYP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALIDATION", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VALIDATION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHOICE_LIST", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_UEBERPRUEFUNG", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_UEBERPRUEFUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WIDTH", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_STYLE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_STYLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_SIZE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_SIZE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_FAMILY", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_FAMILY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_COLOR", Global.System.Data.SqlDbType.BigInt, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_COLOR", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEX_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEX_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYP", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TYP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALIDATION", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALIDATION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHOICE_LIST", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_UEBERPRUEFUNG", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_UEBERPRUEFUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WIDTH", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_STYLE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_STYLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_SIZE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_SIZE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_FAMILY", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_FAMILY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_COLOR", Global.System.Data.SqlDbType.BigInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_COLOR", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@READ_ONLY", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "READ_ONLY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_IDX_VALUE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_IDX_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DEFAULT_VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DEFAULT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NAME = @NAME, CTRL_TYPE = "& _ - "@CTRL_TYPE, CTRL_TEXT = @CTRL_TEXT, X_LOC = @X_LOC, Y_LOC = @Y_LOC, ADDED_WHO = "& _ - "@ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHO = @"& _ - "CHANGED_WHO, INDEX_NAME = @INDEX_NAME, TYP = @TYP, VALIDATION = @VALIDATION, CHO"& _ - "ICE_LIST = @CHOICE_LIST, CONNECTION_ID = @CONNECTION_ID, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " SQL_UEBERPRUEFUNG = @SQL_UEBERPRUEFUNG, HEIGHT = @HEIGHT, WIDTH = @WIDTH, FO"& _ - "NT_STYLE = @FONT_STYLE, FONT_SIZE = @FONT_STYLE, FONT_FAMILY = @FONT_FAMILY, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " FONT_COLOR = @FONT_COLOR, READ_ONLY = @READ_ONLY, LOAD_I"& _ - "DX_VALUE = @LOAD_IDX_VALUE"&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"& _ - ", PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CH"& _ - "ANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID"& _ - ", SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COL"& _ - "OR, READ_ONLY, LOAD_IDX_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE [TBPM_PROFILE_CONTROLS] SET [PROFIL_ID] = @PROFIL_ID, [NAME] = @NAME, [CTR"& _ + "L_TYPE] = @CTRL_TYPE, [CTRL_TEXT] = @CTRL_TEXT, [X_LOC] = @X_LOC, [Y_LOC] = @Y_L"& _ + "OC, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANG"& _ + "ED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [INDEX_NAME] = @INDEX_NAME, [TYP] = @TYP"& _ + ", [VALIDATION] = @VALIDATION, [CHOICE_LIST] = @CHOICE_LIST, [CONNECTION_ID] = @C"& _ + "ONNECTION_ID, [SQL_UEBERPRUEFUNG] = @SQL_UEBERPRUEFUNG, [HEIGHT] = @HEIGHT, [WID"& _ + "TH] = @WIDTH, [FONT_STYLE] = @FONT_STYLE, [FONT_SIZE] = @FONT_SIZE, [FONT_FAMILY"& _ + "] = @FONT_FAMILY, [FONT_COLOR] = @FONT_COLOR, [READ_ONLY] = @READ_ONLY, [LOAD_ID"& _ + "X_VALUE] = @LOAD_IDX_VALUE, [DEFAULT_VALUE] = @DEFAULT_VALUE WHERE (([GUID] = @O"& _ + "riginal_GUID) AND ([PROFIL_ID] = @Original_PROFIL_ID) AND ([NAME] = @Original_NA"& _ + "ME) AND ([CTRL_TYPE] = @Original_CTRL_TYPE) AND ([CTRL_TEXT] = @Original_CTRL_TE"& _ + "XT) AND ([X_LOC] = @Original_X_LOC) AND ([Y_LOC] = @Original_Y_LOC) AND ([ADDED_"& _ + "WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsN"& _ + "ull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHA"& _ + "NGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANG"& _ + "ED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_INDEX_NAME = 1 AND [INDEX_NAME"& _ + "] IS NULL) OR ([INDEX_NAME] = @Original_INDEX_NAME)) AND ((@IsNull_TYP = 1 AND ["& _ + "TYP] IS NULL) OR ([TYP] = @Original_TYP)) AND ([VALIDATION] = @Original_VALIDATI"& _ + "ON) AND ((@IsNull_CHOICE_LIST = 1 AND [CHOICE_LIST] IS NULL) OR ([CHOICE_LIST] ="& _ + " @Original_CHOICE_LIST)) AND ((@IsNull_CONNECTION_ID = 1 AND [CONNECTION_ID] IS "& _ + "NULL) OR ([CONNECTION_ID] = @Original_CONNECTION_ID)) AND ([HEIGHT] = @Original_"& _ + "HEIGHT) AND ([WIDTH] = @Original_WIDTH) AND ((@IsNull_FONT_STYLE = 1 AND [FONT_S"& _ + "TYLE] IS NULL) OR ([FONT_STYLE] = @Original_FONT_STYLE)) AND ((@IsNull_FONT_SIZE"& _ + " = 1 AND [FONT_SIZE] IS NULL) OR ([FONT_SIZE] = @Original_FONT_SIZE)) AND ((@IsN"& _ + "ull_FONT_FAMILY = 1 AND [FONT_FAMILY] IS NULL) OR ([FONT_FAMILY] = @Original_FON"& _ + "T_FAMILY)) AND ((@IsNull_FONT_COLOR = 1 AND [FONT_COLOR] IS NULL) OR ([FONT_COLO"& _ + "R] = @Original_FONT_COLOR)) AND ([READ_ONLY] = @Original_READ_ONLY) AND ([LOAD_I"& _ + "DX_VALUE] = @Original_LOAD_IDX_VALUE) AND ((@IsNull_DEFAULT_VALUE = 1 AND [DEFAU"& _ + "LT_VALUE] IS NULL) OR ([DEFAULT_VALUE] = @Original_DEFAULT_VALUE)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUI"& _ + "D, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, C"& _ + "HANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_I"& _ + "D, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_CO"& _ + "LOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE FROM TBPM_PROFILE_CONTROLS WHERE ("& _ + "GUID = @GUID) ORDER BY Y_LOC, X_LOC" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEX_NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEX_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYP", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "TYP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALIDATION", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VALIDATION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHOICE_LIST", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_UEBERPRUEFUNG", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_UEBERPRUEFUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WIDTH", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_STYLE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_STYLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_FAMILY", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_FAMILY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_COLOR", Global.System.Data.SqlDbType.BigInt, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_COLOR", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@READ_ONLY", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "READ_ONLY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_IDX_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_IDX_VALUE", 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, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEX_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEX_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYP", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TYP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALIDATION", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALIDATION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHOICE_LIST", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_UEBERPRUEFUNG", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_UEBERPRUEFUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WIDTH", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_STYLE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_STYLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_SIZE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_SIZE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_FAMILY", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_FAMILY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_COLOR", Global.System.Data.SqlDbType.BigInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_COLOR", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@READ_ONLY", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "READ_ONLY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_IDX_VALUE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_IDX_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DEFAULT_VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DEFAULT_VALUE", 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, 0, 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("@Original_PROFIL_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_X_LOC", Global.System.Data.SqlDbType.Float, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_Y_LOC", Global.System.Data.SqlDbType.Float, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_INDEX_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEX_NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_INDEX_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEX_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_TYP", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TYP", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TYP", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TYP", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VALIDATION", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALIDATION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHOICE_LIST", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHOICE_LIST", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CONNECTION_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_HEIGHT", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_WIDTH", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FONT_STYLE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_STYLE", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FONT_STYLE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_STYLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FONT_SIZE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_SIZE", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FONT_SIZE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_SIZE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FONT_FAMILY", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_FAMILY", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FONT_FAMILY", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_FAMILY", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FONT_COLOR", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_COLOR", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FONT_COLOR", Global.System.Data.SqlDbType.BigInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_COLOR", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_READ_ONLY", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "READ_ONLY", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOAD_IDX_VALUE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_IDX_VALUE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_DEFAULT_VALUE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DEFAULT_VALUE", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DEFAULT_VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DEFAULT_VALUE", 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.Current, false, Nothing, "", "", "")) End Sub _ Public Overloads Overridable Function Update( _ + ByVal PROFIL_ID As Integer, _ ByVal NAME As String, _ ByVal CTRL_TYPE As String, _ ByVal CTRL_TEXT As String, _ ByVal X_LOC As Double, _ ByVal Y_LOC As Double, _ ByVal ADDED_WHO As String, _ - ByVal ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal ADDED_WHEN As Date, _ ByVal CHANGED_WHO As String, _ + ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ ByVal INDEX_NAME As String, _ ByVal TYP As String, _ ByVal VALIDATION As Boolean, _ ByVal CHOICE_LIST As String, _ ByVal CONNECTION_ID As Global.System.Nullable(Of Short), _ ByVal SQL_UEBERPRUEFUNG As String, _ - ByVal HEIGHT As Global.System.Nullable(Of Short), _ - ByVal WIDTH As Global.System.Nullable(Of Short), _ + ByVal HEIGHT As Short, _ + ByVal WIDTH As Short, _ ByVal FONT_STYLE As Global.System.Nullable(Of Short), _ + ByVal FONT_SIZE As Global.System.Nullable(Of Short), _ ByVal FONT_FAMILY As String, _ ByVal FONT_COLOR As Global.System.Nullable(Of Long), _ ByVal READ_ONLY As Boolean, _ ByVal LOAD_IDX_VALUE As Boolean, _ + ByVal DEFAULT_VALUE As String, _ ByVal Original_GUID As Integer, _ + ByVal Original_PROFIL_ID As Integer, _ + ByVal Original_NAME As String, _ + ByVal Original_CTRL_TYPE As String, _ + ByVal Original_CTRL_TEXT As String, _ + ByVal Original_X_LOC As Double, _ + ByVal Original_Y_LOC As Double, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Date, _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_INDEX_NAME As String, _ + ByVal Original_TYP As String, _ + ByVal Original_VALIDATION As Boolean, _ + ByVal Original_CHOICE_LIST As String, _ + ByVal Original_CONNECTION_ID As Global.System.Nullable(Of Short), _ + ByVal Original_HEIGHT As Short, _ + ByVal Original_WIDTH As Short, _ + ByVal Original_FONT_STYLE As Global.System.Nullable(Of Short), _ + ByVal Original_FONT_SIZE As Global.System.Nullable(Of Short), _ + ByVal Original_FONT_FAMILY As String, _ + ByVal Original_FONT_COLOR As Global.System.Nullable(Of Long), _ + ByVal Original_READ_ONLY As Boolean, _ + ByVal Original_LOAD_IDX_VALUE As Boolean, _ + ByVal Original_DEFAULT_VALUE As String, _ ByVal GUID As Integer) As Integer + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFIL_ID,Integer) If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") Else - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(NAME,String) + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(NAME,String) End If If (CTRL_TYPE Is Nothing) Then Throw New Global.System.ArgumentNullException("CTRL_TYPE") Else - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CTRL_TYPE,String) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(CTRL_TYPE,String) End If If (CTRL_TEXT Is Nothing) Then Throw New Global.System.ArgumentNullException("CTRL_TEXT") Else - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(CTRL_TEXT,String) + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CTRL_TEXT,String) End If - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(X_LOC,Double) - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(Y_LOC,Double) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(X_LOC,Double) + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Y_LOC,Double) If (ADDED_WHO Is Nothing) Then Throw New Global.System.ArgumentNullException("ADDED_WHO") Else - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(ADDED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ADDED_WHO,String) End If - If (ADDED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ADDED_WHEN.Value,Date) + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(ADDED_WHEN,Date) + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(CHANGED_WHO,String) End If - If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date) Else - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value End If If (INDEX_NAME Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(10).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(8).Value = CType(INDEX_NAME,String) + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(INDEX_NAME,String) End If If (TYP Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(11).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(9).Value = CType(TYP,String) + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(TYP,String) End If - Me.Adapter.UpdateCommand.Parameters(10).Value = CType(VALIDATION,Boolean) + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(VALIDATION,Boolean) If (CHOICE_LIST Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(11).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(13).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(11).Value = CType(CHOICE_LIST,String) + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(CHOICE_LIST,String) End If If (CONNECTION_ID.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(12).Value = CType(CONNECTION_ID.Value,Short) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(CONNECTION_ID.Value,Short) Else - Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(14).Value = Global.System.DBNull.Value End If If (SQL_UEBERPRUEFUNG Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(13).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(15).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(13).Value = CType(SQL_UEBERPRUEFUNG,String) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(SQL_UEBERPRUEFUNG,String) End If - If (HEIGHT.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(HEIGHT.Value,Short) - Else - Me.Adapter.UpdateCommand.Parameters(14).Value = Global.System.DBNull.Value - End If - If (WIDTH.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(15).Value = CType(WIDTH.Value,Short) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(HEIGHT,Short) + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(WIDTH,Short) + If (FONT_STYLE.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(FONT_STYLE.Value,Short) Else - Me.Adapter.UpdateCommand.Parameters(15).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(18).Value = Global.System.DBNull.Value End If - If (FONT_STYLE.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(16).Value = CType(FONT_STYLE.Value,Short) + If (FONT_SIZE.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(FONT_SIZE.Value,Short) Else - Me.Adapter.UpdateCommand.Parameters(16).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(19).Value = Global.System.DBNull.Value End If If (FONT_FAMILY Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(20).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(17).Value = CType(FONT_FAMILY,String) + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(FONT_FAMILY,String) End If If (FONT_COLOR.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(18).Value = CType(FONT_COLOR.Value,Long) + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(FONT_COLOR.Value,Long) Else - Me.Adapter.UpdateCommand.Parameters(18).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(21).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(READ_ONLY,Boolean) + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(LOAD_IDX_VALUE,Boolean) + If (DEFAULT_VALUE Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(24).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(DEFAULT_VALUE,String) + End If + Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(26).Value = CType(Original_PROFIL_ID,Integer) + If (Original_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_NAME") + Else + Me.Adapter.UpdateCommand.Parameters(27).Value = CType(Original_NAME,String) + End If + If (Original_CTRL_TYPE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_CTRL_TYPE") + Else + Me.Adapter.UpdateCommand.Parameters(28).Value = CType(Original_CTRL_TYPE,String) End If - Me.Adapter.UpdateCommand.Parameters(19).Value = CType(READ_ONLY,Boolean) - Me.Adapter.UpdateCommand.Parameters(20).Value = CType(LOAD_IDX_VALUE,Boolean) - Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(22).Value = CType(GUID,Integer) + If (Original_CTRL_TEXT Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_CTRL_TEXT") + Else + Me.Adapter.UpdateCommand.Parameters(29).Value = CType(Original_CTRL_TEXT,String) + End If + Me.Adapter.UpdateCommand.Parameters(30).Value = CType(Original_X_LOC,Double) + Me.Adapter.UpdateCommand.Parameters(31).Value = CType(Original_Y_LOC,Double) + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(32).Value = CType(Original_ADDED_WHO,String) + End If + Me.Adapter.UpdateCommand.Parameters(33).Value = CType(Original_ADDED_WHEN,Date) + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(34).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(35).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(34).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(35).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(36).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(37).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(36).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(37).Value = Global.System.DBNull.Value + End If + If (Original_INDEX_NAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(38).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(39).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(38).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(39).Value = CType(Original_INDEX_NAME,String) + End If + If (Original_TYP Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(40).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(41).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(40).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(41).Value = CType(Original_TYP,String) + End If + Me.Adapter.UpdateCommand.Parameters(42).Value = CType(Original_VALIDATION,Boolean) + If (Original_CHOICE_LIST Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(43).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(44).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(43).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(44).Value = CType(Original_CHOICE_LIST,String) + End If + If (Original_CONNECTION_ID.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(45).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(46).Value = CType(Original_CONNECTION_ID.Value,Short) + Else + Me.Adapter.UpdateCommand.Parameters(45).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(46).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(47).Value = CType(Original_HEIGHT,Short) + Me.Adapter.UpdateCommand.Parameters(48).Value = CType(Original_WIDTH,Short) + If (Original_FONT_STYLE.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(49).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(50).Value = CType(Original_FONT_STYLE.Value,Short) + Else + Me.Adapter.UpdateCommand.Parameters(49).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(50).Value = Global.System.DBNull.Value + End If + If (Original_FONT_SIZE.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(51).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(52).Value = CType(Original_FONT_SIZE.Value,Short) + Else + Me.Adapter.UpdateCommand.Parameters(51).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(52).Value = Global.System.DBNull.Value + End If + If (Original_FONT_FAMILY Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(53).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(54).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(53).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(54).Value = CType(Original_FONT_FAMILY,String) + End If + If (Original_FONT_COLOR.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(55).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(56).Value = CType(Original_FONT_COLOR.Value,Long) + Else + Me.Adapter.UpdateCommand.Parameters(55).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(56).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(57).Value = CType(Original_READ_ONLY,Boolean) + Me.Adapter.UpdateCommand.Parameters(58).Value = CType(Original_LOAD_IDX_VALUE,Boolean) + If (Original_DEFAULT_VALUE Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(59).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(60).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(59).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(60).Value = CType(Original_DEFAULT_VALUE,String) + End If + Me.Adapter.UpdateCommand.Parameters(61).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 @@ -18885,6 +19111,64 @@ Namespace DD_DMSLiteDataSetTableAdapters End Try End Function + _ + Public Overloads Overridable Function Update( _ + ByVal PROFIL_ID As Integer, _ + ByVal NAME As String, _ + ByVal CTRL_TYPE As String, _ + ByVal CTRL_TEXT As String, _ + ByVal X_LOC As Double, _ + ByVal Y_LOC As Double, _ + ByVal ADDED_WHO As String, _ + ByVal ADDED_WHEN As Date, _ + ByVal CHANGED_WHO As String, _ + ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal INDEX_NAME As String, _ + ByVal TYP As String, _ + ByVal VALIDATION As Boolean, _ + ByVal CHOICE_LIST As String, _ + ByVal CONNECTION_ID As Global.System.Nullable(Of Short), _ + ByVal SQL_UEBERPRUEFUNG As String, _ + ByVal HEIGHT As Short, _ + ByVal WIDTH As Short, _ + ByVal FONT_STYLE As Global.System.Nullable(Of Short), _ + ByVal FONT_SIZE As Global.System.Nullable(Of Short), _ + ByVal FONT_FAMILY As String, _ + ByVal FONT_COLOR As Global.System.Nullable(Of Long), _ + ByVal READ_ONLY As Boolean, _ + ByVal LOAD_IDX_VALUE As Boolean, _ + ByVal DEFAULT_VALUE As String, _ + ByVal Original_GUID As Integer, _ + ByVal Original_PROFIL_ID As Integer, _ + ByVal Original_NAME As String, _ + ByVal Original_CTRL_TYPE As String, _ + ByVal Original_CTRL_TEXT As String, _ + ByVal Original_X_LOC As Double, _ + ByVal Original_Y_LOC As Double, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Date, _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_INDEX_NAME As String, _ + ByVal Original_TYP As String, _ + ByVal Original_VALIDATION As Boolean, _ + ByVal Original_CHOICE_LIST As String, _ + ByVal Original_CONNECTION_ID As Global.System.Nullable(Of Short), _ + ByVal Original_HEIGHT As Short, _ + ByVal Original_WIDTH As Short, _ + ByVal Original_FONT_STYLE As Global.System.Nullable(Of Short), _ + ByVal Original_FONT_SIZE As Global.System.Nullable(Of Short), _ + ByVal Original_FONT_FAMILY As String, _ + ByVal Original_FONT_COLOR As Global.System.Nullable(Of Long), _ + ByVal Original_READ_ONLY As Boolean, _ + ByVal Original_LOAD_IDX_VALUE As Boolean, _ + ByVal Original_DEFAULT_VALUE As String) As Integer + Return Me.Update(PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, Original_GUID, Original_PROFIL_ID, Original_NAME, Original_CTRL_TYPE, Original_CTRL_TEXT, Original_X_LOC, Original_Y_LOC, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_INDEX_NAME, Original_TYP, Original_VALIDATION, Original_CHOICE_LIST, Original_CONNECTION_ID, Original_HEIGHT, Original_WIDTH, Original_FONT_STYLE, Original_FONT_SIZE, Original_FONT_FAMILY, Original_FONT_COLOR, Original_READ_ONLY, Original_LOAD_IDX_VALUE, Original_DEFAULT_VALUE, Original_GUID) + End Function + _ @@ -19084,7 +19368,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, false)> _ - Public Overloads Overridable Function cmdInsertAnlage(ByVal PROFIL_ID As Integer, ByVal NAME As String, ByVal CTRL_TYPE As String, ByVal CTRL_TEXT As String, ByVal X_LOC As Double, ByVal Y_LOC As Double, ByVal ADDED_WHO As String, ByVal HEIGHT As Global.System.Nullable(Of Short), ByVal Width As Global.System.Nullable(Of Short)) As Integer + Public Overloads Overridable Function cmdInsertAnlage(ByVal PROFIL_ID As Integer, ByVal NAME As String, ByVal CTRL_TYPE As String, ByVal CTRL_TEXT As String, ByVal X_LOC As Double, ByVal Y_LOC As Double, ByVal ADDED_WHO As String, ByVal HEIGHT As Short, ByVal Width As Short) As Integer Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(8) command.Parameters(0).Value = CType(PROFIL_ID,Integer) If (NAME Is Nothing) Then @@ -19109,16 +19393,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Else command.Parameters(6).Value = CType(ADDED_WHO,String) End If - If (HEIGHT.HasValue = true) Then - command.Parameters(7).Value = CType(HEIGHT.Value,Short) - Else - command.Parameters(7).Value = Global.System.DBNull.Value - End If - If (Width.HasValue = true) Then - command.Parameters(8).Value = CType(Width.Value,Short) - Else - command.Parameters(8).Value = Global.System.DBNull.Value - End If + command.Parameters(7).Value = CType(HEIGHT,Short) + command.Parameters(8).Value = CType(Width,Short) Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index a31cdb9..efdee89 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -653,16 +653,16 @@ WHERE (PROFIL_ID = @PROF_ID) - + - + SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_NAME, VALIDATION, CHOICE_LIST, - TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX + TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE FROM VWPM_CONTROL_INDEX WHERE (PROFIL_NAME = @Profil) ORDER BY Y_LOC, X_LOC - + @@ -692,6 +692,7 @@ ORDER BY Y_LOC, X_LOC + @@ -1209,7 +1210,7 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPM_PROFILE (NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, WORK_HISTORY_ENTRY, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY) -VALUES (@NAME,@TITLE,@PRIORITY,@DESCRIPTION,@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@FINAL_PROFILE,@FINAL_TEXT,@MOVE2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@WORK_HISTORY_ENTRY,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY); +VALUES (@NAME,@TITLE,@PRIORITY,@DESCRIPTION,@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@FINAL_PROFILE,@FINAL_TEXT,@MOVE2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@WORK_HISTORY_ENTRY,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY); SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE (GUID = SCOPE_IDENTITY()) @@ -1228,7 +1229,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -1250,7 +1251,7 @@ SET NAME = @NAME, TITLE = @TITLE, PRIORITY = @PRIORITY, DESCRIPTI CHANGED_WHO = @CHANGED_WHO, FINAL_PROFILE = @FINAL_PROFILE, FINAL_TEXT = @FINAL_TEXT, MOVE2FOLDER = @MOVE2FOLDER, TYPE = @TYPE, WD_OBJECTTYPE = @WD_OBJECTTYPE, SORT_BY_LATEST = @SORT_BY_LATEST, PM_VEKTOR_INDEX = @PM_VEKTOR_INDEX, LOG_INDEX = @LOG_INDEX, WORK_HISTORY_ENTRY = @WORK_HISTORY_ENTRY, SQL_VIEW = @SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES = @ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY = @ANNOTATE_WORK_HISTORY_ENTRY -WHERE (GUID = @Original_GUID); +WHERE (GUID = @Original_GUID); SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE (GUID = @GUID) @@ -1270,7 +1271,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -1365,7 +1366,7 @@ WHERE (GUID = @GUID) - + SELECT COUNT(GUID) FROM TBPM_PROFILE WHERE NAME = @NAME @@ -1375,7 +1376,7 @@ WHERE (GUID = @GUID) - + UPDATE TBPM_PROFILE @@ -1390,7 +1391,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + UPDATE TBPM_PROFILE @@ -1404,7 +1405,7 @@ WHERE (GUID = @GUID) - + UPDATE TBPM_PROFILE @@ -1451,92 +1452,128 @@ WHERE (PROFIL_ID = @P_ID) AND (CTRL_TYPE <> 'LBL') - + - + DELETE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @Original_GUID) - + - INSERT INTO TBPM_PROFILE_CONTROLS - (PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, - FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR) -VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR); -SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) + INSERT INTO [TBPM_PROFILE_CONTROLS] ([PROFIL_ID], [NAME], [CTRL_TYPE], [CTRL_TEXT], [X_LOC], [Y_LOC], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [INDEX_NAME], [TYP], [VALIDATION], [CHOICE_LIST], [CONNECTION_ID], [SQL_UEBERPRUEFUNG], [HEIGHT], [WIDTH], [FONT_STYLE], [FONT_SIZE], [FONT_FAMILY], [FONT_COLOR], [READ_ONLY], [LOAD_IDX_VALUE], [DEFAULT_VALUE]) VALUES (@PROFIL_ID, @NAME, @CTRL_TYPE, @CTRL_TEXT, @X_LOC, @Y_LOC, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @INDEX_NAME, @TYP, @VALIDATION, @CHOICE_LIST, @CONNECTION_ID, @SQL_UEBERPRUEFUNG, @HEIGHT, @WIDTH, @FONT_STYLE, @FONT_SIZE, @FONT_FAMILY, @FONT_COLOR, @READ_ONLY, @LOAD_IDX_VALUE, @DEFAULT_VALUE); +SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, - SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE + SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @guid) ORDER BY Y_LOC, X_LOC - + - UPDATE TBPM_PROFILE_CONTROLS -SET NAME = @NAME, CTRL_TYPE = @CTRL_TYPE, CTRL_TEXT = @CTRL_TEXT, X_LOC = @X_LOC, Y_LOC = @Y_LOC, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, - CHANGED_WHO = @CHANGED_WHO, INDEX_NAME = @INDEX_NAME, TYP = @TYP, VALIDATION = @VALIDATION, CHOICE_LIST = @CHOICE_LIST, CONNECTION_ID = @CONNECTION_ID, - SQL_UEBERPRUEFUNG = @SQL_UEBERPRUEFUNG, HEIGHT = @HEIGHT, WIDTH = @WIDTH, FONT_STYLE = @FONT_STYLE, FONT_SIZE = @FONT_STYLE, FONT_FAMILY = @FONT_FAMILY, - FONT_COLOR = @FONT_COLOR, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE -WHERE (GUID = @Original_GUID); -SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) + UPDATE [TBPM_PROFILE_CONTROLS] SET [PROFIL_ID] = @PROFIL_ID, [NAME] = @NAME, [CTRL_TYPE] = @CTRL_TYPE, [CTRL_TEXT] = @CTRL_TEXT, [X_LOC] = @X_LOC, [Y_LOC] = @Y_LOC, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [INDEX_NAME] = @INDEX_NAME, [TYP] = @TYP, [VALIDATION] = @VALIDATION, [CHOICE_LIST] = @CHOICE_LIST, [CONNECTION_ID] = @CONNECTION_ID, [SQL_UEBERPRUEFUNG] = @SQL_UEBERPRUEFUNG, [HEIGHT] = @HEIGHT, [WIDTH] = @WIDTH, [FONT_STYLE] = @FONT_STYLE, [FONT_SIZE] = @FONT_SIZE, [FONT_FAMILY] = @FONT_FAMILY, [FONT_COLOR] = @FONT_COLOR, [READ_ONLY] = @READ_ONLY, [LOAD_IDX_VALUE] = @LOAD_IDX_VALUE, [DEFAULT_VALUE] = @DEFAULT_VALUE WHERE (([GUID] = @Original_GUID) AND ([PROFIL_ID] = @Original_PROFIL_ID) AND ([NAME] = @Original_NAME) AND ([CTRL_TYPE] = @Original_CTRL_TYPE) AND ([CTRL_TEXT] = @Original_CTRL_TEXT) AND ([X_LOC] = @Original_X_LOC) AND ([Y_LOC] = @Original_Y_LOC) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_INDEX_NAME = 1 AND [INDEX_NAME] IS NULL) OR ([INDEX_NAME] = @Original_INDEX_NAME)) AND ((@IsNull_TYP = 1 AND [TYP] IS NULL) OR ([TYP] = @Original_TYP)) AND ([VALIDATION] = @Original_VALIDATION) AND ((@IsNull_CHOICE_LIST = 1 AND [CHOICE_LIST] IS NULL) OR ([CHOICE_LIST] = @Original_CHOICE_LIST)) AND ((@IsNull_CONNECTION_ID = 1 AND [CONNECTION_ID] IS NULL) OR ([CONNECTION_ID] = @Original_CONNECTION_ID)) AND ([HEIGHT] = @Original_HEIGHT) AND ([WIDTH] = @Original_WIDTH) AND ((@IsNull_FONT_STYLE = 1 AND [FONT_STYLE] IS NULL) OR ([FONT_STYLE] = @Original_FONT_STYLE)) AND ((@IsNull_FONT_SIZE = 1 AND [FONT_SIZE] IS NULL) OR ([FONT_SIZE] = @Original_FONT_SIZE)) AND ((@IsNull_FONT_FAMILY = 1 AND [FONT_FAMILY] IS NULL) OR ([FONT_FAMILY] = @Original_FONT_FAMILY)) AND ((@IsNull_FONT_COLOR = 1 AND [FONT_COLOR] IS NULL) OR ([FONT_COLOR] = @Original_FONT_COLOR)) AND ([READ_ONLY] = @Original_READ_ONLY) AND ([LOAD_IDX_VALUE] = @Original_LOAD_IDX_VALUE) AND ((@IsNull_DEFAULT_VALUE = 1 AND [DEFAULT_VALUE] IS NULL) OR ([DEFAULT_VALUE] = @Original_DEFAULT_VALUE))); +SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1568,6 +1605,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + @@ -1669,8 +1707,8 @@ VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ - - + + @@ -1703,16 +1741,16 @@ WHERE (GUID = @Original_GUID); - + SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, - SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE + SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE FROM TBPM_PROFILE_CONTROLS WHERE (PROFIL_ID = @profil_id) ORDER BY Y_LOC, X_LOC - + @@ -2327,8 +2365,8 @@ WHERE (GUID = @GUID) - - + + @@ -2338,6 +2376,7 @@ WHERE (GUID = @GUID) + @@ -2753,7 +2792,7 @@ WHERE (GUID = @GUID) - + @@ -2792,8 +2831,8 @@ WHERE (GUID = @GUID) - - + + @@ -2806,6 +2845,7 @@ WHERE (GUID = @GUID) + diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index eb4e478..b2e2270 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -6,21 +6,21 @@ --> - + - + - - - - - + + + + + - + - - + + @@ -64,7 +64,7 @@ - + 844 @@ -80,7 +80,7 @@ - + 141 diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 33a2271..3c5dc8a 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -166,7 +166,6 @@ Form - diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb index b67ac66..b31a5af 100644 --- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb @@ -129,6 +129,7 @@ Public Module ModuleControlProperties Private _indicies As List(Of String) Private _index As String Private _sql_command As String + Private _default_value Public Property Required() As Boolean Get @@ -196,6 +197,16 @@ Public Module ModuleControlProperties End Set End Property + + Public Property DefaultValue() As String + Get + Return _default_value + End Get + Set(value As String) + _default_value = value + End Set + End Property + ''' ''' Sorgt dafür, dass die Liste von Indicies aus dem gleichnamigen Feld ausgelesen wird ''' diff --git a/app/DD_PM_WINDREAM/ModuleHelperMethods.vb b/app/DD_PM_WINDREAM/ModuleHelperMethods.vb index 4877c3f..52af98e 100644 --- a/app/DD_PM_WINDREAM/ModuleHelperMethods.vb +++ b/app/DD_PM_WINDREAM/ModuleHelperMethods.vb @@ -1,6 +1,6 @@ Module ModuleHelperMethods ''' - ''' Überprüft einen Wert auf verschiedene Arten von "Null"-Werten + ''' Überprüft einen Wert auf verschiedene Arten von "Null" und gibt einen Standard-Wert zurück, wenn der Wert "Null" ist. ''' ''' Der zu überprüfende Wert ''' Der Standard Wert diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 54e0298..f0e5f08 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -598,6 +598,7 @@ Public Class frmFormDesigner obj.ReadOnly = StrToBool(row.Item("READ_ONLY")) obj.Required = StrToBool(row.Item("VALIDATION")) obj.Index = NotNull(row.Item("INDEX_NAME"), "") + obj.DefaultValue = NotNull(row.Item("DEFAULT_VALUE"), Nothing) obj.SQLCommand = New InputProperties.SQLValue(row.Item("SQL_UEBERPRUEFUNG")) Return obj End Function @@ -765,6 +766,9 @@ Public Class frmFormDesigner Case "ChoiceList" UpdateSingleValue("CHOICE_LIST", newValue) UpdateSingleValue("SQL_UEBERPRUEFUNG", "") + + Case "DefaultValue" + UpdateSingleValue("DEFAULT_VALUE", newValue) End Select End Sub diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb index 6d537dc..0c91891 100644 --- a/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb @@ -321,6 +321,27 @@ Partial Class frmProfileDesigner Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() + Me.tabCustomColumns = New System.Windows.Forms.TabPage() + Me.gridColumns = New DevExpress.XtraGrid.GridControl() + Me.viewColumns = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) + Me.BindingNavigatorMoveFirstItem5 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMovePreviousItem5 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator15 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorPositionItem5 = New System.Windows.Forms.ToolStripTextBox() + Me.BindingNavigatorCountItem5 = New System.Windows.Forms.ToolStripLabel() + Me.BindingNavigatorSeparator16 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorMoveNextItem5 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMoveLastItem5 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator17 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorDeleteItem2 = New System.Windows.Forms.ToolStripButton() + Me.Label16 = New System.Windows.Forms.Label() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.Label17 = New System.Windows.Forms.Label() + Me.Label18 = New System.Windows.Forms.Label() + Me.TextBox3 = New System.Windows.Forms.TextBox() + Me.ComboBox1 = New System.Windows.Forms.ComboBox() GUIDLabel = New System.Windows.Forms.Label() CHANGED_WHENLabel1 = New System.Windows.Forms.Label() CHANGED_WHOLabel1 = New System.Windows.Forms.Label() @@ -422,6 +443,11 @@ Partial Class frmProfileDesigner Me.StatusStrip1.SuspendLayout() Me.pnlMain.SuspendLayout() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tabCustomColumns.SuspendLayout() + CType(Me.gridColumns, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.viewColumns, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.BindingNavigator1.SuspendLayout() Me.SuspendLayout() ' 'GUIDLabel @@ -1439,6 +1465,7 @@ Partial Class frmProfileDesigner resources.ApplyResources(Me.tabctrl_Profilkonfig, "tabctrl_Profilkonfig") Me.tabctrl_Profilkonfig.Controls.Add(Me.TabPage5) Me.tabctrl_Profilkonfig.Controls.Add(Me.TabPage6) + Me.tabctrl_Profilkonfig.Controls.Add(Me.tabCustomColumns) Me.tabctrl_Profilkonfig.Name = "tabctrl_Profilkonfig" Me.tabctrl_Profilkonfig.SelectedIndex = 0 ' @@ -2442,6 +2469,139 @@ Partial Class frmProfileDesigner ' Me.TBDD_CONNECTIONTableAdapter.ClearBeforeFill = True ' + 'tabCustomColumns + ' + Me.tabCustomColumns.Controls.Add(Me.ComboBox1) + Me.tabCustomColumns.Controls.Add(Me.Label18) + Me.tabCustomColumns.Controls.Add(Me.Label17) + Me.tabCustomColumns.Controls.Add(Me.TextBox3) + Me.tabCustomColumns.Controls.Add(Me.TextBox1) + Me.tabCustomColumns.Controls.Add(Me.Label16) + Me.tabCustomColumns.Controls.Add(Me.BindingNavigator1) + Me.tabCustomColumns.Controls.Add(Me.gridColumns) + resources.ApplyResources(Me.tabCustomColumns, "tabCustomColumns") + Me.tabCustomColumns.Name = "tabCustomColumns" + Me.tabCustomColumns.UseVisualStyleBackColor = True + ' + 'gridColumns + ' + resources.ApplyResources(Me.gridColumns, "gridColumns") + Me.gridColumns.MainView = Me.viewColumns + Me.gridColumns.Name = "gridColumns" + Me.gridColumns.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewColumns}) + ' + 'viewColumns + ' + Me.viewColumns.GridControl = Me.gridColumns + Me.viewColumns.Name = "viewColumns" + ' + 'BindingNavigator1 + ' + Me.BindingNavigator1.AddNewItem = Me.BindingNavigatorAddNewItem + Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem5 + Me.BindingNavigator1.CountItemFormat = "von {0} Spalten" + Me.BindingNavigator1.DeleteItem = Me.BindingNavigatorDeleteItem2 + Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem5, Me.BindingNavigatorMovePreviousItem5, Me.BindingNavigatorSeparator15, Me.BindingNavigatorPositionItem5, Me.BindingNavigatorCountItem5, Me.BindingNavigatorSeparator16, Me.BindingNavigatorMoveNextItem5, Me.BindingNavigatorMoveLastItem5, Me.BindingNavigatorSeparator17, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem2}) + resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") + Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem5 + Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem5 + Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem5 + Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem5 + Me.BindingNavigator1.Name = "BindingNavigator1" + Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem5 + ' + 'BindingNavigatorMoveFirstItem5 + ' + Me.BindingNavigatorMoveFirstItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveFirstItem5, "BindingNavigatorMoveFirstItem5") + Me.BindingNavigatorMoveFirstItem5.Name = "BindingNavigatorMoveFirstItem" + ' + 'BindingNavigatorMovePreviousItem5 + ' + Me.BindingNavigatorMovePreviousItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMovePreviousItem5, "BindingNavigatorMovePreviousItem5") + Me.BindingNavigatorMovePreviousItem5.Name = "BindingNavigatorMovePreviousItem" + ' + 'BindingNavigatorSeparator15 + ' + Me.BindingNavigatorSeparator15.Name = "BindingNavigatorSeparator" + resources.ApplyResources(Me.BindingNavigatorSeparator15, "BindingNavigatorSeparator15") + ' + 'BindingNavigatorPositionItem5 + ' + resources.ApplyResources(Me.BindingNavigatorPositionItem5, "BindingNavigatorPositionItem5") + Me.BindingNavigatorPositionItem5.Name = "BindingNavigatorPositionItem" + ' + 'BindingNavigatorCountItem5 + ' + Me.BindingNavigatorCountItem5.Name = "BindingNavigatorCountItem" + resources.ApplyResources(Me.BindingNavigatorCountItem5, "BindingNavigatorCountItem5") + ' + 'BindingNavigatorSeparator16 + ' + Me.BindingNavigatorSeparator16.Name = "BindingNavigatorSeparator" + resources.ApplyResources(Me.BindingNavigatorSeparator16, "BindingNavigatorSeparator16") + ' + 'BindingNavigatorMoveNextItem5 + ' + Me.BindingNavigatorMoveNextItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveNextItem5, "BindingNavigatorMoveNextItem5") + Me.BindingNavigatorMoveNextItem5.Name = "BindingNavigatorMoveNextItem" + ' + 'BindingNavigatorMoveLastItem5 + ' + Me.BindingNavigatorMoveLastItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveLastItem5, "BindingNavigatorMoveLastItem5") + Me.BindingNavigatorMoveLastItem5.Name = "BindingNavigatorMoveLastItem" + ' + 'BindingNavigatorSeparator17 + ' + Me.BindingNavigatorSeparator17.Name = "BindingNavigatorSeparator" + resources.ApplyResources(Me.BindingNavigatorSeparator17, "BindingNavigatorSeparator17") + ' + 'BindingNavigatorAddNewItem + ' + Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem") + Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem" + ' + 'BindingNavigatorDeleteItem2 + ' + Me.BindingNavigatorDeleteItem2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorDeleteItem2, "BindingNavigatorDeleteItem2") + Me.BindingNavigatorDeleteItem2.Name = "BindingNavigatorDeleteItem" + ' + 'Label16 + ' + resources.ApplyResources(Me.Label16, "Label16") + Me.Label16.Name = "Label16" + ' + 'TextBox1 + ' + resources.ApplyResources(Me.TextBox1, "TextBox1") + Me.TextBox1.Name = "TextBox1" + ' + 'Label17 + ' + resources.ApplyResources(Me.Label17, "Label17") + Me.Label17.Name = "Label17" + ' + 'Label18 + ' + resources.ApplyResources(Me.Label18, "Label18") + Me.Label18.Name = "Label18" + ' + 'TextBox3 + ' + resources.ApplyResources(Me.TextBox3, "TextBox3") + Me.TextBox3.Name = "TextBox3" + ' + 'ComboBox1 + ' + Me.ComboBox1.FormattingEnabled = True + resources.ApplyResources(Me.ComboBox1, "ComboBox1") + Me.ComboBox1.Name = "ComboBox1" + ' 'frmProfileDesigner ' resources.ApplyResources(Me, "$this") @@ -2539,6 +2699,13 @@ Partial Class frmProfileDesigner Me.StatusStrip1.PerformLayout() Me.pnlMain.ResumeLayout(False) CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + Me.tabCustomColumns.ResumeLayout(False) + Me.tabCustomColumns.PerformLayout() + CType(Me.gridColumns, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.viewColumns, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit() + Me.BindingNavigator1.ResumeLayout(False) + Me.BindingNavigator1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -2802,4 +2969,25 @@ Partial Class frmProfileDesigner Friend WithEvents SQL_VIEWTextBox As TextBox Friend WithEvents WORK_HISTORY_ENTRYTextBox As TextBox Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents tabCustomColumns As TabPage + Friend WithEvents Label18 As Label + Friend WithEvents Label17 As Label + Friend WithEvents TextBox3 As TextBox + Friend WithEvents TextBox1 As TextBox + Friend WithEvents Label16 As Label + Friend WithEvents BindingNavigator1 As BindingNavigator + Friend WithEvents BindingNavigatorAddNewItem As ToolStripButton + Friend WithEvents BindingNavigatorCountItem5 As ToolStripLabel + Friend WithEvents BindingNavigatorDeleteItem2 As ToolStripButton + Friend WithEvents BindingNavigatorMoveFirstItem5 As ToolStripButton + Friend WithEvents BindingNavigatorMovePreviousItem5 As ToolStripButton + Friend WithEvents BindingNavigatorSeparator15 As ToolStripSeparator + Friend WithEvents BindingNavigatorPositionItem5 As ToolStripTextBox + Friend WithEvents BindingNavigatorSeparator16 As ToolStripSeparator + Friend WithEvents BindingNavigatorMoveNextItem5 As ToolStripButton + Friend WithEvents BindingNavigatorMoveLastItem5 As ToolStripButton + Friend WithEvents BindingNavigatorSeparator17 As ToolStripSeparator + Friend WithEvents gridColumns As DevExpress.XtraGrid.GridControl + Friend WithEvents viewColumns As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents ComboBox1 As ComboBox End Class diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.resx b/app/DD_PM_WINDREAM/frmProfileDesigner.resx index 0656441..d43c859 100644 --- a/app/DD_PM_WINDREAM/frmProfileDesigner.resx +++ b/app/DD_PM_WINDREAM/frmProfileDesigner.resx @@ -196,7 +196,7 @@ 0, 25 - 898, 269 + 914, 287 2 @@ -359,7 +359,7 @@ 0, 0 - 898, 25 + 914, 25 2 @@ -425,7 +425,7 @@ 0, 25 - 898, 228 + 914, 245 4 @@ -648,7 +648,7 @@ 0, 0 - 898, 25 + 914, 25 3 @@ -681,10 +681,10 @@ 1 - 898, 551 + 914, 586 - 294 + 312 0 @@ -723,7 +723,7 @@ 3, 3, 3, 3 - 890, 199 + 906, 216 0 @@ -777,7 +777,7 @@ 3, 3 - 884, 193 + 900, 210 3 @@ -3513,7 +3513,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1227, 445 + 1249, 480 0 @@ -3536,510 +3536,417 @@ der Wertänderungen nutzen wollen: True - - True + + TabControl2 - - Segoe UI, 9.75pt, style=Italic + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6, 3 + + TabPage6 - - 497, 17 + + 0 - - 79 + + 4, 25 - - Definieren Sie hier Aktionen welche nach erfolgreicher Indexierung durchgeführt werden: + + 3, 3, 3, 3 - - Label13 + + 1249, 480 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - TabPage11 + + Aktionen nach erfolgreicher Indexierung: - - 0 + + TabPage6 - - Top, Bottom, Left, Right + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage9 + + tabctrl_Profilkonfig - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - TabControlFinalIndices + + 455, 94 - + + 121, 24 + + + 5 + + + ComboBox1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCustomColumns + + 0 - - TabPage10 + + True - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - TabControlFinalIndices + + 334, 97 - + + 96, 16 + + + 4 + + + Art des Inhalts: + + + Label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabCustomColumns + + 1 - - False + + True - - 668, 161 + + 334, 68 - - 1609, 620 + + 90, 16 - - 90 + + 4 - - TabControlFinalIndices + + Anzeigename: - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Label17 - - TabPage11 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tabCustomColumns + + 2 - - True + + 581, 94 - - Tahoma, 12pt, style=Bold + + 120, 23 - - 5, 83 + + 3 - - 120, 19 + + TextBox3 - - 74 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Finale Indexe + + tabCustomColumns - - Label5 + + 3 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 455, 65 - - TabPage11 + + 246, 23 - + 3 - - True + + TextBox1 - - Segoe UI, 9.75pt, style=Italic + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6, 108 + + tabCustomColumns - - 583, 17 + + 4 - - 75 + + True - - Diese Indexe werden nach erfolgreicher Indexierung automatisch bei dem indexierten Dokument gesetzt. + + 0, 37 - - Label6 + + 124, 16 - + + 2 + + + Verfügbare Spalten: + + + Label16 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage11 + + tabCustomColumns - - 4 + + 5 - - 17, 95 - - - 245, 173 + + 1258, 212 - - 44, 22 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFKSURBVDhPYxi84O4C9v+35nH+vzqH6//FGbz/ocLEg+tA + jX8eNf7/87Dh/8nJAqQbcH46L9yAgz0ipBtwfJIgUHPd/z8Pqv7vaBcnbMClmTz/z07l+38SqPFIv9D/ + fd0iQM3l///eK/q/vkHm/6oauf9LKxX/zy9V/j+rSBXTwFNAf/55WA/UVAvElf//3CsB4rz/f+9m/v97 + J/n/39tx///djADikP+TcjQxDTjUKwx27t/7pUCNBUCN2UCNqUCNCf//3YoGagz7/+9G0P9/1/3+d6Xp + Yhqws13i/5Zmqf/rwM6V/7+kQvH/31sxQI3h/6fmafyfkKX1vztD9397qv7/5kRDwmEyG+hPkHP/3Qj4 + 35OhQ1gDOgD5898NfyD2+9+arE+6Ad3pumD/gnB9nBHpBrQkGfxviDf8XxNr/L8y2oR0A+gEGBgAJCPY + nnX8iGkAAAAASUVORK5CYII= + - - von {0} + + True - + + 23, 22 + + + Neu hinzufügen + + + 86, 22 + + + von {0} Spalten + + Die Gesamtanzahl der Elemente. - - None + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFvSURBVDhPtZBNKMNhHMd3Vd5K7eKCWjkgk7yEZDKksciE + yMwkBw6LhHZxcCDlQg64SA4kJeVE4jRv89qaWn8tUtoF/7g8H2Ootb+x4nt56nm+38/v+/xUfyJcJ9Bt + BMcOH1eRiZV5RGcVwqyHrfWwELweWJoJ9rC2AL0mRLse0VEBcxOKkLeGwlwGIz2h75w6ApC6bERjAdia + gkxiyIow5cKkPWxDFYvTiMrUdxDDVnCfwVh/AOo/P2zhhccFzcWBLxmzEPV50Nfyu/Cn2N/1V85DGNKh + Rhth+EaCxkLISUDWxvOgjYXa7F/Wv7kGUz4UJeKzGODi6H25d2l+yPLsDwu8v4NWHY8lSbhL0/HtbX8F + GLXh1MQgnxwoQ3h5hkEL6JI5TlPj21gNMd6WZyC1VSN7r0Mh7G4i56pxpkQhdTWA/KQ4aUcTh+x0KACm + RpBSo3HrM0G6Uq7pl2zvhvNDBcClE8YH4HDv2/A/SKV6BYojAxyEJtLJAAAAAElFTkSuQmCC + - + + True + + + 23, 22 + + + Löschen + + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEqSURBVDhPYxg8oHDW8/9NC57/z5z4+D9UCAOEtz/AKceQ + O/PZ/1VH3v/HpSi++8H/4IZruA3ImPL0/8J9H7Aqiu95+H/p/v///asv4DYgoefJ/2lb3mMoimi/D9ac + Oev/f6/SE7gNiOx69L939QcURaGt98CaW9cBbe/8+98l/wBuAwKbH/6vm/8Orii45e7/RXv//+8Aas6Y + 8/O/Xd3P//YZ23Eb4FF1/3/+tDcoiuyKb/9Pn/P7v3/Xt/86he/+WySsx22Afend/9mTX2Mo0k85/9+k + 6MV/laxP/40jl+E2wCLvzv/U/tdYFRkknfgvm/b1v27wPNwGGGbd/h/W8hKnIv3Uy/81fKfhNkAn7cZ/ + v+qHeBWpeEzAbYBT7pX/IAV4FQ1CwMAAAPB2wKul5ZpwAAAAAElFTkSuQmCC - + True - + 23, 22 - + Erste verschieben - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC2SURBVDhPYxg6ILz9wX8ok3QQ3/3gf3DDNfIMiO95+H/p + /v///asvkG5ARPt9sObMWf//e5WeIM2A0NZ7YM2t64C2d/7975J/gHgDglvu/l+09///DqDmjDk//9vV + /fxvn7GdNBfYFd/+nz7n93//rm//dQrf/bdIWE96GOinnP9vUvTiv0rWp//GkctINwAEDJJO/JdN+/pf + N3geeQaAgH7q5f8avtPINwAEVDwmUGbAYAUMDADQFGCYBLpQVQAAAABJRU5ErkJggg== - + True - + 23, 22 - + Vorherige verschieben - + 6, 25 - + Position - + False - + 50, 23 - + 0 - + Aktuelle Position - + 6, 25 - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACjSURBVDhPYxh8oHDW8/9QJnkgd+az/wnd98g3JGPK0//z + 9v/+n9B1hzxDEnqe/J+979f/zq1//7uVXibdkMiuR/+nbPv1v2Tp3/8J0//+t8k9S5ohgc0P/7eufQ/W + bFzy5b909LX/xpHLiDfEo+r+/5K57+CaFV16SHOBfend/4Etz8jTDAIWeXf+2xRcIU8zCBhm3SZfMwjo + pN0gX/NQBAwMAKB+X6AHNEI4AAAAAElFTkSuQmCC - + True - + 23, 22 - + Nächste verschieben - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEsSURBVDhPYxhcoHDW8/9QJgYAyTUteP4/c+JjnGoYcmc+ + +5/QfQ+rApDcqiPv/4e3P8BtQMaUp//n7f/9P6HrDoYikNzCfR/+Bzdcw21AQs+T/7P3/frfufXvf7fS + yygKQXLTtrz/7199AbcBkV2P/k/Z9ut/ydK//xOm//1vk3sWrhgk17v6w3+v0hO4DQhsfvi/de17sGbj + ki//paOv/TeOXAbWAJKrm//uv0v+AdwGeFTd/18y9x1cs6JLD1wxSC5/2pv/9hnbcRtgX3r3f2DLMwzN + IACSy578+r9FwnrcBljk3flvU3AFQzMIgORS+1/DvYQVGGbdxqoZBEByYS0v/+sGz8NtgE7aDZySIDm/ + 6of/NXyn4TYAH3DKvfJfxWMCGEOFBgVgYAAAvtG/s7kMTpwAAAAASUVORK5CYII= - + True - + 23, 22 - + Letzte verschieben - + 6, 25 - - MiddleLeft + + 3, 3 - - Magenta + + 1243, 25 - - 156, 22 + + 1 - - Neuen Index hinzufügen + + BindingNavigator1 - - MiddleLeft + + BindingNavigator1 - - Magenta + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 99, 22 + + tabCustomColumns - - Index löschen + + 6 - - MiddleLeft + + 0, 56 - - Magenta - - - 95, 22 - - - Aktualisieren - - - MiddleRight - - - 7, 133 - - - 568, 25 - - - 76 - - - BindingNavigator1 - - - TBPM_PROFILE_FINAL_INDEXINGBindingNavigator - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 5 - - - True - - - Top, Bottom, Left - - - 9, 161 - - - 653, 638 - - - 75 - - - TBPM_PROFILE_FINAL_INDEXINGDataGridView - - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 6 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1235, 445 - - - 0 - - - Move und finale Indexe - - - TabPage11 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl2 - - - 0 - - - True - - - ANNOTATE_WORK_HISTORY_ENTRYCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 312, 424 - - TabPage12 - - + 0 - - ANNOTATE_ALL_WORK_HISTORY_ENTRIESCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 1 - - - SQL_VIEWTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 3 - - - WORK_HISTORY_ENTRYTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 5 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1213, 413 - - - 1 - - - Nachbearbeitungsfunktionen 2 - - - TabPage12 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl2 - - - 1 - - - Fill - - - 3, 3 - - - 1243, 474 - - - 92 - - - TabControl2 + + gridColumns - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - TabPage6 + + tabCustomColumns - - 0 + + 7 - + 4, 25 - + 3, 3, 3, 3 - + 1249, 480 - - 1 + + 2 - - Aktionen nach erfolgreicher Indexierung: + + Benutzerdefinierte Spalten: - - TabPage6 + + tabCustomColumns - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabctrl_Profilkonfig - - 1 + + 2 9, 77 @@ -4108,7 +4015,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1250, 557 + 1272, 592 1 @@ -4279,7 +4186,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1250, 557 + 1272, 592 2 @@ -4333,7 +4240,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1250, 557 + 1272, 592 3 @@ -4527,50 +4434,281 @@ der Wertänderungen nutzen wollen: 7 - - CheckBoxPMVEKTOR + + TabPage11 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage9 + + TabControl2 - + 0 - - lblSaveFinalIndex + + TabPage12 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage9 + + TabControl2 - + 1 - - lblIndexPMVektor + + Fill - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3 - - TabPage9 + + 1243, 474 - - 2 + + 92 - - Label11 + + TabControl2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage9 + + TabPage6 + + + 0 + + + 17, 95 + + + Label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 0 + + + TabControlFinalIndices + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 2 + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 3 + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 4 + + + TBPM_PROFILE_FINAL_INDEXINGBindingNavigator + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 5 + + + TBPM_PROFILE_FINAL_INDEXINGDataGridView + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 6 + + + 4, 25 + + + 3, 3, 3, 3 + + + 1235, 445 + + + 0 + + + Move und finale Indexe + + + TabPage11 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl2 + + + 0 + + + True + + + Segoe UI, 9.75pt, style=Italic + + + 6, 3 + + + 497, 17 + + + 79 + + + Definieren Sie hier Aktionen welche nach erfolgreicher Indexierung durchgeführt werden: + + + Label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 0 + + + Top, Bottom, Left, Right + + + TabPage9 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlFinalIndices + + + 0 + + + TabPage10 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlFinalIndices + + + 1 + + + False + + + 668, 161 + + + 1609, 623 + + + 90 + + + TabControlFinalIndices + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 2 + + + CheckBoxPMVEKTOR + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage9 + + + 0 + + + lblSaveFinalIndex + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage9 + + + 1 + + + lblIndexPMVektor + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage9 + + + 2 + + + Label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage9 3 @@ -4690,7 +4828,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1579, 556 + 1601, 594 0 @@ -5260,7 +5398,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1601, 591 + 1601, 597 1 @@ -5438,6 +5576,9 @@ der Wertänderungen nutzen wollen: 4 + + 245, 173 + Tahoma, 9.75pt @@ -5450,113 +5591,378 @@ der Wertänderungen nutzen wollen: 107, 24 - - 9 + + 9 + + + Connections + + + MiddleRight + + + btnShowConnections + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage10 + + + 5 + + + True + + + Tahoma, 9.75pt + + + 6, 3 + + + 76, 16 + + + 8 + + + Connection: + + + Label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage10 + + + 6 + + + 775, 212 + + + Tahoma, 9.75pt + + + 9, 23 + + + 203, 24 + + + 7 + + + cmbConnection + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage10 + + + 7 + + + 775, 212 + + + True + + + 5, 49 + + + 99, 16 + + + 0 + + + SQL-Command: + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage10 + + + 8 + + + True + + + Tahoma, 12pt, style=Bold + + + 5, 83 + + + 120, 19 + + + 74 + + + Finale Indexe + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 3 + + + True + + + Segoe UI, 9.75pt, style=Italic + + + 6, 108 + + + 583, 17 + + + 75 + + + Diese Indexe werden nach erfolgreicher Indexierung automatisch bei dem indexierten Dokument gesetzt. + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 4 + + + 17, 95 + + + 44, 22 + + + von {0} + + + Die Gesamtanzahl der Elemente. + + + None + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Erste verschieben + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + True + + + 23, 22 + + + Vorherige verschieben + + + 6, 25 + + + Position + + + False + + + 50, 23 + + + 0 + + + Aktuelle Position + + + 6, 25 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Nächste verschieben + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + True - - Connections + + 23, 22 - - MiddleRight + + Letzte verschieben - - btnShowConnections + + 6, 25 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MiddleLeft - - TabPage10 + + Magenta - - 5 + + 156, 22 - - True + + Neuen Index hinzufügen - - Tahoma, 9.75pt + + MiddleLeft - - 6, 3 + + Magenta - - 76, 16 + + 99, 22 - - 8 + + Index löschen - - Connection: + + MiddleLeft - - Label14 + + Magenta - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 95, 22 - - TabPage10 + + Aktualisieren - - 6 + + MiddleRight - - 775, 212 - - - Tahoma, 9.75pt + + 7, 133 - - 9, 23 + + 568, 25 - - 203, 24 + + 76 - - 7 + + BindingNavigator1 - - cmbConnection + + TBPM_PROFILE_FINAL_INDEXINGBindingNavigator - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage10 + + TabPage11 - - 7 + + 5 - - 775, 212 - - + True + + + Top, Bottom, Left - - 5, 49 - - - 99, 16 + + 9, 161 - - 0 + + 653, 641 - - SQL-Command: + + 75 - - Label4 + + TBPM_PROFILE_FINAL_INDEXINGDataGridView - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage10 + + TabPage11 - - 8 + + 6 True @@ -5576,6 +5982,84 @@ der Wertänderungen nutzen wollen: Erstellt wann + + True + + + ANNOTATE_WORK_HISTORY_ENTRYCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage12 + + + 0 + + + ANNOTATE_ALL_WORK_HISTORY_ENTRIESCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage12 + + + 1 + + + SQL_VIEWTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage12 + + + 3 + + + WORK_HISTORY_ENTRYTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage12 + + + 5 + + + 4, 25 + + + 3, 3, 3, 3 + + + 1235, 445 + + + 1 + + + Nachbearbeitungsfunktionen 2 + + + TabPage12 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl2 + + + 1 + 291, 336 @@ -5697,7 +6181,7 @@ der Wertänderungen nutzen wollen: 0, 25 - 342, 526 + 348, 561 1 @@ -5830,7 +6314,7 @@ der Wertänderungen nutzen wollen: 0, 0 - 342, 25 + 348, 25 0 @@ -5875,10 +6359,10 @@ der Wertänderungen nutzen wollen: 1 - 1244, 551 + 1266, 586 - 342 + 348 0 @@ -6595,7 +7079,7 @@ der Wertänderungen nutzen wollen: 3, 28 - 1244, 526 + 1266, 561 1 @@ -6749,7 +7233,7 @@ der Wertänderungen nutzen wollen: 3, 3 - 1244, 25 + 1266, 25 0 @@ -7758,6 +8242,78 @@ der Wertänderungen nutzen wollen: DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + viewColumns + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BindingNavigatorMoveFirstItem5 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMovePreviousItem5 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator15 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorPositionItem5 + + + System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorCountItem5 + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator16 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveNextItem5 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveLastItem5 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator17 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorAddNewItem + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorDeleteItem2 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmProfileDesigner diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index e031330..93344b5 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -423,7 +423,7 @@ Public Class frmValidator Dim connectionId As Integer = row.Item("CONNECTION_ID") sql = ClassPatterns.ReplaceInternalValues(sqlStatement) - dt = ClassDatabase.Return_Datatable(sqlStatement) + dt = ClassDatabase.Return_Datatable(sql) If IsNothing(dt) Then MsgBox($"SQL-Query for control {control.Name} is invalid.") @@ -1256,7 +1256,12 @@ Public Class frmValidator If LogErrorsOnly = False Then ClassLogger.Add(" >> Following Document ", False) docCounter += 1 End If - Clear_all_Input() + + ' Controls nicht beim ersten Laden leeren + If first = False Then + Clear_all_Input() + End If + 'Select Case navtype ' Case "next" ' Case "previous" @@ -1644,11 +1649,12 @@ Public Class frmValidator Dim Type As String = inctrl.GetType.ToString Dim Typ As String = controlRow.Item("CTRL_TYPE") Dim idxname As String = controlRow.Item("INDEX_NAME") + ' Wenn kein defaultValue existiert, leeren String setzen + Dim defaultValue As String = NotNull(controlRow.Item("DEFAULT_VALUE"), String.Empty) indexname = idxname Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE") If LogErrorsOnly = False Then ClassLogger.Add(" >> INDEX: " & idxname & " - CONTROLNAME: " & inctrl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString, False) - Select Case Type Case "System.Windows.Forms.TextBox" Try @@ -1659,7 +1665,8 @@ Public Class frmValidator End If If idxname Is Nothing = False Then If LoadIDX = False Or idxname = "DD PM-ONLY FOR DISPLAY" Then - inctrl.Text = "" + ' Wenn kein Index exisitiert, defaultValue laden + inctrl.Text = defaultValue If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) Exit Select End If @@ -1685,11 +1692,7 @@ Public Class frmValidator End If - If wertWD Is Nothing = False Then - inctrl.Text = wertWD.ToString - Else - inctrl.Text = "" - End If + inctrl.Text = NotNull(wertWD, defaultValue) End If Catch ex As Exception errormessage = "Unvorhergesehener Fehler bei FillIndexValues TextBox:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile" @@ -1710,7 +1713,11 @@ Public Class frmValidator End If If idxname Is Nothing = False Then If LoadIDX = False Then - cmb.SelectedIndex = -1 + If defaultValue = String.Empty Then + cmb.SelectedIndex = -1 + Else + cmb.Text = defaultValue + End If If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) Exit Select End If @@ -1721,7 +1728,12 @@ Public Class frmValidator wertWD = aktivesDokument.GetVariableValue(idxname) End If If wertWD Is Nothing Then - cmb.SelectedIndex = -1 + If defaultValue = String.Empty Then + cmb.SelectedIndex = -1 + Else + + cmb.SelectedIndex = cmb.FindStringExact(defaultValue) + End If Else cmb.SelectedIndex = cmb.FindStringExact(wertWD) End If @@ -1805,12 +1817,22 @@ Public Class frmValidator End If If idxname Is Nothing = False Then + Dim chk As CheckBox = inctrl + If LoadIDX = False Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) + + If defaultValue <> String.Empty Then + Dim result + If Boolean.TryParse(defaultValue, result) Then + chk.Checked = result + End If + End If + Exit Select End If - Dim chk As CheckBox = inctrl + Dim wertWD If idxname.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then @@ -1824,7 +1846,15 @@ Public Class frmValidator chk.Checked = False Else If wertWD.ToString = "" Then - chk.Checked = False + If defaultValue <> String.Empty Then + Dim result + If Boolean.TryParse(defaultValue, result) Then + chk.Checked = result + Else : chk.Checked = False + End If + Else + chk.Checked = False + End If Else Dim _value If wertWD.ToString = "System.Object[]" Then @@ -1842,8 +1872,6 @@ Public Class frmValidator Select Case CBool(_value) Case True chk.Checked = True - Case False - chk.Checked = False Case Else chk.Checked = False End Select