diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb index 85349b9..ac5ec16 100644 --- a/app/DD_PM_WINDREAM/ClassControlCreator.vb +++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb @@ -426,7 +426,7 @@ Public Class ClassControlCreator Return control End Function - Public Shared Function CreateExistingGridControl(row As DataRow, DT_MY_COLUMNS As DataTable, designMode As Boolean, pPanel As Panel) As GridControl + Public Shared Function CreateExistingGridControl(row As DataRow, DT_MY_COLUMNS As DataTable, designMode As Boolean) As GridControl Dim oControl As GridControl = CreateBaseControl(New GridControl(), row, designMode) Dim oControlId = DirectCast(oControl.Tag, ControlMetadata).Guid Dim oDatatable As New DataTable @@ -500,11 +500,22 @@ Public Class ClassControlCreator ' Create Columns in Datatable Dim oColumn = New DataColumn() With { - .DataType = GetType(String), .ColumnName = oRow.Item("SPALTENNAME"), .Caption = oRow.Item("SPALTEN_HEADER"), .ReadOnly = False } + Select Case oRow.Item("TYPE_COLUMN") + Case "TEXT" + oColumn.DataType = GetType(String) + Case "INTEGER" + oColumn.DataType = GetType(Integer) + Case "BOOLEAN" + oColumn.DataType = GetType(Boolean) + Case Else + oColumn.DataType = GetType(String) + End Select + + oDatatable.Columns.Add(oColumn) @@ -543,6 +554,29 @@ Public Class ClassControlCreator oControl.RefreshDataSource() oControl.ForceInitialize() + + If row.Item("TABLE_ORDER_COLUMN") <> String.Empty Then + Try + Dim oSortTerm = row.Item("TABLE_ORDER_COLUMN").ToString + Dim oSortOrder As DevExpress.Data.ColumnSortOrder = DevExpress.Data.ColumnSortOrder.Ascending + If oSortTerm.Contains(" ASC") Then + oSortTerm = oSortTerm.Replace(" ASC", "") + ElseIf oSortTerm.Contains(" DESC") Then + oSortOrder = DevExpress.Data.ColumnSortOrder.Descending + oSortTerm = oSortTerm.Replace(" DESC", "") + End If + oView.BeginDataUpdate() + Try + oView.ClearSorting() + oView.Columns(oSortTerm).SortOrder = oSortOrder + Finally + oView.EndDataUpdate() + End Try + Catch ex As Exception + + End Try + + End If Dim oShouldDisplayFooter As Boolean = False For Each oCol As GridColumn In oView.Columns diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 7a9957b..3b8aee3 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -179,7 +179,7 @@ Public Class ClassInit End If If CONNECTION_STRING_IDB <> String.Empty Then - Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_ECM) + Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB) If Database_IDB.DBInitialized = True Then IDB_ACTIVE = True LOGGER.Info("IDB is active via Config") diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 4a95b73..8eaab80 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -4579,6 +4579,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnCONTROL_ACTIVE As Global.System.Data.DataColumn + Private columnTABLE_ORDER_COLUMN As Global.System.Data.DataColumn + _ Public Sub New() @@ -4926,6 +4928,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property TABLE_ORDER_COLUMNColumn() As Global.System.Data.DataColumn + Get + Return Me.columnTABLE_ORDER_COLUMN + End Get + End Property + _ @@ -5001,9 +5011,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal SET_CONTROL_DATA As String, _ ByVal SQL_ENABLE_ON_LOAD As String, _ ByVal SQL_ENABLE_ON_LOAD_CONID As Byte, _ - ByVal CONTROL_ACTIVE As Boolean) As TBPM_PROFILE_CONTROLSRow + ByVal CONTROL_ACTIVE As Boolean, _ + ByVal TABLE_ORDER_COLUMN As String) As TBPM_PROFILE_CONTROLSRow Dim rowTBPM_PROFILE_CONTROLSRow As TBPM_PROFILE_CONTROLSRow = CType(Me.NewRow,TBPM_PROFILE_CONTROLSRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN} If (Not (parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE(0) End If @@ -5074,6 +5085,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnSQL_ENABLE_ON_LOAD = MyBase.Columns("SQL_ENABLE_ON_LOAD") Me.columnSQL_ENABLE_ON_LOAD_CONID = MyBase.Columns("SQL_ENABLE_ON_LOAD_CONID") Me.columnCONTROL_ACTIVE = MyBase.Columns("CONTROL_ACTIVE") + Me.columnTABLE_ORDER_COLUMN = MyBase.Columns("TABLE_ORDER_COLUMN") End Sub _ Public Sub New() @@ -5590,6 +5609,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property TYPE_COLUMNColumn() As Global.System.Data.DataColumn + Get + Return Me.columnTYPE_COLUMN + End Get + End Property + _ @@ -5648,9 +5675,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal SEQUENCE As Integer, _ ByVal DEFAULT_VALUE As String, _ ByVal ADVANCED_LOOKUP As Boolean, _ - ByVal SUMMARY_FUNCTION As String) As TBPM_CONTROL_TABLERow + ByVal SUMMARY_FUNCTION As String, _ + ByVal TYPE_COLUMN 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, SUMMARY_FUNCTION} + 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} If (Not (parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1(0) End If @@ -5704,6 +5732,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnDEFAULT_VALUE = MyBase.Columns("DEFAULT_VALUE") Me.columnADVANCED_LOOKUP = MyBase.Columns("ADVANCED_LOOKUP") Me.columnSUMMARY_FUNCTION = MyBase.Columns("SUMMARY_FUNCTION") + Me.columnTYPE_COLUMN = MyBase.Columns("TYPE_COLUMN") End Sub _ + Public Property TABLE_ORDER_COLUMN() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.TABLE_ORDER_COLUMNColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE_CONTROLS.TABLE_ORDER_COLUMNColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILERow() As TBPM_PROFILERow @@ -12930,6 +12974,17 @@ Partial Public Class DD_DMSLiteDataSet End Set End Property + _ + Public Property TYPE_COLUMN() As String + Get + Return CType(Me(Me.tableTBPM_CONTROL_TABLE.TYPE_COLUMNColumn),String) + End Get + Set + Me(Me.tableTBPM_CONTROL_TABLE.TYPE_COLUMNColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILE_CONTROLSRow() As TBPM_PROFILE_CONTROLSRow @@ -20104,6 +20159,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("SQL_ENABLE_ON_LOAD", "SQL_ENABLE_ON_LOAD") tableMapping.ColumnMappings.Add("SQL_ENABLE_ON_LOAD_CONID", "SQL_ENABLE_ON_LOAD_CONID") tableMapping.ColumnMappings.Add("CONTROL_ACTIVE", "CONTROL_ACTIVE") + tableMapping.ColumnMappings.Add("TABLE_ORDER_COLUMN", "TABLE_ORDER_COLUMN") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -20242,8 +20298,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "LT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL"& _ "2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, C"& _ - "ONTROL_ACTIVE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @guid"& _ - ")"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" + "ONTROL_ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TABLE_ORDER_COLUMN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TB"& _ + "PM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@guid", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() @@ -20322,9 +20378,9 @@ Namespace DD_DMSLiteDataSetTableAdapters " REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, TY"& _ "P, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, I"& _ "MAGE_CONTROL, SQL2, SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SET_CONTROL_DATA, SQL"& _ - "_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_"& _ - "PROFILE_CONTROLS AS T"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL_ID = @profil_id)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_"& _ - "LOC" + "_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"F"& _ + "ROM TBPM_PROFILE_CONTROLS AS T"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL_ID = @profil_id)"& _ + ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" Me._commandCollection(10).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@profil_id", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -21208,6 +21264,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("DEFAULT_VALUE", "DEFAULT_VALUE") tableMapping.ColumnMappings.Add("ADVANCED_LOOKUP", "ADVANCED_LOOKUP") tableMapping.ColumnMappings.Add("SUMMARY_FUNCTION", "SUMMARY_FUNCTION") + tableMapping.ColumnMappings.Add("TYPE_COLUMN", "TYPE_COLUMN") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -21217,18 +21274,20 @@ 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)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@CONTROL_ID,@SPALTEN"& _ - "NAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPAL"& _ - "TENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, "& _ - "SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHAN"& _ - "GED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VAL"& _ - "UE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = SCOPE_IDENTITY())" + ", 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)&"SE"& _ + "LECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, C"& _ + "HOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, AD"& _ + "DED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAG"& _ + "E_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GU"& _ + "ID = 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, "", "", "")) Me._adapter.InsertCommand.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, "", "", "")) 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.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"& _ @@ -21287,8 +21346,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"&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)" + "P, SUMMARY_FUNCTION, TYPE_COLUMN"&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)" 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() @@ -21299,8 +21358,8 @@ Namespace DD_DMSLiteDataSetTableAdapters " 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, "&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)" + "OKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TY"& _ + "PE_COLUMN"&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, "", "", "")) @@ -21316,6 +21375,7 @@ Namespace DD_DMSLiteDataSetTableAdapters 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("@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("@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 @@ -21328,7 +21388,7 @@ 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"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE" + "N, SUMMARY_FUNCTION, TYPE_COLUMN"&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 @@ -21336,8 +21396,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"&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)" + "N, SUMMARY_FUNCTION, TYPE_COLUMN"&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)" 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() @@ -21478,7 +21538,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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) 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) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(CONTROL_ID,Integer) If (SPALTENNAME Is Nothing) Then Throw New Global.System.ArgumentNullException("SPALTENNAME") @@ -21496,6 +21556,11 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO,String) End If + If (TYPE_COLUMN Is Nothing) Then + Throw New Global.System.ArgumentNullException("TYPE_COLUMN") + Else + Me.Adapter.InsertCommand.Parameters(5).Value = CType(TYPE_COLUMN,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -21626,7 +21691,23 @@ 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 SUMMARY_FUNCTION As String, 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 TYPE_COLUMN 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") @@ -21674,7 +21755,12 @@ Namespace DD_DMSLiteDataSetTableAdapters Else command.Parameters(13).Value = CType(SUMMARY_FUNCTION,String) End If - command.Parameters(14).Value = CType(Original_GUID,Integer) + If (TYPE_COLUMN Is Nothing) Then + Throw New Global.System.ArgumentNullException("TYPE_COLUMN") + Else + command.Parameters(14).Value = CType(TYPE_COLUMN,String) + End If + command.Parameters(15).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.xsc b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc index b42fbf2..3d73a46 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc @@ -56,19 +56,32 @@ - + + - + + - + + - + + - + + - + + + + + + + + + diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 401f1aa..f4f5725 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1017,7 +1017,8 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, - REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE + REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, + TABLE_ORDER_COLUMN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @guid) ORDER BY Y_LOC, X_LOC @@ -1115,6 +1116,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + @@ -1242,7 +1244,7 @@ WHERE (GUID = @Original_GUID); SELECT dbo.FNPM_LANGUAGE_CONTROL_TEXT(NAME, @USER_LANGUAGE, CTRL_TYPE, CTRL_TEXT) AS CTRL_CAPTION_LANG, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CTRL_TEXT, CTRL_TYPE, DEFAULT_VALUE, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, GUID, HEIGHT, INDEX_NAME, LOAD_IDX_VALUE, MULTISELECT, NAME, PROFIL_ID, READ_ONLY, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, TYP, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, IMAGE_CONTROL, SQL2, SQL_ENABLE, - SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE + SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN FROM TBPM_PROFILE_CONTROLS AS T WHERE (PROFIL_ID = @profil_id) ORDER BY Y_LOC, X_LOC @@ -1268,24 +1270,25 @@ WHERE (GUID = @Original_GUID) - + INSERT INTO TBPM_CONTROL_TABLE - (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO) -VALUES (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO); + (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN) +VALUES (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN); 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 + CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN FROM TBPM_CONTROL_TABLE WHERE (CONTROL_ID = @CONTROL_ID) @@ -1353,6 +1356,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, + @@ -1361,7 +1365,7 @@ 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 + SEQUENCE = @SEQUENCE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TYPE_COLUMN WHERE (GUID = @Original_GUID) @@ -1378,6 +1382,7 @@ WHERE (GUID = @Original_GUID) + @@ -1398,7 +1403,7 @@ 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, SUMMARY_FUNCTION + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN FROM TBPM_CONTROL_TABLE @@ -1408,7 +1413,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 + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) @@ -2655,6 +2660,13 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + + + + + + + @@ -2743,6 +2755,13 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + + + + + + + diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index 228b7ee..b36cb36 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. --> - + @@ -15,7 +15,7 @@ - + @@ -32,12 +32,12 @@ - 1249 - 541 + 1247 + 542 1300 - 541 + 542 @@ -60,12 +60,12 @@ - 963 + 961 237 - 963 - 399 + 961 + 400 diff --git a/app/DD_PM_WINDREAM/My Project/licenses.licx b/app/DD_PM_WINDREAM/My Project/licenses.licx index 773d16c..759152b 100644 --- a/app/DD_PM_WINDREAM/My Project/licenses.licx +++ b/app/DD_PM_WINDREAM/My Project/licenses.licx @@ -1 +1,7 @@ +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb b/app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb index e5a4b99..21b783e 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb @@ -79,6 +79,8 @@ Partial Class frmColumn_Detail Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TYPE_COLUMNComboBox = New System.Windows.Forms.ComboBox() + Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -124,6 +126,7 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TBPM_CONTROL_TABLEBindingSource @@ -220,6 +223,7 @@ Partial Class frmColumn_Detail ' 'LayoutControl1 ' + Me.LayoutControl1.Controls.Add(Me.TYPE_COLUMNComboBox) Me.LayoutControl1.Controls.Add(Me.GUIDTextBox) Me.LayoutControl1.Controls.Add(Me.SPALTENNAMETextBox) Me.LayoutControl1.Controls.Add(Me.SPALTEN_HEADERTextBox) @@ -418,9 +422,9 @@ Partial Class frmColumn_Detail ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem12, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlGroup1, Me.LayoutControlItem18, Me.LayoutControlItem19}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem12, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlGroup1, Me.LayoutControlItem18, Me.LayoutControlItem19, Me.LayoutControlItem22}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(533, 600) + Me.Root.Size = New System.Drawing.Size(553, 632) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -429,7 +433,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem1.Size = New System.Drawing.Size(513, 40) + Me.LayoutControlItem1.Size = New System.Drawing.Size(533, 40) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") Me.LayoutControlItem1.TextSize = New System.Drawing.Size(103, 13) ' @@ -439,7 +443,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40) Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem2.Size = New System.Drawing.Size(513, 40) + Me.LayoutControlItem2.Size = New System.Drawing.Size(533, 40) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") Me.LayoutControlItem2.TextSize = New System.Drawing.Size(103, 13) ' @@ -449,7 +453,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 80) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(513, 40) + Me.LayoutControlItem3.Size = New System.Drawing.Size(533, 40) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") Me.LayoutControlItem3.TextSize = New System.Drawing.Size(103, 13) ' @@ -459,104 +463,104 @@ Partial Class frmColumn_Detail Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem4.Size = New System.Drawing.Size(256, 40) + Me.LayoutControlItem4.Size = New System.Drawing.Size(266, 40) resources.ApplyResources(Me.LayoutControlItem4, "LayoutControlItem4") Me.LayoutControlItem4.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.REGEX_MATCHTextBox - Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 160) + Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 201) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem5.Size = New System.Drawing.Size(438, 46) + Me.LayoutControlItem5.Size = New System.Drawing.Size(455, 46) resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5") Me.LayoutControlItem5.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.SimpleButton1 - Me.LayoutControlItem6.Location = New System.Drawing.Point(438, 160) + Me.LayoutControlItem6.Location = New System.Drawing.Point(455, 201) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(75, 46) + Me.LayoutControlItem6.Size = New System.Drawing.Size(78, 46) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False ' 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.SQL_COMMANDTextBox - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 246) + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 287) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(438, 46) + Me.LayoutControlItem8.Size = New System.Drawing.Size(455, 46) resources.ApplyResources(Me.LayoutControlItem8, "LayoutControlItem8") Me.LayoutControlItem8.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.REGEX_MESSAGE_DETextBox - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 206) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 247) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(513, 40) + Me.LayoutControlItem7.Size = New System.Drawing.Size(533, 40) resources.ApplyResources(Me.LayoutControlItem7, "LayoutControlItem7") Me.LayoutControlItem7.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.SimpleButton2 - Me.LayoutControlItem9.Location = New System.Drawing.Point(438, 246) + Me.LayoutControlItem9.Location = New System.Drawing.Point(455, 287) Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Size = New System.Drawing.Size(75, 46) + Me.LayoutControlItem9.Size = New System.Drawing.Size(78, 46) Me.LayoutControlItem9.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem9.TextVisible = False ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.TextEdit7 - Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 332) + Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 373) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(256, 40) + Me.LayoutControlItem10.Size = New System.Drawing.Size(266, 40) resources.ApplyResources(Me.LayoutControlItem10, "LayoutControlItem10") Me.LayoutControlItem10.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem12 ' Me.LayoutControlItem12.Control = Me.CHANGED_WHOTextBox - Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 372) + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 413) Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem12.Size = New System.Drawing.Size(256, 40) + Me.LayoutControlItem12.Size = New System.Drawing.Size(266, 40) resources.ApplyResources(Me.LayoutControlItem12, "LayoutControlItem12") Me.LayoutControlItem12.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.TextEdit8 - Me.LayoutControlItem11.Location = New System.Drawing.Point(256, 332) + Me.LayoutControlItem11.Location = New System.Drawing.Point(266, 373) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(257, 40) + Me.LayoutControlItem11.Size = New System.Drawing.Size(267, 40) resources.ApplyResources(Me.LayoutControlItem11, "LayoutControlItem11") Me.LayoutControlItem11.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.TextEdit10 - Me.LayoutControlItem13.Location = New System.Drawing.Point(256, 372) + Me.LayoutControlItem13.Location = New System.Drawing.Point(266, 413) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem13.Size = New System.Drawing.Size(257, 40) + Me.LayoutControlItem13.Size = New System.Drawing.Size(267, 40) resources.ApplyResources(Me.LayoutControlItem13, "LayoutControlItem13") Me.LayoutControlItem13.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlGroup1 ' 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.Location = New System.Drawing.Point(0, 453) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(513, 168) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(533, 159) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' 'LayoutControlItem16 @@ -564,7 +568,7 @@ Partial Class frmColumn_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(244, 24) + Me.LayoutControlItem16.Size = New System.Drawing.Size(254, 24) Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem16.TextVisible = False ' @@ -573,7 +577,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem14.Control = Me.READ_ONLYCheckBox Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(489, 23) + Me.LayoutControlItem14.Size = New System.Drawing.Size(509, 23) Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem14.TextVisible = False ' @@ -582,7 +586,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem15.Control = Me.LOAD_IDX_VALUECheckBox Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 47) Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(489, 23) + Me.LayoutControlItem15.Size = New System.Drawing.Size(509, 23) Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem15.TextVisible = False ' @@ -591,40 +595,58 @@ Partial Class frmColumn_Detail Me.LayoutControlItem17.Control = Me.ADVANCED_LOOKUPCheckbox Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 70) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(489, 55) + Me.LayoutControlItem17.Size = New System.Drawing.Size(509, 46) 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.Location = New System.Drawing.Point(254, 0) Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Size = New System.Drawing.Size(245, 24) + Me.LayoutControlItem20.Size = New System.Drawing.Size(255, 24) resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20") Me.LayoutControlItem20.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem18 ' Me.LayoutControlItem18.Control = Me.DEFAULTVALUETextBox - Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 292) + Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 333) Me.LayoutControlItem18.Name = "LayoutControlItem18" Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem18.Size = New System.Drawing.Size(513, 40) + Me.LayoutControlItem18.Size = New System.Drawing.Size(533, 40) resources.ApplyResources(Me.LayoutControlItem18, "LayoutControlItem18") Me.LayoutControlItem18.TextSize = New System.Drawing.Size(103, 13) ' 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.SEQUENCETextBox - Me.LayoutControlItem19.Location = New System.Drawing.Point(256, 120) + Me.LayoutControlItem19.Location = New System.Drawing.Point(266, 120) Me.LayoutControlItem19.Name = "LayoutControlItem19" Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem19.Size = New System.Drawing.Size(257, 40) + Me.LayoutControlItem19.Size = New System.Drawing.Size(267, 40) resources.ApplyResources(Me.LayoutControlItem19, "LayoutControlItem19") Me.LayoutControlItem19.TextSize = New System.Drawing.Size(103, 13) ' - 'frmControl_Detail + 'TYPE_COLUMNComboBox + ' + Me.TYPE_COLUMNComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "TYPE_COLUMN", True)) + Me.TYPE_COLUMNComboBox.FormattingEnabled = True + Me.TYPE_COLUMNComboBox.Items.AddRange(New Object() {resources.GetString("TYPE_COLUMNComboBox.Items"), resources.GetString("TYPE_COLUMNComboBox.Items1"), resources.GetString("TYPE_COLUMNComboBox.Items2")}) + resources.ApplyResources(Me.TYPE_COLUMNComboBox, "TYPE_COLUMNComboBox") + Me.TYPE_COLUMNComboBox.Name = "TYPE_COLUMNComboBox" + ' + 'LayoutControlItem22 + ' + Me.LayoutControlItem22.Control = Me.TYPE_COLUMNComboBox + resources.ApplyResources(Me.LayoutControlItem22, "LayoutControlItem22") + Me.LayoutControlItem22.Location = New System.Drawing.Point(0, 160) + Me.LayoutControlItem22.Name = "LayoutControlItem22" + Me.LayoutControlItem22.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem22.Size = New System.Drawing.Size(533, 41) + Me.LayoutControlItem22.TextSize = New System.Drawing.Size(103, 13) + ' + 'frmColumn_Detail ' Me.Appearance.Options.UseFont = True resources.ApplyResources(Me, "$this") @@ -635,7 +657,7 @@ Partial Class frmColumn_Detail Me.IconOptions.ShowIcon = False Me.MaximizeBox = False Me.MinimizeBox = False - Me.Name = "frmControl_Detail" + Me.Name = "frmColumn_Detail" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.TopMost = True @@ -684,6 +706,7 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout @@ -743,4 +766,6 @@ End Sub Friend WithEvents LayoutControlItem19 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem20 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents SUMMARY_FUNCTIONCombobox As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents TYPE_COLUMNComboBox As ComboBox + Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/app/DD_PM_WINDREAM/frmColumn_Detail.resx b/app/DD_PM_WINDREAM/frmColumn_Detail.resx index 8a113ff..cc786b7 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.resx +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.resx @@ -123,9 +123,6 @@ 17, 17 - - 17, 17 - 440, 17 @@ -145,17 +142,20 @@ 0, 0 + + RibbonPageGroup1 + RibbonPage1 - 533, 62 + 553, 67 - 0, 662 + 0, 699 - 533, 21 + 553, 21 RibbonStatusBar1 @@ -181,19 +181,46 @@ 2 - - RibbonPageGroup1 - RibbonPage2 - - 126, 20 + + STRING - - 387, 20 + + INTEGER + + + BOOLEAN + + + 127, 180 + + + 406, 21 + + 25 + + + TYPE_COLUMNComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LayoutControl1 + + + 1 + + + 127, 20 + + + 406, 20 + 4 @@ -207,13 +234,13 @@ LayoutControl1 - 4 + 5 - 126, 60 + 127, 60 - 387, 20 + 406, 20 5 @@ -228,13 +255,13 @@ LayoutControl1 - 5 + 6 - 126, 100 + 127, 100 - 387, 20 + 406, 20 6 @@ -249,20 +276,20 @@ LayoutControl1 - 6 + 7 0 - 126, 140 + 127, 140 Combo - 130, 20 + 139, 20 7 @@ -277,13 +304,13 @@ LayoutControl1 - 7 + 8 - 126, 180 + 127, 221 - 312, 20 + 328, 20 8 @@ -298,10 +325,10 @@ LayoutControl1 - 8 + 9 - 450, 172 + 467, 213 @@ -311,7 +338,7 @@ 10, 10, 10, 10 - 71, 42 + 74, 42 9 @@ -329,13 +356,13 @@ LayoutControl1 - 9 + 10 - 126, 226 + 127, 267 - 387, 20 + 406, 20 10 @@ -350,13 +377,13 @@ LayoutControl1 - 10 + 11 - 126, 266 + 127, 307 - 312, 20 + 328, 20 11 @@ -371,16 +398,16 @@ LayoutControl1 - 11 + 12 - 450, 258 + 467, 299 10, 10, 10, 10 - 71, 42 + 74, 42 12 @@ -398,13 +425,13 @@ LayoutControl1 - 12 + 13 - 126, 352 + 127, 393 - 130, 20 + 139, 20 13 @@ -419,13 +446,13 @@ LayoutControl1 - 13 + 14 - 382, 352 + 393, 393 - 131, 20 + 140, 20 14 @@ -440,13 +467,13 @@ LayoutControl1 - 14 + 15 - 126, 392 + 127, 433 - 130, 20 + 139, 20 15 @@ -461,13 +488,13 @@ LayoutControl1 - 15 + 16 - 382, 392 + 393, 433 - 131, 20 + 140, 20 16 @@ -482,16 +509,16 @@ LayoutControl1 - 16 + 17 - 24, 479 + 24, 520 Read Only - 485, 19 + 505, 19 17 @@ -506,16 +533,16 @@ LayoutControl1 - 17 + 18 - 24, 502 + 24, 543 Lade Indexdaten - 485, 19 + 505, 19 18 @@ -530,16 +557,16 @@ LayoutControl1 - 18 + 19 - 24, 455 + 24, 496 Muss ausgefüllt werden - 240, 19 + 250, 19 19 @@ -554,16 +581,16 @@ LayoutControl1 - 19 + 20 - 24, 525 + 24, 566 Erweitertes Auswahl Control (für lange Listen) - 485, 19 + 505, 19 20 @@ -578,13 +605,13 @@ LayoutControl1 - 20 + 21 - 126, 312 + 127, 353 - 387, 20 + 406, 20 21 @@ -599,19 +626,19 @@ LayoutControl1 - 21 + 22 0 - 382, 140 + 393, 140 Combo - 131, 20 + 140, 20 22 @@ -626,10 +653,10 @@ LayoutControl1 - 22 + 23 - 374, 455 + 385, 496 Combo @@ -638,7 +665,7 @@ - 135, 20 + 144, 20 23 @@ -653,13 +680,13 @@ LayoutControl1 - 23 + 24 Fill - 0, 62 + 0, 67 ID @@ -706,8 +733,14 @@ Reihenfolge + + Typ: + + + Typ: + - 533, 600 + 553, 632 33 @@ -734,7 +767,7 @@ 6, 13 - 533, 683 + 553, 720 Segoe UI, 8.25pt @@ -934,8 +967,14 @@ 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 + - frmControl_Detail + frmColumn_Detail DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmColumn_Detail.vb b/app/DD_PM_WINDREAM/frmColumn_Detail.vb index 5a99e39..1bbae64 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.vb +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.vb @@ -74,6 +74,7 @@ Public Class frmColumn_Detail SEQUENCETextBox.Text, ADVANCED_LOOKUPCheckbox.Checked, SUMMARY_FUNCTIONCombobox.EditValue, + TYPE_COLUMNComboBox.Text, GUIDTextBox.Text ) tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 5e2b244..1f3c337 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -268,7 +268,7 @@ Public Class frmFormDesigner Dim oDTColumnsPerDevExGrid As DataTable = Database_ECM.GetDatatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {guid} ORDER BY [SEQUENCE]") ', "FDesignLaodControls") - Dim table = ClassControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True, pnldesigner) + Dim table = ClassControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True) AddHandler table.MouseClick, AddressOf gridControl_MouseClick ' AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick @@ -1355,8 +1355,8 @@ Public Class frmFormDesigner .ReadOnly = False } - TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, USER_USERNAME) - TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, USER_USERNAME) + TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, USER_USERNAME, "TEXT") + TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, USER_USERNAME, "TEXT") pnldesigner.Controls.Add(tb) Case ClassControlCreator.PREFIX_LINE diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index d64eb4a..a4185f3 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -372,7 +372,7 @@ Public Class frmMassValidator LOGGER.Debug("Versuch Tabelle zu laden") Dim oDTMyColumns As DataTable = Database_ECM.GetDatatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1") - oControl = ClassControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False, pnldesigner) + oControl = ClassControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False) End Select If oControl IsNot Nothing AndAlso TypeOf oControl IsNot Label Then diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 0c99675..a37ffb4 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1008,7 +1008,7 @@ Public Class frmValidator Continue For End If - Dim oGrid = ClassControlCreator.CreateExistingGridControl(oControlRow, oFilteredDatatable, False, PanelValidatorControl) + Dim oGrid = ClassControlCreator.CreateExistingGridControl(oControlRow, oFilteredDatatable, False) AddHandler oGrid.ProcessGridKey, Sub(ByVal _sender As Object, ByVal e As KeyEventArgs) If e.KeyCode = Keys.Tab Then