diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index d026162..c0fddec 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -582,7 +582,6 @@ Public Class ClassControlCreator End If oControl.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT")) - ' Add and configure navigator to delete rows oControl.UseEmbeddedNavigator = True With oControl.EmbeddedNavigator.Buttons @@ -642,7 +641,6 @@ Public Class ClassControlCreator oGridControlCreator.ConfigureViewColumns(DT_MY_COLUMNS, oView, oControl, pcurrencySymbol) oGridControlCreator.ConfigureViewEvents(DT_MY_COLUMNS, oView, oControl, oControlId) - ' 08.11.2021: Fix editor being empty on first open oView.FocusInvalidRow() diff --git a/app/TaskFlow/ClassPMWindream.vb b/app/TaskFlow/ClassPMWindream.vb index f5f8e5d..6ab2b30 100644 --- a/app/TaskFlow/ClassPMWindream.vb +++ b/app/TaskFlow/ClassPMWindream.vb @@ -155,7 +155,7 @@ Public Class ClassPMWindream Case WMObjectVariableValueTypeString LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeString") If value = "DeleteWMAttributeValue" Then - LOGGER.Debug("Indexing simpleAttribute with String.Empty") + LOGGER.Debug("DeleteWMAttributeValue - simpleAttribute with String.Empty") convertValue = CStr(String.Empty) Else convertValue = CStr(value) diff --git a/app/TaskFlow/ControlCreator/GridControl.vb b/app/TaskFlow/ControlCreator/GridControl.vb index b347739..10bece9 100644 --- a/app/TaskFlow/ControlCreator/GridControl.vb +++ b/app/TaskFlow/ControlCreator/GridControl.vb @@ -23,6 +23,7 @@ Namespace ControlCreator Private ReadOnly _GridTables As Dictionary(Of Integer, Dictionary(Of String, RepositoryItem)) Private newRowModified As Boolean + Private isApplyingInheritedValue As Boolean Public Sub New(pLogConfig As LogConfig, pGridTables As Dictionary(Of Integer, Dictionary(Of String, RepositoryItem))) _LogConfig = pLogConfig @@ -331,6 +332,75 @@ Namespace ControlCreator AddHandler pGridView.ShownEditor, AddressOf View_ShownEditor AddHandler pGridView.ValidateRow, AddressOf View_ValidateRow AddHandler pControl.LostFocus, AddressOf Control_LostFocus + AddHandler pGridView.CellValueChanged, + Sub(sender As Object, e As CellValueChangedEventArgs) + Try + HandleInheritedColumnValue(TryCast(sender, GridView), pColumnTable, e) + Catch ex As Exception + _Logger.Error(ex) + End Try + End Sub + End Sub + Private Sub HandleInheritedColumnValue(pView As GridView, pColumnDefinition As DataTable, pArgs As CellValueChangedEventArgs) + If pView Is Nothing OrElse pArgs Is Nothing OrElse pArgs.Column Is Nothing Then + Return + End If + + If isApplyingInheritedValue OrElse pArgs.RowHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle Then + Return + End If + + Dim oColumnData As DataRow = pColumnDefinition. + Select($"SPALTENNAME = '{pArgs.Column.FieldName}'"). + FirstOrDefault() + + If oColumnData Is Nothing Then + Return + End If + + Dim inheritRaw = ObjectEx.NotNull(oColumnData.Item("INHERIT_VALUE"), 0) + Dim inheritEnabled As Boolean + + If TypeOf inheritRaw Is Boolean Then + inheritEnabled = CBool(inheritRaw) + Else + Dim inheritInt As Integer + inheritEnabled = Integer.TryParse(inheritRaw.ToString(), inheritInt) AndAlso inheritInt = 1 + End If + + If Not inheritEnabled Then + Return + End If + + Dim listIndex = pView.GetDataSourceRowIndex(pArgs.RowHandle) + If listIndex = DevExpress.XtraGrid.GridControl.InvalidRowHandle Then + Return + End If + + isApplyingInheritedValue = True + Try + Dim valueToApply = pArgs.Value + _Logger.Debug(String.Format("Inherit Value is active for column. So inheritting the value [{0}]...", valueToApply)) + For dataIndex As Integer = listIndex + 1 To pView.DataRowCount - 1 + Dim targetHandle = pView.GetRowHandle(dataIndex) + If targetHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle OrElse pView.IsGroupRow(targetHandle) Then + Continue For + End If + + If pView.IsNewItemRow(targetHandle) Then + Exit For + End If + + Dim existingValue = pView.GetRowCellValue(targetHandle, pArgs.Column.FieldName) + If Equals(existingValue, valueToApply) Then + Continue For + End If + + pView.SetRowCellValue(targetHandle, pArgs.Column.FieldName, valueToApply) + Next + Finally + isApplyingInheritedValue = False + End Try End Sub Private Sub View_CustomColumnDisplayText(ByVal eSender As Object, ByVal e As CustomColumnDisplayTextEventArgs) If IsNothing(e.Value) Then diff --git a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb index 48d141a..a3bfe9f 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb +++ b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb @@ -5462,6 +5462,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnLU_CAPTION As Global.System.Data.DataColumn + Private columnINHERIT_VALUE As Global.System.Data.DataColumn + _ Public Sub New() @@ -5689,6 +5691,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property INHERIT_VALUEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnINHERIT_VALUE + End Get + End Property + _ @@ -5749,9 +5759,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal ADVANCED_LOOKUP As Boolean, _ ByVal SUMMARY_FUNCTION As String, _ ByVal TYPE_COLUMN As String, _ - ByVal LU_CAPTION As String) As TBPM_CONTROL_TABLERow + ByVal LU_CAPTION As String, _ + ByVal INHERIT_VALUE As Boolean) As TBPM_CONTROL_TABLERow Dim rowTBPM_CONTROL_TABLERow As TBPM_CONTROL_TABLERow = CType(Me.NewRow,TBPM_CONTROL_TABLERow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE} If (Not (parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1(0) End If @@ -5807,6 +5818,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnSUMMARY_FUNCTION = MyBase.Columns("SUMMARY_FUNCTION") Me.columnTYPE_COLUMN = MyBase.Columns("TYPE_COLUMN") Me.columnLU_CAPTION = MyBase.Columns("LU_CAPTION") + Me.columnINHERIT_VALUE = MyBase.Columns("INHERIT_VALUE") End Sub _ + Public Property INHERIT_VALUE() As Boolean + Get + Return CType(Me(Me.tableTBPM_CONTROL_TABLE.INHERIT_VALUEColumn),Boolean) + End Get + Set + Me(Me.tableTBPM_CONTROL_TABLE.INHERIT_VALUEColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILE_CONTROLSRow() As TBPM_PROFILE_CONTROLSRow @@ -21463,6 +21490,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("SUMMARY_FUNCTION", "SUMMARY_FUNCTION") tableMapping.ColumnMappings.Add("TYPE_COLUMN", "TYPE_COLUMN") tableMapping.ColumnMappings.Add("LU_CAPTION", "LU_CAPTION") + tableMapping.ColumnMappings.Add("INHERIT_VALUE", "INHERIT_VALUE") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -21472,13 +21500,13 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (CONTROL_ID, SPALTENNAME"& _ - ", SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@CONTRO"& _ - "L_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ - "SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,"& _ - " CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, "& _ - "ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESS"& _ - "AGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE ("& _ - "GUID = SCOPE_IDENTITY())" + ", SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN, INHERIT_VALUE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ + " (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE"& _ + "_COLUMN,@INHERIT_VALUE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HE"& _ + "ADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_O"& _ + "NLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MAT"& _ + "CH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP"& _ + " FROM TBPM_CONTROL_TABLE WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -21486,6 +21514,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENBREITE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENBREITE", 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("@TYPE_COLUMN", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_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_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET CONTROL_ID = @CONTROL_ID, SPA"& _ @@ -21497,12 +21526,13 @@ Namespace DD_DMSLiteDataSetTableAdapters "ED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_M"& _ "ESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQU"& _ "ENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LO"& _ - "OKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Or"& _ - "iginal_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBR"& _ - "EITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_V"& _ - "ALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSA"& _ - "GE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONT"& _ - "ROL_TABLE WHERE (GUID = @GUID)" + "OKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT"& _ + "_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" LU_CAPTION = 'INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"@LU_CAPTION'"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WH"& _ + "ERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SP"& _ + "ALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND"& _ + ", READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, R"& _ + "EGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCE"& _ + "D_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -21525,6 +21555,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DEFAULT_VALUE", Global.System.Data.SqlDbType.VarChar, 2147483647, 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("@ADVANCED_LOOKUP", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ADVANCED_LOOKUP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.[Variant], 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_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, "", "", "")) End Sub @@ -21546,8 +21577,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ "_WHO, ADDED_WHEN, CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHEN, REGEX_MA"& _ "TCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKU"& _ - "P, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE"& _ - ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (CONTROL_ID = @CONTROL_ID)" + "P, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBP"& _ + "M_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (CONTROL_ID = @CONTROL_ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() @@ -21559,7 +21590,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "SSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, DEFAULT_VALU"& _ "E = @DEFAULT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQUENCE = @SEQUENCE, ADVANCED_LO"& _ "OKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TY"& _ - "PE_COLUMN, LU_CAPTION = @LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + "PE_COLUMN, LU_CAPTION = @LU_CAPTION, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" INHERIT_VALUE = "& _ + "@INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTEN_HEADER", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTEN_HEADER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -21577,6 +21609,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SUMMARY_FUNCTION", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "SUMMARY_FUNCTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_COLUMN", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LU_CAPTION", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "LU_CAPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).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._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(2).Connection = Me.Connection @@ -21598,8 +21631,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, REA"& _ "D_ONLY, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" REGEX_MESSAGE_DE, REGEX_MESSAGE_"& _ "EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATIO"& _ - "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE"& _ - ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" + "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBP"& _ + "M_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(4).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(5) = New Global.System.Data.SqlClient.SqlCommand() @@ -21740,7 +21773,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal CONTROL_ID As Integer, ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal ADDED_WHO As String, ByVal TYPE_COLUMN As String) As Integer + Public Overloads Overridable Function Insert(ByVal CONTROL_ID As Integer, ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal ADDED_WHO As String, ByVal TYPE_COLUMN As String, ByVal INHERIT_VALUE As Boolean) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(CONTROL_ID,Integer) If (SPALTENNAME Is Nothing) Then Throw New Global.System.ArgumentNullException("SPALTENNAME") @@ -21763,6 +21796,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.InsertCommand.Parameters(5).Value = CType(TYPE_COLUMN,String) End If + Me.Adapter.InsertCommand.Parameters(6).Value = CType(INHERIT_VALUE,Boolean) 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 @@ -21804,6 +21838,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal DEFAULT_VALUE As String, _ ByVal ADVANCED_LOOKUP As Boolean, _ ByVal SAVE_CHANGE_ON_ENABLED As Object, _ + ByVal INHERIT_VALUE As Boolean, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONTROL_ID,Integer) @@ -21879,8 +21914,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(20).Value = CType(SAVE_CHANGE_ON_ENABLED,Object) End If - Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(22).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(INHERIT_VALUE,Boolean) + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(23).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 @@ -21916,6 +21952,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal SUMMARY_FUNCTION As String, _ ByVal TYPE_COLUMN As String, _ ByVal LU_CAPTION As String, _ + ByVal INHERIT_VALUE As Boolean, _ ByVal Original_GUID As Integer) As Object Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) If (SPALTENNAME Is Nothing) Then @@ -21974,7 +22011,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Else command.Parameters(15).Value = CType(LU_CAPTION,String) End If - command.Parameters(16).Value = CType(Original_GUID,Integer) + command.Parameters(16).Value = CType(INHERIT_VALUE,Boolean) + command.Parameters(17).Value = CType(Original_GUID,Integer) 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/TaskFlow/DD_DMSLiteDataSet.xsd b/app/TaskFlow/DD_DMSLiteDataSet.xsd index 0f4c4b5..fb574e7 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xsd +++ b/app/TaskFlow/DD_DMSLiteDataSet.xsd @@ -1299,25 +1299,26 @@ WHERE (GUID = @Original_GUID) - + INSERT INTO TBPM_CONTROL_TABLE - (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN) -VALUES (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN); + (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN, INHERIT_VALUE) +VALUES (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN,@INHERIT_VALUE); SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = SCOPE_IDENTITY()) - - - - - - + + + + + + + SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, - CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION + CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE FROM TBPM_CONTROL_TABLE WHERE (CONTROL_ID = @CONTROL_ID) @@ -1326,38 +1327,41 @@ WHERE (CONTROL_ID = @CONTROL_ID) - + UPDATE TBPM_CONTROL_TABLE SET CONTROL_ID = @CONTROL_ID, SPALTENNAME = @SPALTENNAME, SPALTEN_HEADER = @SPALTEN_HEADER, SPALTENBREITE = @SPALTENBREITE, VALIDATION = @VALIDATION, CHOICE_LIST = @CHOICE_LIST, CONNECTION_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, - SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED -WHERE (GUID = @Original_GUID); + SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT_VALUE, + LU_CAPTION = 'INHERIT_VALUE +@LU_CAPTION' +WHERE (GUID = @Original_GUID); SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + + @@ -1388,6 +1392,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, + @@ -1396,26 +1401,28 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, UPDATE TBPM_CONTROL_TABLE SET SPALTENNAME = @SPALTENNAME, SPALTEN_HEADER = @SPALTEN_HEADER, SPALTENBREITE = @SPALTENBREITE, VALIDATION = @VALIDATION, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, CHANGED_WHO = @CHANGED_WHO, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, DEFAULT_VALUE = @DEFAULT_VALUE, - SEQUENCE = @SEQUENCE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TYPE_COLUMN, LU_CAPTION = @LU_CAPTION + SEQUENCE = @SEQUENCE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TYPE_COLUMN, LU_CAPTION = @LU_CAPTION, + INHERIT_VALUE = @INHERIT_VALUE WHERE (GUID = @Original_GUID) - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -1445,7 +1452,7 @@ FROM TBPM_CONTROL_TABLE SELECT ADDED_WHEN, ADDED_WHO, ADVANCED_LOOKUP, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, READ_ONLY, REGEX_MATCH, - REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) @@ -2689,7 +2696,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2798,6 +2805,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + @@ -3384,9 +3392,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - - - + + + \ No newline at end of file diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xss b/app/TaskFlow/DD_DMSLiteDataSet.xss index f58fec7..4f3aba6 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xss +++ b/app/TaskFlow/DD_DMSLiteDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/app/TaskFlow/frmColumn_Detail.Designer.vb b/app/TaskFlow/frmColumn_Detail.Designer.vb index 859153f..d4dbcd6 100644 --- a/app/TaskFlow/frmColumn_Detail.Designer.vb +++ b/app/TaskFlow/frmColumn_Detail.Designer.vb @@ -59,6 +59,7 @@ Partial Class frmColumn_Detail Me.SEQUENCETextBox = New DevExpress.XtraEditors.SpinEdit() Me.SUMMARY_FUNCTIONCombobox = New DevExpress.XtraEditors.LookUpEdit() Me.TYPE_COLUMNComboBox2 = New DevExpress.XtraEditors.LookUpEdit() + Me.CheckEditInheritValue = New DevExpress.XtraEditors.CheckEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() @@ -76,9 +77,9 @@ Partial Class frmColumn_Detail Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() @@ -107,6 +108,7 @@ Partial Class frmColumn_Detail CType(Me.SEQUENCETextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SUMMARY_FUNCTIONCombobox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEditInheritValue.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -124,9 +126,9 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() @@ -249,6 +251,7 @@ Partial Class frmColumn_Detail Me.LayoutControl1.Controls.Add(Me.SEQUENCETextBox) Me.LayoutControl1.Controls.Add(Me.SUMMARY_FUNCTIONCombobox) Me.LayoutControl1.Controls.Add(Me.TYPE_COLUMNComboBox2) + Me.LayoutControl1.Controls.Add(Me.CheckEditInheritValue) resources.ApplyResources(Me.LayoutControl1, "LayoutControl1") Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root @@ -309,7 +312,7 @@ Partial Class frmColumn_Detail ' 'REGEX_MESSAGE_DETextBox ' - Me.REGEX_MESSAGE_DETextBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "REGEX_MESSAGE_DE", True)) + Me.REGEX_MESSAGE_DETextBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True)) resources.ApplyResources(Me.REGEX_MESSAGE_DETextBox, "REGEX_MESSAGE_DETextBox") Me.REGEX_MESSAGE_DETextBox.MenuManager = Me.RibbonControl1 Me.REGEX_MESSAGE_DETextBox.Name = "REGEX_MESSAGE_DETextBox" @@ -367,7 +370,7 @@ Partial Class frmColumn_Detail ' 'READ_ONLYCheckBox ' - Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "READ_ONLY", True)) + Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True)) resources.ApplyResources(Me.READ_ONLYCheckBox, "READ_ONLYCheckBox") Me.READ_ONLYCheckBox.MenuManager = Me.RibbonControl1 Me.READ_ONLYCheckBox.Name = "READ_ONLYCheckBox" @@ -440,6 +443,15 @@ Partial Class frmColumn_Detail Me.TYPE_COLUMNComboBox2.Properties.PopupSizeable = False Me.TYPE_COLUMNComboBox2.StyleController = Me.LayoutControl1 ' + 'CheckEditInheritValue + ' + Me.CheckEditInheritValue.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True)) + resources.ApplyResources(Me.CheckEditInheritValue, "CheckEditInheritValue") + Me.CheckEditInheritValue.MenuManager = Me.RibbonControl1 + Me.CheckEditInheritValue.Name = "CheckEditInheritValue" + Me.CheckEditInheritValue.Properties.Caption = resources.GetString("CheckEditInheritValue.Properties.Caption") + Me.CheckEditInheritValue.StyleController = Me.LayoutControl1 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -457,7 +469,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem1.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem2 ' @@ -467,7 +479,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem2.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem3 ' @@ -477,7 +489,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem3.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem4 ' @@ -487,7 +499,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem4.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem4, "LayoutControlItem4") - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem5 ' @@ -497,7 +509,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem5.Size = New System.Drawing.Size(471, 46) resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5") - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem6 ' @@ -516,7 +528,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem8.Size = New System.Drawing.Size(471, 46) resources.ApplyResources(Me.LayoutControlItem8, "LayoutControlItem8") - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem7 ' @@ -526,7 +538,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem7.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem7, "LayoutControlItem7") - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem9 ' @@ -545,7 +557,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem10.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem10, "LayoutControlItem10") - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem12 ' @@ -555,7 +567,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem12.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem12, "LayoutControlItem12") - Me.LayoutControlItem12.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem12.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem11 ' @@ -565,7 +577,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem11.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem11, "LayoutControlItem11") - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem13 ' @@ -575,11 +587,11 @@ Partial Class frmColumn_Detail Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem13.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem13, "LayoutControlItem13") - Me.LayoutControlItem13.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem13.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlGroup1 ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17, Me.LayoutControlItem20}) + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem17, Me.LayoutControlItem20, Me.LayoutControlItem22}) Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 492) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Size = New System.Drawing.Size(553, 156) @@ -603,21 +615,12 @@ Partial Class frmColumn_Detail Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem14.TextVisible = False ' - 'LayoutControlItem15 - ' - Me.LayoutControlItem15.Control = Me.LOAD_IDX_VALUECheckBox - Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 46) - Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(529, 22) - Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem15.TextVisible = False - ' 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.ADVANCED_LOOKUPCheckbox - Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 68) + Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 46) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(529, 43) + Me.LayoutControlItem17.Size = New System.Drawing.Size(529, 22) Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem17.TextVisible = False ' @@ -628,7 +631,17 @@ Partial Class frmColumn_Detail Me.LayoutControlItem20.Name = "LayoutControlItem20" Me.LayoutControlItem20.Size = New System.Drawing.Size(265, 24) resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20") - Me.LayoutControlItem20.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem20.TextSize = New System.Drawing.Size(110, 13) + ' + 'LayoutControlItem22 + ' + Me.LayoutControlItem22.Control = Me.CheckEditInheritValue + Me.LayoutControlItem22.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True)) + Me.LayoutControlItem22.Location = New System.Drawing.Point(0, 68) + Me.LayoutControlItem22.Name = "LayoutControlItem22" + Me.LayoutControlItem22.Size = New System.Drawing.Size(529, 43) + Me.LayoutControlItem22.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem22.TextVisible = False ' 'LayoutControlItem18 ' @@ -638,7 +651,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem18.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem18, "LayoutControlItem18") - Me.LayoutControlItem18.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem18.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem19 ' @@ -648,7 +661,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem19.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem19, "LayoutControlItem19") - Me.LayoutControlItem19.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem19.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem23 ' @@ -658,7 +671,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem23.Name = "LayoutControlItem23" Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem23.Size = New System.Drawing.Size(553, 40) - Me.LayoutControlItem23.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem23.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem21 ' @@ -668,7 +681,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem21.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem21.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem21, "LayoutControlItem21") - Me.LayoutControlItem21.TextSize = New System.Drawing.Size(112, 13) + Me.LayoutControlItem21.TextSize = New System.Drawing.Size(110, 13) ' 'frmColumn_Detail ' @@ -708,6 +721,7 @@ Partial Class frmColumn_Detail CType(Me.SEQUENCETextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SUMMARY_FUNCTIONCombobox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEditInheritValue.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() @@ -725,9 +739,9 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() @@ -779,7 +793,6 @@ End Sub Friend WithEvents READ_ONLYCheckBox As DevExpress.XtraEditors.CheckEdit Friend WithEvents LOAD_IDX_VALUECheckBox As DevExpress.XtraEditors.CheckEdit Friend WithEvents LayoutControlItem14 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem15 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents VALIDATIONCheckbox As DevExpress.XtraEditors.CheckEdit Friend WithEvents ADVANCED_LOOKUPCheckbox As DevExpress.XtraEditors.CheckEdit Friend WithEvents DEFAULTVALUETextBox As DevExpress.XtraEditors.TextEdit @@ -795,4 +808,6 @@ End Sub Friend WithEvents LayoutControlItem23 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem21 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents TYPE_COLUMNComboBox2 As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents CheckEditInheritValue As DevExpress.XtraEditors.CheckEdit + Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/app/TaskFlow/frmColumn_Detail.resx b/app/TaskFlow/frmColumn_Detail.resx index faeaaae..9228e5d 100644 --- a/app/TaskFlow/frmColumn_Detail.resx +++ b/app/TaskFlow/frmColumn_Detail.resx @@ -185,10 +185,10 @@ RibbonPage2 - 144, 306 + 142, 306 - 409, 20 + 411, 20 @@ -207,10 +207,10 @@ 4 - 144, 20 + 142, 20 - 409, 20 + 411, 20 4 @@ -228,10 +228,10 @@ 5 - 144, 60 + 142, 60 - 409, 20 + 411, 20 5 @@ -249,10 +249,10 @@ 6 - 144, 100 + 142, 100 - 409, 20 + 411, 20 6 @@ -273,14 +273,14 @@ 0 - 144, 140 + 142, 140 Combo - 132, 20 + 134, 20 7 @@ -298,10 +298,10 @@ 8 - 144, 220 + 142, 220 - 327, 20 + 329, 20 8 @@ -350,10 +350,10 @@ 10 - 144, 266 + 142, 266 - 409, 20 + 411, 20 10 @@ -371,10 +371,10 @@ 11 - 144, 346 + 142, 346 - 327, 20 + 329, 20 11 @@ -419,10 +419,10 @@ 13 - 144, 432 + 142, 432 - 132, 20 + 134, 20 13 @@ -440,10 +440,10 @@ 14 - 420, 432 + 418, 432 - 133, 20 + 135, 20 14 @@ -461,10 +461,10 @@ 15 - 144, 472 + 142, 472 - 132, 20 + 134, 20 15 @@ -482,10 +482,10 @@ 16 - 420, 472 + 418, 472 - 133, 20 + 135, 20 16 @@ -575,7 +575,7 @@ 20 - 24, 605 + 24, 583 Erweitertes Auswahl Control (für lange Listen) @@ -599,10 +599,10 @@ 21 - 144, 392 + 142, 392 - 409, 20 + 411, 20 21 @@ -623,13 +623,13 @@ 0 - 420, 140 + 418, 140 Combo - 133, 20 + 135, 20 22 @@ -647,7 +647,7 @@ 23 - 412, 537 + 410, 537 Combo @@ -656,7 +656,7 @@ - 137, 20 + 139, 20 23 @@ -674,7 +674,7 @@ 24 - 144, 180 + 142, 180 Combo @@ -683,7 +683,7 @@ - 409, 20 + 411, 20 27 @@ -700,6 +700,30 @@ 25 + + 24, 605 + + + Inherit Value (Vererbt den Wert der aktuellen Zelle auf alle nachfolgenden) + + + 525, 18 + + + 28 + + + CheckEditInheritValue + + + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 26 + Fill @@ -958,12 +982,6 @@ DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - LayoutControlItem15 - - - DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - LayoutControlItem17 @@ -976,6 +994,12 @@ DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + LayoutControlItem22 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + LayoutControlItem18 diff --git a/app/TaskFlow/frmColumn_Detail.vb b/app/TaskFlow/frmColumn_Detail.vb index a465482..a64c51d 100644 --- a/app/TaskFlow/frmColumn_Detail.vb +++ b/app/TaskFlow/frmColumn_Detail.vb @@ -87,6 +87,7 @@ Public Class frmColumn_Detail SUMMARY_FUNCTIONCombobox.EditValue, TYPE_COLUMNComboBox2.EditValue, LU_CAPTIONTextBox.Text, + CheckEditInheritValue.Checked, GUIDTextBox.Text ) tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb index 74d1eaa..a5a1b1c 100644 --- a/app/TaskFlow/frmFormDesigner.vb +++ b/app/TaskFlow/frmFormDesigner.vb @@ -173,6 +173,9 @@ Public Class frmFormDesigner ''' Private Function IsVectorIndex(IndexName As String) As Boolean Dim oType As Integer + If IndexName = "@@DISPLAY_ONLY" Then + Return 0 + End If If IDB_ACTIVE = False Then oType = WINDREAM_MOD.GetIndexType(IndexName) Else @@ -289,7 +292,7 @@ Public Class frmFormDesigner Case "TABLE" - Dim oSQL = $"SELECT IIF(LANG.CAPTION IS NULL,T.SPALTEN_HEADER,LANG.CAPTION) SPALTEN_HEADER_LANG, T.* FROM TBPM_CONTROL_TABLE T + Dim oSQL = $"Select IIF(LANG.CAPTION Is NULL,T.SPALTEN_HEADER,LANG.CAPTION) SPALTEN_HEADER_LANG, T.* FROM TBPM_CONTROL_TABLE T INNER JOIN TBPM_PROFILE_CONTROLS T1 ON T.CONTROL_ID = T1.GUID LEFT JOIN (SELECT * FROM TBPM_CONTOL_TABLE_LANG WHERE LANG_CODE = '{USER_LANGUAGE}') LANG ON T.GUID = LANG.COL_ID WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T.CONTROL_ID = {guid} ORDER BY T.SEQUENCE" Dim oDTColumnsPerDevExGrid As DataTable = DatabaseFallback.GetDatatableECM(oSQL) ', "FDesignLaodControls") @@ -1235,8 +1238,8 @@ Public Class frmFormDesigner .ReadOnly = False } - TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, USER_USERNAME, "TEXT") - TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, USER_USERNAME, "TEXT") + TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, USER_USERNAME, "TEXT", 0) + TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, USER_USERNAME, "TEXT", 0) pnldesigner.Controls.Add(tb) Case ClassControlCreator.PREFIX_LINE diff --git a/app/TaskFlow/frmMassValidator.vb b/app/TaskFlow/frmMassValidator.vb index fa5f710..b46f9ca 100644 --- a/app/TaskFlow/frmMassValidator.vb +++ b/app/TaskFlow/frmMassValidator.vb @@ -539,12 +539,15 @@ Public Class frmMassValidator Select Case Typ 'Tabellendarstellung Case "TABLE" - Dim dt As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {CONTROL_ID} ORDER BY SEQUENCE") ', "MV_FillIndexValues") + Dim osqlControlTable = String.Format("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {0} ORDER BY SEQUENCE", CONTROL_ID) + Dim oDTCONTROL_TABLE As DataTable = DatabaseFallback.GetDatatable("TBPM_CONTROL_TABLE", New GetDatatableOptions(osqlControlTable, DatabaseType.ECM) With { + .FilterExpression = $"CONTROL_ID = {CONTROL_ID}' ", + .SortByColumn = "SEQUENCE"}) ', "MV_FillIndexValues") Dim SpaltenWerte As String() - If dt.Rows.Count > 1 Then + If oDTCONTROL_TABLE.Rows.Count > 1 Then For Each Zeile As Object In wertWD SpaltenWerte = Split(Zeile, Delimiter) - Select Case dt.Rows.Count + Select Case oDTCONTROL_TABLE.Rows.Count Case 2 If SpaltenWerte.Length = 2 Then dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 2d0cb15..cd87c3f 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -1145,7 +1145,6 @@ Public Class frmValidator Dim oGrid = ControlCreator.CreateExistingGridControl(oControlRow, oFilteredDatatable, False, DocCurrency) oMyControl = oGrid 'AddHandler oGrid.Views(0).c AddressOf GridView_CustomColumnDisplayText - Case "LINE" oMyControl = ControlCreator.CreateExistingLine(oControlRow, False) @@ -4384,7 +4383,8 @@ Public Class frmValidator MyValidationLogger.Debug("FINAL INDEXING STARTING...") For Each oFinalIndexRow As DataRow In oDTFinalIndexing.Rows Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString - Dim oDTResult As DataTable + + Dim oDTResult As DataTable = Nothing Dim oFinalIndex = oFinalIndexRow.Item("INDEXNAME") MyValidationLogger.Debug($"Working on final index [{oFinalIndex}]...") Dim oContinueOnIndifferentState As Boolean = CBool(oFinalIndexRow.Item("CONTINUE_INDETERMINED"))