From 97eb1abd785b02c80fa63083ca2c9447a2cdc40b Mon Sep 17 00:00:00 2001 From: JenneJ Date: Mon, 6 Mar 2017 15:42:42 +0100 Subject: [PATCH] jj 06.03.17 --- .../DD_ECMAdmin.Designer.vb | 144 +++++++++++------- app/DD-Record-Organizer/DD_ECMAdmin.xsd | 48 +++--- app/DD-Record-Organizer/frmLevel_Designer.vb | 7 +- .../frmWD_Resultlist_Config.Designer.vb | 20 ++- .../frmWD_Resultlist_Config.resx | 19 ++- .../frmWD_Resultlist_Config.vb | 24 +-- 6 files changed, 161 insertions(+), 101 deletions(-) diff --git a/app/DD-Record-Organizer/DD_ECMAdmin.Designer.vb b/app/DD-Record-Organizer/DD_ECMAdmin.Designer.vb index 87fdef8..4ec510f 100644 --- a/app/DD-Record-Organizer/DD_ECMAdmin.Designer.vb +++ b/app/DD-Record-Organizer/DD_ECMAdmin.Designer.vb @@ -4146,6 +4146,8 @@ Partial Public Class DD_ECMAdmin Private columnCONFIG_COLUMNS As Global.System.Data.DataColumn + Private columnSEQUENCE As Global.System.Data.DataColumn + _ Public Sub New() @@ -4293,6 +4295,14 @@ Partial Public Class DD_ECMAdmin End Get End Property + _ + Public ReadOnly Property SEQUENCEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSEQUENCE + End Get + End Property + _ @@ -4330,9 +4340,9 @@ Partial Public Class DD_ECMAdmin _ - Public Overloads Function AddTBPMO_DOCSEARCH_RESULTLIST_CONFIGRow(ByVal ENTITY_ID As Integer, ByVal LANGUAGE As String, ByVal COLUMN_VIEW As String, ByVal HEADER_CAPTION As String, ByVal WIDTH As Integer, ByVal TYPE_ID As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal VISIBLE As Boolean, ByVal EDITABLE As Boolean, ByVal CONFIG_COLUMNS As Boolean) As TBPMO_DOCSEARCH_RESULTLIST_CONFIGRow + Public Overloads Function AddTBPMO_DOCSEARCH_RESULTLIST_CONFIGRow(ByVal ENTITY_ID As Integer, ByVal LANGUAGE As String, ByVal COLUMN_VIEW As String, ByVal HEADER_CAPTION As String, ByVal WIDTH As Integer, ByVal TYPE_ID As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal VISIBLE As Boolean, ByVal EDITABLE As Boolean, ByVal CONFIG_COLUMNS As Boolean, ByVal SEQUENCE As Integer) As TBPMO_DOCSEARCH_RESULTLIST_CONFIGRow Dim rowTBPMO_DOCSEARCH_RESULTLIST_CONFIGRow As TBPMO_DOCSEARCH_RESULTLIST_CONFIGRow = CType(Me.NewRow,TBPMO_DOCSEARCH_RESULTLIST_CONFIGRow) - Dim columnValuesArray() As Object = New Object() {Nothing, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS} + Dim columnValuesArray() As Object = New Object() {Nothing, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS, SEQUENCE} rowTBPMO_DOCSEARCH_RESULTLIST_CONFIGRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBPMO_DOCSEARCH_RESULTLIST_CONFIGRow) Return rowTBPMO_DOCSEARCH_RESULTLIST_CONFIGRow @@ -4375,6 +4385,7 @@ Partial Public Class DD_ECMAdmin Me.columnVISIBLE = MyBase.Columns("VISIBLE") Me.columnEDITABLE = MyBase.Columns("EDITABLE") Me.columnCONFIG_COLUMNS = MyBase.Columns("CONFIG_COLUMNS") + Me.columnSEQUENCE = MyBase.Columns("SEQUENCE") End Sub _ + Public Property SEQUENCE() As Integer + Get + Return CType(Me(Me.tableTBPMO_DOCSEARCH_RESULTLIST_CONFIG.SEQUENCEColumn),Integer) + End Get + Set + Me(Me.tableTBPMO_DOCSEARCH_RESULTLIST_CONFIG.SEQUENCEColumn) = value + End Set + End Property + _ Public Function IsADDED_WHENNull() As Boolean @@ -12712,6 +12737,7 @@ Namespace DD_ECMAdminTableAdapters tableMapping.ColumnMappings.Add("VISIBLE", "VISIBLE") tableMapping.ColumnMappings.Add("EDITABLE", "EDITABLE") tableMapping.ColumnMappings.Add("CONFIG_COLUMNS", "CONFIG_COLUMNS") + tableMapping.ColumnMappings.Add("SEQUENCE", "SEQUENCE") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -12724,7 +12750,8 @@ Namespace DD_ECMAdminTableAdapters "HO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AN"& _ "D ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @O"& _ "riginal_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Or"& _ - "iginal_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS))" + "iginal_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS) AND ([SEQUENC"& _ + "E] = @Original_SEQUENCE))" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ENTITY_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) @@ -12743,16 +12770,18 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VISIBLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VISIBLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EDITABLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EDITABLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONFIG_COLUMNS", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONFIG_COLUMNS", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SEQUENCE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] ([ENTITY_ID], [LANGUAGE], [COLUMN"& _ "_VIEW], [HEADER_CAPTION], [WIDTH], [TYPE_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGE"& _ - "D_WHO], [CHANGED_WHEN], [VISIBLE], [EDITABLE], [CONFIG_COLUMNS]) VALUES (@ENTITY"& _ - "_ID, @LANGUAGE, @COLUMN_VIEW, @HEADER_CAPTION, @WIDTH, @TYPE_ID, @ADDED_WHO, @AD"& _ - "DED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @VISIBLE, @EDITABLE, @CONFIG_COLUMNS);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"S"& _ - "ELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, AD"& _ - "DED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMN"& _ - "S FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE (GUID = SCOPE_IDENTITY())" + "D_WHO], [CHANGED_WHEN], [VISIBLE], [EDITABLE], [CONFIG_COLUMNS], [SEQUENCE]) VAL"& _ + "UES (@ENTITY_ID, @LANGUAGE, @COLUMN_VIEW, @HEADER_CAPTION, @WIDTH, @TYPE_ID, @AD"& _ + "DED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @VISIBLE, @EDITABLE, @CONFIG_"& _ + "COLUMNS, @SEQUENCE);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPT"& _ + "ION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, "& _ + "EDITABLE, CONFIG_COLUMNS, SEQUENCE FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE "& _ + "(GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -12767,26 +12796,27 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VISIBLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VISIBLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EDITABLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EDITABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONFIG_COLUMNS", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONFIG_COLUMNS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", 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 [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] SET [ENTITY_ID] = @ENTITY_ID, [LANGUAG"& _ "E] = @LANGUAGE, [COLUMN_VIEW] = @COLUMN_VIEW, [HEADER_CAPTION] = @HEADER_CAPTION"& _ ", [WIDTH] = @WIDTH, [TYPE_ID] = @TYPE_ID, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN]"& _ " = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [V"& _ - "ISIBLE] = @VISIBLE, [EDITABLE] = @EDITABLE, [CONFIG_COLUMNS] = @CONFIG_COLUMNS W"& _ - "HERE (([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LA"& _ - "NGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND (["& _ - "HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND "& _ - "([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@I"& _ - "sNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDE"& _ - "D_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_W"& _ - "HO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] "& _ - "IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Origina"& _ - "l_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Origin"& _ - "al_CONFIG_COLUMNS));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPT"& _ - "ION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, "& _ - "EDITABLE, CONFIG_COLUMNS FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE (GUID = @G"& _ - "UID)" + "ISIBLE] = @VISIBLE, [EDITABLE] = @EDITABLE, [CONFIG_COLUMNS] = @CONFIG_COLUMNS, "& _ + "[SEQUENCE] = @SEQUENCE WHERE (([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Orig"& _ + "inal_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Orig"& _ + "inal_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH]"& _ + " = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Orig"& _ + "inal_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDE"& _ + "D_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO]"& _ + " IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN"& _ + " = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) A"& _ + "ND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([C"& _ + "ONFIG_COLUMNS] = @Original_CONFIG_COLUMNS) AND ([SEQUENCE] = @Original_SEQUENCE)"& _ + ");"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_I"& _ + "D, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_C"& _ + "OLUMNS, SEQUENCE FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -12801,6 +12831,7 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VISIBLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VISIBLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EDITABLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EDITABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONFIG_COLUMNS", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONFIG_COLUMNS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ENTITY_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) @@ -12818,6 +12849,7 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VISIBLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VISIBLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EDITABLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EDITABLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONFIG_COLUMNS", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONFIG_COLUMNS", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SEQUENCE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub @@ -12895,7 +12927,7 @@ Namespace DD_ECMAdminTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, true)> _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_ENTITY_ID As Integer, ByVal Original_LANGUAGE As String, ByVal Original_COLUMN_VIEW As String, ByVal Original_HEADER_CAPTION As String, ByVal Original_WIDTH As Integer, ByVal Original_TYPE_ID As Byte, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_VISIBLE As Boolean, ByVal Original_EDITABLE As Boolean, ByVal Original_CONFIG_COLUMNS As Boolean) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_ENTITY_ID As Integer, ByVal Original_LANGUAGE As String, ByVal Original_COLUMN_VIEW As String, ByVal Original_HEADER_CAPTION As String, ByVal Original_WIDTH As Integer, ByVal Original_TYPE_ID As Byte, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_VISIBLE As Boolean, ByVal Original_EDITABLE As Boolean, ByVal Original_CONFIG_COLUMNS As Boolean, ByVal Original_SEQUENCE As Integer) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_ENTITY_ID,Integer) If (Original_LANGUAGE Is Nothing) Then @@ -12944,6 +12976,7 @@ Namespace DD_ECMAdminTableAdapters Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_VISIBLE,Boolean) Me.Adapter.DeleteCommand.Parameters(15).Value = CType(Original_EDITABLE,Boolean) Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_CONFIG_COLUMNS,Boolean) + Me.Adapter.DeleteCommand.Parameters(17).Value = CType(Original_SEQUENCE,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -12963,7 +12996,7 @@ Namespace DD_ECMAdminTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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 ENTITY_ID As Integer, ByVal LANGUAGE As String, ByVal COLUMN_VIEW As String, ByVal HEADER_CAPTION As String, ByVal WIDTH As Integer, ByVal TYPE_ID As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal VISIBLE As Boolean, ByVal EDITABLE As Boolean, ByVal CONFIG_COLUMNS As Boolean) As Integer + Public Overloads Overridable Function Insert(ByVal ENTITY_ID As Integer, ByVal LANGUAGE As String, ByVal COLUMN_VIEW As String, ByVal HEADER_CAPTION As String, ByVal WIDTH As Integer, ByVal TYPE_ID As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal VISIBLE As Boolean, ByVal EDITABLE As Boolean, ByVal CONFIG_COLUMNS As Boolean, ByVal SEQUENCE As Integer) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(ENTITY_ID,Integer) If (LANGUAGE Is Nothing) Then Throw New Global.System.ArgumentNullException("LANGUAGE") @@ -13005,6 +13038,7 @@ Namespace DD_ECMAdminTableAdapters Me.Adapter.InsertCommand.Parameters(10).Value = CType(VISIBLE,Boolean) Me.Adapter.InsertCommand.Parameters(11).Value = CType(EDITABLE,Boolean) Me.Adapter.InsertCommand.Parameters(12).Value = CType(CONFIG_COLUMNS,Boolean) + Me.Adapter.InsertCommand.Parameters(13).Value = CType(SEQUENCE,Integer) 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 @@ -13038,6 +13072,7 @@ Namespace DD_ECMAdminTableAdapters ByVal VISIBLE As Boolean, _ ByVal EDITABLE As Boolean, _ ByVal CONFIG_COLUMNS As Boolean, _ + ByVal SEQUENCE As Integer, _ ByVal Original_GUID As Integer, _ ByVal Original_ENTITY_ID As Integer, _ ByVal Original_LANGUAGE As String, _ @@ -13052,6 +13087,7 @@ Namespace DD_ECMAdminTableAdapters ByVal Original_VISIBLE As Boolean, _ ByVal Original_EDITABLE As Boolean, _ ByVal Original_CONFIG_COLUMNS As Boolean, _ + ByVal Original_SEQUENCE As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(ENTITY_ID,Integer) If (LANGUAGE Is Nothing) Then @@ -13094,55 +13130,57 @@ Namespace DD_ECMAdminTableAdapters Me.Adapter.UpdateCommand.Parameters(10).Value = CType(VISIBLE,Boolean) Me.Adapter.UpdateCommand.Parameters(11).Value = CType(EDITABLE,Boolean) Me.Adapter.UpdateCommand.Parameters(12).Value = CType(CONFIG_COLUMNS,Boolean) - Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_ENTITY_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(SEQUENCE,Integer) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_ENTITY_ID,Integer) If (Original_LANGUAGE Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_LANGUAGE") Else - Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_LANGUAGE,String) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_LANGUAGE,String) End If If (Original_COLUMN_VIEW Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_COLUMN_VIEW") Else - Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_COLUMN_VIEW,String) + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_COLUMN_VIEW,String) End If If (Original_HEADER_CAPTION Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_HEADER_CAPTION") Else - Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_HEADER_CAPTION,String) + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(Original_HEADER_CAPTION,String) End If - Me.Adapter.UpdateCommand.Parameters(18).Value = CType(Original_WIDTH,Integer) - Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_TYPE_ID,Byte) + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_WIDTH,Integer) + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_TYPE_ID,Byte) If (Original_ADDED_WHO Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") Else - Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_ADDED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_ADDED_WHO,String) End If If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(21).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_ADDED_WHEN.Value,Date) + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_ADDED_WHEN.Value,Date) Else - Me.Adapter.UpdateCommand.Parameters(21).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(22).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(23).Value = Global.System.DBNull.Value End If If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(23).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(24).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(25).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(23).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_CHANGED_WHO,String) End If If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(25).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(26).Value = CType(Original_CHANGED_WHEN.Value,Date) + Me.Adapter.UpdateCommand.Parameters(26).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(27).Value = CType(Original_CHANGED_WHEN.Value,Date) Else - Me.Adapter.UpdateCommand.Parameters(25).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(26).Value = Global.System.DBNull.Value - End If - Me.Adapter.UpdateCommand.Parameters(27).Value = CType(Original_VISIBLE,Boolean) - Me.Adapter.UpdateCommand.Parameters(28).Value = CType(Original_EDITABLE,Boolean) - Me.Adapter.UpdateCommand.Parameters(29).Value = CType(Original_CONFIG_COLUMNS,Boolean) - Me.Adapter.UpdateCommand.Parameters(30).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(26).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(27).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(28).Value = CType(Original_VISIBLE,Boolean) + Me.Adapter.UpdateCommand.Parameters(29).Value = CType(Original_EDITABLE,Boolean) + Me.Adapter.UpdateCommand.Parameters(30).Value = CType(Original_CONFIG_COLUMNS,Boolean) + Me.Adapter.UpdateCommand.Parameters(31).Value = CType(Original_SEQUENCE,Integer) + Me.Adapter.UpdateCommand.Parameters(32).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -13176,6 +13214,7 @@ Namespace DD_ECMAdminTableAdapters ByVal VISIBLE As Boolean, _ ByVal EDITABLE As Boolean, _ ByVal CONFIG_COLUMNS As Boolean, _ + ByVal SEQUENCE As Integer, _ ByVal Original_GUID As Integer, _ ByVal Original_ENTITY_ID As Integer, _ ByVal Original_LANGUAGE As String, _ @@ -13189,8 +13228,9 @@ Namespace DD_ECMAdminTableAdapters ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ ByVal Original_VISIBLE As Boolean, _ ByVal Original_EDITABLE As Boolean, _ - ByVal Original_CONFIG_COLUMNS As Boolean) As Integer - Return Me.Update(ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS, Original_GUID, Original_ENTITY_ID, Original_LANGUAGE, Original_COLUMN_VIEW, Original_HEADER_CAPTION, Original_WIDTH, Original_TYPE_ID, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_VISIBLE, Original_EDITABLE, Original_CONFIG_COLUMNS, Original_GUID) + ByVal Original_CONFIG_COLUMNS As Boolean, _ + ByVal Original_SEQUENCE As Integer) As Integer + Return Me.Update(ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS, SEQUENCE, Original_GUID, Original_ENTITY_ID, Original_LANGUAGE, Original_COLUMN_VIEW, Original_HEADER_CAPTION, Original_WIDTH, Original_TYPE_ID, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_VISIBLE, Original_EDITABLE, Original_CONFIG_COLUMNS, Original_SEQUENCE, Original_GUID) End Function End Class diff --git a/app/DD-Record-Organizer/DD_ECMAdmin.xsd b/app/DD-Record-Organizer/DD_ECMAdmin.xsd index 1b7cafb..c46dd40 100644 --- a/app/DD-Record-Organizer/DD_ECMAdmin.xsd +++ b/app/DD-Record-Organizer/DD_ECMAdmin.xsd @@ -496,7 +496,7 @@ WHERE (T2.GUID = @ENTITY_ID) - DELETE FROM [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] WHERE (([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS)) + DELETE FROM [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] WHERE (([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS) AND ([SEQUENCE] = @Original_SEQUENCE)) @@ -515,13 +515,14 @@ WHERE (T2.GUID = @ENTITY_ID) + - INSERT INTO [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] ([ENTITY_ID], [LANGUAGE], [COLUMN_VIEW], [HEADER_CAPTION], [WIDTH], [TYPE_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [VISIBLE], [EDITABLE], [CONFIG_COLUMNS]) VALUES (@ENTITY_ID, @LANGUAGE, @COLUMN_VIEW, @HEADER_CAPTION, @WIDTH, @TYPE_ID, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @VISIBLE, @EDITABLE, @CONFIG_COLUMNS); -SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE (GUID = SCOPE_IDENTITY()) + INSERT INTO [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] ([ENTITY_ID], [LANGUAGE], [COLUMN_VIEW], [HEADER_CAPTION], [WIDTH], [TYPE_ID], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [VISIBLE], [EDITABLE], [CONFIG_COLUMNS], [SEQUENCE]) VALUES (@ENTITY_ID, @LANGUAGE, @COLUMN_VIEW, @HEADER_CAPTION, @WIDTH, @TYPE_ID, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @VISIBLE, @EDITABLE, @CONFIG_COLUMNS, @SEQUENCE); +SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS, SEQUENCE FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE (GUID = SCOPE_IDENTITY()) @@ -536,6 +537,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A + @@ -548,8 +550,8 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - UPDATE [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] SET [ENTITY_ID] = @ENTITY_ID, [LANGUAGE] = @LANGUAGE, [COLUMN_VIEW] = @COLUMN_VIEW, [HEADER_CAPTION] = @HEADER_CAPTION, [WIDTH] = @WIDTH, [TYPE_ID] = @TYPE_ID, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [VISIBLE] = @VISIBLE, [EDITABLE] = @EDITABLE, [CONFIG_COLUMNS] = @CONFIG_COLUMNS WHERE (([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS)); -SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE (GUID = @GUID) + UPDATE [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] SET [ENTITY_ID] = @ENTITY_ID, [LANGUAGE] = @LANGUAGE, [COLUMN_VIEW] = @COLUMN_VIEW, [HEADER_CAPTION] = @HEADER_CAPTION, [WIDTH] = @WIDTH, [TYPE_ID] = @TYPE_ID, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [VISIBLE] = @VISIBLE, [EDITABLE] = @EDITABLE, [CONFIG_COLUMNS] = @CONFIG_COLUMNS, [SEQUENCE] = @SEQUENCE WHERE (([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS) AND ([SEQUENCE] = @Original_SEQUENCE)); +SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS, SEQUENCE FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE (GUID = @GUID) @@ -564,6 +566,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A + @@ -581,6 +584,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A + @@ -602,6 +606,7 @@ SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, A + @@ -667,7 +672,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -713,7 +718,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -834,7 +839,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -907,14 +912,14 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + - + @@ -943,7 +948,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -955,7 +960,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -976,7 +981,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -990,7 +995,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -1002,7 +1007,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -1014,7 +1019,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -1129,7 +1134,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -1173,7 +1178,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -1220,10 +1225,11 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG + - + @@ -1283,7 +1289,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + @@ -1338,7 +1344,7 @@ FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmLevel_Designer.vb b/app/DD-Record-Organizer/frmLevel_Designer.vb index bd11a2b..f4afb66 100644 --- a/app/DD-Record-Organizer/frmLevel_Designer.vb +++ b/app/DD-Record-Organizer/frmLevel_Designer.vb @@ -666,7 +666,8 @@ Try Dim controlId = DirectCast(ctrl.Tag, ClassControlMetadata).Id - Dim sql As String = String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_ID = {0}", ControlId) + Dim sql As String = String.Format("SELECT T.*, dbo.FNPMO_GET_CONTROL_CAPTION ('{0}',{1},{2}) AS 'CAPTION_TRANSLATED' FROM VWPMO_CONTROL_SCREEN T WHERE CONTROL_ID = {2}", USER_LANGUAGE, CURRENT_SCREEN_ID, controlId) + 'Dim sql As String = String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_ID = {0}", controlId) 'Dim sqlHint As String = String.Format("SELECT HINT FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID = {0} AND LANGUAGE_TYPE = '{1}'", controlId, USER_LANGUAGE) Dim sqlHint = String.Format("SELECT HINT FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID = (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = {0} AND SCREEN_ID = {1}) AND LANGUAGE_TYPE = '{2}'", controlId, CURRENT_SCREEN_ID, USER_LANGUAGE) @@ -726,7 +727,9 @@ CType(r.Item("CTRLSCR_FONT_SIZE"), Single), CType(r.Item("CTRLSCR_FONT_STYLE"), FontStyle)) props.ColumnTitle = r.Item("CONTROL_COL_NAME") - props.Caption = r.Item("CTRLSCR_CAPTION") + + props.Caption = r.Item("CAPTION_TRANSLATED") + 'props.Caption = r.Item("CTRLSCR_CAPTION") props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), "")) props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW")) diff --git a/app/DD-Record-Organizer/frmWD_Resultlist_Config.Designer.vb b/app/DD-Record-Organizer/frmWD_Resultlist_Config.Designer.vb index 1ab1ae8..15daa80 100644 --- a/app/DD-Record-Organizer/frmWD_Resultlist_Config.Designer.vb +++ b/app/DD-Record-Organizer/frmWD_Resultlist_Config.Designer.vb @@ -52,6 +52,7 @@ Partial Class frmWD_Resultlist_Config Me.colCHANGED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() Me.colCHANGED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() Me.colVISIBLE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colEDITABLE = New DevExpress.XtraGrid.Columns.GridColumn() Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.TYPE_IDComboBox = New System.Windows.Forms.ComboBox() Me.TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -179,7 +180,7 @@ Partial Class frmWD_Resultlist_Config ' 'grvwMain ' - Me.grvwMain.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colENTITY_ID, Me.colLANGUAGE, Me.colCOLUMN_VIEW, Me.colHEADER_CAPTION, Me.colWIDTH, Me.colTYPE_ID, Me.colADDED_WHO, Me.colADDED_WHEN, Me.colCHANGED_WHO, Me.colCHANGED_WHEN, Me.colVISIBLE, Me.colNAME}) + Me.grvwMain.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colENTITY_ID, Me.colLANGUAGE, Me.colCOLUMN_VIEW, Me.colHEADER_CAPTION, Me.colWIDTH, Me.colTYPE_ID, Me.colADDED_WHO, Me.colADDED_WHEN, Me.colCHANGED_WHO, Me.colCHANGED_WHEN, Me.colVISIBLE, Me.colEDITABLE, Me.colNAME}) Me.grvwMain.GridControl = Me.GridMain Me.grvwMain.Name = "grvwMain" Me.grvwMain.OptionsBehavior.Editable = False @@ -257,6 +258,12 @@ Partial Class frmWD_Resultlist_Config Me.colVISIBLE.Name = "colVISIBLE" resources.ApplyResources(Me.colVISIBLE, "colVISIBLE") ' + 'colEDITABLE + ' + Me.colEDITABLE.FieldName = "EDITABLE" + Me.colEDITABLE.Name = "colEDITABLE" + resources.ApplyResources(Me.colEDITABLE, "colEDITABLE") + ' 'colNAME ' resources.ApplyResources(Me.colNAME, "colNAME") @@ -646,6 +653,11 @@ Partial Class frmWD_Resultlist_Config Friend WithEvents ADDED_WHENTextBox As System.Windows.Forms.TextBox Friend WithEvents CHANGED_WHOTextBox As System.Windows.Forms.TextBox Friend WithEvents CHANGED_WHENTextBox As System.Windows.Forms.TextBox + Friend WithEvents EDITABLECheckBox As System.Windows.Forms.CheckBox + Friend WithEvents CONFIG_CLOUMNSCheckbox As System.Windows.Forms.CheckBox + Friend WithEvents TYPE_IDComboBox As System.Windows.Forms.ComboBox + Friend WithEvents TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDBindingSource As System.Windows.Forms.BindingSource + Friend WithEvents TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDTableAdapter As DD_Record_Organizer.DD_ECMAdminTableAdapters.TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDTableAdapter Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colENTITY_ID As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colLANGUAGE As DevExpress.XtraGrid.Columns.GridColumn @@ -658,10 +670,6 @@ Partial Class frmWD_Resultlist_Config Friend WithEvents colCHANGED_WHO As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colCHANGED_WHEN As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colVISIBLE As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colEDITABLE As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colNAME As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents EDITABLECheckBox As System.Windows.Forms.CheckBox - Friend WithEvents CONFIG_CLOUMNSCheckbox As System.Windows.Forms.CheckBox - Friend WithEvents TYPE_IDComboBox As System.Windows.Forms.ComboBox - Friend WithEvents TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDTableAdapter As DD_Record_Organizer.DD_ECMAdminTableAdapters.TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDTableAdapter End Class diff --git a/app/DD-Record-Organizer/frmWD_Resultlist_Config.resx b/app/DD-Record-Organizer/frmWD_Resultlist_Config.resx index 2ffff83..f5f3128 100644 --- a/app/DD-Record-Organizer/frmWD_Resultlist_Config.resx +++ b/app/DD-Record-Organizer/frmWD_Resultlist_Config.resx @@ -175,7 +175,7 @@ True - 1 + 0 True @@ -243,6 +243,12 @@ 12 + + True + + + 13 + NAME @@ -250,7 +256,7 @@ True - 0 + 1 864, 280 @@ -312,6 +318,9 @@ True + + False + 15, 203 @@ -1280,6 +1289,12 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colEDITABLE + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + colNAME diff --git a/app/DD-Record-Organizer/frmWD_Resultlist_Config.vb b/app/DD-Record-Organizer/frmWD_Resultlist_Config.vb index 351bf8c..a36f2f1 100644 --- a/app/DD-Record-Organizer/frmWD_Resultlist_Config.vb +++ b/app/DD-Record-Organizer/frmWD_Resultlist_Config.vb @@ -1,18 +1,6 @@ Public Class frmWD_Resultlist_Config - 'Private Class ResultListType - ' Public Property Name As String - ' Public Property Id As Integer - - ' Public Sub New(Id As Integer, Name As String) - ' Me.Name = Name - ' Me.Id = Id - ' End Sub - 'End Class - Private Sub frmWD_Resultlist_Config_Load(sender As Object, e As EventArgs) Handles MyBase.Load - 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_ID". Sie können sie bei Bedarf verschieben oder entfernen. - Try Me.TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_IDTableAdapter.Fill(Me.DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_ID) @@ -21,12 +9,6 @@ Me.TBWH_ENTITYTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBWH_ENTITYTableAdapter.Fill(Me.DD_DMSDataSet.TBWH_ENTITY, USER_LANGUAGE) - 'Dim ResultListTypes As New List(Of ResultListType) - 'ResultListTypes.Add(New ResultListType(1, "TextBox")) - 'ResultListTypes.Add(New ResultListType(2, "CheckBox")) - 'ResultListTypes.Add(New ResultListType(3, "DatePicker")) - 'ResultListTypes.Add(New ResultListType(4, "DropDown")) - ' Gruppierung nach Entität und dann nach Sprache grvwMain.Columns.Item("NAME").GroupIndex = 0 grvwMain.Columns.Item("LANGUAGE").GroupIndex = 1 @@ -62,6 +44,12 @@ Private Sub TBPMO_DOCSEARCH_RESULTLIST_CONFIGBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_DOCSEARCH_RESULTLIST_CONFIGBindingSource.AddingNew DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG.ADDED_WHOColumn.DefaultValue = USER_USERNAME + ' Alle neuhinzugefügten Columns müssen CONFIG_COLUMNS = True haben + DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG.CONFIG_COLUMNSColumn.DefaultValue = True + + ' VISIBLE und EDITABLE sollen explizit ausgewählt werden, deshalb erstmal False setzen + DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG.VISIBLEColumn.DefaultValue = False + DD_ECMAdmin.TBPMO_DOCSEARCH_RESULTLIST_CONFIG.EDITABLEColumn.DefaultValue = False End Sub Private Sub grvwMain_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles grvwMain.FocusedRowChanged