From b024ad7f85501c65caf5b75cec801097425d3596 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 2 Sep 2019 14:38:29 +0200 Subject: [PATCH] fix controls not being assigned --- .../MyDataset.Designer.vb | 12 ++--- app/DD_Clipboard_Searcher/MyDataset.xsd | 44 +++++++++---------- app/DD_Clipboard_Searcher/MyDataset.xss | 10 ++--- .../ctrlApplicationAssignment.vb | 3 +- 4 files changed, 34 insertions(+), 35 deletions(-) diff --git a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb index ac5d25b..4d63c8c 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb +++ b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb @@ -11885,9 +11885,9 @@ Namespace MyDatasetTableAdapters Me._adapter.InsertCommand.CommandText = "INSERT INTO TBCW_PROF_REL_CONTROL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (WINDOW_ID, DESCRIPTI"& _ "ON, AUTOMATION_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@WI"& _ "NDOW_ID,@DESCRIPTION,@AUTOMATION_ID,@FRAMEWORK_ID,@REGEX,@SEQUENCE,@ADDED_WHO); "& _ - " "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID,"& _ - " FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"& _ - " FROM TBCW_PROF_REL_CONTROL WHERE (GUID = SCOPE_IDENTITY())" + " "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_I"& _ + "D, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH"& _ + "EN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WINDOW_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "WINDOW_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, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -11901,9 +11901,9 @@ Namespace MyDatasetTableAdapters Me._adapter.UpdateCommand.CommandText = "UPDATE TBCW_PROF_REL_CONTROL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET WINDOW_ID = @WINDOW_ID, DE"& _ "SCRIPTION = @DESCRIPTION, AUTOMATION_ID = @AUTOMATION_ID, FRAMEWORK_ID = @FRAMEW"& _ "ORK_ID, REGEX = @REGEX, SEQUENCE = @SEQUENCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUI"& _ - "D); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATIO"& _ - "N_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED"& _ - "_WHEN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = @GUID)" + "D); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATI"& _ + "ON_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGE"& _ + "D_WHEN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WINDOW_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "WINDOW_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) 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, "", "", "")) diff --git a/app/DD_Clipboard_Searcher/MyDataset.xsd b/app/DD_Clipboard_Searcher/MyDataset.xsd index eea234d..424c5eb 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xsd +++ b/app/DD_Clipboard_Searcher/MyDataset.xsd @@ -690,11 +690,11 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + DELETE FROM TBCW_PROF_REL_CONTROL WHERE (GUID = @Original_GUID) - + @@ -702,7 +702,7 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBCW_PROF_REL_CONTROL (WINDOW_ID, DESCRIPTION, AUTOMATION_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO) -VALUES (@WINDOW_ID,@DESCRIPTION,@AUTOMATION_ID,@FRAMEWORK_ID,@REGEX,@SEQUENCE,@ADDED_WHO); +VALUES (@WINDOW_ID,@DESCRIPTION,@AUTOMATION_ID,@FRAMEWORK_ID,@REGEX,@SEQUENCE,@ADDED_WHO); SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = SCOPE_IDENTITY()) @@ -730,7 +730,7 @@ ORDER BY SEQUENCE UPDATE TBCW_PROF_REL_CONTROL SET WINDOW_ID = @WINDOW_ID, DESCRIPTION = @DESCRIPTION, AUTOMATION_ID = @AUTOMATION_ID, FRAMEWORK_ID = @FRAMEWORK_ID, REGEX = @REGEX, SEQUENCE = @SEQUENCE -WHERE (GUID = @Original_GUID); +WHERE (GUID = @Original_GUID); SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = @GUID) @@ -769,7 +769,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -815,7 +815,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -832,7 +832,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -861,7 +861,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -872,7 +872,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -895,7 +895,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -943,7 +943,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -991,7 +991,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1008,7 +1008,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1016,7 +1016,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1030,7 +1030,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1038,7 +1038,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1077,7 +1077,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1150,7 +1150,7 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR - + @@ -1252,10 +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 f95b62e..2501a22 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xss +++ b/app/DD_Clipboard_Searcher/MyDataset.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -16,7 +16,7 @@ - + @@ -50,11 +50,11 @@ 310 - 456 + 453 - 328 - 456 + 330 + 453 diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb index eb13e3e..3d87747 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb @@ -218,10 +218,9 @@ Public Class ctrlApplicationAssignment If Not IsNothing(MyDataset.TBCW_PROF_REL_CONTROL.GetChanges) Then TBCW_PROF_REL_CONTROLBindingSource.EndEdit() TBCW_PROF_REL_CONTROLTableAdapter.Update(MyDataset.TBCW_PROF_REL_CONTROL) - Return True End If - + Return True Catch ex As Exception Logger.Error(ex) Return False