diff --git a/app/DD_PM_WINDREAM/App.config b/app/DD_PM_WINDREAM/App.config index f11b532..fab7b8d 100644 --- a/app/DD_PM_WINDREAM/App.config +++ b/app/DD_PM_WINDREAM/App.config @@ -59,7 +59,7 @@ diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb index 6b03b75..4a993a3 100644 --- a/app/DD_PM_WINDREAM/ClassControlCreator.vb +++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb @@ -222,7 +222,6 @@ Public Class ClassControlCreator .Cursor = Cursors.Hand, .Location = location } - Return control End Function diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 8eaab80..adf43c1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -5398,6 +5398,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnTYPE_COLUMN As Global.System.Data.DataColumn + Private columnLU_CAPTION As Global.System.Data.DataColumn + _ Public Sub New() @@ -5617,6 +5619,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property LU_CAPTIONColumn() As Global.System.Data.DataColumn + Get + Return Me.columnLU_CAPTION + End Get + End Property + _ @@ -5676,9 +5686,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal DEFAULT_VALUE As String, _ ByVal ADVANCED_LOOKUP As Boolean, _ ByVal SUMMARY_FUNCTION As String, _ - ByVal TYPE_COLUMN As String) As TBPM_CONTROL_TABLERow + ByVal TYPE_COLUMN As String, _ + ByVal LU_CAPTION 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, TYPE_COLUMN} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION} If (Not (parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1(0) End If @@ -5733,6 +5744,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnADVANCED_LOOKUP = MyBase.Columns("ADVANCED_LOOKUP") Me.columnSUMMARY_FUNCTION = MyBase.Columns("SUMMARY_FUNCTION") Me.columnTYPE_COLUMN = MyBase.Columns("TYPE_COLUMN") + Me.columnLU_CAPTION = MyBase.Columns("LU_CAPTION") End Sub _ + Public Property LU_CAPTION() As String + Get + Return CType(Me(Me.tableTBPM_CONTROL_TABLE.LU_CAPTIONColumn),String) + End Get + Set + Me(Me.tableTBPM_CONTROL_TABLE.LU_CAPTIONColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILE_CONTROLSRow() As TBPM_PROFILE_CONTROLSRow @@ -21265,6 +21293,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("ADVANCED_LOOKUP", "ADVANCED_LOOKUP") tableMapping.ColumnMappings.Add("SUMMARY_FUNCTION", "SUMMARY_FUNCTION") tableMapping.ColumnMappings.Add("TYPE_COLUMN", "TYPE_COLUMN") + tableMapping.ColumnMappings.Add("LU_CAPTION", "LU_CAPTION") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -21275,12 +21304,12 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (CONTROL_ID, SPALTENNAME"& _ ", SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@CONTRO"& _ - "L_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"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())" + "L_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ + "SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,"& _ + " CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, "& _ + "ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESS"& _ + "AGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE ("& _ + "GUID = SCOPE_IDENTITY())" 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, "", "", "")) @@ -21346,8 +21375,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ "_WHO, ADDED_WHEN, CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHEN, REGEX_MA"& _ "TCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKU"& _ - "P, SUMMARY_FUNCTION, TYPE_COLUMN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ - " (CONTROL_ID = @CONTROL_ID)" + "P, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&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() @@ -21359,7 +21388,7 @@ Namespace DD_DMSLiteDataSetTableAdapters "SSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, DEFAULT_VALU"& _ "E = @DEFAULT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQUENCE = @SEQUENCE, ADVANCED_LO"& _ "OKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TY"& _ - "PE_COLUMN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + "PE_COLUMN, LU_CAPTION = @LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"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, "", "", "")) @@ -21376,6 +21405,7 @@ Namespace DD_DMSLiteDataSetTableAdapters 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("@LU_CAPTION", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "LU_CAPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@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 @@ -21388,7 +21418,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, REA"& _ "D_ONLY, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" REGEX_MESSAGE_DE, REGEX_MESSAGE_"& _ "EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATIO"& _ - "N, SUMMARY_FUNCTION, TYPE_COLUMN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE" + "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&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 @@ -21396,8 +21427,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, REA"& _ "D_ONLY, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" REGEX_MESSAGE_DE, REGEX_MESSAGE_"& _ "EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATIO"& _ - "N, SUMMARY_FUNCTION, TYPE_COLUMN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ - " (GUID = @GUID)" + "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&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() @@ -21707,6 +21738,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal ADVANCED_LOOKUP As Boolean, _ ByVal SUMMARY_FUNCTION As String, _ ByVal TYPE_COLUMN As String, _ + ByVal LU_CAPTION 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 @@ -21760,7 +21792,12 @@ Namespace DD_DMSLiteDataSetTableAdapters Else command.Parameters(14).Value = CType(TYPE_COLUMN,String) End If - command.Parameters(15).Value = CType(Original_GUID,Integer) + If (LU_CAPTION Is Nothing) Then + Throw New Global.System.ArgumentNullException("LU_CAPTION") + Else + command.Parameters(15).Value = CType(LU_CAPTION,String) + End If + command.Parameters(16).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 3d73a46..95d3423 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc @@ -56,32 +56,24 @@ - - + - - + - - + - - + - - + - - + - - + - - + diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index f4f5725..a9ae54e 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1273,7 +1273,7 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN) -VALUES (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN); +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()) @@ -1288,7 +1288,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, SUMMARY_FUNCTION, TYPE_COLUMN + CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION FROM TBPM_CONTROL_TABLE WHERE (CONTROL_ID = @CONTROL_ID) @@ -1357,6 +1357,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, + @@ -1365,7 +1366,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, TYPE_COLUMN = @TYPE_COLUMN + SEQUENCE = @SEQUENCE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TYPE_COLUMN, LU_CAPTION = @LU_CAPTION WHERE (GUID = @Original_GUID) @@ -1383,6 +1384,7 @@ WHERE (GUID = @Original_GUID) + @@ -1403,7 +1405,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, TYPE_COLUMN + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION FROM TBPM_CONTROL_TABLE @@ -1413,7 +1415,7 @@ FROM TBPM_CONTROL_TABLE SELECT ADDED_WHEN, ADDED_WHO, ADVANCED_LOOKUP, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, READ_ONLY, REGEX_MATCH, - REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) @@ -1978,7 +1980,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2040,7 +2042,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2136,7 +2138,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2201,7 +2203,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2231,7 +2233,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2254,7 +2256,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2328,7 +2330,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2377,7 +2379,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2392,7 +2394,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2465,7 +2467,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2516,7 +2518,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2670,7 +2672,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2762,10 +2764,17 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + + + + + + + - + @@ -2806,7 +2815,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2844,7 +2853,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2901,7 +2910,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2959,7 +2968,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3060,7 +3069,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3113,7 +3122,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3129,7 +3138,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3145,7 +3154,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3340,9 +3349,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 b36cb36..382a060 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. --> - + @@ -16,7 +16,7 @@ - + @@ -36,7 +36,7 @@ 542 - 1300 + 1299 542 @@ -52,7 +52,7 @@ 343 - 1300 + 1299 343 diff --git a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb index b0a8544..fc5b321 100644 --- a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb @@ -57,8 +57,8 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security "& _ + "Info=True;User ID=sa;Password=dd")> _ Public ReadOnly Property ConnectionString() As String Get Return CType(Me("ConnectionString"),String) diff --git a/app/DD_PM_WINDREAM/My Project/Settings.settings b/app/DD_PM_WINDREAM/My Project/Settings.settings index ef3a80d..7ff86a9 100644 --- a/app/DD_PM_WINDREAM/My Project/Settings.settings +++ b/app/DD_PM_WINDREAM/My Project/Settings.settings @@ -5,10 +5,10 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> + <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd 0, 0 diff --git a/app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb b/app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb index 21b783e..7a375c2 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb @@ -37,6 +37,7 @@ Partial Class frmColumn_Detail Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.TYPE_COLUMNComboBox = New System.Windows.Forms.ComboBox() Me.GUIDTextBox = New DevExpress.XtraEditors.TextEdit() Me.SPALTENNAMETextBox = New DevExpress.XtraEditors.TextEdit() Me.SPALTEN_HEADERTextBox = New DevExpress.XtraEditors.TextEdit() @@ -72,15 +73,16 @@ Partial Class frmColumn_Detail Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() Me.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() + Me.LU_CAPTIONTextBox = New System.Windows.Forms.TextBox() + Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem16 = 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() @@ -119,7 +121,6 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit() @@ -127,6 +128,8 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TBPM_CONTROL_TABLEBindingSource @@ -223,6 +226,7 @@ Partial Class frmColumn_Detail ' 'LayoutControl1 ' + Me.LayoutControl1.Controls.Add(Me.LU_CAPTIONTextBox) Me.LayoutControl1.Controls.Add(Me.TYPE_COLUMNComboBox) Me.LayoutControl1.Controls.Add(Me.GUIDTextBox) Me.LayoutControl1.Controls.Add(Me.SPALTENNAMETextBox) @@ -248,6 +252,14 @@ Partial Class frmColumn_Detail Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root ' + '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" + ' 'GUIDTextBox ' Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "GUID", True)) @@ -422,9 +434,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.LayoutControlItem22}) + 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.LayoutControlItem23}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(553, 632) + Me.Root.Size = New System.Drawing.Size(573, 669) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -433,9 +445,9 @@ 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(533, 40) + Me.LayoutControlItem1.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem2 ' @@ -443,9 +455,9 @@ 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(533, 40) + Me.LayoutControlItem2.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem3 ' @@ -453,9 +465,9 @@ 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(533, 40) + Me.LayoutControlItem3.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem4 ' @@ -463,9 +475,9 @@ 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(266, 40) + Me.LayoutControlItem4.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem4, "LayoutControlItem4") - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem5 ' @@ -473,28 +485,28 @@ Partial Class frmColumn_Detail 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(455, 46) + Me.LayoutControlItem5.Size = New System.Drawing.Size(472, 46) resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5") - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.SimpleButton1 - Me.LayoutControlItem6.Location = New System.Drawing.Point(455, 201) + Me.LayoutControlItem6.Location = New System.Drawing.Point(472, 201) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(78, 46) + Me.LayoutControlItem6.Size = New System.Drawing.Size(81, 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, 287) + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 327) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(455, 46) + Me.LayoutControlItem8.Size = New System.Drawing.Size(472, 46) resources.ApplyResources(Me.LayoutControlItem8, "LayoutControlItem8") - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem7 ' @@ -502,82 +514,73 @@ Partial Class frmColumn_Detail 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(533, 40) + Me.LayoutControlItem7.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem7, "LayoutControlItem7") - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.SimpleButton2 - Me.LayoutControlItem9.Location = New System.Drawing.Point(455, 287) + Me.LayoutControlItem9.Location = New System.Drawing.Point(472, 327) Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Size = New System.Drawing.Size(78, 46) + Me.LayoutControlItem9.Size = New System.Drawing.Size(81, 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, 373) + Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 413) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(266, 40) + Me.LayoutControlItem10.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem10, "LayoutControlItem10") - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem12 ' Me.LayoutControlItem12.Control = Me.CHANGED_WHOTextBox - Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 413) + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 453) Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem12.Size = New System.Drawing.Size(266, 40) + Me.LayoutControlItem12.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem12, "LayoutControlItem12") - Me.LayoutControlItem12.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem12.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.TextEdit8 - Me.LayoutControlItem11.Location = New System.Drawing.Point(266, 373) + Me.LayoutControlItem11.Location = New System.Drawing.Point(276, 413) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(267, 40) + Me.LayoutControlItem11.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem11, "LayoutControlItem11") - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.TextEdit10 - Me.LayoutControlItem13.Location = New System.Drawing.Point(266, 413) + Me.LayoutControlItem13.Location = New System.Drawing.Point(276, 453) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem13.Size = New System.Drawing.Size(267, 40) + Me.LayoutControlItem13.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem13, "LayoutControlItem13") - Me.LayoutControlItem13.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem13.TextSize = New System.Drawing.Size(112, 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, 453) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 493) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(533, 159) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(553, 156) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' - 'LayoutControlItem16 - ' - 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(254, 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, 24) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(509, 23) + Me.LayoutControlItem14.Size = New System.Drawing.Size(529, 23) Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem14.TextVisible = False ' @@ -586,7 +589,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(509, 23) + Me.LayoutControlItem15.Size = New System.Drawing.Size(529, 23) Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem15.TextVisible = False ' @@ -595,46 +598,38 @@ 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(509, 46) + Me.LayoutControlItem17.Size = New System.Drawing.Size(529, 43) 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(254, 0) + Me.LayoutControlItem20.Location = New System.Drawing.Point(264, 0) Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Size = New System.Drawing.Size(255, 24) + Me.LayoutControlItem20.Size = New System.Drawing.Size(265, 24) resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20") - Me.LayoutControlItem20.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem20.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem18 ' Me.LayoutControlItem18.Control = Me.DEFAULTVALUETextBox - Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 333) + Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 373) Me.LayoutControlItem18.Name = "LayoutControlItem18" Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem18.Size = New System.Drawing.Size(533, 40) + Me.LayoutControlItem18.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem18, "LayoutControlItem18") - Me.LayoutControlItem18.TextSize = New System.Drawing.Size(103, 13) + Me.LayoutControlItem18.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.SEQUENCETextBox - Me.LayoutControlItem19.Location = New System.Drawing.Point(266, 120) + Me.LayoutControlItem19.Location = New System.Drawing.Point(276, 120) Me.LayoutControlItem19.Name = "LayoutControlItem19" Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem19.Size = New System.Drawing.Size(267, 40) + Me.LayoutControlItem19.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem19, "LayoutControlItem19") - Me.LayoutControlItem19.TextSize = New System.Drawing.Size(103, 13) - ' - '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" + Me.LayoutControlItem19.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem22 ' @@ -643,8 +638,33 @@ Partial Class frmColumn_Detail 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) + Me.LayoutControlItem22.Size = New System.Drawing.Size(553, 41) + Me.LayoutControlItem22.TextSize = New System.Drawing.Size(112, 13) + ' + 'LU_CAPTIONTextBox + ' + Me.LU_CAPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "LU_CAPTION", True)) + resources.ApplyResources(Me.LU_CAPTIONTextBox, "LU_CAPTIONTextBox") + Me.LU_CAPTIONTextBox.Name = "LU_CAPTIONTextBox" + ' + 'LayoutControlItem23 + ' + Me.LayoutControlItem23.Control = Me.LU_CAPTIONTextBox + resources.ApplyResources(Me.LayoutControlItem23, "LayoutControlItem23") + Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 287) + Me.LayoutControlItem23.Name = "LayoutControlItem23" + Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem23.Size = New System.Drawing.Size(553, 40) + Me.LayoutControlItem23.TextSize = New System.Drawing.Size(112, 13) + ' + 'LayoutControlItem16 + ' + 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(264, 24) + Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem16.TextVisible = False ' 'frmColumn_Detail ' @@ -699,7 +719,6 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit() @@ -707,6 +726,8 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout @@ -759,7 +780,6 @@ End Sub Friend WithEvents ADVANCED_LOOKUPCheckbox As DevExpress.XtraEditors.CheckEdit Friend WithEvents DEFAULTVALUETextBox As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlItem16 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem17 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem18 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents SEQUENCETextBox As DevExpress.XtraEditors.SpinEdit @@ -768,4 +788,7 @@ End Sub Friend WithEvents SUMMARY_FUNCTIONCombobox As DevExpress.XtraEditors.LookUpEdit Friend WithEvents TYPE_COLUMNComboBox As ComboBox Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LU_CAPTIONTextBox As TextBox + Friend WithEvents LayoutControlItem16 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem23 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 cc786b7..53bfb88 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.resx +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.resx @@ -149,13 +149,13 @@ RibbonPage1 - 553, 67 + 573, 67 - 0, 699 + 0, 736 - 553, 21 + 573, 21 RibbonStatusBar1 @@ -184,6 +184,28 @@ RibbonPage2 + + 136, 307 + + + 417, 20 + + + + 26 + + + LU_CAPTIONTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LayoutControl1 + + + 4 + STRING @@ -194,12 +216,11 @@ BOOLEAN - 127, 180 + 136, 180 - 406, 21 + 417, 21 - 25 @@ -213,13 +234,13 @@ LayoutControl1 - 1 + 5 - 127, 20 + 136, 20 - 406, 20 + 417, 20 4 @@ -234,13 +255,13 @@ LayoutControl1 - 5 + 6 - 127, 60 + 136, 60 - 406, 20 + 417, 20 5 @@ -255,13 +276,13 @@ LayoutControl1 - 6 + 7 - 127, 100 + 136, 100 - 406, 20 + 417, 20 6 @@ -276,20 +297,20 @@ LayoutControl1 - 7 + 8 0 - 127, 140 + 136, 140 Combo - 139, 20 + 140, 20 7 @@ -304,13 +325,13 @@ LayoutControl1 - 8 + 9 - 127, 221 + 136, 221 - 328, 20 + 336, 20 8 @@ -325,10 +346,10 @@ LayoutControl1 - 9 + 10 - 467, 213 + 484, 213 @@ -338,7 +359,7 @@ 10, 10, 10, 10 - 74, 42 + 77, 42 9 @@ -356,13 +377,13 @@ LayoutControl1 - 10 + 11 - 127, 267 + 136, 267 - 406, 20 + 417, 20 10 @@ -377,13 +398,13 @@ LayoutControl1 - 11 + 12 - 127, 307 + 136, 347 - 328, 20 + 336, 20 11 @@ -398,16 +419,16 @@ LayoutControl1 - 12 + 13 - 467, 299 + 484, 339 10, 10, 10, 10 - 74, 42 + 77, 42 12 @@ -425,13 +446,13 @@ LayoutControl1 - 13 + 14 - 127, 393 + 136, 433 - 139, 20 + 140, 20 13 @@ -446,13 +467,13 @@ LayoutControl1 - 14 + 15 - 393, 393 + 412, 433 - 140, 20 + 141, 20 14 @@ -467,13 +488,13 @@ LayoutControl1 - 15 + 16 - 127, 433 + 136, 473 - 139, 20 + 140, 20 15 @@ -488,13 +509,13 @@ LayoutControl1 - 16 + 17 - 393, 433 + 412, 473 - 140, 20 + 141, 20 16 @@ -509,16 +530,16 @@ LayoutControl1 - 17 + 18 - 24, 520 + 24, 560 Read Only - 505, 19 + 525, 19 17 @@ -533,16 +554,16 @@ LayoutControl1 - 18 + 19 - 24, 543 + 24, 583 Lade Indexdaten - 505, 19 + 525, 19 18 @@ -557,16 +578,16 @@ LayoutControl1 - 19 + 20 - 24, 496 + 24, 536 Muss ausgefüllt werden - 250, 19 + 260, 19 19 @@ -581,16 +602,16 @@ LayoutControl1 - 20 + 21 - 24, 566 + 24, 606 Erweitertes Auswahl Control (für lange Listen) - 505, 19 + 525, 19 20 @@ -605,13 +626,13 @@ LayoutControl1 - 21 + 22 - 127, 353 + 136, 393 - 406, 20 + 417, 20 21 @@ -626,19 +647,19 @@ LayoutControl1 - 22 + 23 0 - 393, 140 + 412, 140 Combo - 140, 20 + 141, 20 22 @@ -653,10 +674,10 @@ LayoutControl1 - 23 + 24 - 385, 496 + 404, 536 Combo @@ -665,7 +686,7 @@ - 144, 20 + 145, 20 23 @@ -680,7 +701,7 @@ LayoutControl1 - 24 + 25 Fill @@ -739,8 +760,14 @@ Typ: + + Caption Auswahldialog: + + + Caption Auswahldialog: + - 553, 632 + 573, 669 33 @@ -767,7 +794,7 @@ 6, 13 - 553, 720 + 573, 757 Segoe UI, 8.25pt @@ -925,12 +952,6 @@ DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - LayoutControlItem16 - - - DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - LayoutControlItem14 @@ -973,6 +994,18 @@ DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + LayoutControlItem23 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControlItem16 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmColumn_Detail diff --git a/app/DD_PM_WINDREAM/frmColumn_Detail.vb b/app/DD_PM_WINDREAM/frmColumn_Detail.vb index f8ae4fa..e85c490 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.vb +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.vb @@ -75,6 +75,7 @@ Public Class frmColumn_Detail ADVANCED_LOOKUPCheckbox.Checked, SUMMARY_FUNCTIONCombobox.EditValue, TYPE_COLUMNComboBox.Text, + LU_CAPTIONTextBox.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 e76a384..3eab5d1 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -890,6 +890,7 @@ Public Class frmFormDesigner lookupProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) lookupProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) lookupProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), "")) + props = lookupProps ElseIf TypeOf sender Is GridControl Then