From 22f8cf121a84cf454d4450ab18dd4c9bf7ba7e0d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 2 Sep 2019 11:57:25 +0200 Subject: [PATCH] fix dataset for window assignments --- .../MyDataset.Designer.vb | 315 ++++++++++++++---- app/DD_Clipboard_Searcher/MyDataset.xsd | 73 ++-- app/DD_Clipboard_Searcher/MyDataset.xss | 58 +++- .../ctrlApplicationAssignment.Designer.vb | 8 +- .../ctrlApplicationAssignment.vb | 8 +- 5 files changed, 343 insertions(+), 119 deletions(-) diff --git a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb index 5c41b68..ac5d25b 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb +++ b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb @@ -57,6 +57,10 @@ Partial Public Class MyDataset Private relationFK_TBCW_PROF_DOC_SEARCH_PROF_IF As Global.System.Data.DataRelation + Private relationFK_WINDOW_ID As Global.System.Data.DataRelation + + Private relationFK_PROCESS_ID As Global.System.Data.DataRelation + Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ - Public Overloads Function AddTBCW_PROF_REL_WINDOWRow(ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal PROCESS_ID As Integer) As TBCW_PROF_REL_WINDOWRow + Public Overloads Function AddTBCW_PROF_REL_WINDOWRow(ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal parentTBCW_PROFILE_PROCESSRowByFK_PROCESS_ID As TBCW_PROFILE_PROCESSRow) As TBCW_PROF_REL_WINDOWRow Dim rowTBCW_PROF_REL_WINDOWRow As TBCW_PROF_REL_WINDOWRow = CType(Me.NewRow,TBCW_PROF_REL_WINDOWRow) - Dim columnValuesArray() As Object = New Object() {Nothing, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PROCESS_ID} + Dim columnValuesArray() As Object = New Object() {Nothing, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, Nothing} + If (Not (parentTBCW_PROFILE_PROCESSRowByFK_PROCESS_ID) Is Nothing) Then + columnValuesArray(8) = parentTBCW_PROFILE_PROCESSRowByFK_PROCESS_ID(0) + End If rowTBCW_PROF_REL_WINDOWRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBCW_PROF_REL_WINDOWRow) Return rowTBCW_PROF_REL_WINDOWRow @@ -4539,9 +4552,12 @@ Partial Public Class MyDataset _ - Public Overloads Function AddTBCW_PROF_REL_CONTROLRow(ByVal WINDOW_ID As Integer, ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal AUTOMATION_ID As String, ByVal FRAMEWORK_ID As String) As TBCW_PROF_REL_CONTROLRow + Public Overloads Function AddTBCW_PROF_REL_CONTROLRow(ByVal parentTBCW_PROF_REL_WINDOWRowByFK_WINDOW_ID As TBCW_PROF_REL_WINDOWRow, ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal AUTOMATION_ID As String, ByVal FRAMEWORK_ID As String) As TBCW_PROF_REL_CONTROLRow Dim rowTBCW_PROF_REL_CONTROLRow As TBCW_PROF_REL_CONTROLRow = CType(Me.NewRow,TBCW_PROF_REL_CONTROLRow) - Dim columnValuesArray() As Object = New Object() {Nothing, WINDOW_ID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, AUTOMATION_ID, FRAMEWORK_ID} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, AUTOMATION_ID, FRAMEWORK_ID} + If (Not (parentTBCW_PROF_REL_WINDOWRowByFK_WINDOW_ID) Is Nothing) Then + columnValuesArray(1) = parentTBCW_PROF_REL_WINDOWRowByFK_WINDOW_ID(0) + End If rowTBCW_PROF_REL_CONTROLRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBCW_PROF_REL_CONTROLRow) Return rowTBCW_PROF_REL_CONTROLRow @@ -6078,6 +6094,16 @@ Partial Public Class MyDataset Public Sub SetADDED_WHENNull() Me(Me.tableTBCW_PROFILE_PROCESS.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub + + _ + Public Function GetTBCW_PROF_REL_WINDOWRows() As TBCW_PROF_REL_WINDOWRow() + If (Me.Table.ChildRelations("FK_PROCESS_ID") Is Nothing) Then + Return New TBCW_PROF_REL_WINDOWRow(-1) {} + Else + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_PROCESS_ID")),TBCW_PROF_REL_WINDOWRow()) + End If + End Function End Class ''' @@ -6777,6 +6803,17 @@ Partial Public Class MyDataset End Set End Property + _ + Public Property TBCW_PROFILE_PROCESSRow() As TBCW_PROFILE_PROCESSRow + Get + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_PROCESS_ID")),TBCW_PROFILE_PROCESSRow) + End Get + Set + Me.SetParentRow(value, Me.Table.ParentRelations("FK_PROCESS_ID")) + End Set + End Property + _ Public Function IsADDED_WHENNull() As Boolean @@ -6812,6 +6849,16 @@ Partial Public Class MyDataset Public Sub SetCHANGED_WHENNull() Me(Me.tableTBCW_PROF_REL_WINDOW.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub + + _ + Public Function GetTBCW_PROF_REL_CONTROLRows() As TBCW_PROF_REL_CONTROLRow() + If (Me.Table.ChildRelations("FK_WINDOW_ID") Is Nothing) Then + Return New TBCW_PROF_REL_CONTROLRow(-1) {} + Else + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_WINDOW_ID")),TBCW_PROF_REL_CONTROLRow()) + End If + End Function End Class ''' @@ -7281,6 +7328,17 @@ Partial Public Class MyDataset End Set End Property + _ + Public Property TBCW_PROF_REL_WINDOWRow() As TBCW_PROF_REL_WINDOWRow + Get + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_WINDOW_ID")),TBCW_PROF_REL_WINDOWRow) + End Get + Set + Me.SetParentRow(value, Me.Table.ParentRelations("FK_WINDOW_ID")) + End Set + End Property + _ Public Function IsADDED_WHENNull() As Boolean @@ -10830,29 +10888,37 @@ Namespace MyDatasetTableAdapters 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.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO TBCW_PROF_REL_WINDOW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (DESCRIPTION, REGEX, S"& _ - "EQUENCE, ADDED_WHO, PROCESS_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@DESCRIPTION,@REGEX,@SEQUENCE,@A"& _ - "DDED_WHO,@PROCESS_ID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, PROCESS_NAME, DESCRIPTION, "& _ - "REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH"& _ - "EN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBCW_PROF_REL_WINDOW] ([DESCRIPTION], [REGEX], [SEQUENCE], [ADDED_WH"& _ + "O], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [PROCESS_ID]) VALUES (@DESCRIPT"& _ + "ION, @REGEX, @SEQUENCE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @P"& _ + "ROCESS_ID);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, C"& _ + "HANGED_WHO, CHANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (GUID = SCO"& _ + "PE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, 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("@PROCESS_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, 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("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_ID", 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 TBCW_PROF_REL_WINDOW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET DESCRIPTION = @DESCRIPTION,"& _ - " REGEX = @REGEX, SEQUENCE = @SEQUENCE, CHANGED_WHO = @CHANGED_WHO, PROCESS_ID = "& _ - "@PROCESS_ID"&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, PROFILE_ID"& _ - ", PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_"& _ - "WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID)" + " REGEX = @REGEX, SEQUENCE = @SEQUENCE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADD"& _ + "ED_WHEN, CHANGED_WHO = @CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHEN = @"& _ + "CHANGED_WHEN, PROCESS_ID = @PROCESS_ID"&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, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C"& _ + "HANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, 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("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_ID", 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, "", "", "")) @@ -10931,6 +10997,133 @@ Namespace MyDatasetTableAdapters Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function + + _ + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,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 + Me.Adapter.DeleteCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.DeleteCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Insert(ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE 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 PROCESS_ID As Integer) As Integer + If (DESCRIPTION Is Nothing) Then + Throw New Global.System.ArgumentNullException("DESCRIPTION") + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(DESCRIPTION,String) + End If + If (REGEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX") + Else + Me.Adapter.InsertCommand.Parameters(1).Value = CType(REGEX,String) + End If + Me.Adapter.InsertCommand.Parameters(2).Value = CType(SEQUENCE,Byte) + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(5).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(6).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value + End If + Me.Adapter.InsertCommand.Parameters(7).Value = CType(PROCESS_ID,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 + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update(ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE 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 PROCESS_ID As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + If (DESCRIPTION Is Nothing) Then + Throw New Global.System.ArgumentNullException("DESCRIPTION") + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DESCRIPTION,String) + End If + If (REGEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX") + Else + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(REGEX,String) + End If + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(SEQUENCE,Byte) + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(PROCESS_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(9).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 + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try + End Function End Class ''' @@ -12187,6 +12380,15 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As MyDataset, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -12196,21 +12398,21 @@ Namespace MyDatasetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBCW_USER_PROFILETableAdapter.Update(updatedRows)) + result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(updatedRows)) + result = (result + Me._tBCW_USER_PROFILETableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -12241,15 +12443,6 @@ Namespace MyDatasetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) - updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -12278,6 +12471,14 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As MyDataset, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -12286,19 +12487,19 @@ Namespace MyDatasetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBCW_USER_PROFILETableAdapter.Update(addedRows)) + result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(addedRows)) + result = (result + Me._tBCW_USER_PROFILETableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -12326,14 +12527,6 @@ Namespace MyDatasetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -12376,14 +12569,6 @@ Namespace MyDatasetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If If (Not (Me._tBCW_GROUP_PROFILETableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_GROUP_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -12408,19 +12593,19 @@ Namespace MyDatasetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(deletedRows)) + result = (result + Me._tBCW_USER_PROFILETableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBCW_USER_PROFILETableAdapter.Update(deletedRows)) + result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -12432,6 +12617,14 @@ Namespace MyDatasetTableAdapters allChangedRows.AddRange(deletedRows) End If End If + If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If Return result End Function diff --git a/app/DD_Clipboard_Searcher/MyDataset.xsd b/app/DD_Clipboard_Searcher/MyDataset.xsd index c999025..eea234d 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xsd +++ b/app/DD_Clipboard_Searcher/MyDataset.xsd @@ -512,33 +512,34 @@ WHERE (GUID = @GUID) - + - + DELETE FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @Original_GUID) - + - - INSERT INTO TBCW_PROF_REL_WINDOW - (DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, PROCESS_ID) -VALUES (@DESCRIPTION,@REGEX,@SEQUENCE,@ADDED_WHO,@PROCESS_ID); -SELECT GUID, PROFILE_ID, PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = SCOPE_IDENTITY()) + + INSERT INTO [TBCW_PROF_REL_WINDOW] ([DESCRIPTION], [REGEX], [SEQUENCE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [PROCESS_ID]) VALUES (@DESCRIPTION, @REGEX, @SEQUENCE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @PROCESS_ID); +SELECT GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (GUID = SCOPE_IDENTITY()) - - - - - + + + + + + + + - + SELECT GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (PROCESS_ID = @PROCESS_ID) @@ -550,14 +551,18 @@ WHERE (PROCESS_ID = @PROCESS_ID) UPDATE TBCW_PROF_REL_WINDOW -SET DESCRIPTION = @DESCRIPTION, REGEX = @REGEX, SEQUENCE = @SEQUENCE, CHANGED_WHO = @CHANGED_WHO, PROCESS_ID = @PROCESS_ID -WHERE (GUID = @Original_GUID); -SELECT GUID, PROFILE_ID, PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID) +SET DESCRIPTION = @DESCRIPTION, REGEX = @REGEX, SEQUENCE = @SEQUENCE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, + CHANGED_WHEN = @CHANGED_WHEN, PROCESS_ID = @PROCESS_ID +WHERE (GUID = @Original_GUID); +SELECT GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID) + + + @@ -764,7 +769,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -810,7 +815,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -827,7 +832,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -856,7 +861,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -867,7 +872,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -890,7 +895,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -938,7 +943,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -986,7 +991,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1003,7 +1008,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1011,7 +1016,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1025,7 +1030,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1033,7 +1038,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1072,7 +1077,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1145,7 +1150,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1247,8 +1252,10 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - - + + + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/MyDataset.xss b/app/DD_Clipboard_Searcher/MyDataset.xss index 1eed88c..f95b62e 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xss +++ b/app/DD_Clipboard_Searcher/MyDataset.xss @@ -4,25 +4,25 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + 254 @@ -34,7 +34,7 @@ - + 254 @@ -46,5 +46,29 @@ + + + + 310 + 456 + + + 328 + 456 + + + + + + + 165 + 585 + + + 165 + 507 + + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb index 3f4c735..b89d830 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb @@ -132,8 +132,6 @@ Partial Class ctrlApplicationAssignment Me.colGUID.Caption = "GUID" Me.colGUID.FieldName = "GUID" Me.colGUID.Name = "colGUID" - Me.colGUID.Visible = True - Me.colGUID.VisibleIndex = 0 ' 'colDESCRIPTION ' @@ -141,7 +139,8 @@ Partial Class ctrlApplicationAssignment Me.colDESCRIPTION.FieldName = "DESCRIPTION" Me.colDESCRIPTION.Name = "colDESCRIPTION" Me.colDESCRIPTION.Visible = True - Me.colDESCRIPTION.VisibleIndex = 1 + Me.colDESCRIPTION.VisibleIndex = 0 + Me.colDESCRIPTION.Width = 409 ' 'colREGEX ' @@ -150,7 +149,8 @@ Partial Class ctrlApplicationAssignment Me.colREGEX.FieldName = "REGEX" Me.colREGEX.Name = "colREGEX" Me.colREGEX.Visible = True - Me.colREGEX.VisibleIndex = 2 + Me.colREGEX.VisibleIndex = 1 + Me.colREGEX.Width = 410 ' 'RepositoryItemRegexEdit ' diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb index 02a267e..eb13e3e 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb @@ -55,7 +55,9 @@ Public Class ctrlApplicationAssignment If Database.ExecuteNonQuery(oSQL) = False Then Return False Else - oSQL = String.Format("INSERT INTO TBCW_PROF_REL_WINDOW (DESCRIPTION, REGEX, ADDED_WHO,PROCESS_ID) VALUES ('{0}', '^{1}$','{3}',{4})", oWindowTitle, oWindowTitle, Environment.UserName, CURRENT_PROCESSID) + Dim oNewProcessId = Database.GetScalarValue("SELECT MAX(GUID) FROM TBCW_PROFILE_PROCESS") + + oSQL = String.Format("INSERT INTO TBCW_PROF_REL_WINDOW (DESCRIPTION, REGEX, ADDED_WHO, PROCESS_ID) VALUES ('{0}', '^{1}$', '{2}' ,{3})", oWindowTitle, oWindowTitle, Environment.UserName, oNewProcessId) If Database.ExecuteNonQuery(oSQL) = False Then Return False End If @@ -74,7 +76,7 @@ Public Class ctrlApplicationAssignment Public Function Process_DeleteAssignment() As Boolean Try Dim oProcessId = GridViewProcessProfile.GetFocusedRowCellValue(GridViewProcessProfile.Columns("GUID")) - Dim oSQL = String.Format("EXEC PRCW_DELETE_PROCESS {0},{1}", oProcessId, Current_ProfileId) + Dim oSQL = String.Format("EXEC PRCW_DELETE_PROCESS {0}", oProcessId) If Database.ExecuteNonQuery(oSQL) Then Process_Load(Current_ProfileId) Return True @@ -161,8 +163,6 @@ Public Class ctrlApplicationAssignment TBCW_PROF_REL_WINDOWTableAdapter.Update(MyDataset.TBCW_PROF_REL_WINDOW) Return True End If - - Catch ex As Exception Logger.Error(ex) Return False