jj: AD+Modules Icon, Show assigned modules

DDUserManager/DDUserManager/ApplicationEvents.vb

@@ -0,0 +1,22 @@
+Imports Microsoft.VisualBasic.ApplicationServices
+
+Namespace My
+    ' Für MyApplication sind folgende Ereignisse verfügbar:
+    ' Startup: Wird beim Starten der Anwendung noch vor dem Erstellen des Startformulars ausgelöst.
+    ' Shutdown: Wird nach dem Schließen aller Anwendungsformulare ausgelöst.  Dieses Ereignis wird nicht ausgelöst, wenn die Anwendung mit einem Fehler beendet wird.
+    ' UnhandledException: Wird bei einem Ausnahmefehler ausgelöst.
+    ' StartupNextInstance: Wird beim Starten einer Einzelinstanzanwendung ausgelöst, wenn die Anwendung bereits aktiv ist. 
+    ' NetworkAvailabilityChanged: Wird beim Herstellen oder Trennen der Netzwerkverbindung ausgelöst.
+    Partial Friend Class MyApplication
+        Protected Overrides Function OnStartup(eventArgs As StartupEventArgs) As Boolean
+            Dim requiredParam As String = "-internal"
+
+            If eventArgs.CommandLine.Count = 1 AndAlso eventArgs.CommandLine.Item(0) = requiredParam Then
+                Return MyBase.OnStartup(eventArgs)
+            Else
+                MsgBox("Diese Anwendung kann nicht manuell gestartet werden und wird nun beendet.", MsgBoxStyle.Exclamation, "User Manager")
+                Return Nothing
+            End If
+        End Function
+    End Class
+End Namespace

DDUserManager/DDUserManager/DDUserManager.vbproj

@@ -86,6 +86,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
     <Compile Include="frmADImport.Designer.vb">
       <DependentUpon>frmADImport.vb</DependentUpon>
     </Compile>
@@ -170,5 +171,11 @@
   <ItemGroup>
     <None Include="Resources\book.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\key.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\user_add.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

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

@@ -80,6 +80,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property key() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("key", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -89,5 +99,15 @@ Namespace My.Resources
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property user_add() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("user_add", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
     End Module
 End Namespace

DDUserManager/DDUserManager/My Project/Resources.resx

@@ -118,8 +118,8 @@
     <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="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="key" 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\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>
@@ -127,4 +127,10 @@
   <data name="book" 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>
   </data>
+  <data name="user" 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>
+  </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>
 </root>

DDUserManager/DDUserManager/UserDataSet.Designer.vb

@@ -6807,11 +6807,31 @@ Namespace UserDataSetTableAdapters
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
         Private Sub InitCommandCollection()
-            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
+            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(2) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
             Me._commandCollection(0).CommandText = "SELECT        TBDD_MODULES.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_MODULES"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(1).Connection = Me.Connection
+            Me._commandCollection(1).CommandText = "SELECT        T.GUID, T.NAME, T.SHORT_NAME, T.LICENSE, T.PRODUCT_VERSION, T.ACTIV"& _ 
+                "E, T.VERSION_DELIMITER, T.FILE_DELIMITER, T.BIT1, T.BIT2, T.STRING1, T.STRING2, "& _ 
+                "T.BACKGROUND_IMAGE, T.PRODUCT_NAME1, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         T.PRODUCT_NAME2,"& _ 
+                " T.VERSION_UPATE_PATH, T.ADDED_WHO, T.ADDED_WHEN, T.CHANGED_WHO, T.CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_MODULES AS T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBDD_USE"& _ 
+                "R_MODULES AS T2 ON T.GUID = T2.MODULE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (T2.USER_ID = @USER_ID) A"& _ 
+                "ND (T2.IS_ADMIN = 1)"
+            Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(2).Connection = Me.Connection
+            Me._commandCollection(2).CommandText = "SELECT        T.GUID, T.NAME, T.SHORT_NAME, T.LICENSE, T.PRODUCT_VERSION, T.ACTIV"& _ 
+                "E, T.VERSION_DELIMITER, T.FILE_DELIMITER, T.BIT1, T.BIT2, T.STRING1, T.STRING2, "& _ 
+                "T.BACKGROUND_IMAGE, T.PRODUCT_NAME1, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         T.PRODUCT_NAME2,"& _ 
+                " T.VERSION_UPATE_PATH, T.ADDED_WHO, T.ADDED_WHEN, T.CHANGED_WHO, T.CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_MODULES AS T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBDD_USE"& _ 
+                "R_MODULES AS T2 ON T.GUID = T2.MODULE_ID INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TB"& _ 
+                "DD_USER AS T3 ON T2.USER_ID = T3.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (T3.USERNAME = @USERNAME)"
+            Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -6838,6 +6858,66 @@ Namespace UserDataSetTableAdapters
             Return dataTable
         End Function
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.Fill, false)>  _
+        Public Overloads Overridable Function FillByUserId_IsAdmin(ByVal dataTable As UserDataSet.TBDD_MODULESDataTable, ByVal USER_ID As Integer) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(1)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(USER_ID,Integer)
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.[Select], false)>  _
+        Public Overloads Overridable Function GetDataByUserId_IsAdmin(ByVal USER_ID As Integer) As UserDataSet.TBDD_MODULESDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(1)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(USER_ID,Integer)
+            Dim dataTable As UserDataSet.TBDD_MODULESDataTable = New UserDataSet.TBDD_MODULESDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.Fill, false)>  _
+        Public Overloads Overridable Function FillByUsername(ByVal dataTable As UserDataSet.TBDD_MODULESDataTable, ByVal USERNAME As String) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            If (USERNAME Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("USERNAME")
+            Else
+                Me.Adapter.SelectCommand.Parameters(0).Value = CType(USERNAME,String)
+            End If
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.[Select], false)>  _
+        Public Overloads Overridable Function GetDataByUsername(ByVal USERNAME As String) As UserDataSet.TBDD_MODULESDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            If (USERNAME Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("USERNAME")
+            Else
+                Me.Adapter.SelectCommand.Parameters(0).Value = CType(USERNAME,String)
+            End If
+            Dim dataTable As UserDataSet.TBDD_MODULESDataTable = New UserDataSet.TBDD_MODULESDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
@@ -7548,36 +7628,22 @@ 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_MODULES] WHERE (([GUID] = @Original_GUID) AND ([USER_ID] ="& _ 
+            Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBDD_USER_MODULES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (USER_ID = @USER_ID) AND (MODULE_ID ="& _ 
-                " @Original_USER_ID) AND ([MODULE_ID] = @Original_MODULE_ID) AND ([IS_ADMIN] = @O"& _ 
+                " @MODULE_ID)"
-                "riginal_IS_ADMIN) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT]"& _ 
-                " = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ("& _ 
-                "[ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN"& _ 
-                "] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_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("@USER_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USER_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
+            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MODULE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "MODULE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_MODULE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "MODULE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_IS_ADMIN", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_ADMIN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, true, 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.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
-            Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_USER_MODULES] ([USER_ID], [MODULE_ID], [IS_ADMIN], [COMMENT], ["& _ 
+            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_USER_MODULES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (USER_ID, MODULE_ID, COMM"& _ 
-                "ADDED_WHO], [ADDED_WHEN]) VALUES (@USER_ID, @MODULE_ID, @IS_ADMIN, @COMMENT, @AD"& _ 
+                "ENT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@USER_ID,@MODULE_ID,@COMMENT,@ADDED_WHO);   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SE"& _ 
-                "DED_WHO, @ADDED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, USER_ID, MODULE_ID, IS_ADMIN, COMMENT, ADDE"& _ 
+                "LECT GUID, USER_ID, MODULE_ID, IS_ADMIN, COMMENT, ADDED_WHO, ADDED_WHEN FROM TBD"& _ 
-                "D_WHO, ADDED_WHEN FROM TBDD_USER_MODULES WHERE (GUID = SCOPE_IDENTITY())"
+                "D_USER_MODULES WHERE (GUID = SCOPE_IDENTITY())"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "USER_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MODULE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "MODULE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MODULE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "MODULE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_ADMIN", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_ADMIN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
             Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_USER_MODULES] SET [USER_ID] = @USER_ID, [MODULE_ID] = @MODULE_ID, [I"& _ 
@@ -7682,32 +7748,9 @@ 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(ByVal Original_GUID As Integer, ByVal Original_USER_ID As Integer, ByVal Original_MODULE_ID As Integer, ByVal Original_IS_ADMIN As Boolean, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date)) As Integer
+        Public Overloads Overridable Function Delete(ByVal USER_ID As Integer, ByVal MODULE_ID As Integer) As Integer
-            Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer)
+            Me.Adapter.DeleteCommand.Parameters(0).Value = CType(USER_ID,Integer)
-            Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_USER_ID,Integer)
+            Me.Adapter.DeleteCommand.Parameters(1).Value = CType(MODULE_ID,Integer)
-            Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_MODULE_ID,Integer)
-            Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_IS_ADMIN,Boolean)
-            If (Original_COMMENT Is Nothing) Then
-                Me.Adapter.DeleteCommand.Parameters(4).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(5).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.DeleteCommand.Parameters(4).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_COMMENT,String)
-            End If
-            If (Original_ADDED_WHO 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_ADDED_WHO,String)
-            End If
-            If (Original_ADDED_WHEN.HasValue = true) Then
-                Me.Adapter.DeleteCommand.Parameters(8).Value = CType(0,Object)
-                Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_ADDED_WHEN.Value,Date)
-            Else
-                Me.Adapter.DeleteCommand.Parameters(8).Value = CType(1,Object)
-                Me.Adapter.DeleteCommand.Parameters(9).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
@@ -7727,24 +7770,18 @@ 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.Insert, true)>  _
-        Public Overloads Overridable Function Insert(ByVal USER_ID As Integer, ByVal MODULE_ID As Integer, ByVal IS_ADMIN As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date)) As Integer
+        Public Overloads Overridable Function Insert(ByVal USER_ID As Integer, ByVal MODULE_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer
             Me.Adapter.InsertCommand.Parameters(0).Value = CType(USER_ID,Integer)
             Me.Adapter.InsertCommand.Parameters(1).Value = CType(MODULE_ID,Integer)
-            Me.Adapter.InsertCommand.Parameters(2).Value = CType(IS_ADMIN,Boolean)
             If (COMMENT Is Nothing) Then
-                Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value
+                Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.InsertCommand.Parameters(3).Value = CType(COMMENT,String)
+                Me.Adapter.InsertCommand.Parameters(2).Value = CType(COMMENT,String)
             End If
             If (ADDED_WHO Is Nothing) Then
-                Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value
+                Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO,String)
+                Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String)
-            End If
-            If (ADDED_WHEN.HasValue = true) Then
-                Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHEN.Value,Date)
-            Else
-                Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value
             End If
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
             If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
@@ -9229,7 +9266,7 @@ Namespace UserDataSetTableAdapters
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
         Private Sub InitCommandCollection()
-            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(4) {}
+            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(7) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
             Me._commandCollection(0).CommandText = "SELECT        TBDD_USER.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_USER"
@@ -9276,6 +9313,39 @@ Namespace UserDataSetTableAdapters
                 "P_ID = @GROUP_ID)"
             Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GROUP_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(5) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(5).Connection = Me.Connection
+            Me._commandCollection(5).CommandText = "SELECT        T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, "& _ 
+                "T1.LANGUAGE, T1.GENERAL_VIEWER, T1.COMMENT, T1.WAN_ENVIRONMENT, T1.LOGGED_IN, T1"& _ 
+                ".LOGGED_WHERE, T1.LOG_IN_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         T1.LOG_OUT_WHEN, T1.PM"& _ 
+                "_RIGHT_FILE_DELETE, T1.USERID_FK_INT_ECM, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED"& _ 
+                "_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_USER AS T1 INNER JO"& _ 
+                "IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBDD_USER_MODULES AS T2 ON T1.GUID = T2.USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WH"& _ 
+                "ERE        (T2.MODULE_ID = @MODULE_ID)"
+            Me._commandCollection(5).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(5).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MODULE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "MODULE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(6) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(6).Connection = Me.Connection
+            Me._commandCollection(6).CommandText = "SELECT        GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_"& _ 
+                "VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_"& _ 
+                "WHEN, PM_RIGHT_FILE_DELETE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         USERID_FK_INT_ECM, DATE_F"& _ 
+                "ORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_US"& _ 
+                "ER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                             (SELECT DISTINCT T.G"& _ 
+                "UID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                               FROM            TBDD_USER AS T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ 
+                "                                                        TBDD_USER_MODULES AS T1 "& _ 
+                "ON T.GUID = T1.USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                               WHERE        (T1.MODULE_I"& _ 
+                "D = @MODULE_ID)))"
+            Me._commandCollection(6).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(6).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MODULE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(7) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(7).Connection = Me.Connection
+            Me._commandCollection(7).CommandText = "SELECT        GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_"& _ 
+                "VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_"& _ 
+                "WHEN, PM_RIGHT_FILE_DELETE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         USERID_FK_INT_ECM, DATE_F"& _ 
+                "ORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_US"& _ 
+                "ER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (USERNAME = @USERNAME)"
+            Me._commandCollection(7).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -9406,6 +9476,92 @@ Namespace UserDataSetTableAdapters
             Return dataTable
         End Function
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.Fill, false)>  _
+        Public Overloads Overridable Function FillByModuleId(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal MODULE_ID As Integer) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(5)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(MODULE_ID,Integer)
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.[Select], false)>  _
+        Public Overloads Overridable Function GetDataByModuleId(ByVal MODULE_ID As Integer) As UserDataSet.TBDD_USERDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(5)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(MODULE_ID,Integer)
+            Dim dataTable As UserDataSet.TBDD_USERDataTable = New UserDataSet.TBDD_USERDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.Fill, false)>  _
+        Public Overloads Overridable Function FillByModuleId_NotInModule(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal MODULE_ID As Integer) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(6)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(MODULE_ID,Integer)
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.[Select], false)>  _
+        Public Overloads Overridable Function GetDataByModuleId_NotInModule(ByVal MODULE_ID As Integer) As UserDataSet.TBDD_USERDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(6)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(MODULE_ID,Integer)
+            Dim dataTable As UserDataSet.TBDD_USERDataTable = New UserDataSet.TBDD_USERDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.Fill, false)>  _
+        Public Overloads Overridable Function FillByUsername(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal USERNAME As String) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(7)
+            If (USERNAME Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("USERNAME")
+            Else
+                Me.Adapter.SelectCommand.Parameters(0).Value = CType(USERNAME,String)
+            End If
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         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.[Select], false)>  _
+        Public Overloads Overridable Function GetDataByUsername(ByVal USERNAME As String) As UserDataSet.TBDD_USERDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(7)
+            If (USERNAME Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("USERNAME")
+            Else
+                Me.Adapter.SelectCommand.Parameters(0).Value = CType(USERNAME,String)
+            End If
+            Dim dataTable As UserDataSet.TBDD_USERDataTable = New UserDataSet.TBDD_USERDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _

DDUserManager/DDUserManager/UserDataSet.xsd

@@ -349,39 +349,62 @@ SELECT GUID, NAME, SHORT_NAME, LICENSE, PRODUCT_VERSION, ACTIVE, VERSION_DELIMIT
               <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
               <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_MODULES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByUserId_IsAdmin" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByUserId_IsAdmin" GeneratorSourceName="FillByUserId_IsAdmin" GetMethodModifier="Public" GetMethodName="GetDataByUserId_IsAdmin" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByUserId_IsAdmin" UserSourceName="FillByUserId_IsAdmin">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        T.GUID, T.NAME, T.SHORT_NAME, T.LICENSE, T.PRODUCT_VERSION, T.ACTIVE, T.VERSION_DELIMITER, T.FILE_DELIMITER, T.BIT1, T.BIT2, T.STRING1, T.STRING2, T.BACKGROUND_IMAGE, T.PRODUCT_NAME1, 
+                         T.PRODUCT_NAME2, T.VERSION_UPATE_PATH, T.ADDED_WHO, T.ADDED_WHEN, T.CHANGED_WHO, T.CHANGED_WHEN
+FROM            TBDD_MODULES AS T INNER JOIN
+                         TBDD_USER_MODULES AS T2 ON T.GUID = T2.MODULE_ID
+WHERE        (T2.USER_ID = @USER_ID) AND (T2.IS_ADMIN = 1)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="USER_ID" ColumnName="USER_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@USER_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="USER_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_MODULES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByUsername" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByUsername" GeneratorSourceName="FillByUsername" GetMethodModifier="Public" GetMethodName="GetDataByUsername" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByUsername" UserSourceName="FillByUsername">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        T.GUID, T.NAME, T.SHORT_NAME, T.LICENSE, T.PRODUCT_VERSION, T.ACTIVE, T.VERSION_DELIMITER, T.FILE_DELIMITER, T.BIT1, T.BIT2, T.STRING1, T.STRING2, T.BACKGROUND_IMAGE, T.PRODUCT_NAME1, 
+                         T.PRODUCT_NAME2, T.VERSION_UPATE_PATH, T.ADDED_WHO, T.ADDED_WHEN, T.CHANGED_WHO, T.CHANGED_WHEN
+FROM            TBDD_MODULES AS T INNER JOIN
+                         TBDD_USER_MODULES AS T2 ON T.GUID = T2.MODULE_ID INNER JOIN
+                         TBDD_USER AS T3 ON T2.USER_ID = T3.GUID
+WHERE        (T3.USERNAME = @USERNAME)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBDD_USER_MODULESTableAdapter" GeneratorDataComponentClassName="TBDD_USER_MODULESTableAdapter" Name="TBDD_USER_MODULES" UserDataComponentName="TBDD_USER_MODULESTableAdapter">
             <MainSource>
               <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" 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_MODULES] WHERE (([GUID] = @Original_GUID) AND ([USER_ID] = @Original_USER_ID) AND ([MODULE_ID] = @Original_MODULE_ID) AND ([IS_ADMIN] = @Original_IS_ADMIN) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM TBDD_USER_MODULES
+WHERE        (USER_ID = @USER_ID) AND (MODULE_ID = @MODULE_ID)</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="USER_ID" ColumnName="USER_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@USER_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="USER_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_USER_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="USER_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="MODULE_ID" ColumnName="MODULE_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@MODULE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="MODULE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_MODULE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="MODULE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_IS_ADMIN" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_ADMIN" 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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" 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" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>INSERT INTO [TBDD_USER_MODULES] ([USER_ID], [MODULE_ID], [IS_ADMIN], [COMMENT], [ADDED_WHO], [ADDED_WHEN]) VALUES (@USER_ID, @MODULE_ID, @IS_ADMIN, @COMMENT, @ADDED_WHO, @ADDED_WHEN);
+                    <CommandText>INSERT INTO TBDD_USER_MODULES
+                         (USER_ID, MODULE_ID, COMMENT, ADDED_WHO)
+VALUES        (@USER_ID,@MODULE_ID,@COMMENT,@ADDED_WHO);   
 SELECT GUID, USER_ID, MODULE_ID, IS_ADMIN, COMMENT, ADDED_WHO, ADDED_WHEN FROM TBDD_USER_MODULES WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@USER_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="USER_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="USER_ID" ColumnName="USER_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@USER_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="USER_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@MODULE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="MODULE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="MODULE_ID" ColumnName="MODULE_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@MODULE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="MODULE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@IS_ADMIN" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_ADMIN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -843,6 +866,50 @@ WHERE
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByModuleId" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByModuleId" GeneratorSourceName="FillByModuleId" GetMethodModifier="Public" GetMethodName="GetDataByModuleId" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByModuleId" UserSourceName="FillByModuleId">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.GENERAL_VIEWER, T1.COMMENT, T1.WAN_ENVIRONMENT, T1.LOGGED_IN, T1.LOGGED_WHERE, T1.LOG_IN_WHEN, 
+                         T1.LOG_OUT_WHEN, T1.PM_RIGHT_FILE_DELETE, T1.USERID_FK_INT_ECM, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN
+FROM            TBDD_USER AS T1 INNER JOIN
+                         TBDD_USER_MODULES AS T2 ON T1.GUID = T2.USER_ID
+WHERE        (T2.MODULE_ID = @MODULE_ID)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="MODULE_ID" ColumnName="MODULE_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@MODULE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="MODULE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByModuleId_NotInModule" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByModuleId_NotInModule" GeneratorSourceName="FillByModuleId_NotInModule" GetMethodModifier="Public" GetMethodName="GetDataByModuleId_NotInModule" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByModuleId_NotInModule" UserSourceName="FillByModuleId_NotInModule">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, 
+                         USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
+FROM            TBDD_USER
+WHERE        (GUID NOT IN
+                             (SELECT DISTINCT T.GUID
+                               FROM            TBDD_USER AS T INNER JOIN
+                                                         TBDD_USER_MODULES AS T1 ON T.GUID = T1.USER_ID
+                               WHERE        (T1.MODULE_ID = @MODULE_ID)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="MODULE_ID" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@MODULE_ID" Precision="0" Scale="0" Size="4" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByUsername" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByUsername" GeneratorSourceName="FillByUsername" GetMethodModifier="Public" GetMethodName="GetDataByUsername" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByUsername" UserSourceName="FillByUsername">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, 
+                         USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
+FROM            TBDD_USER
+WHERE        (USERNAME = @USERNAME)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
             </Sources>
           </TableAdapter>
         </Tables>
@@ -853,7 +920,7 @@ WHERE
   <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_USER_GROUPS" msprop:Generator_TableClassName="TBDD_USER_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_USER_GROUPS" msprop:Generator_RowChangedName="TBDD_USER_GROUPSRowChanged" msprop:Generator_TablePropName="TBDD_USER_GROUPS" msprop:Generator_RowDeletingName="TBDD_USER_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_USER_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USER_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USER_GROUPSRowDeleted" msprop:Generator_RowClassName="TBDD_USER_GROUPSRow" msprop:Generator_UserTableName="TBDD_USER_GROUPS" msprop:Generator_RowEvArgName="TBDD_USER_GROUPSRowChangeEvent">
+        <xs:element name="TBDD_USER_GROUPS" msprop:Generator_TableClassName="TBDD_USER_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_USER_GROUPS" msprop:Generator_TablePropName="TBDD_USER_GROUPS" msprop:Generator_RowDeletingName="TBDD_USER_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_USER_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USER_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USER_GROUPSRowDeleted" msprop:Generator_UserTableName="TBDD_USER_GROUPS" msprop:Generator_RowChangedName="TBDD_USER_GROUPSRowChanged" msprop:Generator_RowEvArgName="TBDD_USER_GROUPSRowChangeEvent" msprop:Generator_RowClassName="TBDD_USER_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" />
@@ -890,7 +957,7 @@ WHERE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -922,7 +989,7 @@ WHERE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -1026,7 +1093,7 @@ WHERE
             </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_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: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: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" />
@@ -1051,7 +1118,7 @@ WHERE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -1116,7 +1183,7 @@ WHERE
             </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_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: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: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" />
@@ -1140,7 +1207,7 @@ WHERE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -1272,12 +1339,12 @@ WHERE
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_USER_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_USER_GROUPS" msprop:Generator_ParentPropName="TBDD_USER_GROUPSRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_USER_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_USER_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_USER_GROUPS" />
-      <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_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_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_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_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_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_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_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_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_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" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

DDUserManager/DDUserManager/UserDataSet.xss

@@ -6,96 +6,84 @@
 </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="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:TBDD_USER_GROUPS" ZOrder="4" X="75" Y="28" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:TBDD_USER_GROUPS" ZOrder="5" X="47" Y="-21" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="3" X="67" Y="315" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="4" X="62" Y="247" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBDD_MODULES" ZOrder="2" X="1140" Y="15" Height="305" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_MODULES" ZOrder="1" X="1046" Y="-25" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="12" X="1001" Y="427" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="2" X="1045" Y="334" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBDD_CLIENT" ZOrder="8" X="466" Y="28" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBDD_CLIENT" ZOrder="9" X="447" Y="503" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="10" X="573" Y="479" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="11" X="730" Y="596" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBDD_USER" ZOrder="1" X="738" Y="-19" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_USER" ZOrder="3" X="538" Y="-27" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_GROUP_ID" ZOrder="13" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>212</X>
+          <X>179</X>
-          <Y>257</Y>
+          <Y>208</Y>
         </Point>
         <Point>
-          <X>212</X>
+          <X>179</X>
-          <Y>315</Y>
+          <Y>247</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_USER_MODULES_MODULE_ID" ZOrder="11" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_USER_MODULES_MODULE_ID" ZOrder="12" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1209</X>
+          <X>1159</X>
-          <Y>320</Y>
+          <Y>318</Y>
         </Point>
         <Point>
-          <X>1209</X>
+          <X>1159</X>
-          <Y>427</Y>
+          <Y>334</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_GROUP_ID" ZOrder="9" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_GROUP_ID" ZOrder="10" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>505</X>
+          <X>671</X>
-          <Y>333</Y>
+          <Y>691</Y>
         </Point>
         <Point>
-          <X>505</X>
+          <X>730</X>
-          <Y>496</Y>
+          <Y>691</Y>
-        </Point>
-        <Point>
-          <X>573</X>
-          <Y>496</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="7" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="8" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>755</X>
+          <X>538</X>
-          <Y>362</Y>
+          <Y>338</Y>
         </Point>
         <Point>
-          <X>755</X>
+          <X>356</X>
-          <Y>462</Y>
+          <Y>338</Y>
-        </Point>
-        <Point>
-          <X>361</X>
-          <Y>462</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_USER_MODULES2_USER_ID" ZOrder="6" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_USER_MODULES2_USER_ID" ZOrder="7" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>934</X>
+          <X>838</X>
-          <Y>362</Y>
+          <Y>382</Y>
         </Point>
         <Point>
-          <X>934</X>
+          <X>1045</X>
-          <Y>462</Y>
+          <Y>382</Y>
-        </Point>
-        <Point>
-          <X>1001</X>
-          <Y>462</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_USER_ID" ZOrder="5" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_USER_ID" ZOrder="6" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>772</X>
+          <X>784</X>
-          <Y>362</Y>
+          <Y>430</Y>
         </Point>
         <Point>
-          <X>772</X>
+          <X>784</X>
-          <Y>479</Y>
+          <Y>596</Y>
         </Point>
       </RoutePoints>
     </Connector>

DDUserManager/DDUserManager/frmMain.vb

@@ -9,14 +9,30 @@ Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
 '''       https://stackoverflow.com/questions/21270697/argumentoutofrangeexception-with-data-binding-when-debugger-is-running-vs2010#28550637      
 ''' </summary>
 Public Class frmMain
+    Private CurrentUser As TBDD_USERRow = Nothing
+
     Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        'TODO: Diese Codezeile lädt Daten in die Tabelle "UserDataSet.TBDD_USER_MODULES". Sie können sie bei Bedarf verschieben oder entfernen.
+        Me.TBDD_USER_MODULESTableAdapter.Fill(Me.UserDataSet.TBDD_USER_MODULES)
+        Try
+            Dim userRow As TBDD_USERRow = GetCurrentUserRow(Environment.UserName)
+
+            If IsNothing(userRow) Then
+                Throw New Exception("User not found in Database!")
+            End If
+
+            CurrentUser = userRow
+        Catch ex As Exception
+            MessageBox.Show($"Error while fetching user: {ex.Message}")
+        End Try
+
         Try
             TBDD_CLIENTTableAdapter.Fill(UserDataSet.TBDD_CLIENT)
-            TBDD_USER_MODULESTableAdapter.Fill(UserDataSet.TBDD_USER_MODULES)
             TBDD_USER_GROUPSTableAdapter.Fill(UserDataSet.TBDD_USER_GROUPS)
             TBDD_CLIENT_USERTableAdapter.Fill(UserDataSet.TBDD_CLIENT_USER)
             TBDD_GROUPS_USERTableAdapter.Fill(UserDataSet.TBDD_GROUPS_USER)
             TBDD_USERTableAdapter.Fill(UserDataSet.TBDD_USER)
+            TBDD_MODULESTableAdapter.FillByUserId_IsAdmin(UserDataSet.TBDD_MODULES, CurrentUser.GUID)
         Catch ex As Exception
             MessageBox.Show($"Error in frmMain_Load: {ex.Message}")
         End Try
@@ -27,6 +43,11 @@ Public Class frmMain
         gvGroups_AllGroups.BestFitColumns()
     End Sub
 
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+        Dim frm As New frmADImport()
+        frm.ShowDialog()
+    End Sub
+
     Private Sub grvwAllGroups_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles gvGroups_AllGroups.FocusedRowChanged
         If e.FocusedRowHandle = -1 Then
             Exit Sub
@@ -49,26 +70,58 @@ Public Class frmMain
         gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(clientId)
     End Sub
 
+    Private Sub gvModules_AllModules_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles gvModules_AllModules.FocusedRowChanged
+        If e.FocusedRowHandle = -1 Then
+            Exit Sub
+        End If
+
+        Dim moduleId As Integer = GetSelectedModuleId()
+
+        gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(moduleId)
+        gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(moduleId)
+    End Sub
+
 #Region "User Details"
-    Private Function GetClientsForUser(username As String) As DataTable
+    Private Function GetCurrentUserRow(username As String) As TBDD_USERRow
+        Dim dt As DataTable = TBDD_USERTableAdapter.GetDataByUsername(username)
+
+        If dt.Rows.Count = 0 Then
+            Return Nothing
+        Else
+            Return dt.Rows.Item(0)
+        End If
+    End Function
+
+    Private Function GetClientsForUser(username As String) As TBDD_CLIENTDataTable
         Try
             Dim dt As New TBDD_CLIENTDataTable()
             TBDD_CLIENTTableAdapter.FillByUsername(dt, username)
 
             Return dt
         Catch ex As Exception
-            MessageBox.Show($"Error in UpdateClientsForUser: {ex.Message}")
+            MessageBox.Show($"Error in GetClientsForUser: {ex.Message}")
         End Try
     End Function
 
-    Private Function GetGroupsForUser(username As String) As DataTable
+    Private Function GetGroupsForUser(username As String) As TBDD_USER_GROUPSDataTable
         Try
             Dim dt As New TBDD_USER_GROUPSDataTable()
             TBDD_USER_GROUPSTableAdapter.FillByUsername(dt, username)
 
             Return dt
         Catch ex As Exception
-            MessageBox.Show($"Error in UpdateGroupsForUser: {ex.Message}")
+            MessageBox.Show($"Error in GetGroupsForUser: {ex.Message}")
+        End Try
+    End Function
+
+    Private Function GetModulesForUser(username As String) As TBDD_MODULESDataTable
+        Try
+            Dim dt As New TBDD_MODULESDataTable()
+            TBDD_MODULESTableAdapter.FillByUsername(dt, username)
+
+            Return dt
+        Catch ex As Exception
+            MessageBox.Show($"Error in GetModulesForUser: {ex.Message}")
         End Try
     End Function
 
@@ -94,6 +147,7 @@ Public Class frmMain
         If USERNAMETextBox.Text <> String.Empty Then
             listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
             listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
+            listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
         End If
     End Sub
 #End Region
@@ -125,6 +179,20 @@ Public Class frmMain
 
         Return dt
     End Function
+
+    Private Function GetAvailableUsersByModuleId(moduleId As Integer) As TBDD_USERDataTable
+        Dim dt As New TBDD_USERDataTable()
+        TBDD_USERTableAdapter.FillByModuleId_NotInModule(dt, moduleId)
+
+        Return dt
+    End Function
+
+    Private Function GetAssignedUsersByModuleId(moduleId As Integer) As TBDD_USERDataTable
+        Dim dt As New TBDD_USERDataTable()
+        TBDD_USERTableAdapter.FillByModuleId(dt, moduleId)
+
+        Return dt
+    End Function
 #End Region
 #Region "Grid Helpers"
     Private Function GetSelectedGroup() As TBDD_USER_GROUPSRow
@@ -157,6 +225,21 @@ Public Class frmMain
         Return clientId
     End Function
 
+    Private Function GetSelectedModule() As TBDD_MODULESRow
+        Dim moduleRowIndex = gvModules_AllModules.GetSelectedRows().First()
+        Dim selectedModuleView As DataRowView = gvModules_AllModules.GetRow(moduleRowIndex)
+        Dim selectedClient As TBDD_MODULESRow = selectedModuleView.Row
+
+        Return selectedClient
+    End Function
+
+    Private Function GetSelectedModuleId() As Integer
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
+        Dim moduleId As Integer = selectedModule.GUID
+
+        Return moduleId
+    End Function
+
     Private Function GetModifiedRowsFromDragDropData(grid As GridControl, data As IDataObject)
         Dim table As DataTable = grid.DataSource
         Dim selectedGroup As TBDD_USER_GROUPSRow = GetSelectedGroup()
@@ -191,10 +274,10 @@ Public Class frmMain
         Return modifiedRows
     End Function
 #End Region
-#Region "DragDrop Events for Groups & Clients"
+#Region "DragDrop Events for Groups, Clients, Modules"
     Private downHitInfo As GridHitInfo
 
-    Private Sub gvUsers_MouseDown(sender As Object, e As MouseEventArgs) Handles gvGroups_AvailableUsers.MouseDown, gvGroups_AssignedUsers.MouseDown, gvClients_AssignedUsers.MouseDown, gvClients_AvailableUsers.MouseDown
+    Private Sub gvUsers_MouseDown(sender As Object, e As MouseEventArgs) Handles gvGroups_AvailableUsers.MouseDown, gvGroups_AssignedUsers.MouseDown, gvClients_AssignedUsers.MouseDown, gvClients_AvailableUsers.MouseDown, gvModules_AssignedUsers.MouseDown, gvModules_AvailableUsers.MouseDown
         Dim view As GridView = sender
         downHitInfo = Nothing
         Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y))
@@ -208,7 +291,7 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub gvUsers_MouseMove(sender As Object, e As MouseEventArgs) Handles gvGroups_AvailableUsers.MouseMove, gvGroups_AssignedUsers.MouseMove, gvClients_AssignedUsers.MouseMove, gvClients_AvailableUsers.MouseMove
+    Private Sub gvUsers_MouseMove(sender As Object, e As MouseEventArgs) Handles gvGroups_AvailableUsers.MouseMove, gvGroups_AssignedUsers.MouseMove, gvClients_AssignedUsers.MouseMove, gvClients_AvailableUsers.MouseMove, gvModules_AssignedUsers.MouseMove, gvModules_AvailableUsers.MouseMove
         Dim view As GridView = sender
         Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y))
 
@@ -247,13 +330,10 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub gridUsers_DragOver(sender As Object, e As DragEventArgs) Handles gridGroups_AssignedUsers.DragOver, gridGroups_AvailableUsers.DragOver, gridClients_AssignedUsers.DragOver, gridClients_AvailableUsers.DragOver
+    Private Sub gridUsers_DragOver(sender As Object, e As DragEventArgs) Handles gridGroups_AssignedUsers.DragOver, gridGroups_AvailableUsers.DragOver, gridClients_AssignedUsers.DragOver, gridClients_AvailableUsers.DragOver, gridModules_AssignedUsers.DragOver, gridModules_AvailableUsers.DragOver
         Dim selectedUsersDropped As Boolean = e.Data.GetDataPresent(GetType(GridView))
         Dim singleUserDropped As Boolean = e.Data.GetDataPresent(GetType(TBDD_USERRow))
 
-        Console.WriteLine($"selectedUsersDropped: {selectedUsersDropped}")
-        Console.WriteLine($"singleUserDropped: {singleUserDropped}")
-
         If selectedUsersDropped Or singleUserDropped Then
             e.Effect = DragDropEffects.Move
         Else
@@ -341,10 +421,45 @@ Public Class frmMain
         gvClients_AssignedUsers.ClearSelection()
         gvClients_AvailableUsers.ClearSelection()
     End Sub
+#End Region
+#Region "DragDrop Events for Modules"
+    Private Sub gridModules_AvailableUsers_DragDrop(sender As Object, e As DragEventArgs) Handles gridModules_AvailableUsers.DragDrop
+        Dim grid As GridControl = sender
+        Dim table As DataTable = grid.DataSource
+        Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
 
-    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+        For Each userRow As TBDD_USERRow In userRowsToBeDeleted
-        Dim frm As New frmADImport()
+            TBDD_USER_MODULESTableAdapter.Delete(userRow.GUID, selectedModule.GUID)
-        frm.ShowDialog()
+        Next
+
+        listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
+
+        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
+        gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(selectedModule.GUID)
+        gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(selectedModule.GUID)
+        gvModules_AssignedUsers.ClearSelection()
+        gvModules_AvailableUsers.ClearSelection()
+    End Sub
+
+    Private Sub gridModules_AssignedUsers_DragDrop(sender As Object, e As DragEventArgs) Handles gridModules_AssignedUsers.DragDrop
+        Dim grid As GridControl = sender
+        Dim table As DataTable = grid.DataSource
+        Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
+
+        ' Zeilen in Oberfläche und in Datenbank einfügen
+        For Each userRow As TBDD_USERRow In userRowsToBeInserted
+            TBDD_USER_MODULESTableAdapter.Insert(userRow.GUID, selectedModule.GUID, $"Assign User {userRow.USERNAME} to Module {selectedModule.NAME}", Environment.UserName)
+        Next
+
+        listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
+
+        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
+        gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(selectedModule.GUID)
+        gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(selectedModule.GUID)
+        gvModules_AssignedUsers.ClearSelection()
+        gvModules_AvailableUsers.ClearSelection()
     End Sub
 #End Region
 End Class