From d82eb5cc2ad7032b531690db99a0fef34bc555ac Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 17 Oct 2019 14:18:15 +0200 Subject: [PATCH] MS Changes layout Force etc --- app/DD_PM_WINDREAM/ClassInit.vb | 10 + .../DD_DMSLiteDataSet.Designer.vb | 373 ++++++++++++++---- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 181 ++++++--- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 42 +- .../FinalIndexDataSet.Designer.vb | 53 ++- app/DD_PM_WINDREAM/FinalIndexDataSet.xsd | 20 +- .../ModuleFinalIndexProperties.vb | 6 + app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 3 + .../frmAdministration.Designer.vb | 19 + app/DD_PM_WINDREAM/frmAdministration.resx | 122 ++++-- app/DD_PM_WINDREAM/frmAdministration.vb | 9 +- app/DD_PM_WINDREAM/frmMain.Designer.vb | 1 - app/DD_PM_WINDREAM/frmMain.resx | 196 ++++----- app/DD_PM_WINDREAM/frmMain.vb | 97 +++-- 14 files changed, 791 insertions(+), 341 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 66e9342..0b01de1 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -182,7 +182,17 @@ Public Class ClassInit USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")) USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + Try + FORCE_LAYOUT_OVERVIEW = DT_CHECKUSER_MODULE.Rows(0).Item("PM_FORCE_LAYOUT_OVERVIEW") + Catch ex As Exception + FORCE_LAYOUT_OVERVIEW = False + End Try + Try + WORKING_MODE = DT_CHECKUSER_MODULE.Rows(0).Item("WORKING_MODE") + Catch ex As Exception + WORKING_MODE = "" + End Try LOGGER.Debug("User exists....") 'Am System anmelden Refresh_Licence() diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 6cfff9b..2d12dcc 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -890,6 +890,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnACTIVE As Global.System.Data.DataColumn + Private columnIF_VEKTOR_BEHAVIOUR As Global.System.Data.DataColumn + _ Public Sub New() @@ -1013,6 +1015,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property IF_VEKTOR_BEHAVIOURColumn() As Global.System.Data.DataColumn + Get + Return Me.columnIF_VEKTOR_BEHAVIOUR + End Get + End Property + _ @@ -1050,9 +1060,9 @@ Partial Public Class DD_DMSLiteDataSet _ - Public Overloads Function AddTBPM_PROFILE_FINAL_INDEXINGRow(ByVal INDEXNAME As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String, ByVal DESCRIPTION As String, ByVal ACTIVE As Boolean) As TBPM_PROFILE_FINAL_INDEXINGRow + Public Overloads Function AddTBPM_PROFILE_FINAL_INDEXINGRow(ByVal INDEXNAME As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String, ByVal DESCRIPTION As String, ByVal ACTIVE As Boolean, ByVal IF_VEKTOR_BEHAVIOUR As String) As TBPM_PROFILE_FINAL_INDEXINGRow Dim rowTBPM_PROFILE_FINAL_INDEXINGRow As TBPM_PROFILE_FINAL_INDEXINGRow = CType(Me.NewRow,TBPM_PROFILE_FINAL_INDEXINGRow) - Dim columnValuesArray() As Object = New Object() {INDEXNAME, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, Nothing, CONNECTION_ID, SQL_COMMAND, DESCRIPTION, ACTIVE} + Dim columnValuesArray() As Object = New Object() {INDEXNAME, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, Nothing, CONNECTION_ID, SQL_COMMAND, DESCRIPTION, ACTIVE, IF_VEKTOR_BEHAVIOUR} rowTBPM_PROFILE_FINAL_INDEXINGRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBPM_PROFILE_FINAL_INDEXINGRow) Return rowTBPM_PROFILE_FINAL_INDEXINGRow @@ -1092,6 +1102,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnSQL_COMMAND = MyBase.Columns("SQL_COMMAND") Me.columnDESCRIPTION = MyBase.Columns("DESCRIPTION") Me.columnACTIVE = MyBase.Columns("ACTIVE") + Me.columnIF_VEKTOR_BEHAVIOUR = MyBase.Columns("IF_VEKTOR_BEHAVIOUR") End Sub _ Public Sub New() @@ -4865,6 +4884,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property DISPLAY_MODEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDISPLAY_MODE + End Get + End Property + _ @@ -4925,9 +4952,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal SQL_VIEW As String, _ ByVal ANNOTATE_ALL_WORK_HISTORY_ENTRIES As Boolean, _ ByVal ANNOTATE_WORK_HISTORY_ENTRY As Boolean, _ - ByVal WORK_HISTORY_ENTRY As String) As TBPM_PROFILERow + ByVal WORK_HISTORY_ENTRY As String, _ + ByVal DISPLAY_MODE As String) As TBPM_PROFILERow Dim rowTBPM_PROFILERow As TBPM_PROFILERow = CType(Me.NewRow,TBPM_PROFILERow) - Dim columnValuesArray() As Object = New Object() {Nothing, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, Nothing, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY} + Dim columnValuesArray() As Object = New Object() {Nothing, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, Nothing, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE} If (Not (parentTBPM_TYPERowByFK_TBPM_PROFILE_TYPE1) Is Nothing) Then columnValuesArray(15) = parentTBPM_TYPERowByFK_TBPM_PROFILE_TYPE1(0) End If @@ -4983,6 +5011,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnANNOTATE_ALL_WORK_HISTORY_ENTRIES = MyBase.Columns("ANNOTATE_ALL_WORK_HISTORY_ENTRIES") Me.columnANNOTATE_WORK_HISTORY_ENTRY = MyBase.Columns("ANNOTATE_WORK_HISTORY_ENTRY") Me.columnWORK_HISTORY_ENTRY = MyBase.Columns("WORK_HISTORY_ENTRY") + Me.columnDISPLAY_MODE = MyBase.Columns("DISPLAY_MODE") End Sub _ Public Property ACTIVE() As Boolean Get - Try - Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.ACTIVEColumn),Boolean) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ACTIVE in Tabelle TBPM_PROFILE_FINAL_INDEXING ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.ACTIVEColumn),Boolean) End Get Set Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.ACTIVEColumn) = value End Set End Property + _ + Public Property IF_VEKTOR_BEHAVIOUR() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOURColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOURColumn) = value + End Set + End Property + _ Public Function IsCHANGED_WHONull() As Boolean @@ -8591,18 +8633,6 @@ Partial Public Class DD_DMSLiteDataSet Public Sub SetCHANGED_WHENNull() Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub - - _ - Public Function IsACTIVENull() As Boolean - Return Me.IsNull(Me.tableTBPM_PROFILE_FINAL_INDEXING.ACTIVEColumn) - End Function - - _ - Public Sub SetACTIVENull() - Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.ACTIVEColumn) = Global.System.Convert.DBNull - End Sub End Class ''' @@ -10620,11 +10650,7 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Property ADDED_WHEN() As Date Get - Try - Return CType(Me(Me.tableTBPM_PROFILE.ADDED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBPM_PROFILE ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBPM_PROFILE.ADDED_WHENColumn),Date) End Get Set Me(Me.tableTBPM_PROFILE.ADDED_WHENColumn) = value @@ -10805,6 +10831,17 @@ Partial Public Class DD_DMSLiteDataSet End Set End Property + _ + Public Property DISPLAY_MODE() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE.DISPLAY_MODEColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE.DISPLAY_MODEColumn) = value + End Set + End Property + _ Public Property TBPM_TYPERow() As TBPM_TYPERow @@ -10828,18 +10865,6 @@ Partial Public Class DD_DMSLiteDataSet Me(Me.tableTBPM_PROFILE.DESCRIPTIONColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBPM_PROFILE.ADDED_WHENColumn) - End Function - - _ - Public Sub SetADDED_WHENNull() - Me(Me.tableTBPM_PROFILE.ADDED_WHENColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsCHANGED_WHONull() As Boolean @@ -13784,6 +13809,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("SQL_COMMAND", "SQL_COMMAND") tableMapping.ColumnMappings.Add("DESCRIPTION", "DESCRIPTION") tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + tableMapping.ColumnMappings.Add("IF_VEKTOR_BEHAVIOUR", "IF_VEKTOR_BEHAVIOUR") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -13793,8 +13819,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPM_PROFILE_FINAL_INDEXING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PROFIL_ID, IND"& _ - "EXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PROFIL_ID"& _ - ",@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMAND)" + "EXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND, IF_VEKTOR_BEHAVIOUR)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALU"& _ + "ES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMAND,@"& _ + "IF_VEKTOR_BEHAVIOUR)" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -13802,6 +13829,11 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IF_VEKTOR_BEHAVIOUR", Global.System.Data.SqlDbType.VarChar, 25, Global.System.Data.ParameterDirection.Input, 0, 0, "IF_VEKTOR_BEHAVIOUR", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE TBPM_PROFILE_FINAL_INDEXING" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text End Sub _ - Public Overloads Overridable Function CmdInsert(ByVal PROFIL_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String) As Integer + Public Overloads Overridable Function CmdInsert(ByVal PROFIL_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String, ByVal IF_VEKTOR_BEHAVIOUR As String) As Integer Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(3) command.Parameters(0).Value = CType(PROFIL_ID,Integer) If (INDEXNAME Is Nothing) Then @@ -14045,6 +14083,11 @@ Namespace DD_DMSLiteDataSetTableAdapters Else command.Parameters(5).Value = CType(SQL_COMMAND,String) End If + If (IF_VEKTOR_BEHAVIOUR Is Nothing) Then + Throw New Global.System.ArgumentNullException("IF_VEKTOR_BEHAVIOUR") + Else + command.Parameters(6).Value = CType(IF_VEKTOR_BEHAVIOUR,String) + End If 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 @@ -14095,9 +14138,8 @@ Namespace DD_DMSLiteDataSetTableAdapters _ - Public Overloads Overridable Function cmdUpdateSQL(ByVal CON_ID As Short, ByVal COMMAND1 As String, ByVal WHO As String, ByVal GUID As Integer) As Integer + Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ + Public Overloads Overridable Function cmdUpdateSQL(ByVal CON_ID As Short, ByVal COMMAND1 As String, ByVal WHO As String, ByVal IF_VEKTOR_BEHAVIOUR As String, ByVal GUID As Integer) As Integer Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(5) command.Parameters(0).Value = CType(CON_ID,Short) If (COMMAND1 Is Nothing) Then @@ -14110,7 +14152,12 @@ Namespace DD_DMSLiteDataSetTableAdapters Else command.Parameters(2).Value = CType(WHO,String) End If - command.Parameters(3).Value = CType(GUID,Integer) + If (IF_VEKTOR_BEHAVIOUR Is Nothing) Then + Throw New Global.System.ArgumentNullException("IF_VEKTOR_BEHAVIOUR") + Else + command.Parameters(3).Value = CType(IF_VEKTOR_BEHAVIOUR,String) + End If + command.Parameters(4).Value = CType(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 @@ -17955,26 +18002,72 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("ANNOTATE_ALL_WORK_HISTORY_ENTRIES", "ANNOTATE_ALL_WORK_HISTORY_ENTRIES") tableMapping.ColumnMappings.Add("ANNOTATE_WORK_HISTORY_ENTRY", "ANNOTATE_WORK_HISTORY_ENTRY") tableMapping.ColumnMappings.Add("WORK_HISTORY_ENTRY", "WORK_HISTORY_ENTRY") + tableMapping.ColumnMappings.Add("DISPLAY_MODE", "DISPLAY_MODE") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBPM_PROFILE] WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Origin"& _ + "al_NAME) AND ([TITLE] = @Original_TITLE) AND ([PRIORITY] = @Original_PRIORITY) A"& _ + "ND ((@IsNull_DESCRIPTION = 1 AND [DESCRIPTION] IS NULL) OR ([DESCRIPTION] = @Ori"& _ + "ginal_DESCRIPTION)) AND ([ACTIVE] = @Original_ACTIVE) AND ([WD_SEARCH] = @Origin"& _ + "al_WD_SEARCH) AND ([NO_OF_DOCUMENTS] = @Original_NO_OF_DOCUMENTS) AND ([ADDED_WH"& _ + "O] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNul"& _ + "l_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANG"& _ + "ED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED"& _ + "_WHEN] = @Original_CHANGED_WHEN)) AND ([FINAL_PROFILE] = @Original_FINAL_PROFILE"& _ + ") AND ((@IsNull_FINAL_TEXT = 1 AND [FINAL_TEXT] IS NULL) OR ([FINAL_TEXT] = @Ori"& _ + "ginal_FINAL_TEXT)) AND ((@IsNull_MOVE2FOLDER = 1 AND [MOVE2FOLDER] IS NULL) OR ("& _ + "[MOVE2FOLDER] = @Original_MOVE2FOLDER)) AND ([TYPE] = @Original_TYPE) AND ([WD_O"& _ + "BJECTTYPE] = @Original_WD_OBJECTTYPE) AND ([SORT_BY_LATEST] = @Original_SORT_BY_"& _ + "LATEST) AND ([PM_VEKTOR_INDEX] = @Original_PM_VEKTOR_INDEX) AND ([LOG_INDEX] = @"& _ + "Original_LOG_INDEX) AND ([ANNOTATE_ALL_WORK_HISTORY_ENTRIES] = @Original_ANNOTAT"& _ + "E_ALL_WORK_HISTORY_ENTRIES) AND ([ANNOTATE_WORK_HISTORY_ENTRY] = @Original_ANNOT"& _ + "ATE_WORK_HISTORY_ENTRY) AND ((@IsNull_WORK_HISTORY_ENTRY = 1 AND [WORK_HISTORY_E"& _ + "NTRY] IS NULL) OR ([WORK_HISTORY_ENTRY] = @Original_WORK_HISTORY_ENTRY)))" 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, 4, 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_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_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PRIORITY", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRIORITY", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_DESCRIPTION", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_WD_SEARCH", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WD_SEARCH", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NO_OF_DOCUMENTS", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NO_OF_DOCUMENTS", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FINAL_PROFILE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FINAL_PROFILE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FINAL_TEXT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FINAL_TEXT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FINAL_TEXT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FINAL_TEXT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_MOVE2FOLDER", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "MOVE2FOLDER", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_MOVE2FOLDER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "MOVE2FOLDER", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_WD_OBJECTTYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WD_OBJECTTYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SORT_BY_LATEST", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SORT_BY_LATEST", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PM_VEKTOR_INDEX", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_VEKTOR_INDEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOG_INDEX", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_INDEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ANNOTATE_ALL_WORK_HISTORY_ENTRIES", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ANNOTATE_ALL_WORK_HISTORY_ENTRIES", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ANNOTATE_WORK_HISTORY_ENTRY", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ANNOTATE_WORK_HISTORY_ENTRY", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_WORK_HISTORY_ENTRY", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WORK_HISTORY_ENTRY", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_WORK_HISTORY_ENTRY", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WORK_HISTORY_ENTRY", 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 TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (NAME, TITLE, PRIORITY, DESCRI"& _ "PTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, FINAL_PROFILE, FINAL_TEXT,"& _ " MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " WORK_HISTORY_ENTRY, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, "& _ - "ANNOTATE_WORK_HISTORY_ENTRY)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@TITLE,@PRIORITY,@DESCRIPTION"& _ - ",@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@FINAL_PROFILE,@FINAL_TEXT,@MOVE"& _ - "2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@WORK_HISTORY_ENTR"& _ - "Y,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY); "& _ - " "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DO"& _ - "CUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_"& _ - "TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE ("& _ - "GUID = SCOPE_IDENTITY())" + "ANNOTATE_WORK_HISTORY_ENTRY, DISPLAY_MODE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@TITLE,@PRIORIT"& _ + "Y,@DESCRIPTION,@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@FINAL_PROFILE,@FI"& _ + "NAL_TEXT,@MOVE2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@WOR"& _ + "K_HISTORY_ENTRY,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HIST"& _ + "ORY_ENTRY,@DISPLAY_MODE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTIO"& _ + "N, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANG"& _ + "ED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LA"& _ + "TEST FROM TBPM_PROFILE WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -17995,6 +18088,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_VIEW", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_VIEW", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ANNOTATE_ALL_WORK_HISTORY_ENTRIES", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ANNOTATE_ALL_WORK_HISTORY_ENTRIES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ANNOTATE_WORK_HISTORY_ENTRY", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ANNOTATE_WORK_HISTORY_ENTRY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DISPLAY_MODE", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "DISPLAY_MODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NAME = @NAME, TITLE = @TITLE, PRIOR"& _ @@ -18006,10 +18100,11 @@ Namespace DD_DMSLiteDataSetTableAdapters "INDEX, LOG_INDEX = @LOG_INDEX, WORK_HISTORY_ENTRY = @WORK_HISTORY_ENTRY, SQL_VIE"& _ "W = @SQL_VIEW, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" ANNOTATE_ALL_WORK_HISTORY_ENTRIES = @A"& _ "NNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY = @ANNOTATE_WORK_H"& _ - "ISTORY_ENTRY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TI"& _ - "TLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED"& _ - "_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, "& _ - "WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE (GUID = @GUID)" + "ISTORY_ENTRY, DISPLAY_MODE = @DISPLAY_MODE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)"& _ + "; "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, N"& _ + "O_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE,"& _ + " FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE "& _ + "WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -18031,6 +18126,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_VIEW", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_VIEW", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ANNOTATE_ALL_WORK_HISTORY_ENTRIES", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ANNOTATE_ALL_WORK_HISTORY_ENTRIES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ANNOTATE_WORK_HISTORY_ENTRY", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ANNOTATE_WORK_HISTORY_ENTRY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DISPLAY_MODE", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "DISPLAY_MODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -18052,8 +18148,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINA"& _ "L_TEXT, MOVE2FOLDER, TYPE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WD_OBJECTTYPE, SORT_BY_LAT"& _ "EST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, AN"& _ - "NOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORD"& _ - "ER BY NAME" + "NOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBP"& _ + "M_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY NAME" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(1).Connection = Me.Connection @@ -18066,8 +18162,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(3).Connection = Me.Connection - Me._commandCollection(3).CommandText = "SELECT GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (FINAL_PROFILE = 1"& _ - ") AND (UPPER(NAME) = UPPER(@name))" + Me._commandCollection(3).CommandText = "SELECT GUID FROM TBPM_PROFILE WHERE (FINAL_PROFILE = 1) AND (UPPER(NAME) = UPPER("& _ + "@name))" Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@name", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(4) = New Global.System.Data.SqlClient.SqlCommand() @@ -18184,8 +18280,117 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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) As Integer + Public Overloads Overridable Function Delete( _ + ByVal Original_GUID As Integer, _ + ByVal Original_NAME As String, _ + ByVal Original_TITLE As String, _ + ByVal Original_PRIORITY As Integer, _ + ByVal Original_DESCRIPTION As String, _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_WD_SEARCH As String, _ + ByVal Original_NO_OF_DOCUMENTS As Integer, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Date, _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_FINAL_PROFILE As Boolean, _ + ByVal Original_FINAL_TEXT As String, _ + ByVal Original_MOVE2FOLDER As String, _ + ByVal Original_TYPE As Short, _ + ByVal Original_WD_OBJECTTYPE As String, _ + ByVal Original_SORT_BY_LATEST As Boolean, _ + ByVal Original_PM_VEKTOR_INDEX As String, _ + ByVal Original_LOG_INDEX As String, _ + ByVal Original_ANNOTATE_ALL_WORK_HISTORY_ENTRIES As Boolean, _ + ByVal Original_ANNOTATE_WORK_HISTORY_ENTRY As Boolean, _ + ByVal Original_WORK_HISTORY_ENTRY As String) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + If (Original_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_NAME") + Else + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_NAME,String) + End If + If (Original_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_TITLE") + Else + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_TITLE,String) + End If + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_PRIORITY,Integer) + If (Original_DESCRIPTION Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_DESCRIPTION,String) + End If + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_ACTIVE,Boolean) + If (Original_WD_SEARCH Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_WD_SEARCH") + Else + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_WD_SEARCH,String) + End If + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_NO_OF_DOCUMENTS,Integer) + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_ADDED_WHO,String) + End If + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHEN,Date) + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(13).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(13).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(14).Value = Global.System.DBNull.Value + End If + Me.Adapter.DeleteCommand.Parameters(15).Value = CType(Original_FINAL_PROFILE,Boolean) + If (Original_FINAL_TEXT Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(16).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(17).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(16).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(17).Value = CType(Original_FINAL_TEXT,String) + End If + If (Original_MOVE2FOLDER Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(18).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(19).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(18).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(19).Value = CType(Original_MOVE2FOLDER,String) + End If + Me.Adapter.DeleteCommand.Parameters(20).Value = CType(Original_TYPE,Short) + If (Original_WD_OBJECTTYPE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_WD_OBJECTTYPE") + Else + Me.Adapter.DeleteCommand.Parameters(21).Value = CType(Original_WD_OBJECTTYPE,String) + End If + Me.Adapter.DeleteCommand.Parameters(22).Value = CType(Original_SORT_BY_LATEST,Boolean) + If (Original_PM_VEKTOR_INDEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_PM_VEKTOR_INDEX") + Else + Me.Adapter.DeleteCommand.Parameters(23).Value = CType(Original_PM_VEKTOR_INDEX,String) + End If + If (Original_LOG_INDEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_LOG_INDEX") + Else + Me.Adapter.DeleteCommand.Parameters(24).Value = CType(Original_LOG_INDEX,String) + End If + Me.Adapter.DeleteCommand.Parameters(25).Value = CType(Original_ANNOTATE_ALL_WORK_HISTORY_ENTRIES,Boolean) + Me.Adapter.DeleteCommand.Parameters(26).Value = CType(Original_ANNOTATE_WORK_HISTORY_ENTRY,Boolean) + If (Original_WORK_HISTORY_ENTRY Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(27).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(28).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(27).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(28).Value = CType(Original_WORK_HISTORY_ENTRY,String) + End If 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 @@ -18224,7 +18429,8 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal WORK_HISTORY_ENTRY As String, _ ByVal SQL_VIEW As String, _ ByVal ANNOTATE_ALL_WORK_HISTORY_ENTRIES As Boolean, _ - ByVal ANNOTATE_WORK_HISTORY_ENTRY As Boolean) As Integer + ByVal ANNOTATE_WORK_HISTORY_ENTRY As Boolean, _ + ByVal DISPLAY_MODE As String) As Integer If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") Else @@ -18282,12 +18488,17 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.InsertCommand.Parameters(15).Value = CType(WORK_HISTORY_ENTRY,String) End If If (SQL_VIEW Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(16).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("SQL_VIEW") Else Me.Adapter.InsertCommand.Parameters(16).Value = CType(SQL_VIEW,String) End If Me.Adapter.InsertCommand.Parameters(17).Value = CType(ANNOTATE_ALL_WORK_HISTORY_ENTRIES,Boolean) Me.Adapter.InsertCommand.Parameters(18).Value = CType(ANNOTATE_WORK_HISTORY_ENTRY,Boolean) + If (DISPLAY_MODE Is Nothing) Then + Throw New Global.System.ArgumentNullException("DISPLAY_MODE") + Else + Me.Adapter.InsertCommand.Parameters(19).Value = CType(DISPLAY_MODE,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -18328,6 +18539,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal SQL_VIEW As String, _ ByVal ANNOTATE_ALL_WORK_HISTORY_ENTRIES As Boolean, _ ByVal ANNOTATE_WORK_HISTORY_ENTRY As Boolean, _ + ByVal DISPLAY_MODE As String, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer If (NAME Is Nothing) Then @@ -18392,14 +18604,19 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.UpdateCommand.Parameters(16).Value = CType(WORK_HISTORY_ENTRY,String) End If If (SQL_VIEW Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("SQL_VIEW") Else Me.Adapter.UpdateCommand.Parameters(17).Value = CType(SQL_VIEW,String) End If Me.Adapter.UpdateCommand.Parameters(18).Value = CType(ANNOTATE_ALL_WORK_HISTORY_ENTRIES,Boolean) Me.Adapter.UpdateCommand.Parameters(19).Value = CType(ANNOTATE_WORK_HISTORY_ENTRY,Boolean) - Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(21).Value = CType(GUID,Integer) + If (DISPLAY_MODE Is Nothing) Then + Throw New Global.System.ArgumentNullException("DISPLAY_MODE") + Else + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(DISPLAY_MODE,String) + End If + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(22).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 diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 5c0931c..10948aa 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -20,17 +20,18 @@ WHERE (GUID = @guid) - + INSERT INTO TBPM_PROFILE_FINAL_INDEXING - (PROFIL_ID, INDEXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND) -VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMAND) + (PROFIL_ID, INDEXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND, IF_VEKTOR_BEHAVIOUR) +VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMAND,@IF_VEKTOR_BEHAVIOUR) - - - - - - + + + + + + + @@ -38,7 +39,7 @@ VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMA SELECT TBPM_PROFILE_FINAL_INDEXING.INDEXNAME, TBPM_PROFILE_FINAL_INDEXING.VALUE, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHO, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHEN, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHO, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHEN, TBPM_PROFILE_FINAL_INDEXING.GUID, TBPM_PROFILE_FINAL_INDEXING.CONNECTION_ID, - TBPM_PROFILE_FINAL_INDEXING.SQL_COMMAND, TBPM_PROFILE_FINAL_INDEXING.DESCRIPTION, TBPM_PROFILE_FINAL_INDEXING.ACTIVE + TBPM_PROFILE_FINAL_INDEXING.SQL_COMMAND, TBPM_PROFILE_FINAL_INDEXING.DESCRIPTION, TBPM_PROFILE_FINAL_INDEXING.ACTIVE, TBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOUR FROM TBPM_PROFILE_FINAL_INDEXING INNER JOIN TBPM_PROFILE ON TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID = TBPM_PROFILE.GUID WHERE (TBPM_PROFILE.NAME = @name) @@ -47,6 +48,12 @@ WHERE (TBPM_PROFILE.NAME = @name) + + + UPDATE TBPM_PROFILE_FINAL_INDEXING + + + @@ -61,6 +68,7 @@ WHERE (TBPM_PROFILE.NAME = @name) + @@ -102,15 +110,16 @@ VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO) INSERT INTO TBPM_PROFILE_FINAL_INDEXING - (PROFIL_ID, INDEXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND) -VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMAND) + (PROFIL_ID, INDEXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND, IF_VEKTOR_BEHAVIOUR) +VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMAND,@IF_VEKTOR_BEHAVIOUR) - - - - - - + + + + + + + @@ -143,7 +152,21 @@ WHERE (PROFIL_ID = @Copy_Profil_ID) - + + + + UPDATE TBPM_PROFILE_FINAL_INDEXING +SET CONNECTION_ID = @CON_ID, SQL_COMMAND = @COMMAND, CHANGED_WHO = @WHO, IF_VEKTOR_BEHAVIOUR = @IF_VEKTOR_BEHAVIOUR +WHERE (GUID = @GUID) + + + + + + + + + UPDATE TBPM_PROFILE_FINAL_INDEXING @@ -163,7 +186,7 @@ WHERE (GUID = @GUID) SELECT TBPM_PROFILE_FINAL_INDEXING.ADDED_WHEN, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHO, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHEN, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHO, TBPM_PROFILE_FINAL_INDEXING.GUID, TBPM_PROFILE_FINAL_INDEXING.INDEXNAME, TBPM_PROFILE_FINAL_INDEXING.VALUE, TBPM_PROFILE_FINAL_INDEXING.SQL_COMMAND, - TBPM_PROFILE_FINAL_INDEXING.CONNECTION_ID + TBPM_PROFILE_FINAL_INDEXING.CONNECTION_ID, TBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOUR FROM TBPM_PROFILE_FINAL_INDEXING INNER JOIN TBPM_PROFILE ON TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID = TBPM_PROFILE.GUID WHERE (TBPM_PROFILE.GUID = @ID) @@ -1091,10 +1114,37 @@ ORDER BY DMS_ERSTELLT_DATE DESC - DELETE FROM TBPM_PROFILE -WHERE (GUID = @Original_GUID) + DELETE FROM [TBPM_PROFILE] WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME) AND ([TITLE] = @Original_TITLE) AND ([PRIORITY] = @Original_PRIORITY) AND ((@IsNull_DESCRIPTION = 1 AND [DESCRIPTION] IS NULL) OR ([DESCRIPTION] = @Original_DESCRIPTION)) AND ([ACTIVE] = @Original_ACTIVE) AND ([WD_SEARCH] = @Original_WD_SEARCH) AND ([NO_OF_DOCUMENTS] = @Original_NO_OF_DOCUMENTS) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([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 ([FINAL_PROFILE] = @Original_FINAL_PROFILE) AND ((@IsNull_FINAL_TEXT = 1 AND [FINAL_TEXT] IS NULL) OR ([FINAL_TEXT] = @Original_FINAL_TEXT)) AND ((@IsNull_MOVE2FOLDER = 1 AND [MOVE2FOLDER] IS NULL) OR ([MOVE2FOLDER] = @Original_MOVE2FOLDER)) AND ([TYPE] = @Original_TYPE) AND ([WD_OBJECTTYPE] = @Original_WD_OBJECTTYPE) AND ([SORT_BY_LATEST] = @Original_SORT_BY_LATEST) AND ([PM_VEKTOR_INDEX] = @Original_PM_VEKTOR_INDEX) AND ([LOG_INDEX] = @Original_LOG_INDEX) AND ([ANNOTATE_ALL_WORK_HISTORY_ENTRIES] = @Original_ANNOTATE_ALL_WORK_HISTORY_ENTRIES) AND ([ANNOTATE_WORK_HISTORY_ENTRY] = @Original_ANNOTATE_WORK_HISTORY_ENTRY) AND ((@IsNull_WORK_HISTORY_ENTRY = 1 AND [WORK_HISTORY_ENTRY] IS NULL) OR ([WORK_HISTORY_ENTRY] = @Original_WORK_HISTORY_ENTRY))) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1102,8 +1152,8 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPM_PROFILE (NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, - WORK_HISTORY_ENTRY, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY) -VALUES (@NAME,@TITLE,@PRIORITY,@DESCRIPTION,@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@FINAL_PROFILE,@FINAL_TEXT,@MOVE2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@WORK_HISTORY_ENTRY,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY); + WORK_HISTORY_ENTRY, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, DISPLAY_MODE) +VALUES (@NAME,@TITLE,@PRIORITY,@DESCRIPTION,@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@FINAL_PROFILE,@FINAL_TEXT,@MOVE2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@WORK_HISTORY_ENTRY,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY,@DISPLAY_MODE); SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE (GUID = SCOPE_IDENTITY()) @@ -1122,16 +1172,17 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + + SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, - WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY + WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE FROM TBPM_PROFILE ORDER BY NAME @@ -1143,8 +1194,8 @@ ORDER BY NAME SET NAME = @NAME, TITLE = @TITLE, PRIORITY = @PRIORITY, DESCRIPTION = @DESCRIPTION, ACTIVE = @ACTIVE, WD_SEARCH = @WD_SEARCH, NO_OF_DOCUMENTS = @NO_OF_DOCUMENTS, CHANGED_WHO = @CHANGED_WHO, FINAL_PROFILE = @FINAL_PROFILE, FINAL_TEXT = @FINAL_TEXT, MOVE2FOLDER = @MOVE2FOLDER, TYPE = @TYPE, WD_OBJECTTYPE = @WD_OBJECTTYPE, SORT_BY_LATEST = @SORT_BY_LATEST, PM_VEKTOR_INDEX = @PM_VEKTOR_INDEX, LOG_INDEX = @LOG_INDEX, WORK_HISTORY_ENTRY = @WORK_HISTORY_ENTRY, SQL_VIEW = @SQL_VIEW, - ANNOTATE_ALL_WORK_HISTORY_ENTRIES = @ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY = @ANNOTATE_WORK_HISTORY_ENTRY -WHERE (GUID = @Original_GUID); + ANNOTATE_ALL_WORK_HISTORY_ENTRIES = @ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY = @ANNOTATE_WORK_HISTORY_ENTRY, DISPLAY_MODE = @DISPLAY_MODE +WHERE (GUID = @Original_GUID); SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST FROM TBPM_PROFILE WHERE (GUID = @GUID) @@ -1164,9 +1215,10 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + + @@ -1199,6 +1251,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + @@ -1220,12 +1273,10 @@ WHERE (GUID = @GUID) - + - SELECT GUID -FROM TBPM_PROFILE -WHERE (FINAL_PROFILE = 1) AND (UPPER(NAME) = UPPER(@name)) + SELECT GUID FROM TBPM_PROFILE WHERE (FINAL_PROFILE = 1) AND (UPPER(NAME) = UPPER(@name)) @@ -2005,7 +2056,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2054,11 +2105,18 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + + + + + + + + - + @@ -2154,7 +2212,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2219,7 +2277,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2249,7 +2307,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2272,7 +2330,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2383,7 +2441,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2456,7 +2514,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2505,7 +2563,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2520,7 +2578,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2562,7 +2620,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2625,10 +2683,17 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE + + + + + + + - + @@ -2701,7 +2766,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2752,7 +2817,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2868,7 +2933,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2946,7 +3011,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2987,7 +3052,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3025,7 +3090,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3160,11 +3225,11 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - - - - - + + + + + \ 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 c2a33ae..9cc50b0 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,35 +4,35 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - - - - + + + + + - - - + + + - + - 461 - 319 + 549 + 316 - 461 + 549 24 @@ -44,24 +44,24 @@ 299 - 360 + 448 299 - 360 - 319 + 448 + 316 - 515 - 511 + 603 + 508 948 - 511 + 508 diff --git a/app/DD_PM_WINDREAM/FinalIndexDataSet.Designer.vb b/app/DD_PM_WINDREAM/FinalIndexDataSet.Designer.vb index 44c34ec..b5716f9 100644 --- a/app/DD_PM_WINDREAM/FinalIndexDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/FinalIndexDataSet.Designer.vb @@ -311,6 +311,8 @@ Partial Public Class FinalIndexDataSet Private columnALLOW_NEW_VALUES As Global.System.Data.DataColumn + Private columnIF_VEKTOR_BEHAVIOUR As Global.System.Data.DataColumn + _ Public Sub New() @@ -458,6 +460,14 @@ Partial Public Class FinalIndexDataSet End Get End Property + _ + Public ReadOnly Property IF_VEKTOR_BEHAVIOURColumn() As Global.System.Data.DataColumn + Get + Return Me.columnIF_VEKTOR_BEHAVIOUR + End Get + End Property + _ @@ -495,9 +505,9 @@ Partial Public Class FinalIndexDataSet _ - Public Overloads Function AddTBPM_PROFILE_FINAL_INDEXINGRow(ByVal PROFIL_ID As Integer, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal DESCRIPTION As String, ByVal ACTIVE As Boolean, ByVal PREVENT_DUPLICATES As Boolean, ByVal ALLOW_NEW_VALUES As Boolean) As TBPM_PROFILE_FINAL_INDEXINGRow + Public Overloads Function AddTBPM_PROFILE_FINAL_INDEXINGRow(ByVal PROFIL_ID As Integer, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal DESCRIPTION As String, ByVal ACTIVE As Boolean, ByVal PREVENT_DUPLICATES As Boolean, ByVal ALLOW_NEW_VALUES As Boolean, ByVal IF_VEKTOR_BEHAVIOUR As String) As TBPM_PROFILE_FINAL_INDEXINGRow Dim rowTBPM_PROFILE_FINAL_INDEXINGRow As TBPM_PROFILE_FINAL_INDEXINGRow = CType(Me.NewRow,TBPM_PROFILE_FINAL_INDEXINGRow) - Dim columnValuesArray() As Object = New Object() {Nothing, PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, DESCRIPTION, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES} + Dim columnValuesArray() As Object = New Object() {Nothing, PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, DESCRIPTION, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, IF_VEKTOR_BEHAVIOUR} rowTBPM_PROFILE_FINAL_INDEXINGRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBPM_PROFILE_FINAL_INDEXINGRow) Return rowTBPM_PROFILE_FINAL_INDEXINGRow @@ -540,6 +550,7 @@ Partial Public Class FinalIndexDataSet Me.columnACTIVE = MyBase.Columns("ACTIVE") Me.columnPREVENT_DUPLICATES = MyBase.Columns("PREVENT_DUPLICATES") Me.columnALLOW_NEW_VALUES = MyBase.Columns("ALLOW_NEW_VALUES") + Me.columnIF_VEKTOR_BEHAVIOUR = MyBase.Columns("IF_VEKTOR_BEHAVIOUR") End Sub _ + Public Property IF_VEKTOR_BEHAVIOUR() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOURColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOURColumn) = value + End Set + End Property + _ Public Function IsCHANGED_WHONull() As Boolean @@ -1110,6 +1136,7 @@ Namespace FinalIndexDataSetTableAdapters tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") tableMapping.ColumnMappings.Add("PREVENT_DUPLICATES", "PREVENT_DUPLICATES") tableMapping.ColumnMappings.Add("ALLOW_NEW_VALUES", "ALLOW_NEW_VALUES") + tableMapping.ColumnMappings.Add("IF_VEKTOR_BEHAVIOUR", "IF_VEKTOR_BEHAVIOUR") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -1126,16 +1153,18 @@ Namespace FinalIndexDataSetTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(3) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT TBPM_PROFILE_FINAL_INDEXING.GUID, TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID, T"& _ - "BPM_PROFILE_FINAL_INDEXING.CONNECTION_ID, TBPM_PROFILE_FINAL_INDEXING.SQL_COMMAN"& _ - "D, TBPM_PROFILE_FINAL_INDEXING.INDEXNAME, TBPM_PROFILE_FINAL_INDEXING.VALUE, TBP"& _ - "M_PROFILE_FINAL_INDEXING.ADDED_WHO, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHEN, TBPM"& _ - "_PROFILE_FINAL_INDEXING.CHANGED_WHO, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHEN, T"& _ - "BPM_PROFILE_FINAL_INDEXING.DESCRIPTION, TBPM_PROFILE_FINAL_INDEXING.ACTIVE, TBPM"& _ - "_PROFILE_FINAL_INDEXING.PREVENT_DUPLICATES, TBPM_PROFILE_FINAL_INDEXING.ALLOW_NE"& _ - "W_VALUES FROM TBPM_PROFILE_FINAL_INDEXING INNER JOIN TBPM_PROFILE ON TBPM_PROFIL"& _ - "E_FINAL_INDEXING.PROFIL_ID = TBPM_PROFILE.GUID WHERE (TBPM_PROFILE.NAME = @NAME)"& _ - "" + Me._commandCollection(0).CommandText = "SELECT TBPM_PROFILE_FINAL_INDEXING.GUID, TBPM_PROFILE_FINAL_INDEXING.PROFI"& _ + "L_ID, TBPM_PROFILE_FINAL_INDEXING.CONNECTION_ID, TBPM_PROFILE_FINAL_INDEXING.SQL"& _ + "_COMMAND, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBPM_PROFILE_FINAL_INDEXING.INDEXNAME, TBPM"& _ + "_PROFILE_FINAL_INDEXING.VALUE, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHO, TBPM_PROFI"& _ + "LE_FINAL_INDEXING.ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBPM_PROFILE_FINAL_INDE"& _ + "XING.CHANGED_WHO, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHEN, TBPM_PROFILE_FINAL_I"& _ + "NDEXING.DESCRIPTION, TBPM_PROFILE_FINAL_INDEXING.ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " TBPM_PROFILE_FINAL_INDEXING.PREVENT_DUPLICATES, TBPM_PROFILE_FINAL_INDEXING."& _ + "ALLOW_NEW_VALUES, TBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOUR"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " TBPM_PROFILE_FINAL_INDEXING INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBPM_PROFILE"& _ + " ON TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID = TBPM_PROFILE.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBP"& _ + "M_PROFILE.NAME = @NAME)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() diff --git a/app/DD_PM_WINDREAM/FinalIndexDataSet.xsd b/app/DD_PM_WINDREAM/FinalIndexDataSet.xsd index 9dc7fe3..459b920 100644 --- a/app/DD_PM_WINDREAM/FinalIndexDataSet.xsd +++ b/app/DD_PM_WINDREAM/FinalIndexDataSet.xsd @@ -11,8 +11,14 @@ - - SELECT TBPM_PROFILE_FINAL_INDEXING.GUID, TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID, TBPM_PROFILE_FINAL_INDEXING.CONNECTION_ID, TBPM_PROFILE_FINAL_INDEXING.SQL_COMMAND, TBPM_PROFILE_FINAL_INDEXING.INDEXNAME, TBPM_PROFILE_FINAL_INDEXING.VALUE, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHO, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHEN, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHO, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHEN, TBPM_PROFILE_FINAL_INDEXING.DESCRIPTION, TBPM_PROFILE_FINAL_INDEXING.ACTIVE, TBPM_PROFILE_FINAL_INDEXING.PREVENT_DUPLICATES, TBPM_PROFILE_FINAL_INDEXING.ALLOW_NEW_VALUES FROM TBPM_PROFILE_FINAL_INDEXING INNER JOIN TBPM_PROFILE ON TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID = TBPM_PROFILE.GUID WHERE (TBPM_PROFILE.NAME = @NAME) + + SELECT TBPM_PROFILE_FINAL_INDEXING.GUID, TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID, TBPM_PROFILE_FINAL_INDEXING.CONNECTION_ID, TBPM_PROFILE_FINAL_INDEXING.SQL_COMMAND, + TBPM_PROFILE_FINAL_INDEXING.INDEXNAME, TBPM_PROFILE_FINAL_INDEXING.VALUE, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHO, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHEN, + TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHO, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHEN, TBPM_PROFILE_FINAL_INDEXING.DESCRIPTION, TBPM_PROFILE_FINAL_INDEXING.ACTIVE, + TBPM_PROFILE_FINAL_INDEXING.PREVENT_DUPLICATES, TBPM_PROFILE_FINAL_INDEXING.ALLOW_NEW_VALUES, TBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOUR +FROM TBPM_PROFILE_FINAL_INDEXING INNER JOIN + TBPM_PROFILE ON TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID = TBPM_PROFILE.GUID +WHERE (TBPM_PROFILE.NAME = @NAME) @@ -35,6 +41,7 @@ + @@ -91,7 +98,7 @@ VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMA - + @@ -144,6 +151,13 @@ VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMA + + + + + + + diff --git a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb index 2c456cb..593e2df 100644 --- a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb @@ -62,6 +62,12 @@ Module ModuleFinalIndexProperties Public Property AllowAddNewValues As Boolean + + + + + Public Property VectorBehaviour As String + Public Property PreventDuplicates As Boolean diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 3cc533c..5dd964c 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -36,6 +36,9 @@ Module ModuleRuntimeVariables Public USER_IN_MODULE = False Public USER_RIGHT_FILE_DELETE As Boolean = False + Public FORCE_LAYOUT_OVERVIEW As Boolean = False + Public WORKING_MODE As String = "" + Public LICENSE_COUNT As Integer = 0 Public LICENSE_EXPIRED As Boolean = False Public LICENSE_PROFILES As Integer = 0 diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 0260651..d1e824a 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -49,6 +49,7 @@ Partial Class frmAdministration Dim VEKTOR_DELIMITERLabel As System.Windows.Forms.Label Dim WORK_HISTORY_ENTRYLabel As System.Windows.Forms.Label Dim SQL_VIEWLabel As System.Windows.Forms.Label + Dim DISPLAY_MODELabel As System.Windows.Forms.Label Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.SplitContainer_Profilzuordnung2 = New System.Windows.Forms.SplitContainer() Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl() @@ -146,6 +147,7 @@ Partial Class frmAdministration Me.TabPage1 = New System.Windows.Forms.TabPage() Me.tabctrl_Profilkonfig = New System.Windows.Forms.TabControl() Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.DISPLAY_MODEComboBox = New System.Windows.Forms.ComboBox() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() @@ -296,6 +298,7 @@ Partial Class frmAdministration VEKTOR_DELIMITERLabel = New System.Windows.Forms.Label() WORK_HISTORY_ENTRYLabel = New System.Windows.Forms.Label() SQL_VIEWLabel = New System.Windows.Forms.Label() + DISPLAY_MODELabel = New System.Windows.Forms.Label() CType(Me.SplitContainer_Profilzuordnung2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer_Profilzuordnung2.Panel1.SuspendLayout() Me.SplitContainer_Profilzuordnung2.Panel2.SuspendLayout() @@ -795,6 +798,11 @@ Partial Class frmAdministration resources.ApplyResources(SQL_VIEWLabel, "SQL_VIEWLabel") SQL_VIEWLabel.Name = "SQL_VIEWLabel" ' + 'DISPLAY_MODELabel + ' + resources.ApplyResources(DISPLAY_MODELabel, "DISPLAY_MODELabel") + DISPLAY_MODELabel.Name = "DISPLAY_MODELabel" + ' 'TBDD_USERBindingSource ' Me.TBDD_USERBindingSource.DataMember = "TBDD_USER" @@ -1171,6 +1179,8 @@ Partial Class frmAdministration 'TabPage5 ' resources.ApplyResources(Me.TabPage5, "TabPage5") + Me.TabPage5.Controls.Add(DISPLAY_MODELabel) + Me.TabPage5.Controls.Add(Me.DISPLAY_MODEComboBox) Me.TabPage5.Controls.Add(Me.GridControl1) Me.TabPage5.Controls.Add(Me.cmbLOGIndex) Me.TabPage5.Controls.Add(Label7) @@ -1200,6 +1210,14 @@ Partial Class frmAdministration Me.TabPage5.Name = "TabPage5" Me.TabPage5.UseVisualStyleBackColor = True ' + 'DISPLAY_MODEComboBox + ' + Me.DISPLAY_MODEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILEBindingSource, "DISPLAY_MODE", True)) + resources.ApplyResources(Me.DISPLAY_MODEComboBox, "DISPLAY_MODEComboBox") + Me.DISPLAY_MODEComboBox.FormattingEnabled = True + Me.DISPLAY_MODEComboBox.Items.AddRange(New Object() {resources.GetString("DISPLAY_MODEComboBox.Items"), resources.GetString("DISPLAY_MODEComboBox.Items1"), resources.GetString("DISPLAY_MODEComboBox.Items2")}) + Me.DISPLAY_MODEComboBox.Name = "DISPLAY_MODEComboBox" + ' 'GridControl1 ' Me.GridControl1.DataSource = Me.TBPM_PROFILEBindingSource @@ -2372,4 +2390,5 @@ Partial Class frmAdministration Friend WithEvents colPREVENT_DUPLICATES As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colALLOW_NEW_VALUES As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents btnSQLProfilehome As Button + Friend WithEvents DISPLAY_MODEComboBox As ComboBox End Class diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 407e800..0f56975 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -856,7 +856,7 @@ TabPage5 - 8 + 10 False @@ -889,7 +889,7 @@ TabPage5 - 9 + 11 False @@ -922,7 +922,7 @@ TabPage5 - 12 + 14 False @@ -955,7 +955,7 @@ TabPage5 - 14 + 16 False @@ -988,7 +988,7 @@ TabPage5 - 18 + 20 False @@ -1021,7 +1021,7 @@ TabPage5 - 25 + 27 False @@ -1054,7 +1054,7 @@ TabPage5 - 19 + 21 False @@ -1421,7 +1421,7 @@ der PM-Indizes verwenden wollen: TabPage5 - 4 + 6 False @@ -1455,7 +1455,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 2 + 4 False @@ -1547,6 +1547,39 @@ der Wertänderungen nutzen wollen: 2 + + False + + + True + + + Tahoma, 9.75pt + + + 702, 12 + + + 77, 16 + + + 84 + + + Darstellung: + + + DISPLAY_MODELabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 0 + 570, 56 @@ -1837,7 +1870,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 5 + 7 Tahoma, 9.75pt @@ -1861,7 +1894,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 10 + 12 Tahoma, 9.75pt @@ -1939,7 +1972,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 13 + 15 True @@ -2023,7 +2056,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 17 + 19 Segoe UI, 9pt @@ -2125,7 +2158,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 24 + 26 Tahoma, 9.75pt @@ -2161,7 +2194,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 23 + 25 Tahoma, 9.75pt @@ -2188,7 +2221,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 20 + 22 510, 47 @@ -2275,7 +2308,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 7 + 9 Tahoma, 9.75pt @@ -2299,7 +2332,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 11 + 13 987, 46 @@ -2347,7 +2380,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 16 + 18 Tahoma, 9.75pt @@ -2371,7 +2404,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 21 + 23 Tahoma, 9.75pt @@ -2395,7 +2428,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 22 + 24 Tahoma, 9.75pt @@ -2419,7 +2452,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 15 + 17 1188, 17 @@ -2442,6 +2475,39 @@ der Wertänderungen nutzen wollen: True + + Tahoma, 9.75pt + + + Overview and Detail + + + Overview + + + Detail + + + 705, 31 + + + 263, 24 + + + 85 + + + DISPLAY_MODEComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 1 + 6, 12 @@ -2479,7 +2545,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 0 + 2 715, 248 @@ -2500,7 +2566,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 1 + 3 715, 186 @@ -2521,13 +2587,13 @@ der Wertänderungen nutzen wollen: TabPage5 - 3 + 5 Tahoma, 9.75pt - 715, 31 + 985, 31 238, 24 @@ -2548,7 +2614,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 6 + 8 Tahoma, 9.75pt, style=Bold @@ -2912,7 +2978,7 @@ der Wertänderungen nutzen wollen: 9, 133 - 678, 27 + 798, 27 92 diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 60133d8..b836f1d 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -952,6 +952,7 @@ Public Class frmAdministration Dim description As String = NotNull(focusedRow.Item("DESCRIPTION"), "") Dim preventDuplicates As Boolean = NotNull(focusedRow.Item("PREVENT_DUPLICATES"), False) Dim allowNewValues As Boolean = NotNull(focusedRow.Item("ALLOW_NEW_VALUES"), False) + Dim VectorBehaviour As String = NotNull(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), False) CURRENT_INDEX_ID = guid @@ -966,6 +967,7 @@ Public Class frmAdministration obj.Active = active obj.AllowAddNewValues = allowNewValues obj.PreventDuplicates = preventDuplicates + obj.VectorBehaviour = VectorBehaviour ' Wenn eine neue Zeile hinzugefügt wird, auf StringValue setzen If e.FocusedRowHandle <> GridControl.NewItemRowHandle Then @@ -1049,6 +1051,7 @@ Public Class frmAdministration Dim active As Integer = IIf(obj.Active, 1, 0) Dim preventDuplicates As Integer = IIf(obj.PreventDuplicates, 1, 0) Dim AllowAddNewValues As Integer = IIf(obj.AllowAddNewValues, 1, 0) + Dim IF_VEKTOR_BEHAVIOUR As String = NotNull(obj.VectorBehaviour, String.Empty) If indexName = String.Empty Then MsgBox("Das Feld IndexName muss ausgefüllt sein!", MsgBoxStyle.Exclamation) @@ -1067,8 +1070,8 @@ Public Class frmAdministration End If If INSERT_ACTIVE = True Then - Dim sql As String = $"INSERT INTO TBPM_PROFILE_FINAL_INDEXING (PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, ADDED_WHO) - VALUES ({profileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}')" + Dim sql As String = $"INSERT INTO TBPM_PROFILE_FINAL_INDEXING (PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, ADDED_WHO,IF_VEKTOR_BEHAVIOUR) + VALUES ({profileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}')" If ClassDatabase.Execute_non_Query(sql, True) Then INSERT_ACTIVE = False @@ -1076,7 +1079,7 @@ Public Class frmAdministration Else Dim sql As String = $"UPDATE TBPM_PROFILE_FINAL_INDEXING SET CONNECTION_ID = {connectionId}, SQL_COMMAND = '{sqlCommand}', INDEXNAME = '{indexName}', CHANGED_WHO = '{addedWho}', - VALUE = '{value}', ACTIVE = {active}, ALLOW_NEW_VALUES = {AllowAddNewValues}, PREVENT_DUPLICATES = {preventDuplicates} + VALUE = '{value}', ACTIVE = {active}, ALLOW_NEW_VALUES = {AllowAddNewValues}, PREVENT_DUPLICATES = {preventDuplicates},IF_VEKTOR_BEHAVIOUR = '{IF_VEKTOR_BEHAVIOUR}' WHERE GUID = {guid}" If ClassDatabase.Execute_non_Query(sql, True) Then diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index daec810..f1e812b 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -446,7 +446,6 @@ Partial Class frmMain Me.GridView_Docs.OptionsBehavior.AllowFixedGroups = DevExpress.Utils.DefaultBoolean.[True] Me.GridView_Docs.OptionsBehavior.AllowGroupExpandAnimation = DevExpress.Utils.DefaultBoolean.[True] Me.GridView_Docs.OptionsBehavior.Editable = False - Me.GridView_Docs.OptionsSelection.MultiSelect = True Me.GridView_Docs.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect Me.GridView_Docs.OptionsView.ColumnAutoWidth = False Me.GridView_Docs.OptionsView.EnableAppearanceEvenRow = True diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 0dfa915..9b0841e 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAATQBBAE0AQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATwBBAE8AQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -547,6 +547,30 @@ Tahoma, 9pt + + 0, 0 + + + 1023, 27 + + + 2 + + + ToolStrip1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 3 + Segoe UI, 9pt, style=Bold, Italic @@ -604,35 +628,35 @@ Aktualisieren - - 0, 0 + + 1015, 17 + + + Tahoma, 9pt - - 1023, 27 + + 0, 498 - - 2 + + 1023, 29 - - ToolStrip1 + + 3 - - ToolStrip1 + + StatusStrip1 - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StatusStrip1 - - Panel1 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + Panel1 - - 1015, 17 - - - Tahoma, 9pt + + 4 150, 24 @@ -679,78 +703,9 @@ 0, 24 - - 0, 498 - - - 1023, 29 - - - 3 - - - StatusStrip1 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 4 - 152, 95 - - 269, 26 - - - Validierung für Gruppe/Profil starten - - - 269, 26 - - - Validierung für Datei starten - - - 266, 6 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA - qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg - 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY - AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC - - - - 269, 26 - - - Massenabschluss markierte Dateien - - - 266, 6 - - - 269, 26 - - - Layout zurücksetzen - - - 269, 26 - - - Layout speichern - 270, 146 @@ -933,7 +888,7 @@ 1 - Profilübersicht + weitere Profile @@ -987,12 +942,6 @@ 301, 95 - - 219, 26 - - - Starte Validierung für Profil - 220, 30 @@ -1217,6 +1166,57 @@ 2 + + 269, 26 + + + Validierung für Gruppe/Profil starten + + + 269, 26 + + + Validierung für Datei starten + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA + qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg + 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY + AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC + + + + 269, 26 + + + Massenabschluss markierte Dateien + + + 266, 6 + + + 269, 26 + + + Layout zurücksetzen + + + 269, 26 + + + Layout speichern + + + 219, 26 + + + Starte Validierung für Profil + 1132, 17 diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 0cf5380..3a42cf3 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -24,7 +24,7 @@ Public Class frmMain Private GRID_LOAD_TYPE As String = "OVERVIEW" Private GRID_INV_COL_REMOVED As Boolean = False Private NO_WORKFLOWITEMS As Boolean = False - + Private InResetlayout As Boolean = False Private RefreshHelper As RefreshHelper Dim DT_CHARTS As DataTable Private formopenClose As Boolean = False @@ -322,7 +322,7 @@ Public Class frmMain End If For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows - If CInt(oProfileRow.Item("FILE_COUNT")) > 0 Then + If CInt(oProfileRow.Item("FILE_COUNT")) > 0 And (oProfileRow.Item("DISPLAY_MODE") = "Overview and Detail" Or oProfileRow.Item("DISPLAY_MODE") = "Detail") Then Dim item1 As NavBarItem = NavBarControl1.Items.Add() item1.Caption = oProfileRow.Item("TITLE") item1.Hint = oProfileRow.Item("TITLE") @@ -608,11 +608,13 @@ Public Class frmMain NO_WORKFLOWITEMS = False End If Create_Basic_View() + If InResetlayout = False Then + Dim Columns_Removed = GridView_CheckInvalidColumns() + End If - Dim Columns_Removed = GridView_CheckInvalidColumns() RestoreLayout() - ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE - End If + ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE + End If Catch ex As Exception LOGGER.Error(ex) @@ -658,6 +660,7 @@ Public Class frmMain bindsourcegrid.DataSource = CURR_DT_PROFILEGRID GridControl_Docs.DataSource = bindsourcegrid + 'GridControlDocRow.ForceInitialize() RestoreLayout() @@ -683,6 +686,9 @@ Public Class frmMain End Sub Private Function GridView_CheckInvalidColumns() As Boolean + 'If FORCE_LAYOUT_OVERVIEW = True Then + ' Return False + 'End If Dim Columns_Removed = False GRID_INV_COL_REMOVED = False Try @@ -860,6 +866,17 @@ Public Class frmMain ElseIf GRID_LOAD_TYPE.StartsWith("PROFILE#") Then Load_single_Profile() End If + If WORKING_MODE <> "" Then + If WORKING_MODE.Contains("PM NO MASS_VALIDATOR") Then + GridView_Docs.OptionsSelection.MultiSelect = False + tsmiMarkedFilesFinish.Visible = False + ToolStripSeparator4.Visible = False + End If + Else + tsmiMarkedFilesFinish.Visible = True + ToolStripSeparator4.Visible = True + GridView_Docs.OptionsSelection.MultiSelect = True + End If Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Unexpected error in Decide_load: " & ex.Message) @@ -1278,8 +1295,10 @@ Public Class frmMain ToolStripLabelViewTape.Text = "Gesamtübersicht" 'GridControlDocRow.ForceInitialize() ' GridControl1.DataSource = CURR_DT_PROFILEGRID + If InResetlayout = False Then + Dim Columns_Removed = GridView_CheckInvalidColumns() + End If - Dim Columns_Removed = GridView_CheckInvalidColumns() RestoreLayout() Try @@ -1326,35 +1345,35 @@ Public Class frmMain LOGGER.Error(ex) LOGGER.Info("Unexpected Error in Formatting Grid: " & ex.Message) End Try - Try - For Each grid_column As GridColumn In GridView_Docs.Columns - Dim GridDXCaption = grid_column.Caption - Dim GridDXTextCaption = grid_column.GetTextCaption - Dim GridDXColumnEditName = grid_column.ColumnEditName - Dim GridDXFieldName = grid_column.FieldName - - Dim exists As Boolean = False - For Each col As DataColumn In CURR_DT_PROFILEGRID.Columns - - If col.Caption = GridDXTextCaption Then - exists = True - Exit For - End If - Next - If exists = False Then - If grid_column.Visible = True Then - Try - grid_column.Dispose() - Catch ex As Exception - LOGGER.Error(ex) - End Try - End If - End If - Next - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("Unexpected Error in Checking ColumnsGrid: " & ex.Message) - End Try + 'Try + ' For Each grid_column As GridColumn In GridView_Docs.Columns + ' Dim GridDXCaption = grid_column.Caption + ' Dim GridDXTextCaption = grid_column.GetTextCaption + ' Dim GridDXColumnEditName = grid_column.ColumnEditName + ' Dim GridDXFieldName = grid_column.FieldName + + ' Dim exists As Boolean = False + ' For Each col As DataColumn In CURR_DT_PROFILEGRID.Columns + + ' If col.Caption = GridDXTextCaption Then + ' exists = True + ' Exit For + ' End If + ' Next + ' If exists = False Then + ' If grid_column.Visible = True Then + ' Try + ' grid_column.Dispose() + ' Catch ex As Exception + ' LOGGER.Error(ex) + ' End Try + ' End If + ' End If + ' Next + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' LOGGER.Info("Unexpected Error in Checking ColumnsGrid: " & ex.Message) + 'End Try SaveGridLayout() If GridView_Docs.Columns.Count <= 2 Then @@ -1381,8 +1400,8 @@ Public Class frmMain End If Catch ex As Exception LOGGER.Error(ex) - LOGGER.Info("Load_Grid_Overview - Fehler: " & ex.Message) - MsgBox("Fehler Load_Grid_Overview - Fehler: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") + LOGGER.Info("Load_Grid_Overview - Fehler: " & ex.Message) + MsgBox("Fehler Load_Grid_Overview - Fehler: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try End Sub @@ -1408,7 +1427,7 @@ Public Class frmMain End Sub Sub Reset_GridLayout() If GridControl_Docs.Visible = True And formopenClose = False Then RefreshHelper.SaveViewInfo() - + InResetlayout = True ' Layout zurücksetzen ResetLayout() SaveGridLayout() @@ -1416,7 +1435,7 @@ Public Class frmMain ' Ansicht neu laden Load_Profile_items() Decide_Load() - + InResetlayout = False RefreshHelper.LoadViewInfo() End Sub