MS

DDUserManager/DDUserManager/ClassActiveDirectory.vb

@@ -2,6 +2,8 @@
 Imports System.DirectoryServices.AccountManagement
 
 Public Class ClassActiveDirectory
+    Private Shared logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger()
+
     Private Shared excludedGroupNames As New List(Of String) From {
            "Abgelehnte",
            "DHCP",
@@ -47,8 +49,24 @@ Public Class ClassActiveDirectory
            "Zulässige"
     }
 
+    Public Shared Function ConnectionTest(path As String)
+        Try
+            Dim de As New DirectoryEntry(path)
+            de.Username = Nothing
+            de.Password = Nothing
+            de.AuthenticationType = AuthenticationTypes.Secure
+            de.RefreshCache()
+
+            Return True
+        Catch ex As Exception
+            MsgBox($"Verbindungstest fehlgeschlagen. Bitte überprüfen sie den ActiveDirectory Pfad. Der zurückgelieferte Fehler lautet:{vbCrLf}{ex.Message}", MsgBoxStyle.Exclamation)
+            logger.Error(ex, $"Connection Test failed for path '{path}'")
+            Return False
+        End Try
+    End Function
+
     Private Shared Function GetDirectoryEntry()
-        Dim de As New DirectoryEntry($"LDAP://{Environment.UserDomainName}")
+        Dim de As New DirectoryEntry(ActiveDirectoryRootNode)
         de.Username = Nothing
         de.Password = Nothing
         de.AuthenticationType = AuthenticationTypes.Secure
@@ -56,7 +74,7 @@ Public Class ClassActiveDirectory
         Return de
     End Function
 
-    Public Shared Function GetDirectorySearch() As DirectorySearcher
+    Public Shared Function GetDirectorySearch(rootNode As DirectoryEntry) As DirectorySearcher
         Dim dirEntry As DirectoryEntry = GetDirectoryEntry()
         Dim dirSearcher As DirectorySearcher = New DirectorySearcher(dirEntry)
         Return dirSearcher
@@ -64,9 +82,7 @@ Public Class ClassActiveDirectory
 
     Public Shared Function GetActiveDirectoryGroups() As List(Of String)
         Dim groups As New List(Of String)
-        Dim de As DirectoryEntry = GetDirectoryEntry()
+        Dim deSearch = GetDirectorySearch(GetDirectoryEntry())
-        Dim deSearch As DirectorySearcher = New DirectorySearcher()
-        deSearch.SearchRoot = de
 
         deSearch.Filter = "(&(objectClass=group) (samAccountName=" & "*" & "))"
         Dim results As SearchResultCollection = deSearch.FindAll()
@@ -92,8 +108,9 @@ Public Class ClassActiveDirectory
         Return groups
     End Function
 
-    Public Shared Function GetActiveDirectoryUsersForGroup(groupName As String) As List(Of UserPrincipal)
+    Public Shared Function GetActiveDirectoryUsersForGroup(groupName As String) As List(Of ADUser)
-        Dim users As New List(Of UserPrincipal)
+        'Dim users As New List(Of UserPrincipal)
+        Dim users As New List(Of ADUser)
 
         Using context As New PrincipalContext(ContextType.Domain)
             Using group As GroupPrincipal = GroupPrincipal.FindByIdentity(context, IdentityType.Name, groupName)
@@ -101,7 +118,15 @@ Public Class ClassActiveDirectory
 
                     For Each member As UserPrincipal In members
                         If TypeOf member Is UserPrincipal Then
-                            users.Add(member)
+                            'users.Add(member)
+
+                            users.Add(New ADUser() With {
+                                .Username = member.SamAccountName,
+                                .Surname = member.Surname,
+                                .GivenName = member.GivenName,
+                                .MiddleName = member.MiddleName,
+                                .Email = member.EmailAddress
+                            })
                         End If
                     Next
 
@@ -112,31 +137,12 @@ Public Class ClassActiveDirectory
         Return users
     End Function
 
-    Private Shared Function GetGroupNameFromTokenGroupEntry(rootEntry As DirectoryEntry, tokenGroup As Byte())
+    Public Class ADUser
-        Dim sID As New Security.Principal.SecurityIdentifier(tokenGroup, 0)
+        Public Username As String
-        Dim sIDSearch = New DirectorySearcher(rootEntry, $"(objectSid={sID.Value})", New String() {"name"})
+        Public Surname As String
-        Dim sIDResult = sIDSearch.FindOne()
+        Public GivenName As String
-
+        Public MiddleName As String
-        If IsNothing(sIDResult) Then
+        Public Email As String
-            Return Nothing
+        Public Path As String
-        Else
+    End Class
-            Return sIDResult.Properties("name").Item(0).ToString()
-        End If
-    End Function
-
-    Private Shared Function FindUser(rootEntry As DirectoryEntry, samAccountName As String) As DirectoryEntry
-        Dim userSearch = New DirectorySearcher(
-            rootEntry,
-            $"(samAccountName={samAccountName})",
-            New String() {"displayName"}
-        )
-
-        Dim result = userSearch.FindOne()
-
-        If IsNothing(result) Then
-            Return Nothing
-        Else
-            Return result.GetDirectoryEntry()
-        End If
-    End Function
 End Class

DDUserManager/DDUserManager/ClassNLog.vb

@@ -0,0 +1,27 @@
+Public Class ClassNLog
+    Public Shared Function GetLogPathFor(moduleName As String)
+        Dim localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
+        Return IO.Path.Combine(localAppData, "Digital Data", "UserManager", "Log")
+    End Function
+
+    Public Shared Function GetLoggerConfigFor(moduleName As String)
+        Dim loggerConfig = New NLog.Config.LoggingConfiguration()
+        Dim logFileName = Environment.UserName & "-${date:format=yyyy-MM-dd}.log"
+        Dim logPath As String = IO.Path.Combine(GetLogPathFor(moduleName), logFileName)
+
+        Dim logFileInfo As New NLog.Targets.FileTarget("logFileInfo") With {
+            .FileName = logPath,
+            .Layout = "${longdate}|${level:uppercase=true}|${logger}|${message}"
+        }
+
+        Dim logFileError As New NLog.Targets.FileTarget("logFileError") With {
+             .FileName = logPath,
+             .Layout = "${longdate}|${level:uppercase=true}|${logger}|${message}|${exception:format=message}" & vbCrLf & "${exception:format=toString}"
+        }
+
+        loggerConfig.AddRule(NLog.LogLevel.Debug, NLog.LogLevel.Warn, logFileInfo)
+        loggerConfig.AddRule(NLog.LogLevel.Error, NLog.LogLevel.Fatal, logFileError)
+
+        Return loggerConfig
+    End Function
+End Class

DDUserManager/DDUserManager/DDUserManager.vbproj

@@ -62,6 +62,9 @@
     <Reference Include="DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraLayout.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="NLog">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\NLog\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
@@ -96,6 +99,7 @@
     <Compile Include="ClassActiveDirectory.vb" />
     <Compile Include="ClassData.vb" />
     <Compile Include="ClassDragDrop.vb" />
+    <Compile Include="ClassNLog.vb" />
     <Compile Include="DS_ChangeS.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -247,6 +251,9 @@
     <None Include="Resources\arrow_refresh.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\database_connect.png" />
+    <None Include="Resources\folder.png" />
+    <None Include="Resources\help.png" />
     <Content Include="user.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />

DDUserManager/DDUserManager/ModuleRuntime.vb

@@ -5,9 +5,7 @@ Module ModuleRuntime
     Public MyConnectionString As String
     Public LogErrorsOnly As Boolean = True
     Public ConfigPath As String = Path.Combine(Application.UserAppDataPath, "UserConfig.xml")
-    Public rowresult
+    Public ActiveDirectoryRootNode As String = $"LDAP://{Environment.UserDomainName}"
-
-    Public USER_ID As Integer
 
     Public Function SaveMySettingsValue(name As String, value As String, type As String)
         Try
@@ -65,7 +63,6 @@ Module ModuleRuntime
                 Return False
             End If
             For Each Row As DataRow In DT.Rows
-                rowresult &= Row.Item("ConfigName")
                 Select Case Row.Item("ConfigName")
                     Case "MyConnectionString"
                         Dim connstring As String
@@ -98,6 +95,12 @@ Module ModuleRuntime
                         End If
                     Case "LogErrorsOnly"
                         LogErrorsOnly = CBool(Row.Item("Value"))
+                    Case "ActiveDirectoryRootNode"
+                        Dim rootNode As String = Row.Item("Value")
+
+                        If rootNode <> String.Empty Then
+                            ActiveDirectoryRootNode = rootNode
+                        End If
                 End Select
             Next
 
@@ -128,14 +131,24 @@ Module ModuleRuntime
             table.Columns.Add("Value", GetType(System.String))
             'Set the ID column as the primary key column.
             table.PrimaryKey = New DataColumn() {idColumn}
-            Dim newRow As DataRow = table.NewRow()
+
-            newRow("ConfigName") = "MyConnectionString"
+            Dim newRow As DataRow
-            newRow("Value") = ""
+
+            newRow = table.NewRow()
+            newRow.Item("ConfigName") = "MyConnectionString"
+            newRow.Item("Value") = ""
             table.Rows.Add(newRow)
-            Dim newRow1 As DataRow = table.NewRow()
+
-            newRow1("ConfigName") = "LogErrorsOnly"
+            newRow = table.NewRow()
-            newRow1("Value") = "True"
+            newRow.Item("ConfigName") = "LogErrorsOnly"
-            table.Rows.Add(newRow1)
+            newRow.Item("Value") = "True"
+            table.Rows.Add(newRow)
+
+            newRow = table.NewRow()
+            newRow.Item("ConfigName") = "ActiveDirectoryRootNode"
+            newRow.Item("Value") = ""
+            table.Rows.Add(newRow)
+
             table.AcceptChanges()
             clsLogger.Add(">> CreateConfigTable su...", False)
             Return table

DDUserManager/DDUserManager/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.0.1")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

DDUserManager/DDUserManager/My Project/Resources.Designer.vb

@@ -110,6 +110,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property database_connect() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("database_connect", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -120,6 +130,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property folder() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("folder", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -140,6 +160,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property help() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("help", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

DDUserManager/DDUserManager/My Project/Resources.resx

@@ -118,23 +118,17 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="database_connect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\database_connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="plugin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="book" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\plugin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\book.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="user_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="arrow_left_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_left_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="group_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\group_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -142,19 +136,34 @@
   <data name="user_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="user_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\user_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="group" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\group.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="book" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\book.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrow_left_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\arrow_left_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="plugin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\plugin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

DDUserManager/DDUserManager/UserDataSet.Designer.vb

@@ -10339,58 +10339,9 @@ Namespace UserDataSetTableAdapters
             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] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME = "& _ 
+            Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID)"
-                "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_SHORTNAME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME]"& _ 
-                " = @Original_SHORTNAME)) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL"& _ 
-                "] = @Original_EMAIL)) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([GENERAL_VIEWER"& _ 
-                "] = @Original_GENERAL_VIEWER) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) O"& _ 
-                "R ([COMMENT] = @Original_COMMENT)) AND ([WAN_ENVIRONMENT] = @Original_WAN_ENVIRO"& _ 
-                "NMENT) AND ([LOGGED_IN] = @Original_LOGGED_IN) AND ((@IsNull_LOGGED_WHERE = 1 AN"& _ 
-                "D [LOGGED_WHERE] IS NULL) OR ([LOGGED_WHERE] = @Original_LOGGED_WHERE)) AND ((@I"& _ 
-                "sNull_LOG_IN_WHEN = 1 AND [LOG_IN_WHEN] IS NULL) OR ([LOG_IN_WHEN] = @Original_L"& _ 
-                "OG_IN_WHEN)) AND ((@IsNull_LOG_OUT_WHEN = 1 AND [LOG_OUT_WHEN] IS NULL) OR ([LOG"& _ 
-                "_OUT_WHEN] = @Original_LOG_OUT_WHEN)) AND ([PM_RIGHT_FILE_DELETE] = @Original_PM"& _ 
-                "_RIGHT_FILE_DELETE) AND ([USERID_FK_INT_ECM] = @Original_USERID_FK_INT_ECM) AND "& _ 
-                "([DATE_FORMAT] = @Original_DATE_FORMAT) AND ([ADDED_WHO] = @Original_ADDED_WHO) "& _ 
-                "AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Origi"& _ 
-                "nal_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([C"& _ 
-                "HANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGE"& _ 
-                "D_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))"
             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, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
+            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_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("@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_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.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_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GENERAL_VIEWER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GENERAL_VIEWER", 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("@Original_WAN_ENVIRONMENT", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WAN_ENVIRONMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOGGED_IN", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_IN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_LOGGED_WHERE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_WHERE", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOGGED_WHERE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_WHERE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_LOG_IN_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_IN_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOG_IN_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_IN_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_LOG_OUT_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_OUT_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOG_OUT_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_OUT_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PM_RIGHT_FILE_DELETE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_RIGHT_FILE_DELETE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USERID_FK_INT_ECM", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERID_FK_INT_ECM", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DATE_FORMAT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DATE_FORMAT", 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.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, SHORTNA"& _ 
@@ -10795,135 +10746,8 @@ Namespace UserDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, true)>  _
-        Public Overloads Overridable Function Delete( _
+        Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer
-                    ByVal Original_GUID As Integer,  _
-                    ByVal Original_PRENAME As String,  _
-                    ByVal Original_NAME As String,  _
-                    ByVal Original_USERNAME As String,  _
-                    ByVal Original_SHORTNAME As String,  _
-                    ByVal Original_EMAIL As String,  _
-                    ByVal Original_LANGUAGE As String,  _
-                    ByVal Original_GENERAL_VIEWER As String,  _
-                    ByVal Original_COMMENT As String,  _
-                    ByVal Original_WAN_ENVIRONMENT As Boolean,  _
-                    ByVal Original_LOGGED_IN As Boolean,  _
-                    ByVal Original_LOGGED_WHERE As String,  _
-                    ByVal Original_LOG_IN_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_LOG_OUT_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_PM_RIGHT_FILE_DELETE As Boolean,  _
-                    ByVal Original_USERID_FK_INT_ECM As Integer,  _
-                    ByVal Original_DATE_FORMAT 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)) 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_SHORTNAME 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_SHORTNAME,String)
-            End If
-            If (Original_EMAIL Is Nothing) Then
-                Me.Adapter.DeleteCommand.Parameters(8).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(9).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.DeleteCommand.Parameters(8).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_EMAIL,String)
-            End If
-            If (Original_LANGUAGE Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_LANGUAGE")
-            Else
-                Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_LANGUAGE,String)
-            End If
-            If (Original_GENERAL_VIEWER Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_GENERAL_VIEWER")
-            Else
-                Me.Adapter.DeleteCommand.Parameters(11).Value = CType(Original_GENERAL_VIEWER,String)
-            End If
-            If (Original_COMMENT Is Nothing) Then
-                Me.Adapter.DeleteCommand.Parameters(12).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(13).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.DeleteCommand.Parameters(12).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(13).Value = CType(Original_COMMENT,String)
-            End If
-            Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_WAN_ENVIRONMENT,Boolean)
-            Me.Adapter.DeleteCommand.Parameters(15).Value = CType(Original_LOGGED_IN,Boolean)
-            If (Original_LOGGED_WHERE Is Nothing) Then
-                Me.Adapter.DeleteCommand.Parameters(16).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(17).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.DeleteCommand.Parameters(16).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(17).Value = CType(Original_LOGGED_WHERE,String)
-            End If
-            If (Original_LOG_IN_WHEN.HasValue = true) Then
-                Me.Adapter.DeleteCommand.Parameters(18).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(19).Value = CType(Original_LOG_IN_WHEN.Value,Date)
-            Else
-                Me.Adapter.DeleteCommand.Parameters(18).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(19).Value = Global.System.DBNull.Value
-            End If
-            If (Original_LOG_OUT_WHEN.HasValue = true) Then
-                Me.Adapter.DeleteCommand.Parameters(20).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(21).Value = CType(Original_LOG_OUT_WHEN.Value,Date)
-            Else
-                Me.Adapter.DeleteCommand.Parameters(20).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(21).Value = Global.System.DBNull.Value
-            End If
-            Me.Adapter.DeleteCommand.Parameters(22).Value = CType(Original_PM_RIGHT_FILE_DELETE,Boolean)
-            Me.Adapter.DeleteCommand.Parameters(23).Value = CType(Original_USERID_FK_INT_ECM,Integer)
-            If (Original_DATE_FORMAT Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_DATE_FORMAT")
-            Else
-                Me.Adapter.DeleteCommand.Parameters(24).Value = CType(Original_DATE_FORMAT,String)
-            End If
-            If (Original_ADDED_WHO Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_ADDED_WHO")
-            Else
-                Me.Adapter.DeleteCommand.Parameters(25).Value = CType(Original_ADDED_WHO,String)
-            End If
-            If (Original_ADDED_WHEN.HasValue = true) Then
-                Me.Adapter.DeleteCommand.Parameters(26).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(27).Value = CType(Original_ADDED_WHEN.Value,Date)
-            Else
-                Me.Adapter.DeleteCommand.Parameters(26).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(27).Value = Global.System.DBNull.Value
-            End If
-            If (Original_CHANGED_WHO Is Nothing) Then
-                Me.Adapter.DeleteCommand.Parameters(28).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(29).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.DeleteCommand.Parameters(28).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(29).Value = CType(Original_CHANGED_WHO,String)
-            End If
-            If (Original_CHANGED_WHEN.HasValue = true) Then
-                Me.Adapter.DeleteCommand.Parameters(30).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(31).Value = CType(Original_CHANGED_WHEN.Value,Date)
-            Else
-                Me.Adapter.DeleteCommand.Parameters(30).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(31).Value = Global.System.DBNull.Value
-            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

DDUserManager/DDUserManager/UserDataSet.xsc

@@ -9,18 +9,14 @@
     <TableUISetting Name="TBDD_USER">
       <ColumnUISettings>
         <ColumnUISetting Name="LANGUAGE">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
               <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
-          </ControlSettings>
         </ColumnUISetting>
         <ColumnUISetting Name="DATE_FORMAT">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
               <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
-          </ControlSettings>
         </ColumnUISetting>
       </ColumnUISettings>
     </TableUISetting>

DDUserManager/DDUserManager/UserDataSet.xsd

@@ -514,41 +514,11 @@ SELECT GUID, USER_ID, CLIENT_ID, COMMENT, ADDED_WHO, ADDED_WHEN FROM TBDD_CLIENT
             <MainSource>
               <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <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] = @Original_USERNAME) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Original_EMAIL)) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([GENERAL_VIEWER] = @Original_GENERAL_VIEWER) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([WAN_ENVIRONMENT] = @Original_WAN_ENVIRONMENT) AND ([LOGGED_IN] = @Original_LOGGED_IN) AND ((@IsNull_LOGGED_WHERE = 1 AND [LOGGED_WHERE] IS NULL) OR ([LOGGED_WHERE] = @Original_LOGGED_WHERE)) AND ((@IsNull_LOG_IN_WHEN = 1 AND [LOG_IN_WHEN] IS NULL) OR ([LOG_IN_WHEN] = @Original_LOG_IN_WHEN)) AND ((@IsNull_LOG_OUT_WHEN = 1 AND [LOG_OUT_WHEN] IS NULL) OR ([LOG_OUT_WHEN] = @Original_LOG_OUT_WHEN)) AND ([PM_RIGHT_FILE_DELETE] = @Original_PM_RIGHT_FILE_DELETE) AND ([USERID_FK_INT_ECM] = @Original_USERID_FK_INT_ECM) AND ([DATE_FORMAT] = @Original_DATE_FORMAT) 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)))</CommandText>
+                    <CommandText>DELETE FROM TBDD_USER
+WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_PRENAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PRENAME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SHORTNAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_EMAIL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="EMAIL" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_LANGUAGE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LANGUAGE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_GENERAL_VIEWER" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="GENERAL_VIEWER" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_WAN_ENVIRONMENT" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="WAN_ENVIRONMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_LOGGED_IN" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="LOGGED_IN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_LOGGED_WHERE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="LOGGED_WHERE" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_LOGGED_WHERE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LOGGED_WHERE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_LOG_IN_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="LOG_IN_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_LOG_IN_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="LOG_IN_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_LOG_OUT_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="LOG_OUT_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_LOG_OUT_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="LOG_OUT_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_PM_RIGHT_FILE_DELETE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="PM_RIGHT_FILE_DELETE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_USERID_FK_INT_ECM" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="USERID_FK_INT_ECM" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_DATE_FORMAT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="DATE_FORMAT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
@@ -1129,7 +1099,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
   <xs:element name="UserDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="UserDataSet" msprop:Generator_UserDSName="UserDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBDD_GROUPS_USER" msprop:Generator_TableClassName="TBDD_GROUPS_USERDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_USER" msprop:Generator_TablePropName="TBDD_GROUPS_USER" msprop:Generator_RowDeletingName="TBDD_GROUPS_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_USERRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_USER" msprop:Generator_RowChangedName="TBDD_GROUPS_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_USERRow">
+        <xs:element name="TBDD_GROUPS_USER" msprop:Generator_TableClassName="TBDD_GROUPS_USERDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_USER" msprop:Generator_RowChangedName="TBDD_GROUPS_USERRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS_USER" msprop:Generator_RowDeletingName="TBDD_GROUPS_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_USERRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPS_USERRow" msprop:Generator_UserTableName="TBDD_GROUPS_USER" msprop:Generator_RowEvArgName="TBDD_GROUPS_USERRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1161,7 +1131,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_MODULES" msprop:Generator_TableClassName="TBDD_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_MODULES" msprop:Generator_TablePropName="TBDD_MODULES" msprop:Generator_RowDeletingName="TBDD_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_MODULESRowDeleted" msprop:Generator_UserTableName="TBDD_MODULES" msprop:Generator_RowChangedName="TBDD_MODULESRowChanged" msprop:Generator_RowEvArgName="TBDD_MODULESRowChangeEvent" msprop:Generator_RowClassName="TBDD_MODULESRow">
+        <xs:element name="TBDD_MODULES" msprop:Generator_TableClassName="TBDD_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_MODULES" msprop:Generator_RowChangedName="TBDD_MODULESRowChanged" msprop:Generator_TablePropName="TBDD_MODULES" msprop:Generator_RowDeletingName="TBDD_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_MODULESRowDeleted" msprop:Generator_RowClassName="TBDD_MODULESRow" msprop:Generator_UserTableName="TBDD_MODULES" msprop:Generator_RowEvArgName="TBDD_MODULESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1265,7 +1235,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER_MODULES" msprop:Generator_TableClassName="TBDD_USER_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_USER_MODULES" msprop:Generator_TablePropName="TBDD_USER_MODULES" msprop:Generator_RowDeletingName="TBDD_USER_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_USER_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USER_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USER_MODULESRowDeleted" msprop:Generator_UserTableName="TBDD_USER_MODULES" msprop:Generator_RowChangedName="TBDD_USER_MODULESRowChanged" msprop:Generator_RowEvArgName="TBDD_USER_MODULESRowChangeEvent" msprop:Generator_RowClassName="TBDD_USER_MODULESRow">
+        <xs:element name="TBDD_USER_MODULES" msprop:Generator_TableClassName="TBDD_USER_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_USER_MODULES" msprop:Generator_RowChangedName="TBDD_USER_MODULESRowChanged" msprop:Generator_TablePropName="TBDD_USER_MODULES" msprop:Generator_RowDeletingName="TBDD_USER_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_USER_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USER_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USER_MODULESRowDeleted" msprop:Generator_RowClassName="TBDD_USER_MODULESRow" msprop:Generator_UserTableName="TBDD_USER_MODULES" msprop:Generator_RowEvArgName="TBDD_USER_MODULESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1290,7 +1260,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CLIENT" msprop:Generator_TableClassName="TBDD_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT" msprop:Generator_TablePropName="TBDD_CLIENT" msprop:Generator_RowDeletingName="TBDD_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENTRowDeleted" msprop:Generator_UserTableName="TBDD_CLIENT" msprop:Generator_RowChangedName="TBDD_CLIENTRowChanged" msprop:Generator_RowEvArgName="TBDD_CLIENTRowChangeEvent" msprop:Generator_RowClassName="TBDD_CLIENTRow">
+        <xs:element name="TBDD_CLIENT" msprop:Generator_TableClassName="TBDD_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT" msprop:Generator_RowChangedName="TBDD_CLIENTRowChanged" msprop:Generator_TablePropName="TBDD_CLIENT" msprop:Generator_RowDeletingName="TBDD_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENTRowDeleted" msprop:Generator_RowClassName="TBDD_CLIENTRow" msprop:Generator_UserTableName="TBDD_CLIENT" msprop:Generator_RowEvArgName="TBDD_CLIENTRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1355,7 +1325,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CLIENT_USER" msprop:Generator_TableClassName="TBDD_CLIENT_USERDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT_USER" msprop:Generator_TablePropName="TBDD_CLIENT_USER" msprop:Generator_RowDeletingName="TBDD_CLIENT_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENT_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENT_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENT_USERRowDeleted" msprop:Generator_UserTableName="TBDD_CLIENT_USER" msprop:Generator_RowChangedName="TBDD_CLIENT_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_CLIENT_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_CLIENT_USERRow">
+        <xs:element name="TBDD_CLIENT_USER" msprop:Generator_TableClassName="TBDD_CLIENT_USERDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT_USER" msprop:Generator_RowChangedName="TBDD_CLIENT_USERRowChanged" msprop:Generator_TablePropName="TBDD_CLIENT_USER" msprop:Generator_RowDeletingName="TBDD_CLIENT_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENT_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENT_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENT_USERRowDeleted" msprop:Generator_RowClassName="TBDD_CLIENT_USERRow" msprop:Generator_UserTableName="TBDD_CLIENT_USER" msprop:Generator_RowEvArgName="TBDD_CLIENT_USERRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1379,7 +1349,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_USERRow">
+        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_RowClassName="TBDD_USERRow" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1458,7 +1428,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBLOCAL_ADUSERS" msprop:Generator_TableClassName="TBLOCAL_ADUSERSDataTable" msprop:Generator_TableVarName="tableTBLOCAL_ADUSERS" msprop:Generator_TablePropName="TBLOCAL_ADUSERS" msprop:Generator_RowDeletingName="TBLOCAL_ADUSERSRowDeleting" msprop:Generator_RowChangingName="TBLOCAL_ADUSERSRowChanging" msprop:Generator_RowEvHandlerName="TBLOCAL_ADUSERSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBLOCAL_ADUSERSRowDeleted" msprop:Generator_UserTableName="TBLOCAL_ADUSERS" msprop:Generator_RowChangedName="TBLOCAL_ADUSERSRowChanged" msprop:Generator_RowEvArgName="TBLOCAL_ADUSERSRowChangeEvent" msprop:Generator_RowClassName="TBLOCAL_ADUSERSRow">
+        <xs:element name="TBLOCAL_ADUSERS" msprop:Generator_TableClassName="TBLOCAL_ADUSERSDataTable" msprop:Generator_TableVarName="tableTBLOCAL_ADUSERS" msprop:Generator_RowChangedName="TBLOCAL_ADUSERSRowChanged" msprop:Generator_TablePropName="TBLOCAL_ADUSERS" msprop:Generator_RowDeletingName="TBLOCAL_ADUSERSRowDeleting" msprop:Generator_RowChangingName="TBLOCAL_ADUSERSRowChanging" msprop:Generator_RowEvHandlerName="TBLOCAL_ADUSERSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBLOCAL_ADUSERSRowDeleted" msprop:Generator_RowClassName="TBLOCAL_ADUSERSRow" msprop:Generator_UserTableName="TBLOCAL_ADUSERS" msprop:Generator_RowEvArgName="TBLOCAL_ADUSERSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="USERNAME" msprop:Generator_ColumnVarNameInTable="columnUSERNAME" msprop:Generator_ColumnPropNameInRow="USERNAME" msprop:Generator_ColumnPropNameInTable="USERNAMEColumn" msprop:Generator_UserColumnName="USERNAME" type="xs:string" minOccurs="0" />
@@ -1468,14 +1438,14 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBLOCAL_ADGROUPS" msprop:Generator_TableClassName="TBLOCAL_ADGROUPSDataTable" msprop:Generator_TableVarName="tableTBLOCAL_ADGROUPS" msprop:Generator_RowChangedName="TBLOCAL_ADGROUPSRowChanged" msprop:Generator_TablePropName="TBLOCAL_ADGROUPS" msprop:Generator_RowDeletingName="TBLOCAL_ADGROUPSRowDeleting" msprop:Generator_RowChangingName="TBLOCAL_ADGROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBLOCAL_ADGROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBLOCAL_ADGROUPSRowDeleted" msprop:Generator_RowClassName="TBLOCAL_ADGROUPSRow" msprop:Generator_UserTableName="TBLOCAL_ADGROUPS" msprop:Generator_RowEvArgName="TBLOCAL_ADGROUPSRowChangeEvent">
+        <xs:element name="TBLOCAL_ADGROUPS" msprop:Generator_TableClassName="TBLOCAL_ADGROUPSDataTable" msprop:Generator_TableVarName="tableTBLOCAL_ADGROUPS" msprop:Generator_TablePropName="TBLOCAL_ADGROUPS" msprop:Generator_RowDeletingName="TBLOCAL_ADGROUPSRowDeleting" msprop:Generator_RowChangingName="TBLOCAL_ADGROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBLOCAL_ADGROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBLOCAL_ADGROUPSRowDeleted" msprop:Generator_UserTableName="TBLOCAL_ADGROUPS" msprop:Generator_RowChangedName="TBLOCAL_ADGROUPSRowChanged" msprop:Generator_RowEvArgName="TBLOCAL_ADGROUPSRowChangeEvent" msprop:Generator_RowClassName="TBLOCAL_ADGROUPSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GROUPNAME" msprop:Generator_ColumnVarNameInTable="columnGROUPNAME" msprop:Generator_ColumnPropNameInRow="GROUPNAME" msprop:Generator_ColumnPropNameInTable="GROUPNAMEColumn" msprop:Generator_UserColumnName="GROUPNAME" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS_MODULES" msprop:Generator_TableClassName="TBDD_GROUPS_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_MODULES" msprop:Generator_TablePropName="TBDD_GROUPS_MODULES" msprop:Generator_RowDeletingName="TBDD_GROUPS_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_MODULESRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_MODULES" msprop:Generator_RowChangedName="TBDD_GROUPS_MODULESRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_MODULESRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_MODULESRow">
+        <xs:element name="TBDD_GROUPS_MODULES" msprop:Generator_TableClassName="TBDD_GROUPS_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_MODULES" msprop:Generator_RowChangedName="TBDD_GROUPS_MODULESRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS_MODULES" msprop:Generator_RowDeletingName="TBDD_GROUPS_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_MODULESRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPS_MODULESRow" msprop:Generator_UserTableName="TBDD_GROUPS_MODULES" msprop:Generator_RowEvArgName="TBDD_GROUPS_MODULESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1507,7 +1477,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS_CLIENT" msprop:Generator_TableClassName="TBDD_GROUPS_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_CLIENT" msprop:Generator_TablePropName="TBDD_GROUPS_CLIENT" msprop:Generator_RowDeletingName="TBDD_GROUPS_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_CLIENTRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_CLIENT" msprop:Generator_RowChangedName="TBDD_GROUPS_CLIENTRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_CLIENTRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_CLIENTRow">
+        <xs:element name="TBDD_GROUPS_CLIENT" msprop:Generator_TableClassName="TBDD_GROUPS_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_CLIENT" msprop:Generator_RowChangedName="TBDD_GROUPS_CLIENTRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS_CLIENT" msprop:Generator_RowDeletingName="TBDD_GROUPS_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_CLIENTRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPS_CLIENTRow" msprop:Generator_UserTableName="TBDD_GROUPS_CLIENT" msprop:Generator_RowEvArgName="TBDD_GROUPS_CLIENTRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1539,7 +1509,7 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPSRow" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent">
+        <xs:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1621,16 +1591,16 @@ VALUES        (@NAME,@ADDED_WHO, 1, 1, 0, 1)</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBDD_USER_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_USER_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_USER_MODULES" msprop:Generator_ChildPropName="GetTBDD_USER_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_USER_MODULES_MODULE_ID" msprop:Generator_ParentPropName="TBDD_MODULESRow" msprop:Generator_RelationVarName="relationFK_TBDD_USER_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" />
+      <msdata:Relationship name="FK_TBDD_USER_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_USER_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_USER_MODULES" msprop:Generator_ChildPropName="GetTBDD_USER_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_USER_MODULES_MODULE_ID" msprop:Generator_RelationVarName="relationFK_TBDD_USER_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" msprop:Generator_ParentPropName="TBDD_MODULESRow" />
-      <msdata:Relationship name="FK_TBDD_CLIENT_USER_GROUP_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_CLIENT_USER" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_CLIENT_USER" msprop:Generator_ChildPropName="GetTBDD_CLIENT_USERRows" msprop:Generator_UserRelationName="FK_TBDD_CLIENT_USER_GROUP_ID" msprop:Generator_ParentPropName="TBDD_CLIENTRow" msprop:Generator_RelationVarName="relationFK_TBDD_CLIENT_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" />
+      <msdata:Relationship name="FK_TBDD_CLIENT_USER_GROUP_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_CLIENT_USER" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_CLIENT_USER" msprop:Generator_ChildPropName="GetTBDD_CLIENT_USERRows" msprop:Generator_UserRelationName="FK_TBDD_CLIENT_USER_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_CLIENT_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" msprop:Generator_ParentPropName="TBDD_CLIENTRow" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
-      <msdata:Relationship name="FK_TBDD_USER_MODULES2_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_USER_MODULES" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_USER_MODULES" msprop:Generator_ChildPropName="GetTBDD_USER_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_USER_MODULES2_USER_ID" msprop:Generator_RelationVarName="relationFK_TBDD_USER_MODULES2_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
+      <msdata:Relationship name="FK_TBDD_USER_MODULES2_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_USER_MODULES" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_USER_MODULES" msprop:Generator_ChildPropName="GetTBDD_USER_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_USER_MODULES2_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_USER_MODULES2_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
-      <msdata:Relationship name="FK_TBDD_CLIENT_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_CLIENT_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_CLIENT_USER" msprop:Generator_ChildPropName="GetTBDD_CLIENT_USERRows" msprop:Generator_UserRelationName="FK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_RelationVarName="relationFK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
+      <msdata:Relationship name="FK_TBDD_CLIENT_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_CLIENT_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_CLIENT_USER" msprop:Generator_ChildPropName="GetTBDD_CLIENT_USERRows" msprop:Generator_UserRelationName="FK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_ParentPropName="TBDD_MODULESRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" msprop:Generator_ParentPropName="TBDD_MODULESRow" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_ParentPropName="TBDD_CLIENTRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" msprop:Generator_ParentPropName="TBDD_CLIENTRow" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" msprop:Generator_ParentPropName="TBDD_GROUPSRow" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" msprop:Generator_ParentPropName="TBDD_GROUPSRow" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" msprop:Generator_ParentPropName="TBDD_GROUPSRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

DDUserManager/DDUserManager/UserDataSet.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-429" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-356" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="8" X="987" Y="190" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:TBDD_MODULES" ZOrder="16" X="1322" Y="-22" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />

DDUserManager/DDUserManager/frmADImport_Groups.vb

@@ -1,12 +1,10 @@
 Imports DevExpress.XtraGrid.Views.Grid
 
 Public Class frmADImport_Groups
+    Private Shared logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger()
+
     Private Sub frmADImport_Groups_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-
         Try
-            'TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString
-            'TBDD_GROUPSTableAdapter.Fill(DS_ChangeS.TBDD_GROUPS)
-
             Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups()
 
             UserDataSet.TBLOCAL_ADGROUPS.Clear()
@@ -17,6 +15,7 @@ Public Class frmADImport_Groups
 
             gridAD_Groups.DataSource = UserDataSet.TBLOCAL_ADGROUPS
         Catch ex As Exception
+            logger.Error(ex, "Error while loading initial groups")
             MsgBox($"Error while loading initial groups")
         End Try
     End Sub
@@ -40,8 +39,10 @@ Public Class frmADImport_Groups
         Next
 
         If importedGroups = 0 Then
+            logger.Warn($"Es wurden keine neuen Gruppen importiert, da alle ausgewählten Gruppen bereits in der Gruppenverwaltung vorhanden sind.")
             MsgBox($"Es wurden keine neuen Gruppen importiert, da alle ausgewählten Gruppen bereits in der Gruppenverwaltung vorhanden sind.", MsgBoxStyle.Exclamation, "UserManager")
         Else
+            logger.Info($"{importedGroups} Gruppen wurden erfolgreich importiert!")
             MsgBox($"{importedGroups} Gruppen wurden erfolgreich importiert!", MsgBoxStyle.Information, "UserManager")
         End If
     End Sub

DDUserManager/DDUserManager/frmADImport_Users.vb

@@ -6,6 +6,8 @@ Imports DD_LIB_Standards
 
 Public Class frmADImport_Users
 
+    Private Shared logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger()
+
     Private Sub frmADImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Try
             Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups()
@@ -13,6 +15,7 @@ Public Class frmADImport_Users
             gridAD_Groups.DataSource = groups
             viewAD_Groups.Columns.Item(0).Caption = "Gruppe"
         Catch ex As Exception
+            logger.Error(ex, $"Error while loading initial groups")
             MsgBox($"Error while loading initial groups")
         End Try
     End Sub
@@ -21,23 +24,24 @@ Public Class frmADImport_Users
         Dim groupName As String = viewAD_Groups.GetRow(e.FocusedRowHandle)
 
         Try
-            Dim usersForGroup As List(Of UserPrincipal) = ClassActiveDirectory.GetActiveDirectoryUsersForGroup(groupName)
+            Dim usersForGroup As List(Of ClassActiveDirectory.ADUser) = ClassActiveDirectory.GetActiveDirectoryUsersForGroup(groupName)
 
             UserDataSet.TBLOCAL_ADUSERS.Clear()
 
-            For Each user As UserPrincipal In usersForGroup
+            For Each user As ClassActiveDirectory.ADUser In usersForGroup
                 Dim row As TBLOCAL_ADUSERSRow = UserDataSet.TBLOCAL_ADUSERS.NewTBLOCAL_ADUSERSRow()
 
-                row.NAME = IIf((IsDBNull(user.Surname) Or IsNothing(user.Surname)), "", user.Surname)
+                row.NAME = user.Surname
-                row.PRENAME = IIf((IsDBNull(user.GivenName) Or IsNothing(user.GivenName)), "", user.GivenName)
+                row.PRENAME = user.GivenName
-                row.USERNAME = IIf((IsDBNull(user.SamAccountName) Or IsNothing(user.SamAccountName)), "", user.SamAccountName)
+                row.USERNAME = user.Username
-                row.EMAIL = IIf((IsDBNull(user.EmailAddress) Or IsNothing(user.EmailAddress)), "", user.EmailAddress)
+                row.EMAIL = user.Email
 
                 UserDataSet.TBLOCAL_ADUSERS.AddTBLOCAL_ADUSERSRow(row)
             Next
 
             TBLOCAL_ADUSERSBindingSource.DataSource = UserDataSet.TBLOCAL_ADUSERS
         Catch ex As Exception
+            logger.Error(ex, $"Error while loading users for group {groupName}")
             MsgBox($"Error while loading users for group {groupName}")
         End Try
     End Sub
@@ -52,9 +56,9 @@ Public Class frmADImport_Users
                 Dim userRow As TBLOCAL_ADUSERSRow = rowView.Row
 
                 Dim Username As String = userRow.USERNAME
-                Dim Prename As String = userRow.PRENAME
+                Dim Prename As String = IIf(IsDBNull(userRow.PRENAME), Nothing, userRow.PRENAME)
-                Dim Name As String = userRow.NAME
+                Dim Name As String = IIf(IsDBNull(userRow.NAME), Nothing, userRow.NAME)
-                Dim Email As String = userRow.EMAIL
+                Dim Email As String = IIf(IsDBNull(userRow.EMAIL), Nothing, userRow.EMAIL)
 
 
                 If Not ClassData.UserExists(Username) Then
@@ -67,12 +71,14 @@ Public Class frmADImport_Users
             Next
 
             If importedUsers = 0 Then
+                logger.Warn("No new users imported. All selected users are already in database.")
                 MsgBox($"Es wurden keine neuen Benutzer importiert, da alle ausgewählten Benutzer bereits in der Benutzerverwaltung vorhanden sind.", MsgBoxStyle.Exclamation, "UserManager")
             Else
+                logger.Info($"{importedUsers} users sucessfully imported.")
                 MsgBox($"{importedUsers} Benutzer wurden erfolgreich importiert!", MsgBoxStyle.Information, "UserManager")
             End If
         Catch ex As Exception
-            clsLogger.Add($"Error while importing users: {ex.Message}")
+            logger.Error(ex, "Error while importing users")
             MsgBox($"Error while importing users: {ex.Message}", MsgBoxStyle.Critical)
         End Try
     End Sub

DDUserManager/DDUserManager/frmConfigDatabase.Designer.vb

@@ -22,11 +22,6 @@ Partial Class frmConfigDatabase
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfigDatabase))
-        Me.lblLinkedServer = New System.Windows.Forms.Label()
-        Me.txtLinkedServer = New System.Windows.Forms.TextBox()
-        Me.rbConn_Proxy = New System.Windows.Forms.RadioButton()
-        Me.rbConnDefault = New System.Windows.Forms.RadioButton()
         Me.chkbxUserAut = New System.Windows.Forms.CheckBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.cmbDatenbank = New System.Windows.Forms.ComboBox()
@@ -39,57 +34,13 @@ Partial Class frmConfigDatabase
         Me.txtUser = New System.Windows.Forms.TextBox()
         Me.txtPasswort = New System.Windows.Forms.TextBox()
         Me.BtnConnect = New System.Windows.Forms.Button()
-        Me.btndeleteProxy = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
-        'lblLinkedServer
-        '
-        Me.lblLinkedServer.AutoSize = True
-        Me.lblLinkedServer.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblLinkedServer.Location = New System.Drawing.Point(9, 180)
-        Me.lblLinkedServer.Name = "lblLinkedServer"
-        Me.lblLinkedServer.Size = New System.Drawing.Size(116, 13)
-        Me.lblLinkedServer.TabIndex = 69
-        Me.lblLinkedServer.Text = "Name/IP Proxy-Server:"
-        Me.lblLinkedServer.Visible = False
-        '
-        'txtLinkedServer
-        '
-        Me.txtLinkedServer.Location = New System.Drawing.Point(12, 196)
-        Me.txtLinkedServer.Name = "txtLinkedServer"
-        Me.txtLinkedServer.Size = New System.Drawing.Size(288, 20)
-        Me.txtLinkedServer.TabIndex = 68
-        Me.txtLinkedServer.Visible = False
-        '
-        'rbConn_Proxy
-        '
-        Me.rbConn_Proxy.AutoSize = True
-        Me.rbConn_Proxy.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.rbConn_Proxy.Location = New System.Drawing.Point(144, 18)
-        Me.rbConn_Proxy.Name = "rbConn_Proxy"
-        Me.rbConn_Proxy.Size = New System.Drawing.Size(108, 17)
-        Me.rbConn_Proxy.TabIndex = 66
-        Me.rbConn_Proxy.Text = "Proxy Connection"
-        Me.rbConn_Proxy.UseVisualStyleBackColor = True
-        '
-        'rbConnDefault
-        '
-        Me.rbConnDefault.AutoSize = True
-        Me.rbConnDefault.Checked = True
-        Me.rbConnDefault.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.rbConnDefault.Location = New System.Drawing.Point(12, 18)
-        Me.rbConnDefault.Name = "rbConnDefault"
-        Me.rbConnDefault.Size = New System.Drawing.Size(116, 17)
-        Me.rbConnDefault.TabIndex = 65
-        Me.rbConnDefault.TabStop = True
-        Me.rbConnDefault.Text = "Default Connection"
-        Me.rbConnDefault.UseVisualStyleBackColor = True
-        '
         'chkbxUserAut
         '
         Me.chkbxUserAut.AutoSize = True
         Me.chkbxUserAut.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.chkbxUserAut.Location = New System.Drawing.Point(514, 60)
+        Me.chkbxUserAut.Location = New System.Drawing.Point(514, 33)
         Me.chkbxUserAut.Name = "chkbxUserAut"
         Me.chkbxUserAut.Size = New System.Drawing.Size(151, 17)
         Me.chkbxUserAut.TabIndex = 64
@@ -100,7 +51,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label5.AutoSize = True
         Me.Label5.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label5.Location = New System.Drawing.Point(9, 139)
+        Me.Label5.Location = New System.Drawing.Point(9, 112)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(135, 13)
         Me.Label5.TabIndex = 63
@@ -109,7 +60,7 @@ Partial Class frmConfigDatabase
         'cmbDatenbank
         '
         Me.cmbDatenbank.FormattingEnabled = True
-        Me.cmbDatenbank.Location = New System.Drawing.Point(12, 106)
+        Me.cmbDatenbank.Location = New System.Drawing.Point(12, 79)
         Me.cmbDatenbank.Name = "cmbDatenbank"
         Me.cmbDatenbank.Size = New System.Drawing.Size(288, 21)
         Me.cmbDatenbank.TabIndex = 56
@@ -118,7 +69,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label4.AutoSize = True
         Me.Label4.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label4.Location = New System.Drawing.Point(9, 86)
+        Me.Label4.Location = New System.Drawing.Point(9, 59)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(63, 13)
         Me.Label4.TabIndex = 61
@@ -128,7 +79,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label1.AutoSize = True
         Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label1.Location = New System.Drawing.Point(9, 38)
+        Me.Label1.Location = New System.Drawing.Point(9, 11)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(72, 13)
         Me.Label1.TabIndex = 58
@@ -138,7 +89,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label2.AutoSize = True
         Me.Label2.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label2.Location = New System.Drawing.Point(303, 38)
+        Me.Label2.Location = New System.Drawing.Point(303, 11)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(78, 13)
         Me.Label2.TabIndex = 59
@@ -148,7 +99,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label3.AutoSize = True
         Me.Label3.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label3.Location = New System.Drawing.Point(427, 38)
+        Me.Label3.Location = New System.Drawing.Point(427, 11)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(53, 13)
         Me.Label3.TabIndex = 60
@@ -159,7 +110,7 @@ Partial Class frmConfigDatabase
         Me.txtActualConnection.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtActualConnection.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.txtActualConnection.Location = New System.Drawing.Point(12, 155)
+        Me.txtActualConnection.Location = New System.Drawing.Point(12, 128)
         Me.txtActualConnection.Name = "txtActualConnection"
         Me.txtActualConnection.ReadOnly = True
         Me.txtActualConnection.Size = New System.Drawing.Size(457, 20)
@@ -168,7 +119,7 @@ Partial Class frmConfigDatabase
         'txtServer
         '
         Me.txtServer.ForeColor = System.Drawing.SystemColors.WindowText
-        Me.txtServer.Location = New System.Drawing.Point(12, 58)
+        Me.txtServer.Location = New System.Drawing.Point(12, 31)
         Me.txtServer.Name = "txtServer"
         Me.txtServer.Size = New System.Drawing.Size(288, 20)
         Me.txtServer.TabIndex = 53
@@ -176,7 +127,7 @@ Partial Class frmConfigDatabase
         'txtUser
         '
         Me.txtUser.ForeColor = System.Drawing.SystemColors.WindowText
-        Me.txtUser.Location = New System.Drawing.Point(306, 58)
+        Me.txtUser.Location = New System.Drawing.Point(306, 31)
         Me.txtUser.Name = "txtUser"
         Me.txtUser.Size = New System.Drawing.Size(118, 20)
         Me.txtUser.TabIndex = 54
@@ -184,7 +135,7 @@ Partial Class frmConfigDatabase
         'txtPasswort
         '
         Me.txtPasswort.ForeColor = System.Drawing.SystemColors.WindowText
-        Me.txtPasswort.Location = New System.Drawing.Point(430, 58)
+        Me.txtPasswort.Location = New System.Drawing.Point(430, 31)
         Me.txtPasswort.Name = "txtPasswort"
         Me.txtPasswort.Size = New System.Drawing.Size(64, 20)
         Me.txtPasswort.TabIndex = 55
@@ -194,7 +145,7 @@ Partial Class frmConfigDatabase
         '
         Me.BtnConnect.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.BtnConnect.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.BtnConnect.Location = New System.Drawing.Point(306, 102)
+        Me.BtnConnect.Location = New System.Drawing.Point(306, 75)
         Me.BtnConnect.Name = "BtnConnect"
         Me.BtnConnect.Size = New System.Drawing.Size(253, 25)
         Me.BtnConnect.TabIndex = 57
@@ -202,30 +153,11 @@ Partial Class frmConfigDatabase
         Me.BtnConnect.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.BtnConnect.UseVisualStyleBackColor = True
         '
-        'btndeleteProxy
-        '
-        Me.btndeleteProxy.Image = CType(resources.GetObject("btndeleteProxy.Image"), System.Drawing.Image)
-        Me.btndeleteProxy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btndeleteProxy.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btndeleteProxy.Location = New System.Drawing.Point(562, 153)
-        Me.btndeleteProxy.Name = "btndeleteProxy"
-        Me.btndeleteProxy.Size = New System.Drawing.Size(97, 23)
-        Me.btndeleteProxy.TabIndex = 67
-        Me.btndeleteProxy.Text = "Lösche Proxy"
-        Me.btndeleteProxy.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btndeleteProxy.UseVisualStyleBackColor = True
-        Me.btndeleteProxy.Visible = False
-        '
         'frmConfigDatabase
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(710, 235)
+        Me.ClientSize = New System.Drawing.Size(710, 205)
-        Me.Controls.Add(Me.lblLinkedServer)
-        Me.Controls.Add(Me.txtLinkedServer)
-        Me.Controls.Add(Me.btndeleteProxy)
-        Me.Controls.Add(Me.rbConn_Proxy)
-        Me.Controls.Add(Me.rbConnDefault)
         Me.Controls.Add(Me.chkbxUserAut)
         Me.Controls.Add(Me.Label5)
         Me.Controls.Add(Me.cmbDatenbank)
@@ -239,17 +171,11 @@ Partial Class frmConfigDatabase
         Me.Controls.Add(Me.txtPasswort)
         Me.Controls.Add(Me.BtnConnect)
         Me.Name = "frmConfigDatabase"
-        Me.Text = "ConfigDatabase"
+        Me.Text = "Datenbank Verbindung"
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
-
-    Friend WithEvents lblLinkedServer As Label
-    Friend WithEvents txtLinkedServer As TextBox
-    Friend WithEvents btndeleteProxy As Button
-    Friend WithEvents rbConn_Proxy As RadioButton
-    Friend WithEvents rbConnDefault As RadioButton
     Friend WithEvents chkbxUserAut As CheckBox
     Friend WithEvents Label5 As Label
     Friend WithEvents cmbDatenbank As ComboBox

DDUserManager/DDUserManager/frmConfigDatabase.resx

@@ -117,21 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btndeleteProxy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAACLUlE
-        QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc
-        TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f
-        hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG
-        +Wwu8G5QkIa0jN5gqnR1oOkGuOk6b1x3jHl9uaWGhpb1UtXNY1luPmJ4KbIkmAElAcgD3egfa5oJxq77
-        oq3ovKJoE7XbBbwoTWhG2F7cWRJ4dFR1S9fNCvykT41mB9TqjSOxXvtJM9zrYokLrc4vFYtUBcngq9Lf
-        tqICvlr7RhQr8U1za4FHXZIIurT/mePFf1AEJLkFGJb7uml2LRBrcp4us1+g4KRcYV8lkmkplyenglgH
-        VIm9tzq/VJRZLpUlih9yBQrAt79Pp3bjkVgM244nsPwe/VQQ6r8pRsgu7pwtC61grkA/T10r/NrnxB8s
-        V2VmvQiOB0MhLMZVxY/pDPEkU6DnZ2Qu2M0STjJFAIpmAUmXD0NY9PQMzEBRPwJzkiSp71F8J1/ipNMj
-        f9rE8XggkUgexq9cBXmi+DYYjtCRGL72T+D4jr/RaE+waFgu8c0zgUcmT9UuBS4/9m0hmh9Fo7N8FXih
-        CIKE5/Vi8yJsDM8P8P0HLGwR4Wl3ICYAAAAASUVORK5CYII=
-</value>
-  </data>
 </root>

DDUserManager/DDUserManager/frmConfigDatabase.vb

@@ -82,7 +82,6 @@ Public Class frmConfigDatabase
                 con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";Application Name=DD ADDI-Client"
             End If
 
-
             Dim connection As New SqlClient.SqlConnection(con) 'csb.ConnectionString)
             'während Verbindungsaufbau Sanduhr-Mauszeiger
             Cursor = Cursors.WaitCursor
@@ -91,15 +90,12 @@ Public Class frmConfigDatabase
             'DialogResult = Windows.Forms.DialogResult.OK
             Dim result As MsgBoxResult
             Dim msg = "Die Verbindung wurde erfolgreich aufgebaut!" & vbNewLine & "Möchten Sie diese Verbindung nun in der Anwendung speichern?"
-            result = MessageBox.Show(msg, "Database-Connection", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            result = MessageBox.Show(msg, "Datenbank-Verbindung", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.Yes Then
                 ConnectionChanged = True
                 'Set the construction string
-                If rbConnDefault.Checked Then
+                MyConnectionString = con
-                    MyConnectionString = con
+                clsDatabase.Init(MyConnectionString)
-                    'csb.ConnectionString
-                    clsDatabase.Init(MyConnectionString)
-                End If
                 My.Settings.Save()
 
                 If chkbxUserAut.Checked = False Then
@@ -108,11 +104,9 @@ Public Class frmConfigDatabase
                     Dim pw As String = cipherText
                     con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & pw & ";"
                 End If
-                If rbConnDefault.Checked Then
+
-                    SaveMySettingsValue("MyConnectionString", con, "ConfigMain")
+                SaveMySettingsValue("MyConnectionString", con, "ConfigMain")
-                Else
+
-                    SaveMySettingsValue("MyProxyConnectionString", con, "ConfigMain")
-                End If
                 Dim csb As New SqlClient.SqlConnectionStringBuilder
                 csb.ConnectionString = MyConnectionString
                 Dim constr = connection.ConnectionString
@@ -128,6 +122,10 @@ Public Class frmConfigDatabase
     End Sub
 
     Private Sub cmbDatenbank_MouseClick(sender As Object, e As MouseEventArgs) Handles cmbDatenbank.MouseClick
-        Load_Databases()
+        If txtServer.Text = String.Empty Or txtUser.Text = String.Empty Or txtPasswort.Text = String.Empty Then
+            MsgBox("Bitte füllen Sie die Felder 'Server-Name', 'Benutzername' und 'Passwort' zuerst aus!", MsgBoxStyle.Exclamation, "Datenbank-Verbindung")
+        Else
+            Load_Databases()
+        End If
     End Sub
 End Class

DDUserManager/DDUserManager/frmMain.resx

@@ -213,9 +213,36 @@
   <metadata name="PRODUCT_VERSIONLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="TBDD_USERBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>693, 17</value>
+  </metadata>
+  <metadata name="TBDD_GROUPSBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 95</value>
+  </metadata>
+  <metadata name="TBDD_CLIENTBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>247, 95</value>
+  </metadata>
+  <metadata name="TBDD_MODULESBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>909, 95</value>
+  </metadata>
   <metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>136, 17</value>
   </metadata>
+  <metadata name="TBDD_MODULESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>469, 95</value>
+  </metadata>
+  <metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>489, 56</value>
+  </metadata>
+  <metadata name="TBDD_CLIENTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>911, 56</value>
+  </metadata>
+  <metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>136, 17</value>
+  </metadata>
+  <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -234,6 +261,9 @@
   <metadata name="DS_ChangeS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>906, 134</value>
   </metadata>
+  <metadata name="DS_ChangeS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>906, 134</value>
+  </metadata>
   <metadata name="TBDD_USERBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>693, 17</value>
   </metadata>

DDUserManager/DDUserManager/frmMain.vb

@@ -10,74 +10,115 @@ Imports DD_LIB_Standards
 '''       https://stackoverflow.com/questions/21270697/argumentoutofrangeexception-with-data-binding-when-debugger-is-running-vs2010#28550637      
 ''' </summary>
 Public Class frmMain
+    Private Const MODULE_NAME As String = "UserManager"
+
     Private CurrentUser As TBDD_USERRow = Nothing
+    Private CurrentUserId As Integer
+
     Private DragDropManager As ClassDragDrop = Nothing
 
+    Private Shared logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger()
+
     Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        If InitDatabase() = False Then
+        Try
-            MsgBox($"Unexpected error in Database Init(1). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager")
+            NLog.LogManager.Configuration = ClassNLog.GetLoggerConfigFor(MODULE_NAME)
-            Application.Exit()
-            Exit Sub
-        End If
-        If MyConnectionString = "" Then
-            MsgBox($"Unexpected error in Database Init(2). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager")
-            Application.Exit()
-            Exit Sub
-        End If
-        TBDD_CLIENTTableAdapter.Connection.ConnectionString = MyConnectionString
-        TBDD_CLIENT_USERTableAdapter.Connection.ConnectionString = MyConnectionString
-        TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString
-        TBDD_GROUPS_CLIENTTableAdapter.Connection.ConnectionString = MyConnectionString
-        TBDD_GROUPS_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString
-        TBDD_GROUPS_USERTableAdapter.Connection.ConnectionString = MyConnectionString
-        TBDD_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString
-        TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString
-        TBDD_USER_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString
 
+            logger.Info("Starting UserManager v" & Application.ProductVersion)
+            logger.Info($"Current Username: {Environment.UserName}")
 
-        Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','UM',{1})", Environment.UserName, 1)
+            If InitDatabase() = False Then
-        Dim DT_CHECKUSER_MODULE As DataTable = clsDatabase.Return_Datatable(sql)
+                MsgBox($"Unexpected error in Database Init(1). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager")
+                logger.Fatal($"Unexpected error in Database Init(1). {vbCrLf & vbCrLf}Please contact Your admin.")
+                Application.Exit()
+                Exit Sub
+            End If
+            If MyConnectionString = "" Then
+                MsgBox($"Unexpected error in Database Init(2). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager")
+                logger.Fatal($"Unexpected error in Database Init(2). {vbCrLf & vbCrLf}Please contact Your admin.")
+                Application.Exit()
+                Exit Sub
+            End If
 
-        If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
+            TBDD_CLIENTTableAdapter.Connection.ConnectionString = MyConnectionString
-            USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
+            TBDD_CLIENT_USERTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBDD_GROUPS_CLIENTTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBDD_GROUPS_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBDD_GROUPS_USERTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBDD_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBDD_USER_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString
 
-            Dim userRow As TBDD_USERRow = GetCurrentUserRow(Environment.UserName)
+            Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','UM',{1})", Environment.UserName, 1)
-            tsLabelUser.Text = $"Angemeldeter Benutzer: {Environment.UserName}"
+            Dim DT_CHECKUSER_MODULE As DataTable = clsDatabase.Return_Datatable(sql)
-            CurrentUser = userRow
 
-            ' Grunddaten aus Tabellen laden
+            If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
-            ' Davon abhängige Daten werden in den `focusedRowChanged`-Events der Grids geladen
+                MsgBox($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt. {vbCrLf & vbCrLf}Bitte kontaktieren Sie den Administrator, wenn dies ein Fehler ist.", MsgBoxStyle.Critical, "UserManager")
-            LoadData()
+                logger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.")
+                Application.ExitThread()
+            End If
 
-            'Spalten an Inhalte anpassen
+            Dim firstRow As DataRow = DT_CHECKUSER_MODULE.Rows.Item(0)
-            gvUsers.BestFitColumns()
+            Dim userId As Integer = firstRow.Item("USER_ID")
-            viewClients_AllClients.BestFitColumns()
-            viewGroups_AllGroups.BestFitColumns()
 
-            ' Dragdrop Events für Grids anlegen
+            If userId = 0 Then
-            DragDropManager = New ClassDragDrop()
+                MsgBox($"Der Benutzer '{Environment.UserName}' ist nicht in der Benutzerverwaltung vorhanden. {vbCrLf & vbCrLf}Bitte kontaktieren Sie den Administrator, wenn dies ein Fehler ist.", MsgBoxStyle.Critical, "UserManager")
-            DragDropManager.AddGridView(viewGroups_AvailableUsers)
+                logger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht in der Benutzerverwaltung vorhanden.")
-            DragDropManager.AddGridView(viewGroups_AssignedUsers)
+                Application.ExitThread()
-            DragDropManager.AddGridView(viewModules_AvailableUsers)
+            End If
-            DragDropManager.AddGridView(viewModules_AssignedUsers)
-            DragDropManager.AddGridView(viewClients_AvailableUsers)
-            DragDropManager.AddGridView(viewClients_AssignedUsers)
-            DragDropManager.AddGridView(viewClientsGroups_AssignedGroups)
-            DragDropManager.AddGridView(viewClientsGroups_AvailableGroups)
-            DragDropManager.AddGridView(viewModulesGroups_AssignedGroups)
-            DragDropManager.AddGridView(viewModulesGroups_AvailableGroups)
-        Else
-            MsgBox($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt. {vbCrLf & vbCrLf}Bitte kontaktieren Sie den Administrator, wenn dies ein Fehler ist.", MsgBoxStyle.Critical, "UserManager")
-            Application.Exit()
-        End If
 
-        If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) = 1 Then
+            If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
+                Dim userRow As TBDD_USERRow = GetCurrentUserRow(Environment.UserName)
 
+                If userRow Is Nothing Then
 
-        Else
+                End If
-            MsgBox($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt. {vbCrLf & vbCrLf}Bitte kontaktieren Sie den Administrator, wenn dies ein Fehler ist.", MsgBoxStyle.Critical, "UserManager")
+
-            Application.Exit()
+                tsLabelUser.Text = $"Angemeldeter Benutzer: {Environment.UserName}"
-        End If
+                tsLabelVersion.Text = $"Version {Application.ProductVersion}"
+
+                lblADRootNode.Text = String.Format(lblADRootNode.Text, Environment.UserDomainName)
+                txtADRootNode.Text = ActiveDirectoryRootNode
+
+                CurrentUser = userRow
+                CurrentUserId = userRow.GUID
+
+                ' Grunddaten aus Tabellen laden
+                ' Davon abhängige Daten werden in den `focusedRowChanged`-Events der Grids geladen
+                LoadData()
+
+                'Spalten an Inhalte anpassen
+                gvUsers.BestFitColumns()
+                viewClients_AllClients.BestFitColumns()
+                viewGroups_AllGroups.BestFitColumns()
+
+                ' Dragdrop Events für Grids anlegen
+                DragDropManager = New ClassDragDrop()
+                DragDropManager.AddGridView(viewGroups_AvailableUsers)
+                DragDropManager.AddGridView(viewGroups_AssignedUsers)
+                DragDropManager.AddGridView(viewModules_AvailableUsers)
+                DragDropManager.AddGridView(viewModules_AssignedUsers)
+                DragDropManager.AddGridView(viewClients_AvailableUsers)
+                DragDropManager.AddGridView(viewClients_AssignedUsers)
+                DragDropManager.AddGridView(viewClientsGroups_AssignedGroups)
+                DragDropManager.AddGridView(viewClientsGroups_AvailableGroups)
+                DragDropManager.AddGridView(viewModulesGroups_AssignedGroups)
+                DragDropManager.AddGridView(viewModulesGroups_AvailableGroups)
+            Else
+                MsgBox($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt. {vbCrLf & vbCrLf}Bitte kontaktieren Sie den Administrator, wenn dies ein Fehler ist.", MsgBoxStyle.Critical, "UserManager")
+                logger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.")
+                Application.ExitThread()
+            End If
+
+            If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) <> 1 Then
+                MsgBox($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt. {vbCrLf & vbCrLf}Bitte kontaktieren Sie den Administrator, wenn dies ein Fehler ist.", MsgBoxStyle.Critical, "UserManager")
+                logger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.")
+                Application.ExitThread()
+            End If
+        Catch ex As Exception
+            MsgBox("Unexpected Error while loading. Please check the log.", MsgBoxStyle.Critical, "User Manager")
+            logger.Fatal(ex, "Unexpected Error while loading.")
+        End Try
     End Sub
 
     Public Function InitDatabase()
@@ -104,10 +145,11 @@ Public Class frmMain
             End If
             Return True
         Catch ex As Exception
+            logger.Fatal(ex, "Unexpected Error in Init Database:")
             MsgBox("Unexpected Error in Init Database:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+
             Return False
         End Try
-
     End Function
 
     Private Sub btnImportUsers_Click(sender As Object, e As EventArgs) Handles btnImportUsers.Click
@@ -991,7 +1033,8 @@ Public Class frmMain
 #End Region
 
     Private Sub ShowErrorMessage(errorText As String, ex As Exception)
-        MsgBox(errorText & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, "Process Manager")
+        logger.Error(ex, errorText)
+        MsgBox(errorText & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, "User Manager")
     End Sub
 
     Private Sub BindingNavigatorAddNewItem_Click(sender As Object, e As EventArgs) Handles TBDD_GROUPSBindingNavigator.Click
@@ -1004,7 +1047,43 @@ Public Class frmMain
     End Sub
 
     Private Sub TBDD_GROUPSBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_GROUPSBindingSource1.AddingNew
-        'UserDataSet.TBDD_GROUPS.ADDED_WHOColumn.DefaultValue = Environment.UserName
         DS_ChangeS.TBDD_GROUPS.ADDED_WHOColumn.DefaultValue = Environment.UserName
     End Sub
+
+    Private Sub btnConfigConnections_Click(sender As Object, e As EventArgs) Handles btnConfigConnections.Click
+        frmConfigDatabase.ShowDialog()
+    End Sub
+
+    Private Sub TBDD_USERBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_USERBindingSource.AddingNew
+        UserDataSet.TBDD_USER.ADDED_WHOColumn.DefaultValue = Environment.UserName
+    End Sub
+
+    Private Sub btnOpenConfigDir_Click(sender As Object, e As EventArgs) Handles btnOpenConfigDir.Click
+        Process.Start(Application.UserAppDataPath())
+    End Sub
+
+    Private Sub btnOpenLogDir_Click(sender As Object, e As EventArgs) Handles btnOpenLogDir.Click
+        Process.Start(ClassNLog.GetLogPathFor(MODULE_NAME))
+    End Sub
+
+    Private Sub txtADRootNode_Leave(sender As Object, e As EventArgs) Handles txtADRootNode.Leave
+        SaveMySettingsValue("ActiveDirectoryRootNode", txtADRootNode.Text, "ConfigMain")
+    End Sub
+
+
+    Private Sub btnADConnectionTest_Click(sender As Object, e As EventArgs) Handles btnADConnectionTest.Click
+        Dim ldapPAth = IIf(txtADRootNode.Text = String.Empty, ActiveDirectoryRootNode, txtADRootNode.Text)
+
+
+        If ClassActiveDirectory.ConnectionTest(txtADRootNode.Text) Then
+            MsgBox("Verbindung erfolgreich aufgebaut!", MsgBoxStyle.Information)
+
+            SaveMySettingsValue("ActiveDirectoryRootNode", txtADRootNode.Text, "ConfigMain")
+            logger.Info($"New ActiveDirectory Path saved: {txtADRootNode.Text}")
+        End If
+    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        Process.Start("https://didalog.de/support")
+    End Sub
 End Class

DDUserManager/SetupWix/Product.wxs

@@ -20,7 +20,7 @@
 
     <MajorUpgrade
       AllowDowngrades="no"
-      AllowSameVersionUpgrades="no"
+      AllowSameVersionUpgrades="yes"
       DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
     />