diff --git a/app/DD_PM_WINDREAM/ClassPatterns.vb b/app/DD_PM_WINDREAM/ClassPatterns.vb deleted file mode 100644 index 1be5103..0000000 --- a/app/DD_PM_WINDREAM/ClassPatterns.vb +++ /dev/null @@ -1,262 +0,0 @@ -Imports System.Text.RegularExpressions -Imports WINDREAMLib - -''' -''' Defines common Functions for Checking for and replacing placeholders. -''' This Class also includes a child class `Pattern` for passing around Patterns. -''' -''' The format of all placeholders is: -''' {#TYPE#VALUE} -''' -''' Some Examples: -''' {#INT#USERNAME} -''' {#CTRL#CMB_2} -''' {#WMI#String 39} -''' -Public Class ClassPatterns - ' Complex patterns that rely on a datasource like a Database or Windream - Public Const PATTERN_WMI = "WMI" - Public Const PATTERN_CTRL = "CTRL" - ' Simple patterns that only rely on .NET functions - Public Const PATTERN_INT = "INT" - ' Simple patterns that rely on Data from the TBDD_USER table - Public Const PATTERN_USER = "USER" - - Public Const USER_VALUE_PRENAME = "PRENAME" - Public Const USER_VALUE_SURNAME = "SURNAME" - Public Const USER_VALUE_EMAIL = "EMAIL" - Public Const USER_VALUE_SHORTNAME = "SHORTNAME" - - Public Const INT_VALUE_USERNAME = "USERNAME" - Public Const INT_VALUE_MACHINE = "MACHINE" - Public Const INT_VALUE_DOMAIN = "DOMAIN" - - Private Shared regex As Regex = New Regex("{#(\w+)#([\w\s_]+)}+") - Private Shared allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_USER, PATTERN_INT} - Private Shared complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL} - Private Shared simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT} - - ''' - ''' Wraps a pattern-type and -value in the common format: {#type#value} - ''' - Public Shared Function WrapPatternValue(type As String, value As String) As String - Return New Pattern(type, value).ToString - End Function - - - Public Shared Function ReplaceAllValues(input As String, panel As Panel, document As WMObject, prename As String, surname As String, shortname As String, email As String) As String - Dim result = input - - result = ReplaceInternalValues(result) - result = ReplaceControlValues(result, panel) - If Not IsNothing(document) Then result = ReplaceWindreamIndicies(result, document) - result = ReplaceUserValues(result, prename, surname, shortname, email) - - Return result - End Function - - Public Shared Function ReplaceInternalValues(input As String) As String - Dim result = input - - ' Replace Username(s) - While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_USERNAME) - result = ReplacePattern(result, PATTERN_INT, Environment.UserName) - End While - - ' Replace Machinename(s) - While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_MACHINE) - result = ReplacePattern(result, PATTERN_INT, Environment.MachineName) - End While - - ' Replace Domainname(s) - While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_DOMAIN) - result = ReplacePattern(result, PATTERN_INT, Environment.UserDomainName) - End While - - Return result - End Function - - Public Shared Function ReplaceUserValues(input As String, prename As String, surname As String, shortname As String, email As String) As String - Dim result = input - - While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_PRENAME) - result = ReplacePattern(input, PATTERN_USER, prename) - End While - - While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_SURNAME) - result = ReplacePattern(input, PATTERN_USER, surname) - End While - - While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_SHORTNAME) - result = ReplacePattern(input, PATTERN_USER, shortname) - End While - - While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_EMAIL) - result = ReplacePattern(input, PATTERN_USER, email) - End While - - Return result - End Function - - - Public Shared Function ReplaceControlValues(input As String, panel As Panel) As String - Dim result = input - - While ContainsPattern(result, PATTERN_CTRL) - Dim controlName As String = GetNextPattern(result, PATTERN_CTRL).Value - Dim control As Control = panel.Controls.Find(controlName, False).FirstOrDefault() - - If control IsNot Nothing Then - Dim value As String = control.Text - result = ReplacePattern(result, PATTERN_CTRL, value) - End If - End While - - Return result - End Function - - Public Shared Function ReplaceWindreamIndicies(input As String, document As WMObject) As String - Dim result = input - - While ContainsPattern(result, PATTERN_WMI) - Dim indexName As String = GetNextPattern(result, PATTERN_WMI).Value - Dim value = document.GetVariableValue(indexName) - - If value IsNot Nothing Then - result = ReplacePattern(result, PATTERN_WMI, value) - End If - End While - - Return result - End Function - - Private Shared Function ContainsPattern(input As String, type As String) As String - Dim elements As MatchCollection = regex.Matches(input) - - For Each element As Match In elements - Dim t As String = element.Groups(1).Value - - If t = type Then - Return True - End If - Next - - Return False - End Function - - Public Shared Function GetNextPattern(input As String, type As String) As Pattern - Dim elements As MatchCollection = regex.Matches(input) - - For Each element As Match In elements - ' Pattern in input - Dim t As String = element.Groups(1).Value - Dim v As String = element.Groups(2).Value - - If t = type Then - Return New Pattern(t, v) - End If - Next - - Return Nothing - End Function - - Public Shared Function GetAllPatterns(input As String) As List(Of Pattern) - Dim elements As MatchCollection = regex.Matches(input) - Dim results As New List(Of Pattern) - - For Each element As Match In elements - ' Pattern in input - Dim t As String = element.Groups(1).Value - Dim v As String = element.Groups(2).Value - - results.Add(New Pattern(t, v)) - Next - - Return results - End Function - - Public Shared Function ReplacePattern(input As String, type As String, replacement As String) As String - Dim elements As MatchCollection = regex.Matches(input) - - If IsNothing(replacement) Or replacement = String.Empty Then - Return input - End If - - For Each element As Match In elements - ' if group 1 contains the 'pattern' the replace whole group with 'replacement' - ' and return it - If element.Groups(1).Value = type Then - Return Regex.Replace(input, element.Groups(0).Value, replacement) - End If - Next - - ' no replacement made - Return input - End Function - - Private Shared Function ContainsPatternAndValue(input As String, type As String, value As String) As Boolean - Dim elements As MatchCollection = regex.Matches(input) - - For Each element As Match In elements - ' Pattern in input - Dim t As String = element.Groups(1).Value - Dim v As String = element.Groups(2).Value - - If t = type And v = value Then - Return True - End If - Next - - Return False - End Function - - Public Shared Function HasAnyPatterns(input) As Boolean - Return allPatterns.Any(Function(p) - Return HasPattern(input, p) - End Function) - End Function - - Public Shared Function HasOnlySimplePatterns(input As String) As Boolean - Return Not HasComplexPatterns(input) - End Function - - Public Shared Function HasComplexPatterns(input As String) As Boolean - Return complexPatterns.Any(Function(p) - Return HasPattern(input, p) - End Function) - End Function - - Public Shared Function HasPattern(input As String, type As String) As Boolean - Dim matches = regex.Matches(input) - - For Each match As Match In matches - For Each group As Group In match.Groups - If group.Value = type Then - Return True - End If - Next - Next - - Return False - End Function - - Public Class Pattern - Public ReadOnly Property Type As String - Public ReadOnly Property Value As String - - Public Sub New(type As String, value As String) - Me.Type = type - Me.Value = value - End Sub - - Public Sub New(stringRepresentation As String) - Dim array = stringRepresentation.Split("#") - Me.Type = array(0) - Me.Value = array(1) - End Sub - - Public Overrides Function ToString() As String - Return $"{Type}#{Value}" - End Function - End Class -End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 3568c53..dc3406f 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -2360,6 +2360,10 @@ Partial Public Class DD_DMSLiteDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn + Private columnCOMMENT As Global.System.Data.DataColumn + + Private columnSHORTNAME As Global.System.Data.DataColumn + _ Public Sub New() @@ -2467,6 +2471,22 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCOMMENT + End Get + End Property + + _ + Public ReadOnly Property SHORTNAMEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSHORTNAME + End Get + End Property + _ @@ -2504,9 +2524,9 @@ Partial Public Class DD_DMSLiteDataSet _ - Public Overloads Function AddTBDD_USERRow(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_USERRow + Public Overloads Function AddTBDD_USERRow(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal COMMENT As String, ByVal SHORTNAME As String) As TBDD_USERRow Dim rowTBDD_USERRow As TBDD_USERRow = CType(Me.NewRow,TBDD_USERRow) - Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME} rowTBDD_USERRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBDD_USERRow) Return rowTBDD_USERRow @@ -2544,6 +2564,8 @@ Partial Public Class DD_DMSLiteDataSet Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + Me.columnCOMMENT = MyBase.Columns("COMMENT") + Me.columnSHORTNAME = MyBase.Columns("SHORTNAME") End Sub _ Public Sub New() @@ -4498,22 +4526,6 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property - _ - Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn - Get - Return Me.columnADDED_WHO - End Get - End Property - - _ - Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn - Get - Return Me.columnADDED_WHEN - End Get - End Property - _ Public ReadOnly Property EMAILColumn() As Global.System.Data.DataColumn @@ -4522,6 +4534,22 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCOMMENT + End Get + End Property + + _ + Public ReadOnly Property SHORTNAMEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSHORTNAME + End Get + End Property + _ @@ -4559,9 +4587,9 @@ Partial Public Class DD_DMSLiteDataSet _ - Public Overloads Function AddTBPROFILE_USERRow(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal EMAIL As String) As TBPROFILE_USERRow + Public Overloads Function AddTBPROFILE_USERRow(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal COMMENT As String, ByVal SHORTNAME As String) As TBPROFILE_USERRow Dim rowTBPROFILE_USERRow As TBPROFILE_USERRow = CType(Me.NewRow,TBPROFILE_USERRow) - Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, ADDED_WHO, ADDED_WHEN, EMAIL} + Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, EMAIL, COMMENT, SHORTNAME} rowTBPROFILE_USERRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBPROFILE_USERRow) Return rowTBPROFILE_USERRow @@ -4594,9 +4622,9 @@ Partial Public Class DD_DMSLiteDataSet Me.columnPRENAME = MyBase.Columns("PRENAME") Me.columnNAME = MyBase.Columns("NAME") Me.columnUSERNAME = MyBase.Columns("USERNAME") - Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") - Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") Me.columnEMAIL = MyBase.Columns("EMAIL") + Me.columnCOMMENT = MyBase.Columns("COMMENT") + Me.columnSHORTNAME = MyBase.Columns("SHORTNAME") End Sub _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBDD_USER.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBDD_USER ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_USER.COMMENTColumn) = value + End Set + End Property + + _ + Public Property SHORTNAME() As String + Get + Try + Return CType(Me(Me.tableTBDD_USER.SHORTNAMEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SHORTNAME in Tabelle TBDD_USER ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_USER.SHORTNAMEColumn) = value + End Set + End Property + _ Public Function IsPRENAMENull() As Boolean @@ -9713,6 +9770,30 @@ Partial Public Class DD_DMSLiteDataSet Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_USER.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub + + _ + Public Function IsCOMMENTNull() As Boolean + Return Me.IsNull(Me.tableTBDD_USER.COMMENTColumn) + End Function + + _ + Public Sub SetCOMMENTNull() + Me(Me.tableTBDD_USER.COMMENTColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsSHORTNAMENull() As Boolean + Return Me.IsNull(Me.tableTBDD_USER.SHORTNAMEColumn) + End Function + + _ + Public Sub SetSHORTNAMENull() + Me(Me.tableTBDD_USER.SHORTNAMEColumn) = Global.System.Convert.DBNull + End Sub End Class ''' @@ -10747,28 +10828,6 @@ Partial Public Class DD_DMSLiteDataSet End Set End Property - _ - Public Property ADDED_WHO() As String - Get - Return CType(Me(Me.tableTBPROFILE_USER.ADDED_WHOColumn),String) - End Get - Set - Me(Me.tableTBPROFILE_USER.ADDED_WHOColumn) = value - End Set - End Property - - _ - Public Property ADDED_WHEN() As Date - Get - Return CType(Me(Me.tableTBPROFILE_USER.ADDED_WHENColumn),Date) - End Get - Set - Me(Me.tableTBPROFILE_USER.ADDED_WHENColumn) = value - End Set - End Property - _ Public Property EMAIL() As String @@ -10784,6 +10843,36 @@ Partial Public Class DD_DMSLiteDataSet End Set End Property + _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBPROFILE_USER.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBPROFILE_USER ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBPROFILE_USER.COMMENTColumn) = value + End Set + End Property + + _ + Public Property SHORTNAME() As String + Get + Try + Return CType(Me(Me.tableTBPROFILE_USER.SHORTNAMEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SHORTNAME in Tabelle TBPROFILE_USER ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBPROFILE_USER.SHORTNAMEColumn) = value + End Set + End Property + _ Public Function IsPRENAMENull() As Boolean @@ -10819,6 +10908,30 @@ Partial Public Class DD_DMSLiteDataSet Public Sub SetEMAILNull() Me(Me.tableTBPROFILE_USER.EMAILColumn) = Global.System.Convert.DBNull End Sub + + _ + Public Function IsCOMMENTNull() As Boolean + Return Me.IsNull(Me.tableTBPROFILE_USER.COMMENTColumn) + End Function + + _ + Public Sub SetCOMMENTNull() + Me(Me.tableTBPROFILE_USER.COMMENTColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsSHORTNAMENull() As Boolean + Return Me.IsNull(Me.tableTBPROFILE_USER.SHORTNAMEColumn) + End Function + + _ + Public Sub SetSHORTNAMENull() + Me(Me.tableTBPROFILE_USER.SHORTNAMEColumn) = Global.System.Convert.DBNull + End Sub End Class ''' @@ -15322,43 +15435,110 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") + tableMapping.ColumnMappings.Add("SHORTNAME", "SHORTNAME") 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 TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_USER] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME = "& _ + "1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAME "& _ + "= 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Origina"& _ + "l_USERNAME) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Original"& _ + "_EMAIL)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AN"& _ + "D [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_"& _ + "CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED"& _ + "_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_W"& _ + "HEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL)"& _ + " OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME]"& _ + " IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)))" 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("@IsNull_PRENAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, 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_USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EMAIL", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", 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("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, 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("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SHORTNAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", 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 TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PRENAME, NAME, USERNAME, EMAIL, "& _ - "ADDED_WHO, PM_RIGHT_FILE_DELETE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PRENAME,@NAME,@USERNAME,@EMAIL"& _ - ",@ADDED_WHO,@PM_RIGHT_FILE_DELETE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAME, USERNAME, EM"& _ - "AIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, ADDED_WHO, ADDED_WHEN, "& _ - "CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_USER] ([PRENAME], [NAME], [USERNAME], [EMAIL], [ADDED_WHO], [AD"& _ + "DED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [COMMENT], [SHORTNAME]) VALUES (@PRENA"& _ + "ME, @NAME, @USERNAME, @EMAIL, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WH"& _ + "EN, @COMMENT, @SHORTNAME);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_W"& _ + "HO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME FROM TBDD_USER WHE"& _ + "RE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, 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("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", 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("@PM_RIGHT_FILE_DELETE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_RIGHT_FILE_DELETE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, 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("@USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", 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("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", 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 TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PRENAME = @PRENAME, NAME = @NAME, USER"& _ - "NAME = @USERNAME, EMAIL = @EMAIL, CHANGED_WHO = @CHANGED_WHO, PM_RIGHT_FILE_DELE"& _ - "TE = @PM_RIGHT_FILE_DELETE"&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"& _ - ", PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_"& _ - "WHEN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUI"& _ - "D = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_USER] SET [PRENAME] = @PRENAME, [NAME] = @NAME, [USERNAME] = @USERNA"& _ + "ME, [EMAIL] = @EMAIL, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHA"& _ + "NGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [COMMENT] = @COMMENT, "& _ + "[SHORTNAME] = @SHORTNAME WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME "& _ + "= 1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAM"& _ + "E = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Origi"& _ + "nal_USERNAME) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Origin"& _ + "al_EMAIL)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 "& _ + "AND [ADDED_WHEN] IS NULL) OR ([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 ((@IsNull_COMMENT = 1 AND [COMMENT] IS NUL"& _ + "L) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAM"& _ + "E] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAM"& _ + "E, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, S"& _ + "HORTNAME FROM TBDD_USER WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, 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("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", 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("@PM_RIGHT_FILE_DELETE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_RIGHT_FILE_DELETE", 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, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, 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("@USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", 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, 0, 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, 0, 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, 0, 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, 0, 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("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PRENAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EMAIL", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SHORTNAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_PRENAME As String, ByVal Original_NAME As String, ByVal Original_USERNAME As String, ByVal Original_EMAIL As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_COMMENT As String, ByVal Original_SHORTNAME As String) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + If (Original_PRENAME Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(2).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_PRENAME,String) + End If + If (Original_NAME Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_NAME,String) + End If + If (Original_USERNAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_USERNAME") + Else + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_USERNAME,String) + End If + If (Original_EMAIL Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_EMAIL,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value + End If + 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 + If (Original_COMMENT Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(15).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(16).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(15).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_COMMENT,String) + End If + If (Original_SHORTNAME Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(17).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(18).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(17).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(18).Value = CType(Original_SHORTNAME,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 @@ -15496,7 +15743,7 @@ 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.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal ADDED_WHO As String, ByVal PM_RIGHT_FILE_DELETE As Boolean) As Integer + Public Overloads Overridable Function Insert(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, 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 COMMENT As String, ByVal SHORTNAME As String) As Integer If (PRENAME Is Nothing) Then Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value Else @@ -15522,7 +15769,31 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO,String) End If - Me.Adapter.InsertCommand.Parameters(5).Value = CType(PM_RIGHT_FILE_DELETE,Boolean) + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(6).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(7).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (COMMENT Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(8).Value = CType(COMMENT,String) + End If + If (SHORTNAME Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(9).Value = CType(SHORTNAME,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 @@ -15542,7 +15813,29 @@ 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.Update, true)> _ - Public Overloads Overridable Function Update(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal CHANGED_WHO As String, ByVal PM_RIGHT_FILE_DELETE As Boolean, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update( _ + ByVal PRENAME As String, _ + ByVal NAME As String, _ + ByVal USERNAME As String, _ + ByVal EMAIL As String, _ + 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 COMMENT As String, _ + ByVal SHORTNAME As String, _ + ByVal Original_GUID As Integer, _ + ByVal Original_PRENAME As String, _ + ByVal Original_NAME As String, _ + ByVal Original_USERNAME As String, _ + ByVal Original_EMAIL As String, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_COMMENT As String, _ + ByVal Original_SHORTNAME As String, _ + ByVal GUID As Integer) As Integer If (PRENAME Is Nothing) Then Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value Else @@ -15563,14 +15856,104 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(3).Value = CType(EMAIL,String) End If - If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") Else - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ADDED_WHO,String) End If - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(PM_RIGHT_FILE_DELETE,Boolean) - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(GUID,Integer) + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (COMMENT Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(COMMENT,String) + End If + If (SHORTNAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(SHORTNAME,String) + End If + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_GUID,Integer) + If (Original_PRENAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_PRENAME,String) + End If + If (Original_NAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(14).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_NAME,String) + End If + If (Original_USERNAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_USERNAME") + Else + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_USERNAME,String) + End If + If (Original_EMAIL Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_EMAIL,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(20).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(22).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(24).Value = Global.System.DBNull.Value + End If + If (Original_COMMENT Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(25).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(26).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(25).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(26).Value = CType(Original_COMMENT,String) + End If + If (Original_SHORTNAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(27).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(28).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(27).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(28).Value = CType(Original_SHORTNAME,String) + End If + Me.Adapter.UpdateCommand.Parameters(29).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 @@ -15585,6 +15968,35 @@ Namespace DD_DMSLiteDataSetTableAdapters End If End Try End Function + + _ + Public Overloads Overridable Function Update( _ + ByVal PRENAME As String, _ + ByVal NAME As String, _ + ByVal USERNAME As String, _ + ByVal EMAIL As String, _ + 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 COMMENT As String, _ + ByVal SHORTNAME As String, _ + ByVal Original_GUID As Integer, _ + ByVal Original_PRENAME As String, _ + ByVal Original_NAME As String, _ + ByVal Original_USERNAME As String, _ + ByVal Original_EMAIL As String, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_COMMENT As String, _ + ByVal Original_SHORTNAME As String) As Integer + Return Me.Update(PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME, Original_GUID, Original_PRENAME, Original_NAME, Original_USERNAME, Original_EMAIL, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_COMMENT, Original_SHORTNAME, Original_GUID) + End Function End Class ''' @@ -17466,9 +17878,9 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("PRENAME", "PRENAME") tableMapping.ColumnMappings.Add("NAME", "NAME") tableMapping.ColumnMappings.Add("USERNAME", "USERNAME") - tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") - tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("EMAIL", "EMAIL") + tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") + tableMapping.ColumnMappings.Add("SHORTNAME", "SHORTNAME") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -17485,11 +17897,10 @@ Namespace DD_DMSLiteDataSetTableAdapters 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 TBDD_USER.GUID, TBDD_USER.PRENAME, TBDD_USER.NAME, TBDD_USER.USERNA"& _ - "ME, TBPM_PROFILE_USER.ADDED_WHO, TBPM_PROFILE_USER.ADDED_WHEN, TBDD_USER.EMAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ - "FROM TBPM_PROFILE_USER INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_USER"& _ - " ON TBPM_PROFILE_USER.USER_ID = TBDD_USER.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBPM_PROFILE_USER."& _ - "PROFIL_ID = @profil_id)" + Me._commandCollection(0).CommandText = "SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.EMAIL, T1.COMMENT, T1"& _ + ".SHORTNAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_USER T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " TBDD_USER T1 ON T.USER_ID = T1.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (T.PROFIL_ID = @profil_id"& _ + ")" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).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._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc index 195a42d..5716e53 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc @@ -57,15 +57,6 @@ - - - - - - - - - diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index e87546d..4c9eb26 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -427,32 +427,51 @@ WHERE (GUID = 1) - DELETE FROM TBDD_USER -WHERE (GUID = @Original_GUID) + DELETE FROM [TBDD_USER] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME = 1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Original_USERNAME) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Original_EMAIL)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME))) - + + + + + + + + + + + + + + + + + + + - INSERT INTO TBDD_USER - (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, PM_RIGHT_FILE_DELETE) -VALUES (@PRENAME,@NAME,@USERNAME,@EMAIL,@ADDED_WHO,@PM_RIGHT_FILE_DELETE); -SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY()) + INSERT INTO [TBDD_USER] ([PRENAME], [NAME], [USERNAME], [EMAIL], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [COMMENT], [SHORTNAME]) VALUES (@PRENAME, @NAME, @USERNAME, @EMAIL, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @COMMENT, @SHORTNAME); +SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY()) - - - - - - + + + + + + + + + + - - SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + + SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME FROM TBDD_USER WHERE (GUID IN (SELECT USER_ID @@ -466,19 +485,39 @@ WHERE (GUID IN - UPDATE TBDD_USER -SET PRENAME = @PRENAME, NAME = @NAME, USERNAME = @USERNAME, EMAIL = @EMAIL, CHANGED_WHO = @CHANGED_WHO, PM_RIGHT_FILE_DELETE = @PM_RIGHT_FILE_DELETE -WHERE (GUID = @Original_GUID); -SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID) + UPDATE [TBDD_USER] SET [PRENAME] = @PRENAME, [NAME] = @NAME, [USERNAME] = @USERNAME, [EMAIL] = @EMAIL, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [COMMENT] = @COMMENT, [SHORTNAME] = @SHORTNAME WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME = 1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Original_USERNAME) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Original_EMAIL)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME))); +SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME FROM TBDD_USER WHERE (GUID = @GUID) - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -494,12 +533,14 @@ SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHE + + - SELECT T1.* FROM TBDD_USER_MODULES T, TBDD_USER T1 WHERE T.USER_ID = T1.GUID AND T.MODULE_ID = (SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'PM') AND T.USER_ID NOT IN (SELECT USER_ID FROM TBPM_PROFILE_USER WHERE PROFIL_ID = @PROFILE_ID) + SELECT T1.ADDED_WHEN, T1.ADDED_WHO, T1.CHANGED_WHEN, T1.CHANGED_WHO, T1.COMMENT, T1.EMAIL, T1.GUID, T1.NAME, T1.PRENAME, T1.SHORTNAME, T1.USERNAME FROM TBDD_USER_MODULES AS T INNER JOIN TBDD_USER AS T1 ON T.USER_ID = T1.GUID WHERE (T.MODULE_ID = (SELECT GUID FROM TBDD_MODULES WHERE (SHORT_NAME = 'PM'))) AND (T.USER_ID NOT IN (SELECT USER_ID FROM TBPM_PROFILE_USER WHERE (PROFIL_ID = @PROFILE_ID))) @@ -889,13 +930,13 @@ WHERE (GUID = @ID) - + - SELECT TBDD_USER.GUID, TBDD_USER.PRENAME, TBDD_USER.NAME, TBDD_USER.USERNAME, TBPM_PROFILE_USER.ADDED_WHO, TBPM_PROFILE_USER.ADDED_WHEN, TBDD_USER.EMAIL -FROM TBPM_PROFILE_USER INNER JOIN - TBDD_USER ON TBPM_PROFILE_USER.USER_ID = TBDD_USER.GUID -WHERE (TBPM_PROFILE_USER.PROFIL_ID = @profil_id) + SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.EMAIL, T1.COMMENT, T1.SHORTNAME +FROM TBPM_PROFILE_USER T INNER JOIN + TBDD_USER T1 ON T.USER_ID = T1.GUID +WHERE (T.PROFIL_ID = @profil_id) @@ -908,12 +949,12 @@ WHERE (TBPM_PROFILE_USER.PROFIL_ID = @profil_id) - - + + - + DELETE FROM TBPM_PROFILE_USER @@ -925,7 +966,7 @@ WHERE (PROFIL_ID = @PROFILE_ID) AND (USER_ID = @USER_ID) - + DELETE FROM TBPM_PROFILE_USER @@ -2037,7 +2078,7 @@ WHERE (PROFIL_ID = @PROFIL_ID AND GROUP_ID = @GROUP_ID) - + DELETE FROM TBPM_PROFILE_GROUP WHERE PROFIL_ID = @PROFILE_ID @@ -2047,7 +2088,7 @@ WHERE (PROFIL_ID = @PROFIL_ID AND GROUP_ID = @GROUP_ID) - + INSERT INTO TBPM_PROFILE_GROUP @@ -2071,7 +2112,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2116,7 +2157,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2219,7 +2260,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2315,7 +2356,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2363,10 +2404,24 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) + + + + + + + + + + + + + + - + @@ -2396,7 +2451,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2419,7 +2474,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2509,7 +2564,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2582,7 +2637,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2607,14 +2662,6 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - - - - - - - - @@ -2622,10 +2669,24 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) + + + + + + + + + + + + + + - + @@ -2640,7 +2701,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2661,7 +2722,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2769,7 +2830,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2842,7 +2903,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2893,7 +2954,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2985,7 +3046,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -3042,7 +3103,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -3083,7 +3144,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -3203,11 +3264,11 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - - - - - + + + + + \ 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 fa2a37d..8922c20 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -9,20 +9,20 @@ - - + + - + - - - - + + + + diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 47c071e..d3f9780 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -159,7 +159,6 @@ - diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index 4095a4f..71d4548 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -1,6 +1,7 @@ Imports WINDREAMLib Imports Oracle.ManagedDataAccess.Client Imports System.ComponentModel +Imports DD_LIB_Standards Public Class frmMassValidator Dim DT_PROFIL As DataTable @@ -205,26 +206,26 @@ Public Class frmMassValidator Dim i As Integer - 'sql = ClassPatterns.ReplaceAllValues(sql, pnldesigner, aktivesDokument) - If ClassPatterns.HasOnlySimplePatterns(CURR_SELECT_CONTROL) Then - CURR_SELECT_CONTROL = ClassPatterns.ReplaceInternalValues(CURR_SELECT_CONTROL) - CURR_SELECT_CONTROL = ClassPatterns.ReplaceControlValues(CURR_SELECT_CONTROL, pnldesigner) + 'sql = ClassPatterns.ReplaceAllValues(sql, pnldesigner, aktivesDokument) + If clsPatterns.HasOnlySimplePatterns(CURR_SELECT_CONTROL) Then + CURR_SELECT_CONTROL = clsPatterns.ReplaceInternalValues(CURR_SELECT_CONTROL) + CURR_SELECT_CONTROL = clsPatterns.ReplaceControlValues(CURR_SELECT_CONTROL, pnldesigner) - sqlCnn = New SqlClient.SqlConnection(connectionString) - ' Try - sqlCnn.Open() - sqlCmd = New SqlClient.SqlCommand(CURR_SELECT_CONTROL, sqlCnn) - adapter.SelectCommand = sqlCmd - adapter.Fill(NewDataset) + sqlCnn = New SqlClient.SqlConnection(connectionString) + ' Try + sqlCnn.Open() + sqlCmd = New SqlClient.SqlCommand(CURR_SELECT_CONTROL, sqlCnn) + adapter.SelectCommand = sqlCmd + adapter.Fill(NewDataset) - For i = 0 To NewDataset.Tables(0).Rows.Count - 1 - cmb.Items.Add(NewDataset.Tables(0).Rows(i).Item(0)) - Next - adapter.Dispose() - sqlCmd.Dispose() - sqlCnn.Close() - End If - Catch ex As Exception + For i = 0 To NewDataset.Tables(0).Rows.Count - 1 + cmb.Items.Add(NewDataset.Tables(0).Rows(i).Item(0)) + Next + adapter.Dispose() + sqlCmd.Dispose() + sqlCnn.Close() + End If + Catch ex As Exception ClassLogger.Add("Unexpected Error in running depending sql-command: " & ex.Message) MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected Error in running depending sql-command:") End Try @@ -695,9 +696,9 @@ Public Class frmMassValidator Dim displayboxname = ROW.Item(Name).ToString If Not IsDBNull(ROW.Item(1)) And Not IsDBNull(ROW.Item(2)) Then Dim sql_Statement = ROW.Item(2) - sql_Statement = ClassPatterns.ReplaceAllValues(sql_Statement, pnldesigner, WMObject, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL) + sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, WMObject, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL) - _dependingControl_in_action = True + _dependingControl_in_action = True Depending_Control_Set_Result(displayboxname, sql_Statement, ROW.Item(1)) _dependingControl_in_action = False End If @@ -769,10 +770,10 @@ Public Class frmMassValidator If Not IsDBNull(ROW.Item("CONNECTION_ID")) And Not IsDBNull(ROW.Item("SQL_UEBERPRUEFUNG")) Then Dim sql_Statement = ROW.Item("SQL_UEBERPRUEFUNG") - sql_Statement = ClassPatterns.ReplaceAllValues(sql_Statement, pnldesigner, WMObject, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL) + sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, WMObject, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL) - _dependingControl_in_action = True + _dependingControl_in_action = True Depending_Control_Set_Result(displayboxname, sql_Statement, ROW.Item(1)) _dependingControl_in_action = False @@ -865,7 +866,7 @@ Public Class frmMassValidator Dim sqlStatement As String = row.Item("SQL_UEBERPRUEFUNG") Dim connectionId As Integer = row.Item("CONNECTION_ID") - sql = ClassPatterns.ReplaceInternalValues(sqlStatement) + sql = clsPatterns.ReplaceInternalValues(sqlStatement) dt = ClassDatabase.Return_Datatable(sql) If IsNothing(dt) Then diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb index 2d7fece..0ef0744 100644 --- a/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb @@ -49,7 +49,7 @@ Partial Class frmProfileDesigner 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.SplitContainer_Profilzuordnung2 = New System.Windows.Forms.SplitContainer() Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl() Me.TBPROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -58,6 +58,9 @@ Partial Class frmProfileDesigner Me.colPRENAME1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colNAME3 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colUSERNAME1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colEMAIL1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.Panel1 = New System.Windows.Forms.Panel() Me.Label20 = New System.Windows.Forms.Label() Me.gridAvailableUsers = New DevExpress.XtraGrid.GridControl() @@ -67,6 +70,8 @@ Partial Class frmProfileDesigner Me.colNAME2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colUSERNAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.colEMAIL = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label19 = New System.Windows.Forms.Label() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() @@ -84,7 +89,6 @@ Partial Class frmProfileDesigner Me.colCOMMENT = New DevExpress.XtraGrid.Columns.GridColumn() Me.Panel4 = New System.Windows.Forms.Panel() Me.Label23 = New System.Windows.Forms.Label() - Me.btnUserManager = New System.Windows.Forms.Button() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() @@ -197,6 +201,7 @@ Partial Class frmProfileDesigner Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() + Me.tsBtnCancel = New System.Windows.Forms.ToolStripButton() Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView = New System.Windows.Forms.DataGridView() Me.GUID = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn26 = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -208,38 +213,18 @@ Partial Class frmProfileDesigner Me.ANNOTATE_ALL_WORK_HISTORY_ENTRIESCheckBox = New System.Windows.Forms.CheckBox() Me.SQL_VIEWTextBox = New System.Windows.Forms.TextBox() Me.WORK_HISTORY_ENTRYTextBox = New System.Windows.Forms.TextBox() - Me.tabCustomColumns = New System.Windows.Forms.TabPage() - Me.ComboBox1 = New System.Windows.Forms.ComboBox() - Me.Label18 = New System.Windows.Forms.Label() - Me.Label17 = New System.Windows.Forms.Label() - Me.TextBox3 = New System.Windows.Forms.TextBox() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.Label16 = New System.Windows.Forms.Label() - Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) - Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorCountItem5 = New System.Windows.Forms.ToolStripLabel() - Me.BindingNavigatorDeleteItem2 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveFirstItem5 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMovePreviousItem5 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator15 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorPositionItem5 = New System.Windows.Forms.ToolStripTextBox() - Me.BindingNavigatorSeparator16 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorMoveNextItem5 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveLastItem5 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator17 = New System.Windows.Forms.ToolStripSeparator() - Me.gridColumns = New DevExpress.XtraGrid.GridControl() - Me.viewColumns = New DevExpress.XtraGrid.Views.Grid.GridView() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.SplitContainerProfilzuordnung = New System.Windows.Forms.SplitContainer() Me.gridAvailableProfiles = New DevExpress.XtraGrid.GridControl() Me.viewAvailableProfiles = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colDESCRIPTION = New DevExpress.XtraGrid.Columns.GridColumn() Me.colNAME1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colDESCRIPTION = New DevExpress.XtraGrid.Columns.GridColumn() Me.Label21 = New System.Windows.Forms.Label() Me.TabControl3 = New System.Windows.Forms.TabControl() Me.TabPage7 = New System.Windows.Forms.TabPage() Me.TabPage8 = New System.Windows.Forms.TabPage() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.btnUserManager = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.VEKTOR_DELIMITERTextBox = New System.Windows.Forms.TextBox() Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -297,7 +282,6 @@ Partial Class frmProfileDesigner Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBDD_GROUPSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_GROUPSTableAdapter() Me.TBPROFILE_GROUPTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPROFILE_GROUPTableAdapter() - Me.colEMAIL1 = New DevExpress.XtraGrid.Columns.GridColumn() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() DESCRIPTIONLabel = New System.Windows.Forms.Label() @@ -375,11 +359,6 @@ Partial Class frmProfileDesigner Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.SuspendLayout() CType(Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage12.SuspendLayout() - Me.tabCustomColumns.SuspendLayout() - CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.BindingNavigator1.SuspendLayout() - CType(Me.gridColumns, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.viewColumns, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage2.SuspendLayout() CType(Me.SplitContainerProfilzuordnung, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerProfilzuordnung.Panel1.SuspendLayout() @@ -449,7 +428,7 @@ Partial Class frmProfileDesigner ' 'viewAssignedUsers ' - Me.viewAssignedUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME1, Me.colNAME3, Me.colUSERNAME1, Me.colEMAIL1}) + Me.viewAssignedUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME1, Me.colNAME3, Me.colUSERNAME1, Me.colEMAIL1, Me.GridColumn1, Me.GridColumn2}) Me.viewAssignedUsers.GridControl = Me.gridAssignedUsers Me.viewAssignedUsers.Name = "viewAssignedUsers" Me.viewAssignedUsers.OptionsBehavior.Editable = False @@ -475,6 +454,24 @@ Partial Class frmProfileDesigner Me.colUSERNAME1.FieldName = "USERNAME" Me.colUSERNAME1.Name = "colUSERNAME1" ' + 'colEMAIL1 + ' + resources.ApplyResources(Me.colEMAIL1, "colEMAIL1") + Me.colEMAIL1.FieldName = "EMAIL" + Me.colEMAIL1.Name = "colEMAIL1" + ' + 'GridColumn1 + ' + resources.ApplyResources(Me.GridColumn1, "GridColumn1") + Me.GridColumn1.FieldName = "COMMENT" + Me.GridColumn1.Name = "GridColumn1" + ' + 'GridColumn2 + ' + resources.ApplyResources(Me.GridColumn2, "GridColumn2") + Me.GridColumn2.FieldName = "SHORTNAME" + Me.GridColumn2.Name = "GridColumn2" + ' 'Panel1 ' Me.Panel1.Controls.Add(Me.Label20) @@ -502,7 +499,7 @@ Partial Class frmProfileDesigner ' 'viewAvailableUsers ' - Me.viewAvailableUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME, Me.colNAME2, Me.colUSERNAME, Me.colEMAIL}) + Me.viewAvailableUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME, Me.colNAME2, Me.colUSERNAME, Me.colEMAIL, Me.GridColumn3, Me.GridColumn4}) Me.viewAvailableUsers.GridControl = Me.gridAvailableUsers Me.viewAvailableUsers.Name = "viewAvailableUsers" Me.viewAvailableUsers.OptionsBehavior.Editable = False @@ -534,6 +531,18 @@ Partial Class frmProfileDesigner Me.colEMAIL.FieldName = "EMAIL" Me.colEMAIL.Name = "colEMAIL" ' + 'GridColumn3 + ' + resources.ApplyResources(Me.GridColumn3, "GridColumn3") + Me.GridColumn3.FieldName = "COMMENT" + Me.GridColumn3.Name = "GridColumn3" + ' + 'GridColumn4 + ' + resources.ApplyResources(Me.GridColumn4, "GridColumn4") + Me.GridColumn4.FieldName = "SHORTNAME" + Me.GridColumn4.Name = "GridColumn4" + ' 'Panel2 ' Me.Panel2.Controls.Add(Me.Label19) @@ -777,13 +786,6 @@ Partial Class frmProfileDesigner resources.ApplyResources(SQL_VIEWLabel, "SQL_VIEWLabel") SQL_VIEWLabel.Name = "SQL_VIEWLabel" ' - 'btnUserManager - ' - Me.btnUserManager.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.user - resources.ApplyResources(Me.btnUserManager, "btnUserManager") - Me.btnUserManager.Name = "btnUserManager" - Me.btnUserManager.UseVisualStyleBackColor = True - ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -1151,7 +1153,6 @@ Partial Class frmProfileDesigner resources.ApplyResources(Me.tabctrl_Profilkonfig, "tabctrl_Profilkonfig") Me.tabctrl_Profilkonfig.Controls.Add(Me.TabPage5) Me.tabctrl_Profilkonfig.Controls.Add(Me.TabPage6) - Me.tabctrl_Profilkonfig.Controls.Add(Me.tabCustomColumns) Me.tabctrl_Profilkonfig.Name = "tabctrl_Profilkonfig" Me.tabctrl_Profilkonfig.SelectedIndex = 0 ' @@ -1503,7 +1504,7 @@ Partial Class frmProfileDesigner Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.CountItem = Me.BindingNavigatorCountItem4 Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.DeleteItem = Nothing resources.ApplyResources(Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator, "TBPM_PROFILE_FINAL_INDEXINGBindingNavigator") - Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem4, Me.BindingNavigatorMovePreviousItem4, Me.BindingNavigatorSeparator12, Me.BindingNavigatorPositionItem4, Me.BindingNavigatorCountItem4, Me.BindingNavigatorSeparator13, Me.BindingNavigatorMoveNextItem4, Me.BindingNavigatorMoveLastItem4, Me.BindingNavigatorSeparator14, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton1}) + Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem4, Me.BindingNavigatorMovePreviousItem4, Me.BindingNavigatorSeparator12, Me.BindingNavigatorPositionItem4, Me.BindingNavigatorCountItem4, Me.BindingNavigatorSeparator13, Me.BindingNavigatorMoveNextItem4, Me.BindingNavigatorMoveLastItem4, Me.BindingNavigatorSeparator14, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton1, Me.tsBtnCancel}) Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem4 Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem4 Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem4 @@ -1578,6 +1579,12 @@ Partial Class frmProfileDesigner resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1") Me.ToolStripButton1.Name = "ToolStripButton1" ' + 'tsBtnCancel + ' + Me.tsBtnCancel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text + resources.ApplyResources(Me.tsBtnCancel, "tsBtnCancel") + Me.tsBtnCancel.Name = "tsBtnCancel" + ' 'TBPM_PROFILE_FINAL_INDEXINGDataGridView ' Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView.AllowUserToAddRows = False @@ -1662,139 +1669,6 @@ Partial Class frmProfileDesigner resources.ApplyResources(Me.WORK_HISTORY_ENTRYTextBox, "WORK_HISTORY_ENTRYTextBox") Me.WORK_HISTORY_ENTRYTextBox.Name = "WORK_HISTORY_ENTRYTextBox" ' - 'tabCustomColumns - ' - Me.tabCustomColumns.Controls.Add(Me.ComboBox1) - Me.tabCustomColumns.Controls.Add(Me.Label18) - Me.tabCustomColumns.Controls.Add(Me.Label17) - Me.tabCustomColumns.Controls.Add(Me.TextBox3) - Me.tabCustomColumns.Controls.Add(Me.TextBox1) - Me.tabCustomColumns.Controls.Add(Me.Label16) - Me.tabCustomColumns.Controls.Add(Me.BindingNavigator1) - Me.tabCustomColumns.Controls.Add(Me.gridColumns) - resources.ApplyResources(Me.tabCustomColumns, "tabCustomColumns") - Me.tabCustomColumns.Name = "tabCustomColumns" - Me.tabCustomColumns.UseVisualStyleBackColor = True - ' - 'ComboBox1 - ' - Me.ComboBox1.FormattingEnabled = True - resources.ApplyResources(Me.ComboBox1, "ComboBox1") - Me.ComboBox1.Name = "ComboBox1" - ' - 'Label18 - ' - resources.ApplyResources(Me.Label18, "Label18") - Me.Label18.Name = "Label18" - ' - 'Label17 - ' - resources.ApplyResources(Me.Label17, "Label17") - Me.Label17.Name = "Label17" - ' - 'TextBox3 - ' - resources.ApplyResources(Me.TextBox3, "TextBox3") - Me.TextBox3.Name = "TextBox3" - ' - 'TextBox1 - ' - resources.ApplyResources(Me.TextBox1, "TextBox1") - Me.TextBox1.Name = "TextBox1" - ' - 'Label16 - ' - resources.ApplyResources(Me.Label16, "Label16") - Me.Label16.Name = "Label16" - ' - 'BindingNavigator1 - ' - Me.BindingNavigator1.AddNewItem = Me.BindingNavigatorAddNewItem - Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem5 - Me.BindingNavigator1.CountItemFormat = "von {0} Spalten" - Me.BindingNavigator1.DeleteItem = Me.BindingNavigatorDeleteItem2 - Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem5, Me.BindingNavigatorMovePreviousItem5, Me.BindingNavigatorSeparator15, Me.BindingNavigatorPositionItem5, Me.BindingNavigatorCountItem5, Me.BindingNavigatorSeparator16, Me.BindingNavigatorMoveNextItem5, Me.BindingNavigatorMoveLastItem5, Me.BindingNavigatorSeparator17, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem2}) - resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") - Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem5 - Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem5 - Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem5 - Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem5 - Me.BindingNavigator1.Name = "BindingNavigator1" - Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem5 - ' - 'BindingNavigatorAddNewItem - ' - Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem") - Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem" - ' - 'BindingNavigatorCountItem5 - ' - Me.BindingNavigatorCountItem5.Name = "BindingNavigatorCountItem5" - resources.ApplyResources(Me.BindingNavigatorCountItem5, "BindingNavigatorCountItem5") - ' - 'BindingNavigatorDeleteItem2 - ' - Me.BindingNavigatorDeleteItem2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorDeleteItem2, "BindingNavigatorDeleteItem2") - Me.BindingNavigatorDeleteItem2.Name = "BindingNavigatorDeleteItem2" - ' - 'BindingNavigatorMoveFirstItem5 - ' - Me.BindingNavigatorMoveFirstItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveFirstItem5, "BindingNavigatorMoveFirstItem5") - Me.BindingNavigatorMoveFirstItem5.Name = "BindingNavigatorMoveFirstItem5" - ' - 'BindingNavigatorMovePreviousItem5 - ' - Me.BindingNavigatorMovePreviousItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMovePreviousItem5, "BindingNavigatorMovePreviousItem5") - Me.BindingNavigatorMovePreviousItem5.Name = "BindingNavigatorMovePreviousItem5" - ' - 'BindingNavigatorSeparator15 - ' - Me.BindingNavigatorSeparator15.Name = "BindingNavigatorSeparator15" - resources.ApplyResources(Me.BindingNavigatorSeparator15, "BindingNavigatorSeparator15") - ' - 'BindingNavigatorPositionItem5 - ' - resources.ApplyResources(Me.BindingNavigatorPositionItem5, "BindingNavigatorPositionItem5") - Me.BindingNavigatorPositionItem5.Name = "BindingNavigatorPositionItem5" - ' - 'BindingNavigatorSeparator16 - ' - Me.BindingNavigatorSeparator16.Name = "BindingNavigatorSeparator16" - resources.ApplyResources(Me.BindingNavigatorSeparator16, "BindingNavigatorSeparator16") - ' - 'BindingNavigatorMoveNextItem5 - ' - Me.BindingNavigatorMoveNextItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveNextItem5, "BindingNavigatorMoveNextItem5") - Me.BindingNavigatorMoveNextItem5.Name = "BindingNavigatorMoveNextItem5" - ' - 'BindingNavigatorMoveLastItem5 - ' - Me.BindingNavigatorMoveLastItem5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveLastItem5, "BindingNavigatorMoveLastItem5") - Me.BindingNavigatorMoveLastItem5.Name = "BindingNavigatorMoveLastItem5" - ' - 'BindingNavigatorSeparator17 - ' - Me.BindingNavigatorSeparator17.Name = "BindingNavigatorSeparator17" - resources.ApplyResources(Me.BindingNavigatorSeparator17, "BindingNavigatorSeparator17") - ' - 'gridColumns - ' - resources.ApplyResources(Me.gridColumns, "gridColumns") - Me.gridColumns.MainView = Me.viewColumns - Me.gridColumns.Name = "gridColumns" - Me.gridColumns.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewColumns}) - ' - 'viewColumns - ' - Me.viewColumns.GridControl = Me.gridColumns - Me.viewColumns.Name = "viewColumns" - ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.SplitContainerProfilzuordnung) @@ -1809,7 +1683,6 @@ Partial Class frmProfileDesigner ' 'SplitContainerProfilzuordnung.Panel1 ' - Me.SplitContainerProfilzuordnung.Panel1.Controls.Add(Me.btnUserManager) Me.SplitContainerProfilzuordnung.Panel1.Controls.Add(Me.gridAvailableProfiles) Me.SplitContainerProfilzuordnung.Panel1.Controls.Add(Me.Label21) ' @@ -1836,18 +1709,18 @@ Partial Class frmProfileDesigner Me.viewAvailableProfiles.OptionsView.ShowAutoFilterRow = True Me.viewAvailableProfiles.OptionsView.ShowGroupPanel = False ' - 'colDESCRIPTION - ' - resources.ApplyResources(Me.colDESCRIPTION, "colDESCRIPTION") - Me.colDESCRIPTION.FieldName = "DESCRIPTION" - Me.colDESCRIPTION.Name = "colDESCRIPTION" - ' 'colNAME1 ' resources.ApplyResources(Me.colNAME1, "colNAME1") Me.colNAME1.FieldName = "NAME" Me.colNAME1.Name = "colNAME1" ' + 'colDESCRIPTION + ' + resources.ApplyResources(Me.colDESCRIPTION, "colDESCRIPTION") + Me.colDESCRIPTION.FieldName = "DESCRIPTION" + Me.colDESCRIPTION.Name = "colDESCRIPTION" + ' 'Label21 ' resources.ApplyResources(Me.Label21, "Label21") @@ -1877,6 +1750,7 @@ Partial Class frmProfileDesigner ' 'TabPage3 ' + Me.TabPage3.Controls.Add(Me.btnUserManager) Me.TabPage3.Controls.Add(Me.Button2) Me.TabPage3.Controls.Add(VEKTOR_DELIMITERLabel) Me.TabPage3.Controls.Add(Me.VEKTOR_DELIMITERTextBox) @@ -1897,6 +1771,13 @@ Partial Class frmProfileDesigner Me.TabPage3.Name = "TabPage3" Me.TabPage3.UseVisualStyleBackColor = True ' + 'btnUserManager + ' + Me.btnUserManager.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.user + resources.ApplyResources(Me.btnUserManager, "btnUserManager") + Me.btnUserManager.Name = "btnUserManager" + Me.btnUserManager.UseVisualStyleBackColor = True + ' 'Button2 ' Me.Button2.BackColor = System.Drawing.Color.LightGray @@ -2072,8 +1953,8 @@ Partial Class frmProfileDesigner 'TBPM_ERROR_LOGDataGridView ' Me.TBPM_ERROR_LOGDataGridView.AllowUserToAddRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan - Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan + Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 Me.TBPM_ERROR_LOGDataGridView.AutoGenerateColumns = False Me.TBPM_ERROR_LOGDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.TBPM_ERROR_LOGDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn17, Me.DataGridViewTextBoxColumn22, Me.DataGridViewTextBoxColumn23, Me.DataGridViewTextBoxColumn24, Me.DataGridViewTextBoxColumn25}) @@ -2260,12 +2141,6 @@ Partial Class frmProfileDesigner ' Me.TBPROFILE_GROUPTableAdapter.ClearBeforeFill = True ' - 'colEMAIL1 - ' - resources.ApplyResources(Me.colEMAIL1, "colEMAIL1") - Me.colEMAIL1.FieldName = "EMAIL" - Me.colEMAIL1.Name = "colEMAIL1" - ' 'frmProfileDesigner ' resources.ApplyResources(Me, "$this") @@ -2336,13 +2211,6 @@ Partial Class frmProfileDesigner CType(Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage12.ResumeLayout(False) Me.TabPage12.PerformLayout() - Me.tabCustomColumns.ResumeLayout(False) - Me.tabCustomColumns.PerformLayout() - CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit() - Me.BindingNavigator1.ResumeLayout(False) - Me.BindingNavigator1.PerformLayout() - CType(Me.gridColumns, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.viewColumns, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage2.ResumeLayout(False) Me.SplitContainerProfilzuordnung.Panel1.ResumeLayout(False) Me.SplitContainerProfilzuordnung.Panel2.ResumeLayout(False) @@ -2563,27 +2431,6 @@ Partial Class frmProfileDesigner Friend WithEvents ANNOTATE_ALL_WORK_HISTORY_ENTRIESCheckBox As CheckBox Friend WithEvents SQL_VIEWTextBox As TextBox Friend WithEvents WORK_HISTORY_ENTRYTextBox As TextBox - Friend WithEvents tabCustomColumns As TabPage - Friend WithEvents Label18 As Label - Friend WithEvents Label17 As Label - Friend WithEvents TextBox3 As TextBox - Friend WithEvents TextBox1 As TextBox - Friend WithEvents Label16 As Label - Friend WithEvents BindingNavigator1 As BindingNavigator - Friend WithEvents BindingNavigatorAddNewItem As ToolStripButton - Friend WithEvents BindingNavigatorCountItem5 As ToolStripLabel - Friend WithEvents BindingNavigatorDeleteItem2 As ToolStripButton - Friend WithEvents BindingNavigatorMoveFirstItem5 As ToolStripButton - Friend WithEvents BindingNavigatorMovePreviousItem5 As ToolStripButton - Friend WithEvents BindingNavigatorSeparator15 As ToolStripSeparator - Friend WithEvents BindingNavigatorPositionItem5 As ToolStripTextBox - Friend WithEvents BindingNavigatorSeparator16 As ToolStripSeparator - Friend WithEvents BindingNavigatorMoveNextItem5 As ToolStripButton - Friend WithEvents BindingNavigatorMoveLastItem5 As ToolStripButton - Friend WithEvents BindingNavigatorSeparator17 As ToolStripSeparator - Friend WithEvents gridColumns As DevExpress.XtraGrid.GridControl - Friend WithEvents viewColumns As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents ComboBox1 As ComboBox Friend WithEvents gridAvailableProfiles As DevExpress.XtraGrid.GridControl Friend WithEvents viewAvailableProfiles As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents colDESCRIPTION As DevExpress.XtraGrid.Columns.GridColumn @@ -2600,7 +2447,6 @@ Partial Class frmProfileDesigner Friend WithEvents colUSERNAME As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colEMAIL As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents Panel1 As Panel - Friend WithEvents btnUserManager As Button Friend WithEvents Label20 As Label Friend WithEvents Panel2 As Panel Friend WithEvents Label19 As Label @@ -2626,4 +2472,10 @@ Partial Class frmProfileDesigner Friend WithEvents colNAME5 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colCOMMENT1 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colEMAIL1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents btnUserManager As Button + Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents tsBtnCancel As ToolStripButton End Class diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.resx b/app/DD_PM_WINDREAM/frmProfileDesigner.resx index eb0149c..a2af600 100644 --- a/app/DD_PM_WINDREAM/frmProfileDesigner.resx +++ b/app/DD_PM_WINDREAM/frmProfileDesigner.resx @@ -210,6 +210,24 @@ 3 + + Kommentar + + + True + + + 4 + + + Kurzname + + + True + + + 5 + 900, 268 @@ -228,24 +246,6 @@ 0 - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Benutzer: - - - MiddleLeft - Label20 @@ -342,6 +342,24 @@ 3 + + Kommentar + + + True + + + 4 + + + Kurzname + + + True + + + 5 + 900, 229 @@ -360,24 +378,6 @@ 0 - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Benutzer: - - - MiddleLeft - Label19 @@ -447,6 +447,69 @@ 0 + + 206, 17 + + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Benutzer: + + + MiddleLeft + + + Label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 0 + + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Benutzer: + + + MiddleLeft + + + Label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel2 + + + 0 + Fill @@ -504,27 +567,6 @@ 0 - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Gruppen: - - - MiddleLeft - Label22 @@ -621,27 +663,6 @@ 0 - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Gruppen: - - - MiddleLeft - Label23 @@ -711,6 +732,72 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Gruppen: + + + MiddleLeft + + + Label22 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel3 + + + 0 + + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Gruppen: + + + MiddleLeft + + + Label23 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel4 + + + 0 + False @@ -1063,7 +1150,7 @@ TabPage3 - 8 + 9 False @@ -1093,7 +1180,7 @@ TabPage3 - 13 + 14 False @@ -1123,7 +1210,7 @@ TabPage3 - 11 + 12 False @@ -1401,7 +1488,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 1 + 2 False @@ -1463,33 +1550,6 @@ der Wertänderungen nutzen wollen: 2 - - MiddleLeft - - - 180, 0 - - - 165, 23 - - - 1 - - - Benutzer verwalten - - - btnUserManager - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerProfilzuordnung.Panel1 - - - 0 - 368, 17 @@ -1809,6 +1869,57 @@ der Wertänderungen nutzen wollen: 11 + + FINAL_PROFILECheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 0 + + + FINAL_TEXTTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 2 + + + Tahoma, 9.75pt + + + 280, 151 + + + 420, 100 + + + 75 + + + Alternativer Abschlusstext: + + + GroupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 14 + Tahoma, 9.75pt @@ -1860,32 +1971,56 @@ der Wertänderungen nutzen wollen: 2 - + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 0 + + + cmbType + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 1 + + Tahoma, 9.75pt - - 280, 151 + + 280, 257 - - 420, 100 + + 420, 71 - - 75 + + 74 - - Alternativer Abschlusstext: + + Type: - - GroupBox4 + + GroupBox2 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabPage5 - - 14 + + 18 True @@ -1944,32 +2079,59 @@ der Wertänderungen nutzen wollen: 1 - - Tahoma, 9.75pt + + 17, 56 + + + MOVE2FOLDERTextBox - - 280, 257 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 420, 71 + + GroupBox3 - - 74 + + 0 - - Type: + + btnmovetoFolderDialog - - GroupBox2 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + GroupBox3 + + + 1 + + + Segoe UI, 8.25pt, style=Bold + + + 9, 23 + + + 1007, 57 + + + 73 + + + Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreicher Indexierung verschoben werden soll: + + + GroupBox3 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage5 + + TabPage11 - - 18 + + 1 Segoe UI, 9pt @@ -2022,33 +2184,6 @@ der Wertänderungen nutzen wollen: 1 - - Segoe UI, 8.25pt, style=Bold - - - 9, 23 - - - 1007, 57 - - - 73 - - - Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreicher Indexierung verschoben werden soll: - - - GroupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 1 - Tahoma, 9.75pt @@ -2388,42 +2523,6 @@ der Wertänderungen nutzen wollen: True - - 6, 12 - - - Cyan - - - Fuchsia - - - Profil-Name - - - True - - - 0 - - - 166 - - - Titel - - - True - - - 1 - - - 268, 367 - - - 84 - GridControl1 @@ -2436,27 +2535,6 @@ der Wertänderungen nutzen wollen: 0 - - Tahoma, 8.25pt, style=Bold - - - MiddleLeft - - - 1069, 25 - - - 139, 34 - - - 81 - - - Daten zu Profil entfernen - - - MiddleRight - Button3 @@ -2469,15 +2547,6 @@ der Wertänderungen nutzen wollen: 1 - - 715, 248 - - - 230, 24 - - - 83 - cmbLOGIndex @@ -2490,15 +2559,6 @@ der Wertänderungen nutzen wollen: 2 - - 715, 186 - - - 230, 24 - - - 81 - PM_VEKTOR_INDEXComboBox @@ -2511,21 +2571,6 @@ der Wertänderungen nutzen wollen: 4 - - Tahoma, 9.75pt - - - 715, 31 - - - 238, 24 - - - 78 - - - Neueste Dokumente zuerst anzeigen - SORT_BY_LATESTCheckBox @@ -2716,7 +2761,7 @@ der Wertänderungen nutzen wollen: 3 - 27, 27 + 27, 30 160, 23 @@ -2767,7 +2812,7 @@ der Wertänderungen nutzen wollen: 5 - 27, 25 + 27, 27 160, 24 @@ -2844,24 +2889,6 @@ der Wertänderungen nutzen wollen: 8 - - MiddleLeft - - - 9, 51 - - - 119, 29 - - - 1 - - - Datumstempel - - - MiddleRight - btnStampDate @@ -2874,24 +2901,6 @@ der Wertänderungen nutzen wollen: 0 - - MiddleLeft - - - 9, 22 - - - 119, 23 - - - 0 - - - Username - - - MiddleRight - btnStampUser @@ -3019,7 +3028,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1601, 663 + 1601, 678 0 @@ -3324,7 +3333,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1601, 666 + 1601, 678 1 @@ -3351,7 +3360,7 @@ der Wertänderungen nutzen wollen: 668, 161 - 1609, 692 + 1609, 707 90 @@ -3431,6 +3440,9 @@ der Wertänderungen nutzen wollen: 765, 56 + + 245, 134 + 44, 22 @@ -3582,6 +3594,33 @@ der Wertänderungen nutzen wollen: MiddleRight + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + Magenta + + + 57, 22 + + + Abbruch + + + False + 7, 133 @@ -3631,7 +3670,7 @@ der Wertänderungen nutzen wollen: 9, 161 - 653, 710 + 653, 725 75 @@ -3852,379 +3891,6 @@ der Wertänderungen nutzen wollen: 1 - - 455, 94 - - - 121, 24 - - - 5 - - - ComboBox1 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCustomColumns - - - 0 - - - True - - - NoControl - - - 334, 97 - - - 96, 16 - - - 4 - - - Art des Inhalts: - - - Label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCustomColumns - - - 1 - - - True - - - 334, 68 - - - 90, 16 - - - 4 - - - Anzeigename: - - - Label17 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCustomColumns - - - 2 - - - 581, 94 - - - 120, 23 - - - 3 - - - TextBox3 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCustomColumns - - - 3 - - - 455, 65 - - - 246, 23 - - - 3 - - - TextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCustomColumns - - - 4 - - - True - - - 0, 37 - - - 124, 16 - - - 2 - - - Verfügbare Spalten: - - - Label16 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCustomColumns - - - 5 - - - 984, 173 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC - pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ - Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ - /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA - zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ - IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E - rkJggg== - - - - True - - - 23, 22 - - - Neu hinzufügen - - - 86, 22 - - - von {0} Spalten - - - Die Gesamtanzahl der Elemente. - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - True - - - 23, 22 - - - Löschen - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - True - - - 23, 22 - - - Erste verschieben - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - True - - - 23, 22 - - - Vorherige verschieben - - - 6, 25 - - - Position - - - False - - - 50, 23 - - - 0 - - - Aktuelle Position - - - 6, 25 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - True - - - 23, 22 - - - Nächste verschieben - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - True - - - 23, 22 - - - Letzte verschieben - - - 6, 25 - - - 3, 3 - - - 1243, 25 - - - 1 - - - BindingNavigator1 - - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabCustomColumns - - - 6 - - - 0, 56 - - - 312, 424 - - - 0 - - - gridColumns - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - tabCustomColumns - - - 7 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1249, 480 - - - 2 - - - Benutzerdefinierte Spalten: - - - tabCustomColumns - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabctrl_Profilkonfig - - - 2 - 9, 77 @@ -4273,6 +3939,519 @@ der Wertänderungen nutzen wollen: 0 + + SplitContainerProfilzuordnung + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 1272, 592 + + + 1 + + + Profilzuordnung + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + btnUserManager + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 0 + + + Button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 1 + + + VEKTOR_DELIMITERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 3 + + + btnConnections + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 4 + + + btnopen_SQLAdmin + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 5 + + + EMAIL_ACTIVECheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 6 + + + grpbxEmail + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 7 + + + btnlicensemanager_open + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + + + INTERVALL_CKECK_NO_OF_FILESNumericUpDown + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 10 + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 11 + + + GEAENDERTWERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 13 + + + GEAENDERTWANNTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 15 + + + btnSaveKonfig + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 16 + + + 4, 25 + + + 3, 3, 3, 3 + + + 1272, 592 + + + 2 + + + Grundeinstellungen + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + 1092, 56 + + + TBPM_ERROR_LOGDataGridView + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 0 + + + TBPM_ERROR_LOGBindingNavigator + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 1 + + + 4, 25 + + + 3, 3, 3, 3 + + + 1272, 592 + + + 3 + + + Log + + + TabPage4 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 3 + + + Fill + + + 0, 0 + + + 1280, 621 + + + 3 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMain + + + 0 + + + 6, 12 + + + Cyan + + + Fuchsia + + + Profil-Name + + + True + + + 0 + + + 166 + + + Titel + + + True + + + 1 + + + 268, 367 + + + 84 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage5 + + + 0 + + + Tahoma, 8.25pt, style=Bold + + + MiddleLeft + + + 1069, 25 + + + 139, 34 + + + 81 + + + Daten zu Profil entfernen + + + MiddleRight + + + Button3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 1 + + + 715, 248 + + + 230, 24 + + + 83 + + + cmbLOGIndex + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 2 + + + 715, 186 + + + 230, 24 + + + 81 + + + PM_VEKTOR_INDEXComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 4 + + + Tahoma, 9.75pt + + + 715, 31 + + + 238, 24 + + + 78 + + + Neueste Dokumente zuerst anzeigen + + + SORT_BY_LATESTCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 7 + + + MiddleLeft + + + 9, 51 + + + 119, 29 + + + 1 + + + Datumstempel + + + MiddleRight + + + btnStampDate + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grbxSystemStamps + + + 0 + + + MiddleLeft + + + 9, 22 + + + 119, 23 + + + 0 + + + Username + + + MiddleRight + + + btnStampUser + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grbxSystemStamps + + + 1 + + + 502, 173 + Fill @@ -4319,7 +4498,7 @@ der Wertänderungen nutzen wollen: SplitContainerProfilzuordnung.Panel1 - 1 + 0 Top @@ -4349,7 +4528,7 @@ der Wertänderungen nutzen wollen: SplitContainerProfilzuordnung.Panel1 - 2 + 1 SplitContainerProfilzuordnung.Panel1 @@ -4363,21 +4542,6 @@ der Wertänderungen nutzen wollen: 0 - - 4, 25 - - - 3, 3, 3, 3 - - - 906, 557 - - - 0 - - - Benutzer - TabPage7 @@ -4390,21 +4554,6 @@ der Wertänderungen nutzen wollen: 0 - - 4, 25 - - - 3, 3, 3, 3 - - - 906, 557 - - - 1 - - - Gruppen - TabPage8 @@ -4474,38 +4623,98 @@ der Wertänderungen nutzen wollen: 0 - + 4, 25 - + 3, 3, 3, 3 - - 1272, 592 + + 906, 557 - - 1 + + 0 - - Profilzuordnung + + Benutzer - - TabPage2 + + TabPage7 - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabControl1 + + TabControl3 - + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 906, 557 + + 1 + + Gruppen + + + TabPage8 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl3 + + + 1 + + + MiddleLeft + + + NoControl + + + 649, 194 + + + 172, 34 + + + 16 + + + Benutzer verwalten + + + MiddleRight + + + btnUserManager + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 0 + MiddleLeft - 649, 162 + 649, 149 172, 34 @@ -4529,7 +4738,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 0 + 1 457, 95 @@ -4553,8 +4762,11 @@ der Wertänderungen nutzen wollen: TabPage3 - 2 + 3 + + 457, 95 + MiddleLeft @@ -4583,7 +4795,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 3 + 4 MiddleLeft @@ -4613,7 +4825,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 4 + 5 463, 32 @@ -4637,7 +4849,178 @@ der Wertänderungen nutzen wollen: TabPage3 - 5 + 6 + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 0 + + + EMAIL_REMINDER_FOOTERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 2 + + + EMAIL_REMINDER_HEADERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 4 + + + EMAIL_PWTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 6 + + + EMAIL_USERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 8 + + + EMAIL_SMTPTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 10 + + + EMAIL_FROMTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 12 + + + False + + + 21, 90 + + + 622, 324 + + + 1 + + + E-Mail Konfiguration + + + grpbxEmail + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 7 + + + txtemailEmpfaenger + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 0 + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 1 + + + btnTest_Email + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 2 + + + 307, 23 + + + 303, 87 + + + 21 + + + Email testen + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 0 112, 19 @@ -4720,30 +5103,6 @@ der Wertänderungen nutzen wollen: 2 - - 307, 23 - - - 303, 87 - - - 21 - - - Email testen - - - GroupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 0 - 10, 258 @@ -4876,33 +5235,6 @@ der Wertänderungen nutzen wollen: 12 - - False - - - 21, 90 - - - 622, 324 - - - 1 - - - E-Mail Konfiguration - - - grpbxEmail - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 6 - MiddleLeft @@ -4931,7 +5263,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 7 + 8 20, 33 @@ -4952,7 +5284,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 9 + 10 True @@ -4979,7 +5311,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 10 + 11 649, 303 @@ -5000,7 +5332,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 12 + 13 649, 348 @@ -5021,7 +5353,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 14 + 15 MiddleLeft @@ -5051,34 +5383,7 @@ der Wertänderungen nutzen wollen: TabPage3 - 15 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1272, 592 - - - 2 - - - Grundeinstellungen - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 + 16 ID @@ -5279,69 +5584,12 @@ der Wertänderungen nutzen wollen: 1 - - 4, 25 - - - 3, 3, 3, 3 - - - 1272, 592 - - - 3 - - - Log - - - TabPage4 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 3 - - - Fill - - - 0, 0 - - - 1280, 621 - - - 3 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlMain - - - 0 - 860, 134 977, 95 - - 16, 17 - - - False - 0, 621 @@ -5366,6 +5614,12 @@ der Wertänderungen nutzen wollen: 1 + + 16, 17 + + + False + 240, 95 @@ -5563,6 +5817,24 @@ der Wertänderungen nutzen wollen: DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colEMAIL1 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn1 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn2 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + TBDD_USERBindingSource @@ -5599,6 +5871,18 @@ der Wertänderungen nutzen wollen: DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + GridColumn3 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn4 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + TBPROFILE_GROUPBindingSource @@ -5911,6 +6195,12 @@ der Wertänderungen nutzen wollen: System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsBtnCancel + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GUID @@ -5941,96 +6231,24 @@ der Wertänderungen nutzen wollen: System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - BindingNavigatorAddNewItem - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorCountItem5 - - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorDeleteItem2 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMoveFirstItem5 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMovePreviousItem5 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator15 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorPositionItem5 - - - System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator16 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMoveNextItem5 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMoveLastItem5 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator17 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - viewColumns - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - viewAvailableProfiles DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - colDESCRIPTION - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - colNAME1 DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colDESCRIPTION + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + TBPM_KONFIGURATIONBindingSource @@ -6211,12 +6429,6 @@ der Wertänderungen nutzen wollen: DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPROFILE_GROUPTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - colEMAIL1 - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmProfileDesigner diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.vb b/app/DD_PM_WINDREAM/frmProfileDesigner.vb index 909881c..325d41d 100644 --- a/app/DD_PM_WINDREAM/frmProfileDesigner.vb +++ b/app/DD_PM_WINDREAM/frmProfileDesigner.vb @@ -1,4 +1,6 @@ Imports System.Data.SqlClient +Imports System.IO +Imports DD_LIB_Standards Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid @@ -50,6 +52,12 @@ Public Class frmProfileDesigner dragDropManager.AddGridView(viewAvailableGroups) dragDropManager.AddGridView(viewAssignedGroups) + If clsModules.IsModuleInstalled("User Manager") Then + btnUserManager.Enabled = True + Else + btnUserManager.Enabled = False + End If + Catch ex As Exception MsgBox("Fehler bei Laden der Wertehilfen und Konfig-Daten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try @@ -409,6 +417,7 @@ Public Class frmProfileDesigner If tabctrl_Profilkonfig.SelectedIndex = 1 Then CURRENT_OBJECTTYPE = cmbObjekttypen.Text Refresh_Final_indexe() + CancelFinalIndexInsert() End If End Sub @@ -724,7 +733,8 @@ Public Class frmProfileDesigner End Sub Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click TabControlFinalIndices.Enabled = True - Me.cmbIndexe.Items.Clear() + tsBtnCancel.Visible = True + cmbIndexe.Items.Clear() cmbIndexe2.Items.Clear() Dim indexe = _windreamPM.GetIndicesByObjecttype(cmbObjekttypen.Text) If indexe IsNot Nothing Then @@ -736,6 +746,21 @@ Public Class frmProfileDesigner End If INSERT_ACTIVE = True End Sub + + Private Sub CancelFinalIndexInsert() + TabControlFinalIndices.Enabled = False + INSERT_ACTIVE = False + tsBtnCancel.Visible = False + + txtBezeichner.Text = String.Empty + txtindexwert_final.Text = String.Empty + cmbIndexe.SelectedIndex = -1 + cmbIndexe2.SelectedIndex = -1 + cmbConnection.SelectedIndex = -1 + SQL_COMMANDTextBox.Text = String.Empty + CheckBoxPMVEKTOR.Checked = False + End Sub + Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click Dim i, ID As Integer i = TBPM_PROFILE_FINAL_INDEXINGDataGridView.CurrentRow.Index @@ -911,6 +936,24 @@ Public Class frmProfileDesigner End Sub Private Sub btnUserManager_Click(sender As Object, e As EventArgs) Handles btnUserManager.Click + Try + Dim userManagerPath As String = clsModules.GetModulePath("User Manager") + If userManagerPath Is Nothing Then + MsgBox("User Manager konnte nicht gefunden werden!", MsgBoxStyle.Critical) + Else + + Dim exePath As String = Path.Combine(userManagerPath, "DDUserManager.exe") + Dim psi As New ProcessStartInfo(exePath) + + Process.Start(psi) + End If + Catch ex As Exception + MsgBox("Error while startign User Manager:" & vbCrLf & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub tsBtnCancel_Click(sender As Object, e As EventArgs) Handles tsBtnCancel.Click + CancelFinalIndexInsert() End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 1817a4d..007474d 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -1,5 +1,6 @@ Imports System.Text.RegularExpressions Imports Oracle.ManagedDataAccess.Client +Imports DD_LIB_Standards Public Class frmSQL_DESIGNER Private _windreamPM As ClassPMWindream @@ -95,7 +96,7 @@ Public Class frmSQL_DESIGNER Dim text As String = SQL_COMMANDTextBox.Text dgvPlaceholders.Rows.Clear() - Dim patterns As List(Of ClassPatterns.Pattern) = ClassPatterns.GetAllPatterns(text) + Dim patterns As List(Of clsPatterns.Pattern) = clsPatterns.GetAllPatterns(text) For Each pattern In patterns dgvPlaceholders.Rows.Add({pattern.ToString, ""}) @@ -120,9 +121,9 @@ Public Class frmSQL_DESIGNER ' Wenn Ersetzung ausgefüllt wurde, Platzhalter damit ersetzen If Not String.IsNullOrEmpty(replacement) Then - Dim pattern As New ClassPatterns.Pattern(placeholder) + Dim pattern As New clsPatterns.Pattern(placeholder) - query = ClassPatterns.ReplacePattern(query, pattern.Type, replacement) + query = clsPatterns.ReplacePattern(query, pattern.Type, replacement) 'query = query.Replace(placeholder, replacement) Else @@ -228,21 +229,21 @@ Public Class frmSQL_DESIGNER Private Sub btnAddControl_Click(sender As Object, e As EventArgs) Handles btnAddControl.Click If cmbControls.SelectedIndex <> -1 Then - Dim value As String = ClassPatterns.WrapPatternValue("CTRL", cmbControls.Text) + Dim value As String = clsPatterns.WrapPatternValue("CTRL", cmbControls.Text) InsertAtSelection(value) End If End Sub Private Sub btnAddStatic_Click(sender As Object, e As EventArgs) Handles btnAddStatic.Click If cmbStatic.SelectedIndex <> -1 Then - Dim value As String = ClassPatterns.WrapPatternValue("INT", cmbStatic.Text) + Dim value As String = clsPatterns.WrapPatternValue("INT", cmbStatic.Text) InsertAtSelection(value) End If End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndex.Click If cmbIndexe.SelectedIndex <> -1 Then - Dim value As String = ClassPatterns.WrapPatternValue("WMI", cmbIndexe.Text) + Dim value As String = clsPatterns.WrapPatternValue("WMI", cmbIndexe.Text) InsertAtSelection(value) End If End Sub @@ -259,7 +260,7 @@ Public Class frmSQL_DESIGNER Private Sub btnAddUser_Click(sender As Object, e As EventArgs) Handles btnAddUser.Click If cmbUser.SelectedIndex <> -1 Then - Dim value As String = ClassPatterns.WrapPatternValue("USER", cmbUser.Text) + Dim value As String = clsPatterns.WrapPatternValue("USER", cmbUser.Text) InsertAtSelection(value) End If End Sub diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 1fea49c..70ec216 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -11,6 +11,7 @@ Imports DevExpress.Pdf.pdfdo Imports DevExpress.Pdf Imports System.Text.RegularExpressions Imports System.ComponentModel +Imports DD_LIB_Standards Public Class frmValidator Dim viewerID @@ -423,7 +424,8 @@ Public Class frmValidator Dim sqlStatement As String = row.Item("SQL_UEBERPRUEFUNG") Dim connectionId As Integer = row.Item("CONNECTION_ID") - sql = ClassPatterns.ReplaceInternalValues(sqlStatement) + sql = DD_LIB_Standards.clsPatterns.ReplaceInternalValues(sqlStatement) + 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) dt = ClassDatabase.Return_Datatable(sql) If IsNothing(dt) Then @@ -638,9 +640,11 @@ Public Class frmValidator sql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID) 'sql = ClassPatterns.ReplaceAllValues(sql, pnldesigner, aktivesDokument) - If ClassPatterns.HasOnlySimplePatterns(sql) Then - sql = ClassPatterns.ReplaceInternalValues(sql) - sql = ClassPatterns.ReplaceControlValues(sql, pnldesigner) + + 'If ClassPatterns.HasOnlySimplePatterns(sql) Then + If clsPatterns.HasOnlySimplePatterns(sql) Then + sql = clsPatterns.ReplaceInternalValues(sql) + sql = clsPatterns.ReplaceControlValues(sql, pnldesigner) sqlCnn = New SqlClient.SqlConnection(connectionString) ' Try @@ -813,7 +817,7 @@ Public Class frmValidator Dim sql_Statement = ROW.Item(2) - sql_Statement = ClassPatterns.ReplaceAllValues(sql_Statement, pnldesigner, aktivesDokument, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL) + sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, aktivesDokument, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL) '' Regulären Ausdruck zum Auslesen der Indexe definieren 'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" @@ -936,7 +940,7 @@ Public Class frmValidator If Not IsDBNull(ROW.Item("CONNECTION_ID")) And Not IsDBNull(ROW.Item("SQL_UEBERPRUEFUNG")) Then Dim sql_Statement = ROW.Item("SQL_UEBERPRUEFUNG") - sql_Statement = ClassPatterns.ReplaceAllValues(sql_Statement, pnldesigner, aktivesDokument, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL) + sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, aktivesDokument, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL) '' Regulären Ausdruck zum Auslesen der Indexe definieren 'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" '' einen Regulären Ausdruck laden diff --git a/app/Setup/Product.wxs b/app/Setup/Product.wxs index dac9270..af32faf 100644 --- a/app/Setup/Product.wxs +++ b/app/Setup/Product.wxs @@ -138,14 +138,12 @@ - - + -