From 89eef1feb3e6892345c8b1fbfffd6c722d204296 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 28 May 2018 14:33:29 +0200 Subject: [PATCH] jj: Profil kopieren bricht ab bei doppeltem Namen --- .../DD_DMSLiteDataSet.Designer.vb | 113 +++++++++++++----- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 73 ++++++----- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 36 +++--- app/DD_PM_WINDREAM/frmProfileDesigner.vb | 8 +- 4 files changed, 140 insertions(+), 90 deletions(-) diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 30d6bad..4ee3e41 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -17366,7 +17366,7 @@ Namespace DD_DMSLiteDataSetTableAdapters _ Private Sub InitCommandCollection() - Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(8) {} + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(9) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_"& _ @@ -17398,14 +17398,15 @@ Namespace DD_DMSLiteDataSetTableAdapters " MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " LOG_INDEX, WORK_HISTORY_ENTRY, SQL_GROUP_COLOR, SQL_GROUP_TEXT, S"& _ "QL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT"& _ - " NAME + '_COPY' AS Expr1, TITLE + '_COPY' AS Expr5, PRIORITY, DESCRIPTION"& _ - ", 0 AS Expr2, WD_SEARCH, 0 AS Expr3, @USER AS Expr4, FINAL_PROFILE, FINAL_TEXT, "& _ - "MOVE2FOLDER, TYPE, WD_OBJECTTYPE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SORT_BY_LATEST, PM_"& _ - "VEKTOR_INDEX, LOG_INDEX, WORK_HISTORY_ENTRY, SQL_GROUP_COLOR, SQL_GROUP_TEXT, SQ"& _ - "L_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" ANNOTATE_W"& _ - "ORK_HISTORY_ENTRY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE AS TBPM_PROFILE_1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ - "(GUID = @GUID)" + " NAME + @COPY_SUFFIX AS Expr1, TITLE + @COPY_SUFFIX AS Expr5, PRIORITY, D"& _ + "ESCRIPTION, 0 AS Expr2, WD_SEARCH, 0 AS Expr3, @USER AS Expr4, FINAL_PROFILE, FI"& _ + "NAL_TEXT, MOVE2FOLDER, TYPE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WD_OBJECTTYPE, SORT_BY_L"& _ + "ATEST, PM_VEKTOR_INDEX, LOG_INDEX, WORK_HISTORY_ENTRY, SQL_GROUP_COLOR, SQL_GROU"& _ + "P_TEXT, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + "ANNOTATE_WORK_HISTORY_ENTRY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE AS TBPM_PROFILE_1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHE"& _ + "RE (GUID = @GUID)" Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COPY_SUFFIX", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(5) = New Global.System.Data.SqlClient.SqlCommand() @@ -17414,34 +17415,39 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(5).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(6) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(6).Connection = Me.Connection - Me._commandCollection(6).CommandText = "UPDATE TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET LOG_INDEX = @LOG__INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ + Me._commandCollection(6).CommandText = "SELECT COUNT(GUID) FROM TBPM_PROFILE WHERE NAME = @NAME" + Me._commandCollection(6).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(6).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(7) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(7).Connection = Me.Connection + Me._commandCollection(7).CommandText = "UPDATE TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET LOG_INDEX = @LOG__INDEX"&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, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED"& _ "_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATE"& _ "ST,LOG_INDEX FROM TBPM_PROFILE WHERE (GUID = @GUID)" - Me._commandCollection(6).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(6).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOG__INDEX", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(6).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._commandCollection(6).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(7) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(7).Connection = Me.Connection - Me._commandCollection(7).CommandText = "UPDATE TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NO_OF_DOCUMENTS = @NUMBER, CHANGED_"& _ - "WHO = @WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" Me._commandCollection(7).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NUMBER", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "NO_OF_DOCUMENTS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOG__INDEX", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._commandCollection(7).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(8) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(8).Connection = Me.Connection - Me._commandCollection(8).CommandText = "UPDATE TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PM_VEKTOR_INDEX = @PM_VEKTOR_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ + Me._commandCollection(8).CommandText = "UPDATE TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NO_OF_DOCUMENTS = @NUMBER, CHANGED_"& _ + "WHO = @WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" + Me._commandCollection(8).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NUMBER", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "NO_OF_DOCUMENTS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(8).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(9) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(9).Connection = Me.Connection + Me._commandCollection(9).CommandText = "UPDATE TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PM_VEKTOR_INDEX = @PM_VEKTOR_INDEX"&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, DES"& _ "CRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO"& _ ", CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SOR"& _ "T_BY_LATEST FROM TBPM_PROFILE WHERE (GUID = @GUID)" - Me._commandCollection(8).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PM_VEKTOR_INDEX", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_VEKTOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._commandCollection(8).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(9).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(9).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PM_VEKTOR_INDEX", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_VEKTOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(9).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._commandCollection(9).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 _ - Public Overloads Overridable Function cmdInsert_Copy(ByVal USER As String, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function cmdInsert_Copy(ByVal COPY_SUFFIX As String, ByVal USER As String, ByVal GUID As Integer) As Object Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(4) + If (COPY_SUFFIX Is Nothing) Then + Throw New Global.System.ArgumentNullException("COPY_SUFFIX") + Else + command.Parameters(0).Value = CType(COPY_SUFFIX,String) + End If If (USER Is Nothing) Then Throw New Global.System.ArgumentNullException("USER") Else - command.Parameters(0).Value = CType(USER,String) + command.Parameters(1).Value = CType(USER,String) End If - command.Parameters(1).Value = CType(GUID,Integer) + command.Parameters(2).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 command.Connection.Open End If - Dim returnValue As Integer + Dim returnValue As Object Try - returnValue = command.ExecuteNonQuery + returnValue = command.ExecuteScalar Finally If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then command.Connection.Close End If End Try - Return returnValue + If ((returnValue Is Nothing) _ + OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then + Return Nothing + Else + Return CType(returnValue,Object) + End If End Function _ + Public Overloads Overridable Function cmdProfileExists(ByVal NAME As String) As Global.System.Nullable(Of Integer) + Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(6) + If (NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("NAME") + Else + command.Parameters(0).Value = CType(NAME,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 + command.Connection.Open + End If + Dim returnValue As Object + Try + returnValue = command.ExecuteScalar + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + command.Connection.Close + End If + End Try + If ((returnValue Is Nothing) _ + OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then + Return New Global.System.Nullable(Of Integer)() + Else + Return New Global.System.Nullable(Of Integer)(CType(returnValue,Integer)) + End If + End Function + _ Public Overloads Overridable Function cmdUpdatelogIndex(ByVal LOG__INDEX As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(6) + Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(7) If (LOG__INDEX Is Nothing) Then Throw New Global.System.ArgumentNullException("LOG__INDEX") Else @@ -17898,7 +17945,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, false)> _ Public Overloads Overridable Function cmdUpdateNo(ByVal NUMBER As Integer, ByVal WHO As String, ByVal GUID As Integer) As Integer - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(7) + Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(8) command.Parameters(0).Value = CType(NUMBER,Integer) If (WHO Is Nothing) Then command.Parameters(1).Value = Global.System.DBNull.Value @@ -17927,7 +17974,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, false)> _ Public Overloads Overridable Function CmdUpdateVKT_Index(ByVal PM_VEKTOR_INDEX As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(8) + Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(9) If (PM_VEKTOR_INDEX Is Nothing) Then Throw New Global.System.ArgumentNullException("PM_VEKTOR_INDEX") Else diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index c9f0f9b..a31cdb9 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1338,32 +1338,19 @@ WHERE (FINAL_PROFILE = 1) AND (UPPER(NAME) = UPPER(@name)) - - - - 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) -SELECT 'KOPIE_VON_' + NAME AS Expr1, TITLE, PRIORITY, DESCRIPTION, 0 AS Expr2, WD_SEARCH, 0 AS Expr3, @USER AS Expr4, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, - SORT_BY_LATEST -FROM TBPM_PROFILE AS TBPM_PROFILE_1 -WHERE (GUID = @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, LOG_INDEX, WORK_HISTORY_ENTRY, SQL_GROUP_COLOR, SQL_GROUP_TEXT, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY) -SELECT NAME + '_COPY' AS Expr1, TITLE + '_COPY' AS Expr5, PRIORITY, DESCRIPTION, 0 AS Expr2, WD_SEARCH, 0 AS Expr3, @USER AS Expr4, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, - SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, WORK_HISTORY_ENTRY, SQL_GROUP_COLOR, SQL_GROUP_TEXT, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, +SELECT NAME + @COPY_SUFFIX AS Expr1, TITLE + @COPY_SUFFIX AS Expr5, PRIORITY, DESCRIPTION, 0 AS Expr2, WD_SEARCH, 0 AS Expr3, @USER AS Expr4, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, + WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, WORK_HISTORY_ENTRY, SQL_GROUP_COLOR, SQL_GROUP_TEXT, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY FROM TBPM_PROFILE AS TBPM_PROFILE_1 WHERE (GUID = @GUID) + @@ -1378,6 +1365,16 @@ WHERE (GUID = @GUID) + + + + SELECT COUNT(GUID) FROM TBPM_PROFILE WHERE NAME = @NAME + + + + + + @@ -1907,7 +1904,7 @@ WHERE (GUID = @GUID) - + @@ -1952,7 +1949,7 @@ WHERE (GUID = @GUID) - + @@ -2055,7 +2052,7 @@ WHERE (GUID = @GUID) - + @@ -2151,7 +2148,7 @@ WHERE (GUID = @GUID) - + @@ -2202,7 +2199,7 @@ WHERE (GUID = @GUID) - + @@ -2232,7 +2229,7 @@ WHERE (GUID = @GUID) - + @@ -2255,7 +2252,7 @@ WHERE (GUID = @GUID) - + @@ -2344,7 +2341,7 @@ WHERE (GUID = @GUID) - + @@ -2417,7 +2414,7 @@ WHERE (GUID = @GUID) - + @@ -2453,7 +2450,7 @@ WHERE (GUID = @GUID) - + @@ -2468,7 +2465,7 @@ WHERE (GUID = @GUID) - + @@ -2489,7 +2486,7 @@ WHERE (GUID = @GUID) - + @@ -2597,7 +2594,7 @@ WHERE (GUID = @GUID) - + @@ -2670,7 +2667,7 @@ WHERE (GUID = @GUID) - + @@ -2721,7 +2718,7 @@ WHERE (GUID = @GUID) - + @@ -2812,7 +2809,7 @@ WHERE (GUID = @GUID) - + @@ -2943,11 +2940,11 @@ WHERE (GUID = @GUID) - - - - - + + + + + \ 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 bb6a389..eb4e478 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,27 +4,27 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - - - - + + + + + - - - - - + + + + + - + 461 @@ -36,7 +36,7 @@ - + 343 @@ -52,7 +52,7 @@ - + 515 @@ -64,7 +64,7 @@ - + 844 @@ -80,7 +80,7 @@ - + 141 diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.vb b/app/DD_PM_WINDREAM/frmProfileDesigner.vb index f561510..9045e24 100644 --- a/app/DD_PM_WINDREAM/frmProfileDesigner.vb +++ b/app/DD_PM_WINDREAM/frmProfileDesigner.vb @@ -597,7 +597,13 @@ Public Class frmProfileDesigner 'wenn Speichern ja If result = MsgBoxResult.Yes Then Try - TBPM_PROFILETableAdapter.cmdInsert_Copy(Environment.UserName, PROFILGUIDTextBox.Text) + Dim copySuffix = "_COPY" + + While TBPM_PROFILETableAdapter.cmdProfileExists($"{NAMETextBox.Text}{copySuffix}") > 0 + copySuffix = copySuffix & "_COPY" + End While + + TBPM_PROFILETableAdapter.cmdInsert_Copy(copySuffix, Environment.UserName, PROFILGUIDTextBox.Text) Dim NewGUID As Integer = TBPM_PROFILETableAdapter.cmdMaxGuid If NewGUID > 0 Then Dim _sql = "INSERT INTO TBPM_PROFILE_CONTROLS " &