diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb index a428290..31cdf5b 100644 --- a/app/DD_PM_WINDREAM/ClassControlCreator.vb +++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb @@ -40,6 +40,14 @@ Public Class ClassControlCreator Public Const PREFIX_LINE = "LINE" Public Const PREFIX_BUTTON = "BTN" + Public Const AGGREGATE_NONE = "NONE" + Public Const AGGREGATE_TOTAL_INTEGER = "TOTAL_INTEGER" + Public Const AGGREGATE_TOTAL_FLOAT = "TOTAL_FLOAT" + Public Const AGGREGATE_TOTAL_MIN = "TOTAL_MIN" + Public Const AGGREGATE_TOTAL_MAX = "TOTAL_MAX" + Public Const AGGREGATE_TOTAL_AVG = "TOTAL_AVG" + Public Const AGGREGATE_TOTAL_COUNT = "TOTAL_COUNT" + ''' ''' Saves the column data for each grid and each column in that grid ''' @@ -520,54 +528,117 @@ Public Class ClassControlCreator oControl.RefreshDataSource() oControl.ForceInitialize() + Dim oShouldDisplayFooter As Boolean = False + For Each oCol As GridColumn In oView.Columns - Dim oColumnData As DataRow = DT_MY_COLUMNS.Select($"SPALTENNAME = '{oCol.FieldName}'").FirstOrDefault() + Dim oColumnData As DataRow = DT_MY_COLUMNS. + Select($"SPALTENNAME = '{oCol.FieldName}'"). + FirstOrDefault() + If oColumnData Is Nothing Then - Dim oSequence As Integer = oColumnData.Item("SEQUENCE") - oCol.VisibleIndex = oSequence + Continue For End If + + Dim oSequence As Integer = oColumnData.Item("SEQUENCE") + oCol.VisibleIndex = oSequence + + Dim oSummaryFunction As String = oColumnData.Item("SUMMARY_FUNCTION") + + Select Case oSummaryFunction + Case AGGREGATE_TOTAL_INTEGER + oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum + oCol.SummaryItem.DisplayFormat = "{0:0}" + oShouldDisplayFooter = True + + Case AGGREGATE_TOTAL_FLOAT + oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum + oCol.SummaryItem.DisplayFormat = "{0:n2}" + oShouldDisplayFooter = True + + Case AGGREGATE_TOTAL_AVG + oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Average + oShouldDisplayFooter = True + + Case AGGREGATE_TOTAL_MAX + oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Max + oShouldDisplayFooter = True + + Case AGGREGATE_TOTAL_MIN + oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Min + oShouldDisplayFooter = True + + Case AGGREGATE_TOTAL_COUNT + oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Count + oShouldDisplayFooter = True + + End Select Next + oView.OptionsView.ShowFooter = oShouldDisplayFooter + + AddHandler oView.InitNewRow, Sub(sender As Object, e As InitNewRowEventArgs) + ' TODO: Remove when this works and is properly implemented. + Exit Sub + + Try + For Each oColumnData As DataRow In DT_MY_COLUMNS.Rows + For Each oGridColumn As GridColumn In oView.Columns + If oGridColumn.FieldName <> oColumnData.Item("SPALTENNAME") Then + Continue For + End If + + Dim oDefaultValue = NotNull(oColumnData.Item("DEFAULT_VALUE"), String.Empty) + + If oDefaultValue <> String.Empty Then + oView.SetRowCellValue(e.RowHandle, oGridColumn.FieldName, oDefaultValue) + End If + Next + Next + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub + AddHandler oView.CustomRowCellEdit, Sub(sender As Object, e As CustomRowCellEditEventArgs) - Try - For Each oRow As DataRow In DT_MY_COLUMNS.Rows - Dim oColumnName = oRow.Item("SPALTENNAME") - Dim oEditorExists = GridTables_TestEditorExistsByControlAndColumn(oControlId, oColumnName) + Try + For Each oRow As DataRow In DT_MY_COLUMNS.Rows + Dim oColumnName = oRow.Item("SPALTENNAME") + Dim oEditorExists = GridTables_TestEditorExistsByControlAndColumn(oControlId, oColumnName) - If oColumnName = e.Column.FieldName And oEditorExists Then - Dim oEditor = GridTables.Item(oControlId).Item(oColumnName) + If oColumnName = e.Column.FieldName And oEditorExists Then + Dim oEditor = GridTables.Item(oControlId).Item(oColumnName) - e.RepositoryItem = oEditor - End If - Next - Catch ex As Exception - LOGGER.Warn("Error in CustomRowCellEdit for [{0}]", e.CellValue) - LOGGER.Error(ex) - End Try - End Sub + e.RepositoryItem = oEditor + End If + Next + Catch ex As Exception + LOGGER.Warn("Error in CustomRowCellEdit for [{0}]", e.CellValue) + LOGGER.Error(ex) + End Try + End Sub - AddHandler oView.ValidatingEditor, Sub(sender As Object, e As BaseContainerValidateEditorEventArgs) - Dim oRow As DataRowView = oView.GetRow(oView.FocusedRowHandle) - Dim oColumnName = oView.FocusedColumn.FieldName + AddHandler oView.ValidatingEditor, Sub(sender As Object, e As BaseContainerValidateEditorEventArgs) + Dim oRow As DataRowView = oView.GetRow(oView.FocusedRowHandle) + Dim oColumnName = oView.FocusedColumn.FieldName - GridTables_ValidateColumn(oView, DT_MY_COLUMNS, oColumnName, e.Value, e.Valid, e.ErrorText) - End Sub + GridTables_ValidateColumn(oView, DT_MY_COLUMNS, oColumnName, e.Value, e.Valid, e.ErrorText) + End Sub - AddHandler oView.InvalidRowException, Sub(sender As Object, e As InvalidRowExceptionEventArgs) - e.ExceptionMode = ExceptionMode.NoAction - End Sub + AddHandler oView.InvalidRowException, Sub(sender As Object, e As InvalidRowExceptionEventArgs) + e.ExceptionMode = ExceptionMode.NoAction + End Sub - AddHandler oView.ValidatingEditor, Sub(sender As Object, e As BaseContainerValidateEditorEventArgs) - Dim oValue As String = NotNull(e.Value, "") + AddHandler oView.ValidatingEditor, Sub(sender As Object, e As BaseContainerValidateEditorEventArgs) + Dim oValue As String = NotNull(e.Value, "") - If oValue.Contains(" | ") Then - oValue = oValue.Split(" | ").ToList().First() - e.Value = oValue - End If - End Sub + If oValue.Contains(" | ") Then + oValue = oValue.Split(" | ").ToList().First() + e.Value = oValue + End If + End Sub - Return oControl + Return oControl End Function Public Shared Function CreateExistingLine(row As DataRow, designMode As Boolean) As LineLabel diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 79381fc..4a95b73 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -5377,6 +5377,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnADVANCED_LOOKUP As Global.System.Data.DataColumn + Private columnSUMMARY_FUNCTION As Global.System.Data.DataColumn + _ Public Sub New() @@ -5580,6 +5582,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property SUMMARY_FUNCTIONColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSUMMARY_FUNCTION + End Get + End Property + _ @@ -5637,9 +5647,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal REGEX_MESSAGE_DE As String, _ ByVal SEQUENCE As Integer, _ ByVal DEFAULT_VALUE As String, _ - ByVal ADVANCED_LOOKUP As Boolean) As TBPM_CONTROL_TABLERow + ByVal ADVANCED_LOOKUP As Boolean, _ + ByVal SUMMARY_FUNCTION As String) 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} + 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} If (Not (parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1(0) End If @@ -5692,6 +5703,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnSEQUENCE = MyBase.Columns("SEQUENCE") Me.columnDEFAULT_VALUE = MyBase.Columns("DEFAULT_VALUE") Me.columnADVANCED_LOOKUP = MyBase.Columns("ADVANCED_LOOKUP") + Me.columnSUMMARY_FUNCTION = MyBase.Columns("SUMMARY_FUNCTION") End Sub _ + Public Property SUMMARY_FUNCTION() As String + Get + Return CType(Me(Me.tableTBPM_CONTROL_TABLE.SUMMARY_FUNCTIONColumn),String) + End Get + Set + Me(Me.tableTBPM_CONTROL_TABLE.SUMMARY_FUNCTIONColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILE_CONTROLSRow() As TBPM_PROFILE_CONTROLSRow @@ -21180,6 +21207,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("SEQUENCE", "SEQUENCE") tableMapping.ColumnMappings.Add("DEFAULT_VALUE", "DEFAULT_VALUE") tableMapping.ColumnMappings.Add("ADVANCED_LOOKUP", "ADVANCED_LOOKUP") + tableMapping.ColumnMappings.Add("SUMMARY_FUNCTION", "SUMMARY_FUNCTION") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -21259,7 +21287,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"&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"&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_I"& _ + "D = @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() @@ -21269,8 +21298,9 @@ Namespace DD_DMSLiteDataSetTableAdapters "ALIDATION, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " CHANGED_WHO = @CHANGED_WHO, REGEX_MATCH = @REGEX_MATCH, REGEX_ME"& _ "SSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, DEFAULT_VALU"& _ - "E = @DEFAULT_VALUE, SEQUENCE = @SEQUENCE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WH"& _ - "ERE (GUID = @Original_GUID)" + "E = @DEFAULT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQUENCE = @SEQUENCE, ADVANCED_LO"& _ + "OKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUI"& _ + "D = @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, "", "", "")) @@ -21285,7 +21315,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(1).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._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).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._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.Current, false, Nothing, "", "", "")) + 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("@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 Me._commandCollection(2).CommandText = "DELETE FROM TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (CONTROL_ID = @CONTROL_ID)" @@ -21293,18 +21324,20 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(2).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.Original, false, Nothing, "", "", "")) Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(3).Connection = Me.Connection - Me._commandCollection(3).CommandText = "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, SPALT"& _ - "ENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION FROM TBPM_CONTROL_TABLE" + Me._commandCollection(3).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, ADVANCED_LOOKUP, CHANGED_WHEN, CHANGED_WHO, "& _ + "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"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE" Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(4) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(4).Connection = Me.Connection - Me._commandCollection(4).CommandText = "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, SPALT"& _ - "ENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION FROM TBPM_CONTROL_TABLE WHERE (G"& _ - "UID = @GUID)" + Me._commandCollection(4).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, ADVANCED_LOOKUP, CHANGED_WHEN, CHANGED_WHO, "& _ + "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"&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 = @G"& _ + "UID)" 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() @@ -21593,7 +21626,7 @@ Namespace DD_DMSLiteDataSetTableAdapters _ - Public Overloads Overridable Function cmdUpdate(ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal VALIDATION As Boolean, ByVal READ_ONLY As Boolean, ByVal LOAD_IDX_VALUE As Boolean, ByVal CHANGED_WHO As String, ByVal REGEX_MATCH As String, ByVal REGEX_MESSAGE_EN As String, ByVal REGEX_MESSAGE_DE As String, ByVal DEFAULT_VALUE As String, ByVal SEQUENCE As Integer, ByVal ADVANCED_LOOKUP As Boolean, ByVal Original_GUID As Integer) As Object + Public Overloads Overridable Function cmdUpdate(ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal VALIDATION As Boolean, ByVal READ_ONLY As Boolean, ByVal LOAD_IDX_VALUE As Boolean, ByVal CHANGED_WHO As String, ByVal REGEX_MATCH As String, ByVal REGEX_MESSAGE_EN As String, ByVal REGEX_MESSAGE_DE As String, ByVal DEFAULT_VALUE As String, ByVal SEQUENCE As Integer, ByVal ADVANCED_LOOKUP As Boolean, ByVal SUMMARY_FUNCTION As String, ByVal Original_GUID As Integer) As Object Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) If (SPALTENNAME Is Nothing) Then Throw New Global.System.ArgumentNullException("SPALTENNAME") @@ -21636,7 +21669,12 @@ Namespace DD_DMSLiteDataSetTableAdapters End If command.Parameters(11).Value = CType(SEQUENCE,Integer) command.Parameters(12).Value = CType(ADVANCED_LOOKUP,Boolean) - command.Parameters(13).Value = CType(Original_GUID,Integer) + If (SUMMARY_FUNCTION Is Nothing) Then + Throw New Global.System.ArgumentNullException("SUMMARY_FUNCTION") + Else + command.Parameters(13).Value = CType(SUMMARY_FUNCTION,String) + End If + command.Parameters(14).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/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index d7fa8d9..401f1aa 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1285,7 +1285,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, 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 + CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION FROM TBPM_CONTROL_TABLE WHERE (CONTROL_ID = @CONTROL_ID) @@ -1352,6 +1352,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, + @@ -1359,7 +1360,8 @@ 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 + 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 WHERE (GUID = @Original_GUID) @@ -1375,7 +1377,8 @@ WHERE (GUID = @Original_GUID) - + + @@ -1394,7 +1397,9 @@ WHERE (CONTROL_ID = @CONTROL_ID) - 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 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 +FROM TBPM_CONTROL_TABLE @@ -1402,7 +1407,10 @@ WHERE (CONTROL_ID = @CONTROL_ID) - 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 FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) + 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 +FROM TBPM_CONTROL_TABLE +WHERE (GUID = @GUID) @@ -1965,7 +1973,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2027,7 +2035,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2123,7 +2131,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2188,7 +2196,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2218,7 +2226,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2241,7 +2249,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2315,7 +2323,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2364,7 +2372,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2379,7 +2387,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2452,7 +2460,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2503,7 +2511,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2650,7 +2658,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2734,10 +2742,11 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + - + @@ -2778,7 +2787,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2816,7 +2825,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2873,7 +2882,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2931,7 +2940,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3032,7 +3041,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3085,7 +3094,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3101,7 +3110,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3117,7 +3126,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3312,9 +3321,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - - - + + + \ 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 256d413..228b7ee 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/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/DD_PM_WINDREAM/My Project/licenses.licx b/app/DD_PM_WINDREAM/My Project/licenses.licx index a22b6ff..dc90a5e 100644 --- a/app/DD_PM_WINDREAM/My Project/licenses.licx +++ b/app/DD_PM_WINDREAM/My Project/licenses.licx @@ -1,18 +1,19 @@ DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.Snap.Extensions.SnapDockManager, DevExpress.Snap.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.Snap.SnapControl, DevExpress.Snap.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.Snap.Extensions.SnapDockManager, DevExpress.Snap.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.Snap.SnapControl, DevExpress.Snap.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraPrinting.Preview.DocumentViewer, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb b/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb index aefae30..d978a39 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb +++ b/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb @@ -56,6 +56,7 @@ Partial Class frmControl_Detail Me.ADVANCED_LOOKUPCheckbox = New DevExpress.XtraEditors.CheckEdit() Me.DEFAULTVALUETextBox = New DevExpress.XtraEditors.TextEdit() Me.SEQUENCETextBox = New DevExpress.XtraEditors.SpinEdit() + Me.SUMMARY_FUNCTIONCombobox = New DevExpress.XtraEditors.LookUpEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() @@ -75,6 +76,7 @@ Partial Class frmControl_Detail 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.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -99,6 +101,7 @@ Partial Class frmControl_Detail CType(Me.ADVANCED_LOOKUPCheckbox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DEFAULTVALUETextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SEQUENCETextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SUMMARY_FUNCTIONCombobox.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() @@ -118,6 +121,7 @@ Partial Class frmControl_Detail 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.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -235,6 +239,7 @@ Partial Class frmControl_Detail Me.LayoutControl1.Controls.Add(Me.ADVANCED_LOOKUPCheckbox) Me.LayoutControl1.Controls.Add(Me.DEFAULTVALUETextBox) Me.LayoutControl1.Controls.Add(Me.SEQUENCETextBox) + Me.LayoutControl1.Controls.Add(Me.SUMMARY_FUNCTIONCombobox) resources.ApplyResources(Me.LayoutControl1, "LayoutControl1") Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root @@ -398,6 +403,17 @@ Partial Class frmControl_Detail Me.SEQUENCETextBox.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("SEQUENCETextBox.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) Me.SEQUENCETextBox.StyleController = Me.LayoutControl1 ' + 'SUMMARY_FUNCTIONCombobox + ' + Me.SUMMARY_FUNCTIONCombobox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "SUMMARY_FUNCTION", True)) + resources.ApplyResources(Me.SUMMARY_FUNCTIONCombobox, "SUMMARY_FUNCTIONCombobox") + Me.SUMMARY_FUNCTIONCombobox.MenuManager = Me.RibbonControl1 + Me.SUMMARY_FUNCTIONCombobox.Name = "SUMMARY_FUNCTIONCombobox" + Me.SUMMARY_FUNCTIONCombobox.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("SUMMARY_FUNCTIONCombobox.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.SUMMARY_FUNCTIONCombobox.Properties.NullText = resources.GetString("SUMMARY_FUNCTIONCombobox.Properties.NullText") + Me.SUMMARY_FUNCTIONCombobox.Properties.PopupSizeable = False + Me.SUMMARY_FUNCTIONCombobox.StyleController = Me.LayoutControl1 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -537,7 +553,7 @@ Partial Class frmControl_Detail ' 'LayoutControlGroup1 ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17}) + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17, Me.LayoutControlItem20}) Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 412) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Size = New System.Drawing.Size(513, 168) @@ -548,14 +564,14 @@ Partial Class frmControl_Detail Me.LayoutControlItem16.Control = Me.VALIDATIONCheckbox Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(489, 23) + Me.LayoutControlItem16.Size = New System.Drawing.Size(244, 24) Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem16.TextVisible = False ' 'LayoutControlItem14 ' Me.LayoutControlItem14.Control = Me.READ_ONLYCheckBox - Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 23) + Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem14.Name = "LayoutControlItem14" Me.LayoutControlItem14.Size = New System.Drawing.Size(489, 23) Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0) @@ -564,7 +580,7 @@ Partial Class frmControl_Detail 'LayoutControlItem15 ' Me.LayoutControlItem15.Control = Me.LOAD_IDX_VALUECheckBox - Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 46) + Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 47) Me.LayoutControlItem15.Name = "LayoutControlItem15" Me.LayoutControlItem15.Size = New System.Drawing.Size(489, 23) Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0) @@ -573,12 +589,21 @@ Partial Class frmControl_Detail 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.ADVANCED_LOOKUPCheckbox - Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 69) + Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 70) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(489, 56) + Me.LayoutControlItem17.Size = New System.Drawing.Size(489, 55) Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem17.TextVisible = False ' + 'LayoutControlItem20 + ' + Me.LayoutControlItem20.Control = Me.SUMMARY_FUNCTIONCombobox + Me.LayoutControlItem20.Location = New System.Drawing.Point(244, 0) + Me.LayoutControlItem20.Name = "LayoutControlItem20" + Me.LayoutControlItem20.Size = New System.Drawing.Size(245, 24) + resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20") + Me.LayoutControlItem20.TextSize = New System.Drawing.Size(103, 13) + ' 'LayoutControlItem18 ' Me.LayoutControlItem18.Control = Me.DEFAULTVALUETextBox @@ -636,6 +661,7 @@ Partial Class frmControl_Detail CType(Me.ADVANCED_LOOKUPCheckbox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DEFAULTVALUETextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SEQUENCETextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SUMMARY_FUNCTIONCombobox.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() @@ -655,6 +681,7 @@ Partial Class frmControl_Detail 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.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -714,4 +741,6 @@ End Sub Friend WithEvents LayoutControlItem18 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents SEQUENCETextBox As DevExpress.XtraEditors.SpinEdit Friend WithEvents LayoutControlItem19 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem20 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents SUMMARY_FUNCTIONCombobox As DevExpress.XtraEditors.LookUpEdit End Class diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.resx b/app/DD_PM_WINDREAM/frmControl_Detail.resx index 00fd422..49f69cc 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.resx +++ b/app/DD_PM_WINDREAM/frmControl_Detail.resx @@ -123,6 +123,9 @@ 17, 17 + + 17, 17 + 440, 17 @@ -142,9 +145,6 @@ 0, 0 - - RibbonPageGroup1 - RibbonPage1 @@ -181,6 +181,9 @@ 2 + + RibbonPageGroup1 + RibbonPage2 @@ -482,7 +485,7 @@ 16 - 24, 478 + 24, 479 Read Only @@ -506,7 +509,7 @@ 17 - 24, 501 + 24, 502 Lade Indexdaten @@ -536,7 +539,7 @@ Muss ausgefüllt werden - 485, 19 + 240, 19 19 @@ -554,7 +557,7 @@ 19 - 24, 524 + 24, 525 Erweitertes Auswahl Control (für lange Listen) @@ -577,9 +580,6 @@ 20 - - False - 126, 312 @@ -628,6 +628,33 @@ 22 + + 374, 455 + + + Combo + + + + + + 135, 20 + + + 23 + + + SUMMARY_FUNCTIONCombobox + + + DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 23 + Fill @@ -667,6 +694,9 @@ Geändert Wann + + Aggregatsfunktion + Einstellungen @@ -886,6 +916,12 @@ DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + LayoutControlItem20 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + LayoutControlItem18 diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.vb b/app/DD_PM_WINDREAM/frmControl_Detail.vb index d39009b..8b58c61 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.vb +++ b/app/DD_PM_WINDREAM/frmControl_Detail.vb @@ -1,5 +1,41 @@  Public Class frmControl_Detail + + Private Class ComboboxItem + Public Property Id As String + Public Property Name As String + + Public Sub New(Id As String, name As String) + + End Sub + End Class + + Private Sub frmControl_Detail_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + Me.TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM + If My.Settings.frmTableColumns_Position.IsEmpty = False Then + If My.Settings.frmTableColumns_Position.X > 0 And My.Settings.frmTableColumns_Position.Y > 0 Then + Me.Location = My.Settings.frmTableColumns_Position + End If + End If + + SUMMARY_FUNCTIONCombobox.Properties.DataSource = New Dictionary(Of String, String) From { + {ClassControlCreator.AGGREGATE_NONE, "Keine Summierung"}, + {ClassControlCreator.AGGREGATE_TOTAL_INTEGER, "Summe (Ganzzahl)"}, + {ClassControlCreator.AGGREGATE_TOTAL_FLOAT, "Summe (Zwei Nachkommastellen)"}, + {ClassControlCreator.AGGREGATE_TOTAL_COUNT, "Anzahl"}, + {ClassControlCreator.AGGREGATE_TOTAL_MIN, "Minimum"}, + {ClassControlCreator.AGGREGATE_TOTAL_MAX, "Maximum"}, + {ClassControlCreator.AGGREGATE_TOTAL_AVG, "Durchschnitt"} + } + Catch ex As Exception + LOGGER.Error(ex) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Formulardaten:") + End Try + + End Sub + + Private Sub TBPM_CONTROL_TABLEBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Me.Validate() Me.TBPM_CONTROL_TABLEBindingSource.EndEdit() @@ -37,6 +73,7 @@ Public Class frmControl_Detail DEFAULTVALUETextBox.Text, SEQUENCETextBox.Text, ADVANCED_LOOKUPCheckbox.Checked, + SUMMARY_FUNCTIONCombobox.EditValue, GUIDTextBox.Text ) tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always @@ -55,20 +92,7 @@ Public Class frmControl_Detail My.Settings.frmTableColumns_Position = Me.Location End Sub - Private Sub frmControl_Detail_Load(sender As Object, e As EventArgs) Handles Me.Load - Try - Me.TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM - If My.Settings.frmTableColumns_Position.IsEmpty = False Then - If My.Settings.frmTableColumns_Position.X > 0 And My.Settings.frmTableColumns_Position.Y > 0 Then - Me.Location = My.Settings.frmTableColumns_Position - End If - End If - Catch ex As Exception - LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Formulardaten:") - End Try - - End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Dim oForm As New frmRegexEditor()