diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 4032dae..25f5d25 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -2949,6 +2949,10 @@ Partial Public Class DD_DMSLiteDataSet Private columnREGEX_MATCH As Global.System.Data.DataColumn + Private columnREGEX_MESSAGE_DE As Global.System.Data.DataColumn + + Private columnREGEX_MESSAGE_EN As Global.System.Data.DataColumn + _ Public Sub New() @@ -3184,6 +3188,22 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property REGEX_MESSAGE_DEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX_MESSAGE_DE + End Get + End Property + + _ + Public ReadOnly Property REGEX_MESSAGE_ENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX_MESSAGE_EN + End Get + End Property + _ @@ -3246,9 +3266,11 @@ Partial Public Class DD_DMSLiteDataSet ByVal LOAD_IDX_VALUE As Boolean, _ ByVal LOG_INDEX As String, _ ByVal DEFAULT_VALUE As String, _ - ByVal REGEX_MATCH As String) As VWPM_CONTROL_INDEXRow + ByVal REGEX_MATCH As String, _ + ByVal REGEX_MESSAGE_DE As String, _ + ByVal REGEX_MESSAGE_EN 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, DEFAULT_VALUE, REGEX_MATCH} + 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, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN} rowVWPM_CONTROL_INDEXRow.ItemArray = columnValuesArray Me.Rows.Add(rowVWPM_CONTROL_INDEXRow) Return rowVWPM_CONTROL_INDEXRow @@ -3302,6 +3324,8 @@ Partial Public Class DD_DMSLiteDataSet Me.columnLOG_INDEX = MyBase.Columns("LOG_INDEX") Me.columnDEFAULT_VALUE = MyBase.Columns("DEFAULT_VALUE") Me.columnREGEX_MATCH = MyBase.Columns("REGEX_MATCH") + Me.columnREGEX_MESSAGE_DE = MyBase.Columns("REGEX_MESSAGE_DE") + Me.columnREGEX_MESSAGE_EN = MyBase.Columns("REGEX_MESSAGE_EN") End Sub _ Public Sub New() @@ -6219,6 +6255,22 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property REGEX_MESSAGE_DEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX_MESSAGE_DE + End Get + End Property + + _ + Public ReadOnly Property REGEX_MESSAGE_ENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX_MESSAGE_EN + End Get + End Property + _ @@ -6285,9 +6337,11 @@ Partial Public Class DD_DMSLiteDataSet ByVal MULTISELECT As Boolean, _ ByVal VKT_ADD_ITEM As Boolean, _ ByVal VKT_PREVENT_MULTIPLE_VALUES As Boolean, _ - ByVal REGEX_MATCH As String) As TBPM_PROFILE_CONTROLSRow + ByVal REGEX_MATCH As String, _ + ByVal REGEX_MESSAGE_DE As String, _ + ByVal REGEX_MESSAGE_EN 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, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH} + 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, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN} If (Not (parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE1) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE1(0) End If @@ -6349,6 +6403,8 @@ Partial Public Class DD_DMSLiteDataSet Me.columnVKT_ADD_ITEM = MyBase.Columns("VKT_ADD_ITEM") Me.columnVKT_PREVENT_MULTIPLE_VALUES = MyBase.Columns("VKT_PREVENT_MULTIPLE_VALUES") Me.columnREGEX_MATCH = MyBase.Columns("REGEX_MATCH") + Me.columnREGEX_MESSAGE_DE = MyBase.Columns("REGEX_MESSAGE_DE") + Me.columnREGEX_MESSAGE_EN = MyBase.Columns("REGEX_MESSAGE_EN") End Sub _ + Public Property REGEX_MESSAGE_DE() As String + Get + Return CType(Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MESSAGE_DEColumn),String) + End Get + Set + Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MESSAGE_DEColumn) = value + End Set + End Property + + _ + Public Property REGEX_MESSAGE_EN() As String + Get + Return CType(Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MESSAGE_ENColumn),String) + End Get + Set + Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MESSAGE_ENColumn) = value + End Set + End Property + _ Public Function IsINDEX_NAMENull() As Boolean @@ -11789,6 +11875,28 @@ Partial Public Class DD_DMSLiteDataSet End Set End Property + _ + Public Property REGEX_MESSAGE_DE() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.REGEX_MESSAGE_DEColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE_CONTROLS.REGEX_MESSAGE_DEColumn) = value + End Set + End Property + + _ + Public Property REGEX_MESSAGE_EN() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.REGEX_MESSAGE_ENColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE_CONTROLS.REGEX_MESSAGE_ENColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILERow() As TBPM_PROFILERow @@ -16409,6 +16517,8 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("LOG_INDEX", "LOG_INDEX") tableMapping.ColumnMappings.Add("DEFAULT_VALUE", "DEFAULT_VALUE") tableMapping.ColumnMappings.Add("REGEX_MATCH", "REGEX_MATCH") + tableMapping.ColumnMappings.Add("REGEX_MESSAGE_DE", "REGEX_MESSAGE_DE") + tableMapping.ColumnMappings.Add("REGEX_MESSAGE_EN", "REGEX_MESSAGE_EN") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -16429,8 +16539,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "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, DEFAULT_VALUE, REGEX_MATCH"& _ - ""&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)&"ORDE"& _ - "R BY Y_LOC, X_LOC" + ", REGEX_MESSAGE_DE, REGEX_MESSAGE_EN"&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() @@ -19665,6 +19775,8 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("VKT_ADD_ITEM", "VKT_ADD_ITEM") tableMapping.ColumnMappings.Add("VKT_PREVENT_MULTIPLE_VALUES", "VKT_PREVENT_MULTIPLE_VALUES") tableMapping.ColumnMappings.Add("REGEX_MATCH", "REGEX_MATCH") + tableMapping.ColumnMappings.Add("REGEX_MESSAGE_DE", "REGEX_MESSAGE_DE") + tableMapping.ColumnMappings.Add("REGEX_MESSAGE_EN", "REGEX_MESSAGE_EN") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -19678,18 +19790,19 @@ Namespace DD_DMSLiteDataSetTableAdapters "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], [MULTISELECT], [VKT_ADD_ITEM],"& _ - " [VKT_PREVENT_MULTIPLE_VALUES], [REGEX_MATCH]) VALUES (@PROFIL_ID, @NAME, @CTRL_"& _ - "TYPE, @CTRL_TEXT, @X_LOC, @Y_LOC, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGE"& _ - "D_WHEN, @INDEX_NAME, @TYP, @VALIDATION, @CHOICE_LIST, @CONNECTION_ID, @SQL_UEBER"& _ - "PRUEFUNG, @HEIGHT, @WIDTH, @FONT_STYLE, @FONT_SIZE, @FONT_FAMILY, @FONT_COLOR, @"& _ - "READ_ONLY, @LOAD_IDX_VALUE, @DEFAULT_VALUE, @MULTISELECT, @VKT_ADD_ITEM, @VKT_PR"& _ - "EVENT_MULTIPLE_VALUES, @REGEX_MATCH);"&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, CHANGED_WHEN, INDEX"& _ - "_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, W"& _ - "IDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE,"& _ - " DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MA"& _ - "TCH FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X"& _ - "_LOC" + " [VKT_PREVENT_MULTIPLE_VALUES], [REGEX_MATCH], [REGEX_MESSAGE_DE], [REGEX_MESSAG"& _ + "E_EN]) 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_VAL"& _ + "UE, @MULTISELECT, @VKT_ADD_ITEM, @VKT_PREVENT_MULTIPLE_VALUES, @REGEX_MATCH, @RE"& _ + "GEX_MESSAGE_DE, @REGEX_MESSAGE_EN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CT"& _ + "RL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_N"& _ + "AME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WID"& _ + "TH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, D"& _ + "EFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATC"& _ + "H, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = S"& _ + "COPE_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, 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, "", "", "")) @@ -19720,6 +19833,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VKT_ADD_ITEM", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_ADD_ITEM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MATCH", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_DE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_DE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_EN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_EN", 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] SET [PROFIL_ID] = @PROFIL_ID, [NAME] = @NAME, [CTR"& _ @@ -19732,7 +19847,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "] = @FONT_FAMILY, [FONT_COLOR] = @FONT_COLOR, [READ_ONLY] = @READ_ONLY, [LOAD_ID"& _ "X_VALUE] = @LOAD_IDX_VALUE, [DEFAULT_VALUE] = @DEFAULT_VALUE, [MULTISELECT] = @M"& _ "ULTISELECT, [VKT_ADD_ITEM] = @VKT_ADD_ITEM, [VKT_PREVENT_MULTIPLE_VALUES] = @VKT"& _ - "_PREVENT_MULTIPLE_VALUES, [REGEX_MATCH] = @REGEX_MATCH WHERE (([GUID] = @Origina"& _ + "_PREVENT_MULTIPLE_VALUES, [REGEX_MATCH] = @REGEX_MATCH, [REGEX_MESSAGE_DE] = @RE"& _ + "GEX_MESSAGE_DE, [REGEX_MESSAGE_EN] = @REGEX_MESSAGE_EN WHERE (([GUID] = @Origina"& _ "l_GUID) AND ([PROFIL_ID] = @Original_PROFIL_ID) AND ([NAME] = @Original_NAME) AN"& _ "D ([CTRL_TYPE] = @Original_CTRL_TYPE) AND ([CTRL_TEXT] = @Original_CTRL_TEXT) AN"& _ "D ([X_LOC] = @Original_X_LOC) AND ([Y_LOC] = @Original_Y_LOC) AND ([ADDED_WHO] ="& _ @@ -19756,12 +19872,14 @@ Namespace DD_DMSLiteDataSetTableAdapters "= @Original_MULTISELECT) AND ([VKT_ADD_ITEM] = @Original_VKT_ADD_ITEM) AND ([VKT"& _ "_PREVENT_MULTIPLE_VALUES] = @Original_VKT_PREVENT_MULTIPLE_VALUES) AND ((@IsNull"& _ "_REGEX_MATCH = 1 AND [REGEX_MATCH] IS NULL) OR ([REGEX_MATCH] = @Original_REGEX_"& _ - "MATCH)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADD"& _ - "ED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOI"& _ - "CE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE,"& _ - " FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT,"& _ - " VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH FROM TBPM_PROFILE_CONTRO"& _ - "LS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC" + "MATCH)) AND ([REGEX_MESSAGE_DE] = @Original_REGEX_MESSAGE_DE) AND ([REGEX_MESSAG"& _ + "E_EN] = @Original_REGEX_MESSAGE_EN));"&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, CHANGED_WHEN, INDEX"& _ + "_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, W"& _ + "IDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE,"& _ + " DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MA"& _ + "TCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN 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("@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, "", "", "")) @@ -19792,6 +19910,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VKT_ADD_ITEM", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_ADD_ITEM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MATCH", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_DE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_DE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_EN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_EN", 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, "", "", "")) @@ -19833,6 +19953,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_REGEX_MATCH", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_MATCH", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_MESSAGE_DE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_DE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_MESSAGE_EN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_EN", 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 @@ -19854,8 +19976,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "ST, CONNECTION_ID, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, "& _ "FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAU"& _ "LT_VALUE, MULTISELECT, VKT_ADD_ITEM, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" VKT_PREVENT_MULT"& _ - "IPLE_VALUES, REGEX_MATCH"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (G"& _ - "UID = @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" + "IPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TB"& _ + "PM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @guid)"&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("@guid", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() @@ -19942,9 +20064,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(11).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_"& _ "ID, CTRL_TEXT, CTRL_TYPE, DEFAULT_VALUE, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FON"& _ "T_STYLE, GUID, HEIGHT, INDEX_NAME, LOAD_IDX_VALUE, MULTISELECT, NAME, PROFIL_ID,"& _ - " READ_ONLY, REGEX_MATCH, SQL_UEBERPRUEFUNG, TYP, VALIDATION, VKT_ADD_ITEM, VKT_P"& _ - "REVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, REGEX_MATCH FROM TBPM_PROFILE_CONTR"& _ - "OLS WHERE (PROFIL_ID = @profil_id) ORDER BY Y_LOC, X_LOC" + " READ_ONLY, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, "& _ + "TYP, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC "& _ + "FROM TBPM_PROFILE_CONTROLS WHERE (PROFIL_ID = @profil_id) ORDER BY Y_LOC, X_LOC" Me._commandCollection(11).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(11).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, "", "", "")) End Sub @@ -20083,7 +20205,9 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal MULTISELECT As Boolean, _ ByVal VKT_ADD_ITEM As Boolean, _ ByVal VKT_PREVENT_MULTIPLE_VALUES As Boolean, _ - ByVal REGEX_MATCH As String) As Integer + ByVal REGEX_MATCH As String, _ + ByVal REGEX_MESSAGE_DE As String, _ + ByVal REGEX_MESSAGE_EN As String) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFIL_ID,Integer) If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") @@ -20181,6 +20305,16 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.InsertCommand.Parameters(28).Value = CType(REGEX_MATCH,String) End If + If (REGEX_MESSAGE_DE Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_MESSAGE_DE") + Else + Me.Adapter.InsertCommand.Parameters(29).Value = CType(REGEX_MESSAGE_DE,String) + End If + If (REGEX_MESSAGE_EN Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_MESSAGE_EN") + Else + Me.Adapter.InsertCommand.Parameters(30).Value = CType(REGEX_MESSAGE_EN,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -20230,6 +20364,8 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal VKT_ADD_ITEM As Boolean, _ ByVal VKT_PREVENT_MULTIPLE_VALUES As Boolean, _ ByVal REGEX_MATCH As String, _ + ByVal REGEX_MESSAGE_DE As String, _ + ByVal REGEX_MESSAGE_EN As String, _ ByVal Original_GUID As Integer, _ ByVal Original_PROFIL_ID As Integer, _ ByVal Original_NAME As String, _ @@ -20259,6 +20395,8 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal Original_VKT_ADD_ITEM As Boolean, _ ByVal Original_VKT_PREVENT_MULTIPLE_VALUES As Boolean, _ ByVal Original_REGEX_MATCH As String, _ + ByVal Original_REGEX_MESSAGE_DE As String, _ + ByVal Original_REGEX_MESSAGE_EN As String, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFIL_ID,Integer) If (NAME Is Nothing) Then @@ -20357,124 +20495,144 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(28).Value = CType(REGEX_MATCH,String) End If - Me.Adapter.UpdateCommand.Parameters(29).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(30).Value = CType(Original_PROFIL_ID,Integer) + If (REGEX_MESSAGE_DE Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_MESSAGE_DE") + Else + Me.Adapter.UpdateCommand.Parameters(29).Value = CType(REGEX_MESSAGE_DE,String) + End If + If (REGEX_MESSAGE_EN Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_MESSAGE_EN") + Else + Me.Adapter.UpdateCommand.Parameters(30).Value = CType(REGEX_MESSAGE_EN,String) + End If + Me.Adapter.UpdateCommand.Parameters(31).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(32).Value = CType(Original_PROFIL_ID,Integer) If (Original_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_NAME") Else - Me.Adapter.UpdateCommand.Parameters(31).Value = CType(Original_NAME,String) + Me.Adapter.UpdateCommand.Parameters(33).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(32).Value = CType(Original_CTRL_TYPE,String) + Me.Adapter.UpdateCommand.Parameters(34).Value = CType(Original_CTRL_TYPE,String) End If If (Original_CTRL_TEXT Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_CTRL_TEXT") Else - Me.Adapter.UpdateCommand.Parameters(33).Value = CType(Original_CTRL_TEXT,String) + Me.Adapter.UpdateCommand.Parameters(35).Value = CType(Original_CTRL_TEXT,String) End If - Me.Adapter.UpdateCommand.Parameters(34).Value = CType(Original_X_LOC,Double) - Me.Adapter.UpdateCommand.Parameters(35).Value = CType(Original_Y_LOC,Double) + Me.Adapter.UpdateCommand.Parameters(36).Value = CType(Original_X_LOC,Double) + Me.Adapter.UpdateCommand.Parameters(37).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(36).Value = CType(Original_ADDED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(38).Value = CType(Original_ADDED_WHO,String) End If - Me.Adapter.UpdateCommand.Parameters(37).Value = CType(Original_ADDED_WHEN,Date) + Me.Adapter.UpdateCommand.Parameters(39).Value = CType(Original_ADDED_WHEN,Date) If (Original_CHANGED_WHO 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_CHANGED_WHO,String) - End If - If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(40).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(41).Value = CType(Original_CHANGED_WHEN.Value,Date) - Else 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_CHANGED_WHO,String) End If - If (Original_INDEX_NAME Is Nothing) Then + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(42).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(43).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else Me.Adapter.UpdateCommand.Parameters(42).Value = CType(1,Object) Me.Adapter.UpdateCommand.Parameters(43).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(42).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(43).Value = CType(Original_INDEX_NAME,String) End If - If (Original_TYP Is Nothing) Then + If (Original_INDEX_NAME Is Nothing) Then Me.Adapter.UpdateCommand.Parameters(44).Value = CType(1,Object) Me.Adapter.UpdateCommand.Parameters(45).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(44).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(45).Value = CType(Original_TYP,String) + Me.Adapter.UpdateCommand.Parameters(45).Value = CType(Original_INDEX_NAME,String) End If - Me.Adapter.UpdateCommand.Parameters(46).Value = CType(Original_VALIDATION,Boolean) + If (Original_TYP Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(46).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(47).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(46).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(47).Value = CType(Original_TYP,String) + End If + Me.Adapter.UpdateCommand.Parameters(48).Value = CType(Original_VALIDATION,Boolean) If (Original_CHOICE_LIST Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(47).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(48).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(47).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(48).Value = CType(Original_CHOICE_LIST,String) - End If - If (Original_CONNECTION_ID.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(49).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(50).Value = CType(Original_CONNECTION_ID.Value,Short) - Else Me.Adapter.UpdateCommand.Parameters(49).Value = CType(1,Object) Me.Adapter.UpdateCommand.Parameters(50).Value = Global.System.DBNull.Value - End If - Me.Adapter.UpdateCommand.Parameters(51).Value = CType(Original_HEIGHT,Short) - Me.Adapter.UpdateCommand.Parameters(52).Value = CType(Original_WIDTH,Short) - If (Original_FONT_STYLE.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(53).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(54).Value = CType(Original_FONT_STYLE.Value,Short) Else - Me.Adapter.UpdateCommand.Parameters(53).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(54).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(49).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(50).Value = CType(Original_CHOICE_LIST,String) End If - If (Original_FONT_SIZE.HasValue = true) Then + If (Original_CONNECTION_ID.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(51).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(52).Value = CType(Original_CONNECTION_ID.Value,Short) + Else + Me.Adapter.UpdateCommand.Parameters(51).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(52).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(53).Value = CType(Original_HEIGHT,Short) + Me.Adapter.UpdateCommand.Parameters(54).Value = CType(Original_WIDTH,Short) + If (Original_FONT_STYLE.HasValue = true) Then Me.Adapter.UpdateCommand.Parameters(55).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(56).Value = CType(Original_FONT_SIZE.Value,Short) + Me.Adapter.UpdateCommand.Parameters(56).Value = CType(Original_FONT_STYLE.Value,Short) Else Me.Adapter.UpdateCommand.Parameters(55).Value = CType(1,Object) Me.Adapter.UpdateCommand.Parameters(56).Value = Global.System.DBNull.Value End If - If (Original_FONT_FAMILY Is Nothing) Then + If (Original_FONT_SIZE.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(57).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(58).Value = CType(Original_FONT_SIZE.Value,Short) + Else Me.Adapter.UpdateCommand.Parameters(57).Value = CType(1,Object) Me.Adapter.UpdateCommand.Parameters(58).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(57).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(58).Value = CType(Original_FONT_FAMILY,String) End If - If (Original_FONT_COLOR.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(59).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(60).Value = CType(Original_FONT_COLOR.Value,Long) - Else + If (Original_FONT_FAMILY 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_FONT_FAMILY,String) End If - Me.Adapter.UpdateCommand.Parameters(61).Value = CType(Original_READ_ONLY,Boolean) - Me.Adapter.UpdateCommand.Parameters(62).Value = CType(Original_LOAD_IDX_VALUE,Boolean) + If (Original_FONT_COLOR.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(61).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(62).Value = CType(Original_FONT_COLOR.Value,Long) + Else + Me.Adapter.UpdateCommand.Parameters(61).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(62).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(63).Value = CType(Original_READ_ONLY,Boolean) + Me.Adapter.UpdateCommand.Parameters(64).Value = CType(Original_LOAD_IDX_VALUE,Boolean) If (Original_DEFAULT_VALUE Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(63).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(64).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(65).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(66).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(63).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(64).Value = CType(Original_DEFAULT_VALUE,String) + Me.Adapter.UpdateCommand.Parameters(65).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(66).Value = CType(Original_DEFAULT_VALUE,String) End If - Me.Adapter.UpdateCommand.Parameters(65).Value = CType(Original_MULTISELECT,Boolean) - Me.Adapter.UpdateCommand.Parameters(66).Value = CType(Original_VKT_ADD_ITEM,Boolean) - Me.Adapter.UpdateCommand.Parameters(67).Value = CType(Original_VKT_PREVENT_MULTIPLE_VALUES,Boolean) + Me.Adapter.UpdateCommand.Parameters(67).Value = CType(Original_MULTISELECT,Boolean) + Me.Adapter.UpdateCommand.Parameters(68).Value = CType(Original_VKT_ADD_ITEM,Boolean) + Me.Adapter.UpdateCommand.Parameters(69).Value = CType(Original_VKT_PREVENT_MULTIPLE_VALUES,Boolean) If (Original_REGEX_MATCH Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(68).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(69).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(70).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(71).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(68).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(69).Value = CType(Original_REGEX_MATCH,String) + Me.Adapter.UpdateCommand.Parameters(70).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(71).Value = CType(Original_REGEX_MATCH,String) End If - Me.Adapter.UpdateCommand.Parameters(70).Value = CType(GUID,Integer) + If (Original_REGEX_MESSAGE_DE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_REGEX_MESSAGE_DE") + Else + Me.Adapter.UpdateCommand.Parameters(72).Value = CType(Original_REGEX_MESSAGE_DE,String) + End If + If (Original_REGEX_MESSAGE_EN Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_REGEX_MESSAGE_EN") + Else + Me.Adapter.UpdateCommand.Parameters(73).Value = CType(Original_REGEX_MESSAGE_EN,String) + End If + Me.Adapter.UpdateCommand.Parameters(74).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 @@ -20524,6 +20682,8 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal VKT_ADD_ITEM As Boolean, _ ByVal VKT_PREVENT_MULTIPLE_VALUES As Boolean, _ ByVal REGEX_MATCH As String, _ + ByVal REGEX_MESSAGE_DE As String, _ + ByVal REGEX_MESSAGE_EN As String, _ ByVal Original_GUID As Integer, _ ByVal Original_PROFIL_ID As Integer, _ ByVal Original_NAME As String, _ @@ -20552,8 +20712,10 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal Original_MULTISELECT As Boolean, _ ByVal Original_VKT_ADD_ITEM As Boolean, _ ByVal Original_VKT_PREVENT_MULTIPLE_VALUES As Boolean, _ - ByVal Original_REGEX_MATCH 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, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, 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_MULTISELECT, Original_VKT_ADD_ITEM, Original_VKT_PREVENT_MULTIPLE_VALUES, Original_REGEX_MATCH, Original_GUID) + ByVal Original_REGEX_MATCH As String, _ + ByVal Original_REGEX_MESSAGE_DE As String, _ + ByVal Original_REGEX_MESSAGE_EN 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, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, 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_MULTISELECT, Original_VKT_ADD_ITEM, Original_VKT_PREVENT_MULTIPLE_VALUES, Original_REGEX_MATCH, Original_REGEX_MESSAGE_DE, Original_REGEX_MESSAGE_EN, Original_GUID) End Function 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, DEFAULT_VALUE, REGEX_MATCH + TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM VWPM_CONTROL_INDEX WHERE (PROFIL_NAME = @Profil) ORDER BY Y_LOC, X_LOC @@ -659,6 +659,8 @@ ORDER BY Y_LOC, X_LOC + + @@ -1446,8 +1448,8 @@ WHERE (GUID = @Original_GUID) - 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], [MULTISELECT], [VKT_ADD_ITEM], [VKT_PREVENT_MULTIPLE_VALUES], [REGEX_MATCH]) 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, @MULTISELECT, @VKT_ADD_ITEM, @VKT_PREVENT_MULTIPLE_VALUES, @REGEX_MATCH); -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, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC + 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], [MULTISELECT], [VKT_ADD_ITEM], [VKT_PREVENT_MULTIPLE_VALUES], [REGEX_MATCH], [REGEX_MESSAGE_DE], [REGEX_MESSAGE_EN]) 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, @MULTISELECT, @VKT_ADD_ITEM, @VKT_PREVENT_MULTIPLE_VALUES, @REGEX_MATCH, @REGEX_MESSAGE_DE, @REGEX_MESSAGE_EN); +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, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC @@ -1478,6 +1480,8 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + + @@ -1485,7 +1489,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD 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, MULTISELECT, VKT_ADD_ITEM, - VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH + VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @guid) ORDER BY Y_LOC, X_LOC @@ -1496,8 +1500,8 @@ ORDER BY Y_LOC, X_LOC - 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, [MULTISELECT] = @MULTISELECT, [VKT_ADD_ITEM] = @VKT_ADD_ITEM, [VKT_PREVENT_MULTIPLE_VALUES] = @VKT_PREVENT_MULTIPLE_VALUES, [REGEX_MATCH] = @REGEX_MATCH 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)) AND ([MULTISELECT] = @Original_MULTISELECT) AND ([VKT_ADD_ITEM] = @Original_VKT_ADD_ITEM) AND ([VKT_PREVENT_MULTIPLE_VALUES] = @Original_VKT_PREVENT_MULTIPLE_VALUES) AND ((@IsNull_REGEX_MATCH = 1 AND [REGEX_MATCH] IS NULL) OR ([REGEX_MATCH] = @Original_REGEX_MATCH))); -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, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC + 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, [MULTISELECT] = @MULTISELECT, [VKT_ADD_ITEM] = @VKT_ADD_ITEM, [VKT_PREVENT_MULTIPLE_VALUES] = @VKT_PREVENT_MULTIPLE_VALUES, [REGEX_MATCH] = @REGEX_MATCH, [REGEX_MESSAGE_DE] = @REGEX_MESSAGE_DE, [REGEX_MESSAGE_EN] = @REGEX_MESSAGE_EN 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)) AND ([MULTISELECT] = @Original_MULTISELECT) AND ([VKT_ADD_ITEM] = @Original_VKT_ADD_ITEM) AND ([VKT_PREVENT_MULTIPLE_VALUES] = @Original_VKT_PREVENT_MULTIPLE_VALUES) AND ((@IsNull_REGEX_MATCH = 1 AND [REGEX_MATCH] IS NULL) OR ([REGEX_MATCH] = @Original_REGEX_MATCH)) AND ([REGEX_MESSAGE_DE] = @Original_REGEX_MESSAGE_DE) AND ([REGEX_MESSAGE_EN] = @Original_REGEX_MESSAGE_EN)); +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, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC @@ -1528,6 +1532,8 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + + @@ -1569,6 +1575,8 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + + @@ -1606,6 +1614,8 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + + @@ -1744,7 +1754,7 @@ WHERE (GUID = @Original_GUID); - SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CTRL_TEXT, CTRL_TYPE, DEFAULT_VALUE, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, GUID, HEIGHT, INDEX_NAME, LOAD_IDX_VALUE, MULTISELECT, NAME, PROFIL_ID, READ_ONLY, REGEX_MATCH, SQL_UEBERPRUEFUNG, TYP, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, REGEX_MATCH FROM TBPM_PROFILE_CONTROLS WHERE (PROFIL_ID = @profil_id) ORDER BY Y_LOC, X_LOC + SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CTRL_TEXT, CTRL_TYPE, DEFAULT_VALUE, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, GUID, HEIGHT, INDEX_NAME, LOAD_IDX_VALUE, MULTISELECT, NAME, PROFIL_ID, READ_ONLY, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, TYP, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC FROM TBPM_PROFILE_CONTROLS WHERE (PROFIL_ID = @profil_id) ORDER BY Y_LOC, X_LOC @@ -2079,7 +2089,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2132,7 +2142,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2228,7 +2238,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2293,7 +2303,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2323,7 +2333,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2346,7 +2356,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2440,10 +2450,24 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE + + + + + + + + + + + + + + - + @@ -2516,7 +2540,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2565,7 +2589,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2580,7 +2604,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2601,7 +2625,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2709,7 +2733,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2782,7 +2806,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2833,7 +2857,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2932,10 +2956,24 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE + + + + + + + + + + + + + + - + @@ -2992,7 +3030,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3033,7 +3071,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3071,7 +3109,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3206,11 +3244,11 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index 9290f81..c691a66 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,9 +4,9 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + @@ -16,13 +16,13 @@ - + - + - + - + diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb index 56181f8..9052f54 100644 --- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb @@ -1,4 +1,5 @@ Imports System.ComponentModel +Imports System.ComponentModel.Design Imports System.Drawing.Design Imports System.Globalization @@ -9,67 +10,26 @@ Public Module ModuleControlProperties End Enum Public Class BaseProperties - Private _id As Integer - Private _name As String - Private _location As Point Private _size As Size Private _font As Font - Private _text_color As Color - Private _changed_at As Date - Private _changed_who As String <[ReadOnly](True)> Public Property ChangedAt As Date - Get - Return _changed_at - End Get - Set(value As Date) - _changed_at = value - End Set - End Property <[ReadOnly](True)> Public Property ChangedWho As String - Get - Return _changed_who - End Get - Set(value As String) - _changed_who = value - End Set - End Property <[ReadOnly](True)> Public Property ID() As Integer - Get - Return _id - End Get - Set(value As Integer) - _id = value - End Set - End Property Public Property Name() As String - Get - Return _name - End Get - Set(value As String) - _name = value - End Set - End Property Public Property Location() As Point - Get - Return _location - End Get - Set(value As Point) - _location = value - End Set - End Property Public Property Size() As Size @@ -102,13 +62,6 @@ Public Module ModuleControlProperties Public Property TextColor As Color - Get - Return _text_color - End Get - Set(value As Color) - _text_color = value - End Set - End Property Class FontConverter Inherits TypeConverter @@ -123,55 +76,24 @@ Public Module ModuleControlProperties Public Class InputProperties Inherits BaseProperties - Private _required As Boolean - Private _read_only As Boolean Private _index_type As String - Private _indicies As List(Of String) - Private _index As String Private _sql_command As String Private _default_value Public Property Required() As Boolean - Get - Return _required - End Get - Set(ByVal value As Boolean) - _required = value - End Set - End Property + Public Property [ReadOnly]() As Boolean - Get - Return _read_only - End Get - Set(ByVal value As Boolean) - _read_only = value - End Set - End Property Public Property IndexType() As IndexTypes - Get - Return _index_type - End Get - Set(ByVal value As IndexTypes) - _index_type = value - End Set - End Property ''' ''' Diese Eigenschaft enthält die auswählbaren Indicies, die für das Control verfügbar sind. Wird nicht direkt angezeigt. ''' Public Property Indicies() As List(Of String) - Get - Return _indicies - End Get - Set(ByVal value As List(Of String)) - _indicies = value - End Set - End Property ''' ''' Diese Eigenschaft enthält des ausgewählten Index @@ -179,13 +101,6 @@ Public Module ModuleControlProperties Public Property Index() As String - Get - Return _index - End Get - Set(value As String) - _index = value - End Set - End Property Public Property SQLCommand() As SQLValue @@ -211,79 +126,41 @@ Public Module ModuleControlProperties Public Class TextboxProperties Inherits InputProperties + Public Property Regex As String + + + + Public Property RegexMessage As String End Class Public Class LabelProperties Inherits BaseProperties - Private _text As String - Public Property Text() As String - Get - Return _text - End Get - Set(value As String) - _text = value - End Set - End Property End Class Public Class CheckboxProperties Inherits InputProperties - Private _text As String - Public Property Text() As String - Get - Return _text - End Get - Set(value As String) - _text = value - End Set - End Property End Class Public Class ComboboxProperties Inherits InputProperties - Private _text As String - Private _choice_list As String - Private _choice_lists As List(Of String) - Public Property Text() As String - Get - Return _text - End Get - Set(value As String) - _text = value - End Set - End Property Public Property ChoiceLists() As List(Of String) - Get - Return _choice_lists - End Get - Set(value As List(Of String)) - _choice_lists = value - End Set - End Property Public Property ChoiceList() As String - Get - Return _choice_list - End Get - Set(value As String) - _choice_list = value - End Set - End Property Public Class ChoiceListConverter Inherits TypeConverter diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index ffdc401..7a05970 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -758,6 +758,7 @@ Public Class frmFormDesigner Dim txt As TextBox = sender Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Windream_AllIndicies) txtProps.Regex = NotNull(row.Item("REGEX_MATCH"), String.Empty) + txtProps.RegexMessage = NotNull(row.Item("REGEX_MESSAGE_DE"), String.Empty) props = txtProps @@ -897,6 +898,9 @@ Public Class frmFormDesigner Case "Regex" UpdateSingleValue("REGEX_MATCH", newValue) + + Case "RegexMessage" + UpdateSingleValue("REGEX_MESSAGE_DE", newValue) End Select End Sub diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 4e7750a..bc1bb63 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1,18 +1,13 @@ - -Imports WINDREAMLib +Imports WINDREAMLib Imports System.Threading Imports System.Runtime.InteropServices -Imports System.Management -Imports System.Globalization Imports Oracle.ManagedDataAccess.Client Imports Independentsoft Imports System.IO -Imports DevExpress.Pdf Imports System.Text.RegularExpressions Imports System.ComponentModel Imports DD_LIB_Standards Imports DigitalData.Controls.LookupGrid -Imports System.Data.SqlClient Imports DevExpress.XtraGrid Public Class frmValidator @@ -174,7 +169,6 @@ Public Class frmValidator Next Catch ex As Exception LOGGER.Error(ex) - End Try End Sub Sub Kill_PDFAcrobat() @@ -2425,23 +2419,33 @@ Public Class frmValidator End Sub Sub CloseWDDocview() Try - If VIEWER_ALL = "docview" Then - If aktivesDokument.aPath.EndsWith("pdf") = False Or VIEWER_PDF = "none" Then - If DocView Is Nothing = False Then - DocView.CloseView(aktivesDokument.aPath, 0) - End If - Else - If DocView Is Nothing = False Then - DocView.CloseView(aktivesDokument.aPath, 0) - End If + Dim oFileName = New FileInfo(aktivesDokument.aPath) + Dim oProcesses As Process() = Process.GetProcesses() + Dim oViewerNames As New List(Of String) From { + "WMPViewX", + "WMPViewXNG" + } + + For Each p In oProcesses + If oViewerNames.Contains(p.ProcessName) Then + p.Kill() End If - End If + Next Catch ex As Exception LOGGER.Error(ex) LOGGER.Info(" ### FEHLER in CloseDocView") LOGGER.Info("### " & ex.Message & " ###") End Try + 'Try + ' If VIEWER_ALL = "docview" Then + ' DocView.CloseView(aktivesDokument.aPath, 0) + ' End If + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' LOGGER.Info(" ### FEHLER in CloseDocView") + ' LOGGER.Info("### " & ex.Message & " ###") + 'End Try End Sub Sub Abschluss() btnSave.Enabled = False @@ -2450,90 +2454,88 @@ Public Class frmValidator If Check_UpdateIndexe() = False Then 'lblerror.Visible = False Try - Dim _error As Boolean = False - 'If ClassFinalizeDoc.Write_Final_Metadata(aktivesDokument) = False Then - ' _error = True - 'End If - Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(Me.FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName) + Dim oHasError As Boolean = False + + TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName) Dim dtfinal As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING If dtfinal.Rows.Count > 0 Then 'Jetzt finale Indexe setzen LOGGER.Debug(" >> Finale(r) Index(e) für Dok: " & aktivesDokument.aName & " soll gesetzt werden", False) For Each dr As DataRow In dtfinal.Rows - Dim value As String = dr.Item("VALUE").ToString - If value.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### + Dim oValue As String = dr.Item("VALUE").ToString + Dim oIndexType = WINDREAM.GetTypeOfIndex(dr.Item("INDEXNAME")) + + If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### LOGGER.Debug(" >> Indexierung mit dynamischem SQL!", False) - Dim SQL_COMMAND = dr.Item("SQL_COMMAND") + Dim oSQLCommand = dr.Item("SQL_COMMAND") - LOGGER.Debug(" >> SQL_COMMAND before ReplaceAllValues: " & SQL_COMMAND, False) - SQL_COMMAND = clsPatterns.ReplaceAllValues(SQL_COMMAND, pnldesigner, aktivesDokument, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL) - LOGGER.Debug(" >> SQL_COMMAND after ReplaceAllValues: " & SQL_COMMAND, False) + LOGGER.Debug(" >> SQL_COMMAND before ReplaceAllValues: " & oSQLCommand, False) + oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, aktivesDokument, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL) + LOGGER.Debug(" >> SQL_COMMAND after ReplaceAllValues: " & oSQLCommand, False) - Dim dynamic_value = ClassDatabase.Execute_Scalar(SQL_COMMAND, CONNECTION_STRING, True) + Dim dynamic_value = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True) If Not IsNothing(dynamic_value) Then LOGGER.Debug("DYNAMIC VALUE IS: " & dynamic_value.ToString, False) - value = dynamic_value + oValue = dynamic_value Else LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!") End If Else - If value.StartsWith("v") Then + If oValue.StartsWith("v") Then Select Case dr.Item("VALUE").ToString Case "vDate" - value = Now.ToShortDateString + oValue = Now.ToShortDateString Case "vUserName" - value = Environment.UserName + oValue = Environment.UserName Case Else - value = dr.Item("VALUE") + oValue = dr.Item("VALUE") End Select End If End If - Dim result() As String - ReDim Preserve result(0) - result(0) = value + Dim oResult() As String + ReDim Preserve oResult(0) + oResult(0) = oValue - Dim oIndexType = WINDREAM.GetTypeOfIndex(dr.Item("INDEXNAME")) LOGGER.Debug($" >> oIndexType {oIndexType.ToString}", False) If oIndexType > 4000 And oIndexType < 5000 Then 'If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then ' Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME")) 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(value, dr.Item("INDEXNAME"), dr.Item("PREVENT_DUPLICATES"), dr.Item("ALLOW_NEW_VALUES")) = False Then + If Indexiere_VektorfeldPM(oValue, dr.Item("INDEXNAME"), dr.Item("PREVENT_DUPLICATES"), dr.Item("ALLOW_NEW_VALUES")) = False Then LOGGER.Debug(" >> FINALER INDEX '" & dr.Item("INDEXNAME").ToString & "' WURDE ERFOLGREICH GESETZT", False) Else errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message My.Settings.Save() frmError.ShowDialog() - _error = True + oHasError = True End If Else LOGGER.Debug(" >> Jetzt das indexieren", False) - If Indexiere_File(aktivesDokument, dr.Item("INDEXNAME"), result) = True Then + If Indexiere_File(aktivesDokument, dr.Item("INDEXNAME"), oResult) = True Then LOGGER.Debug(" >> FINALER INDEX '" & dr.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT", False) - LOGGER.Debug("") + 'Nun das Logging If PROFIL_LOGINDEX <> "" Then - Dim logstr = Return_LOGString(value, "DDFINALINDEX", dr.Item("INDEXNAME")) + Dim logstr = Return_LOGString(oValue, "DDFINALINDEX", dr.Item("INDEXNAME")) Indexiere_VektorfeldPM(logstr, PROFIL_LOGINDEX) End If - Else errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message My.Settings.Save() frmError.ShowDialog() - _error = True + oHasError = True End If End If - If _error = True Then + If oHasError = True Then Exit For End If Next End If ''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde - If _error = False Then + If oHasError = False Then LOGGER.Debug(" >> Tabelle updaten und co", False) 'Das Dokument freigeben und als editiert markieren Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID) @@ -2672,7 +2674,7 @@ Public Class frmValidator errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message My.Settings.Save() frmError.ShowDialog() - _error = True + oHasError = True End If End If 'Validierungsfile löschen wenn vorhanden @@ -2800,19 +2802,22 @@ Public Class frmValidator If dr.Item("CTRL_TYPE") = "LBL" Or dr.Item("CTRL_TYPE") = "LINE" Then Continue For End If + 'Den Indexnamen auslesen - Dim _IDXName As String = dr.Item("INDEX_NAME") - Dim _MUSSEINGABE As Boolean = CBool(dr.Item("VALIDATION")) - Dim _SQL As String = IIf(IsDBNull(dr.Item("SQL_UEBERPRUEFUNG")), "", dr.Item("SQL_UEBERPRUEFUNG")) - Dim _READ_ONLY As Boolean = CBool(dr.Item("READ_ONLY")) - Dim Typ As String = dr.Item("CTRL_TYPE") - Dim CONTROL_ID As String = dr.Item("GUID") - Dim RegexMatch As String = NotNull(dr.Item("REGEX_MATCH"), String.Empty) - Dim ctrl = dr.Item("CTRL_NAME") + Dim oIndexName As String = dr.Item("INDEX_NAME") + Dim oIsRequired As Boolean = CBool(dr.Item("VALIDATION")) + Dim oSQLCheckCommand As String = IIf(IsDBNull(dr.Item("SQL_UEBERPRUEFUNG")), "", dr.Item("SQL_UEBERPRUEFUNG")) + Dim oIsReadOnly As Boolean = CBool(dr.Item("READ_ONLY")) + Dim oControlType As String = dr.Item("CTRL_TYPE") + Dim oControlId As String = dr.Item("GUID") + Dim oRegexMatch As String = NotNull(dr.Item("REGEX_MATCH"), String.Empty) + Dim oRegexMessage As String = NotNull(dr.Item("REGEX_MESSAGE_DE"), String.Empty) + Dim oControlName = dr.Item("CTRL_NAME") + 'Nur wenn der Name der Zeile entspricht und der Index READ_ONLY FALSE ist - If dr.Item("CTRL_NAME") = oControl.Name And (_READ_ONLY = False Or _SQL <> "") And _IDXName <> "DD PM-ONLY FOR DISPLAY" Then - LOGGER.Debug(" >> Indexierung für Control (" & CONTROL_ID & ") '" & ctrl & "' gestartet. Indexname '" & _IDXName & "'", False) - If _IDXName = "" Then + If dr.Item("CTRL_NAME") = oControl.Name And (oIsReadOnly = False Or oSQLCheckCommand <> "") And oIndexName <> "DD PM-ONLY FOR DISPLAY" Then + LOGGER.Debug(" >> Indexierung für Control (" & oControlId & ") '" & oControlName & "' gestartet. Indexname '" & oIndexName & "'", False) + If oIndexName = "" Then LOGGER.Info(" >> Indexname is unexpected empty.", False) Continue For End If @@ -2822,7 +2827,7 @@ Public Class frmValidator Try Dim lookup As LookupControl2 = oControl - If lookup.SelectedValues.Count = 0 And _MUSSEINGABE = True Then + If lookup.SelectedValues.Count = 0 And oIsRequired = True Then oMissing = True oErrorMessage = $"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'" oControl.BackColor = Color.Red @@ -2848,14 +2853,14 @@ Public Class frmValidator Next 'Jetzt die Datei indexieren - If Indexiere_File(aktivesDokument, _IDXName, myVektorArr) = False Then + If Indexiere_File(aktivesDokument, oIndexName, myVektorArr) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren von LookupGrid - ERROR: " & idxerr_message Exit For End If Else Dim oValues As New List(Of Object) From {String.Empty} - If Indexiere_File(aktivesDokument, _IDXName, oValues.ToArray) = False Then + If Indexiere_File(aktivesDokument, oIndexName, oValues.ToArray) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren von LookupGrid - ERROR: " & idxerr_message Exit For @@ -2870,16 +2875,16 @@ Public Class frmValidator 'den aktuellen Wert in windream auslesen Dim wertWD - If _IDXName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(_IDXName) + If oIndexName.StartsWith("[%VKT") Then + wertWD = ReturnVektor_IndexValue(oIndexName) Else - wertWD = aktivesDokument.GetVariableValue(_IDXName) + wertWD = aktivesDokument.GetVariableValue(oIndexName) If Not IsNothing(wertWD) Then If wertWD.ToString = "System.Object[]" Then If wertWD.Length = 1 Then wertWD = wertWD(0) Else ' - LOGGER.Info(" >> Vectorfield " & _IDXName & "' contains more then one value - First value will be used", False) + LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used", False) wertWD = wertWD(0) End If End If @@ -2890,8 +2895,8 @@ Public Class frmValidator 'wenn Wert in Windream <> der Eingabe darf indexiert werden If IsNothing(wertWD) Or wertWD <> input Then 'Wenn der Wert in ein Vektorfeld geschrieben wird - If _IDXName.StartsWith("[%VKT") Then - input = Return_PM_VEKTOR(input, _IDXName) + If oIndexName.StartsWith("[%VKT") Then + input = Return_PM_VEKTOR(input, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then oMissing = True @@ -2902,14 +2907,14 @@ Public Class frmValidator Dim result() As String ReDim Preserve result(0) result(0) = input - If Indexiere_File(aktivesDokument, _IDXName, result) = False Then + If Indexiere_File(aktivesDokument, oIndexName, result) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message Exit For Else 'Nun das Logging If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, _IDXName) + input = Return_LOGString(input, wertWD, oIndexName) Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) End If End If @@ -2926,15 +2931,20 @@ Public Class frmValidator Case "System.Windows.Forms.TextBox" Try - If RegexMatch <> String.Empty AndAlso Not Regex.IsMatch(oControl.Text, RegexMatch) Then + If oRegexMatch <> String.Empty AndAlso Not Regex.IsMatch(oControl.Text, oRegexMatch) Then oMissing = True oErrorMessage = "Falsche Eingabe in Textbox '" & oControl.Name & "'" + + If oRegexMessage <> String.Empty Then + oErrorMessage &= ":" & vbCrLf & oRegexMessage + End If + oControl.BackColor = Color.Red Exit For End If 'Als erstes überprüfen ob überhaupt etwas eingetragen worden ist - If Check_Missing(oControl, "txt") = True And _MUSSEINGABE = True Then 'NICHTS EINGETRAGEN + If Check_Missing(oControl, "txt") = True And oIsRequired = True Then 'NICHTS EINGETRAGEN oMissing = True oErrorMessage = "Fehlende Eingabe in Textbox '" & oControl.Name & "'" oControl.BackColor = Color.Red @@ -2944,16 +2954,16 @@ Public Class frmValidator 'den aktuellen Wert in windream auslesen Dim wertWD - If _IDXName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(_IDXName) + If oIndexName.StartsWith("[%VKT") Then + wertWD = ReturnVektor_IndexValue(oIndexName) Else - wertWD = aktivesDokument.GetVariableValue(_IDXName) + wertWD = aktivesDokument.GetVariableValue(oIndexName) If Not IsNothing(wertWD) Then If wertWD.ToString = "System.Object[]" Then If wertWD.Length = 1 Then wertWD = wertWD(0) Else ' - LOGGER.Info(" >> Vectorfield " & _IDXName & "' contains more then one value - First value will be used", False) + LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used", False) wertWD = wertWD(0) End If End If @@ -2964,8 +2974,8 @@ Public Class frmValidator 'wenn Wert in Windream <> der Eingabe darf indexiert werden If IsNothing(wertWD) Or wertWD <> input Then 'Wenn der Wert in ein Vektorfeld geschrieben wird - If _IDXName.StartsWith("[%VKT") Then - input = Return_PM_VEKTOR(input, _IDXName) + If oIndexName.StartsWith("[%VKT") Then + input = Return_PM_VEKTOR(input, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then oMissing = True @@ -2976,14 +2986,14 @@ Public Class frmValidator Dim result() As String ReDim Preserve result(0) result(0) = input - If Indexiere_File(aktivesDokument, _IDXName, result) = False Then + If Indexiere_File(aktivesDokument, oIndexName, result) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message Exit For Else 'Nun das Logging If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, _IDXName) + input = Return_LOGString(input, wertWD, oIndexName) Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) End If End If @@ -3005,7 +3015,7 @@ Public Class frmValidator Case "System.Windows.Forms.ComboBox" Dim cmb As ComboBox = oControl 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss - If cmb.SelectedIndex = -1 And _MUSSEINGABE = True Then + If cmb.SelectedIndex = -1 And oIsRequired = True Then oMissing = True oErrorMessage = "Please Choose an entry out of ComboBox '" & cmb.Name & "'" Exit For @@ -3014,17 +3024,17 @@ Public Class frmValidator input = cmb.Text Dim wertWD As String 'den aktuellen Wert in windream auslesen - If _IDXName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(_IDXName) + If oIndexName.StartsWith("[%VKT") Then + wertWD = ReturnVektor_IndexValue(oIndexName) Else - wertWD = aktivesDokument.GetVariableValue(_IDXName) + wertWD = aktivesDokument.GetVariableValue(oIndexName) End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden If wertWD <> input Then 'Wenn der Wert in ein Vektorfeld geschrieben wird - If _IDXName.StartsWith("[%VKT") Then - input = Return_PM_VEKTOR(input, _IDXName) + If oIndexName.StartsWith("[%VKT") Then + input = Return_PM_VEKTOR(input, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then oMissing = True @@ -3035,7 +3045,7 @@ Public Class frmValidator Dim result() As String ReDim Preserve result(0) result(0) = input - If Indexiere_File(aktivesDokument, _IDXName, result) = False Then + If Indexiere_File(aktivesDokument, oIndexName, result) = False Then cmb.DroppedDown = True oMissing = True oErrorMessage = "Fehler beim Indexieren Combobox - ERROR: " & idxerr_message @@ -3043,7 +3053,7 @@ Public Class frmValidator Else 'Nun das Logging If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, _IDXName) + input = Return_LOGString(input, wertWD, oIndexName) Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) End If End If @@ -3053,7 +3063,7 @@ Public Class frmValidator Case "System.Windows.Forms.DateTimePicker" Dim dtp As DateTimePicker = oControl 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss - If _MUSSEINGABE = True And dtp.Value.ToString = String.Empty Then + If oIsRequired = True And dtp.Value.ToString = String.Empty Then oMissing = True oErrorMessage = "Please Choose DateValue for field'" & dtp.Name & "'" Exit For @@ -3062,10 +3072,10 @@ Public Class frmValidator 'den aktuellen Wert in windream auslesen ' Dim wertWD As String = aktivesDokument.GetVariableValue(_IDXName) Dim wertWD As String - If _IDXName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(_IDXName) + If oIndexName.StartsWith("[%VKT") Then + wertWD = ReturnVektor_IndexValue(oIndexName) Else - wertWD = aktivesDokument.GetVariableValue(_IDXName) + wertWD = aktivesDokument.GetVariableValue(oIndexName) End If If IsNothing(wertWD) Then wertWD = CDate("01.01.1900") @@ -3073,9 +3083,9 @@ Public Class frmValidator 'wenn Wert in Windream <> der Eingabe darf indexiert werden If wertWD <> input Then 'Wenn der WErt in ein Vektorfeld geschrieben wird - If _IDXName.StartsWith("[%VKT") Then + If oIndexName.StartsWith("[%VKT") Then 'Input = die String komponente als String - input = Return_PM_VEKTOR(input, _IDXName) + input = Return_PM_VEKTOR(input, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then oMissing = True @@ -3087,14 +3097,14 @@ Public Class frmValidator ReDim Preserve result(0) result(0) = CDate(input) 'MsgBox(_IDXName) - If Indexiere_File(aktivesDokument, _IDXName, result) = False Then + If Indexiere_File(aktivesDokument, oIndexName, result) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren DatePicker- ERROR: " & idxerr_message Exit For Else 'Nun das Logging If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, _IDXName) + input = Return_LOGString(input, wertWD, oIndexName) Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) End If End If @@ -3110,7 +3120,7 @@ Public Class frmValidator Dim chk As CheckBox = oControl input = chk.Checked.ToString - If chk.Checked = False And _MUSSEINGABE = True Then + If chk.Checked = False And oIsRequired = True Then oMissing = True oErrorMessage = "Option '" & chk.Name & "' is required." Exit For @@ -3119,8 +3129,8 @@ Public Class frmValidator 'den aktuellen Wert in windream auslesen Dim WertWD As String Dim Bool_WD As Boolean - If _IDXName.StartsWith("[%VKT") Then - WertWD = ReturnVektor_IndexValue(_IDXName) + If oIndexName.StartsWith("[%VKT") Then + WertWD = ReturnVektor_IndexValue(oIndexName) If WertWD = "" Then Bool_WD = False Else @@ -3128,7 +3138,7 @@ Public Class frmValidator End If Else Dim _Value - Dim ValueWD = aktivesDokument.GetVariableValue(_IDXName) + Dim ValueWD = aktivesDokument.GetVariableValue(oIndexName) If IsNothing(ValueWD) Then Bool_WD = False Else @@ -3136,7 +3146,7 @@ Public Class frmValidator If ValueWD.Length = 1 Then _Value = ValueWD(0) Else ' - LOGGER.Info(" >> Vectorfield " & _IDXName & "' contains more then one value - First value will be used", False) + LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used", False) _Value = ValueWD(0) End If Else @@ -3160,9 +3170,9 @@ Public Class frmValidator result(0) = 0 End If - If _IDXName.StartsWith("[%VKT") Then + If oIndexName.StartsWith("[%VKT") Then 'Input = die String komponente mit Boolean als String - input = Return_PM_VEKTOR(chk.Checked.ToString, _IDXName) + input = Return_PM_VEKTOR(chk.Checked.ToString, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then oMissing = True @@ -3170,14 +3180,14 @@ Public Class frmValidator Exit For End If Else - If Indexiere_File(aktivesDokument, _IDXName, result) = False Then + If Indexiere_File(aktivesDokument, oIndexName, result) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren Checkbox - ERROR: " & idxerr_message Exit For Else 'Nun das Logging If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(CBool(result(0)).ToString, WertWD, _IDXName) + input = Return_LOGString(CBool(result(0)).ToString, WertWD, oIndexName) Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) End If End If @@ -3198,7 +3208,7 @@ Public Class frmValidator End If Next 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss - If _MUSSEINGABE = True And Zeilen = 0 Then + If oIsRequired = True And Zeilen = 0 Then oMissing = True oErrorMessage = "Fehlende Eingabe in Vektorfeld '" & dgv.Name & "'" Exit For @@ -3208,7 +3218,7 @@ Public Class frmValidator 'Jeden Werte des Datagridviews durchlaufen For Each row As DataGridViewRow In dgv.Rows Dim exists = False - Select Case Typ + Select Case oControlType Case "TABLE" ' MsgBox(row.Cells(0).Value.GetType.ToString) Dim str As String @@ -3242,7 +3252,7 @@ Public Class frmValidator Next 'Jetzt die Datei indexieren - If Indexiere_File(aktivesDokument, _IDXName, myVektorArr) = False Then + If Indexiere_File(aktivesDokument, oIndexName, myVektorArr) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren Vektorfeld - ERROR: " & idxerr_message Exit For @@ -3255,7 +3265,7 @@ Public Class frmValidator Dim Zeilen As Integer = dgv.DataSource.Rows.Count 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss - If _MUSSEINGABE = True And Zeilen = 0 Then + If oIsRequired = True And Zeilen = 0 Then oMissing = True oErrorMessage = "Fehlende Eingabe in Tabelle '" & dgv.Name & "'" oControl.BackColor = Color.Red @@ -3268,7 +3278,7 @@ Public Class frmValidator 'Jeden Werte des Datagridviews durchlaufen For Each row As DataRow In dgv.DataSource.Rows Dim exists = False - Select Case Typ + Select Case oControlType Case "TABLE" ' MsgBox(row.Cells(0).Value.GetType.ToString) Dim str As String = String.Empty @@ -3303,7 +3313,7 @@ Public Class frmValidator Next 'Jetzt die Datei indexieren - If Indexiere_File(aktivesDokument, _IDXName, myVektorArr) = False Then + If Indexiere_File(aktivesDokument, oIndexName, myVektorArr) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren der Tabelle - ERROR: " & idxerr_message Exit For @@ -3312,7 +3322,7 @@ Public Class frmValidator Dim oValue As New List(Of Object) From {String.Empty} 'Jetzt die Datei indexieren - If Indexiere_File(aktivesDokument, _IDXName, oValue.ToArray) = False Then + If Indexiere_File(aktivesDokument, oIndexName, oValue.ToArray) = False Then oMissing = True oErrorMessage = "Fehler beim Indexieren der Tabelle - ERROR: " & idxerr_message Exit For @@ -3412,7 +3422,7 @@ Public Class frmValidator Next Return connectionString Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) LOGGER.Info(" - Unvorhergesehener Fehler bei GetConnectionString - Fehler: " & vbNewLine & ex.Message) MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei GetConnectionString:") Return "" @@ -3457,7 +3467,7 @@ LOGGER.Error(ex) Proc.Start() LOGGER.Info(" - Datei wurde geöffnet!", False) Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) MsgBox("Fehler bei Datei öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) LOGGER.Info("Fehler bei Datei öffnen: " & ex.Message, True) End Try @@ -3480,7 +3490,7 @@ LOGGER.Error(ex) LOGGER.Info("", False) Load_Next_Document(False) Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) MsgBox("Fehler bei Überspringen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub @@ -3502,7 +3512,7 @@ LOGGER.Error(ex) End If End If Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) MsgBox("Fehler bei Löschen windream-Datei:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -3521,14 +3531,14 @@ LOGGER.Error(ex) LOGGER.Info(">> Manuelles Löschen: Datei " & aktivesDokument.aName & " erfolgreich gelöscht", False) Return True Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) MsgBox("Das windream-Objekt konnte nicht gelöscht werden!" & vbNewLine & vbNewLine & "Fehlermeldung:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) LOGGER.Info(" windream-Objekt konnte nicht gelöscht werden - Fehlermeldung: " & ex.Message, True) Return False End Try End If Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) LOGGER.Info(" Fehler bei Delete_File", True) LOGGER.Info(">> Fehlermeldung: " & ex.Message, False) Return False @@ -3613,7 +3623,7 @@ LOGGER.Error(ex) Try pdfstatuslblPageNumber.Text = "Page " & PdfViewer1.CurrentPageNumber & "/" & PdfViewer1.PageCount Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) End Try End Sub