jj

DDUserManager/DDUserManager/ClassDragDrop.vb

@@ -0,0 +1,85 @@
+Imports DDUserManager.UserDataSet
+Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Views.Grid
+Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
+
+Public Class ClassDragDrop
+    Private downHitInfo As GridHitInfo = Nothing
+
+    Public Sub New()
+    End Sub
+
+    Public Sub AddGridView(view As GridView)
+        AddHandler view.MouseDown, AddressOf view_MouseDown
+        AddHandler view.MouseMove, AddressOf view_MouseMove
+        AddHandler view.GridControl.DragOver, AddressOf grid_DragOver
+    End Sub
+
+    Private Sub view_MouseDown(sender As Object, e As MouseEventArgs)
+        Dim view As GridView = sender
+        downHitInfo = Nothing
+        Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y))
+
+        If Control.ModifierKeys <> Keys.None Then
+            Return
+        End If
+
+        If e.Button = MouseButtons.Left And hitInfo.RowHandle >= 0 Then
+            downHitInfo = hitInfo
+        End If
+    End Sub
+
+    Private Sub view_MouseMove(sender As Object, e As MouseEventArgs)
+        Dim view As GridView = sender
+        Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y))
+
+        If e.Button = MouseButtons.Left And Not IsNothing(downHitInfo) Then
+            Dim dragSize As Size = SystemInformation.DragSize
+            Dim dragRect As New Rectangle(New Point(downHitInfo.HitPoint.X - dragSize.Width / 2, downHitInfo.HitPoint.Y - dragSize.Height / 2), dragSize)
+
+            ' DragRect ist ein kleines Rechteck, dessen Mitte der Punkt ist, wo die Maus geklickt wurde.
+            ' Es soll verhindern, dass durch schnelles Klicken unbeabsichtigt Drag'n'Drop Operationen initiiert werden
+            ' Siehe: https://msdn.microsoft.com/en-us/library/system.windows.forms.systeminformation.dragsize(v=vs.110).aspx
+            If Not dragRect.Contains(New Point(e.X, e.Y)) Then
+                ' dragDropData enhält eine einzelne Row oder den kompletten View,
+                ' jenachdem, wie die Drag'n'Drop Operation gestartet wurde.
+                Dim dragDropData As Object
+
+                ' Wenn keine Zeile markiert ist
+                If downHitInfo.RowHandle < 0 Then
+                    Exit Sub
+                End If
+
+                ' Wenn zwar eine Zeile markiert ist, aber keine über die Checkbox angehakt wurde,
+                ' wird die markierte Zeile übergeben.
+                ' Wenn 1 oder n Zeilen über die Checkbox angehakt wurde, werden diese übergeben
+                If view.GetSelectedRows().Length = 0 Then
+                    Dim row As DataRow = view.GetDataRow(downHitInfo.RowHandle)
+                    dragDropData = row
+                Else
+                    dragDropData = view
+                End If
+
+                view.GridControl.DoDragDrop(dragDropData, DragDropEffects.Move)
+                downHitInfo = Nothing
+
+                DevExpress.Utils.DXMouseEventArgs.GetMouseArgs(e).Handled = True
+            End If
+        End If
+    End Sub
+
+    Private Sub grid_DragOver(sender As Object, e As DragEventArgs)
+        Dim multipleDropped As Boolean = e.Data.GetDataPresent(GetType(GridView))
+        Dim singleUserDropped As Boolean = e.Data.GetDataPresent(GetType(TBDD_USERRow))
+        Dim singleGroupDropped As Boolean = e.Data.GetDataPresent(GetType(TBDD_GROUPSRow))
+
+        Console.WriteLine("singleUserDropped: " & singleUserDropped)
+        Console.WriteLine("singleGroupDropped: " & singleGroupDropped)
+
+        If multipleDropped Or singleUserDropped Or singleGroupDropped Then
+            e.Effect = DragDropEffects.Move
+        Else
+            e.Effect = DragDropEffects.None
+        End If
+    End Sub
+End Class

DDUserManager/DDUserManager/DDUserManager.vbproj

@@ -88,6 +88,7 @@
   <ItemGroup>
     <Compile Include="ApplicationEvents.vb" />
     <Compile Include="ClassActiveDirectory.vb" />
+    <Compile Include="ClassDragDrop.vb" />
     <Compile Include="frmADImport_Groups.Designer.vb">
       <DependentUpon>frmADImport_Groups.vb</DependentUpon>
     </Compile>
@@ -140,6 +141,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmMain.resx">
       <DependentUpon>frmMain.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\licenses.licx" />
     <EmbeddedResource Include="My Project\Resources.resx">

DDUserManager/DDUserManager/UserDataSet.xsd

@@ -7,12 +7,12 @@
           <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="DD_ECMConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="DD_ECMConnectionString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.DDUserManager.My.MySettings.GlobalReference.Default.DD_ECMConnectionString" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
-          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBDD_USER_GROUPSTableAdapter" GeneratorDataComponentClassName="TBDD_USER_GROUPSTableAdapter" Name="TBDD_USER_GROUPS" UserDataComponentName="TBDD_USER_GROUPSTableAdapter">
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBDD_GROUPSTableAdapter" GeneratorDataComponentClassName="TBDD_GROUPSTableAdapter" Name="TBDD_GROUPS" UserDataComponentName="TBDD_GROUPSTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER_GROUPS" 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">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_GROUPS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" 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">
-                    <CommandText>DELETE FROM [TBDD_USER_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([INTERNAL] = @Original_INTERNAL) AND ([AD_SYNC] = @Original_AD_SYNC) 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)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_ECM_FK_ID = 1 AND [ECM_FK_ID] IS NULL) OR ([ECM_FK_ID] = @Original_ECM_FK_ID)) AND ([ACTIVE] = @Original_ACTIVE))</CommandText>
+                    <CommandText>DELETE FROM [TBDD_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([INTERNAL] = @Original_INTERNAL) AND ([AD_SYNC] = @Original_AD_SYNC) 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)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([ACTIVE] = @Original_ACTIVE))</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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -29,35 +29,34 @@
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>INSERT INTO TBDD_USER_GROUPS
+                    <CommandText>INSERT INTO TBDD_GROUPS
-                         (NAME, ADDED_WHO, AD_SYNC, INTERNAL, ACTIVE)
+                         (NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ACTIVE)
-VALUES        (@NAME,@ADDED_WHO, 1, 0, 1);    
+VALUES        (@NAME, 0, 1, '""',@ADDED_WHO, 1);  
-SELECT GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ECM_FK_ID, ACTIVE FROM TBDD_USER_GROUPS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+SELECT GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ECM_FK_ID, ACTIVE FROM TBDD_GROUPS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_GROUPS" 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="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" 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" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>SELECT        GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ECM_FK_ID, ACTIVE
-FROM            TBDD_USER_GROUPS</CommandText>
+FROM            TBDD_GROUPS</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBDD_USER_GROUPS] SET [NAME] = @NAME, [INTERNAL] = @INTERNAL, [AD_SYNC] = @AD_SYNC, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [ECM_FK_ID] = @ECM_FK_ID, [ACTIVE] = @ACTIVE WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([INTERNAL] = @Original_INTERNAL) AND ([AD_SYNC] = @Original_AD_SYNC) 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)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_ECM_FK_ID = 1 AND [ECM_FK_ID] IS NULL) OR ([ECM_FK_ID] = @Original_ECM_FK_ID)) AND ([ACTIVE] = @Original_ACTIVE));
+                    <CommandText>UPDATE [TBDD_GROUPS] SET [NAME] = @NAME, [INTERNAL] = @INTERNAL, [AD_SYNC] = @AD_SYNC, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [ECM_FK_ID] = @ECM_FK_ID, [ACTIVE] = @ACTIVE WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([INTERNAL] = @Original_INTERNAL) AND ([AD_SYNC] = @Original_AD_SYNC) 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)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([ACTIVE] = @Original_ACTIVE));
-SELECT GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ECM_FK_ID, ACTIVE FROM TBDD_USER_GROUPS WHERE (GUID = @GUID)</CommandText>
+SELECT GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ECM_FK_ID, ACTIVE FROM TBDD_GROUPS WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@INTERNAL" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="INTERNAL" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -67,7 +66,7 @@ SELECT GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WH
                       <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" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -84,10 +83,9 @@ SELECT GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WH
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_GROUPS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -107,24 +105,83 @@ SELECT GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WH
               <Mapping SourceColumn="ACTIVE" DataSetColumn="ACTIVE" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER_GROUPS" 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">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_GROUPS" 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="false">
-                    <CommandText>SELECT T2.ACTIVE, T2.ADDED_WHEN, T2.ADDED_WHO, T2.AD_SYNC, T2.CHANGED_WHEN, T2.CHANGED_WHO, T2.COMMENT, T2.ECM_FK_ID, T2.GUID, T2.INTERNAL, T2.NAME FROM TBDD_GROUPS_USER AS T1 INNER JOIN TBDD_USER_GROUPS AS T2 ON T1.GROUP_ID = T2.GUID INNER JOIN TBDD_USER AS T3 ON T1.USER_ID = T3.GUID WHERE (T3.USERNAME = @USERNAME)</CommandText>
+                    <CommandText>SELECT T2.ACTIVE, T2.ADDED_WHEN, T2.ADDED_WHO, T2.AD_SYNC, T2.CHANGED_WHEN, T2.CHANGED_WHO, T2.COMMENT, T2.ECM_FK_ID, T2.GUID, T2.INTERNAL, T2.NAME FROM TBDD_GROUPS_USER AS T1 INNER JOIN TBDD_GROUPS AS T2 ON T1.GROUP_ID = T2.GUID INNER JOIN TBDD_USER AS T3 ON T1.USER_ID = T3.GUID WHERE (T3.USERNAME = @USERNAME)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="" 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>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER_GROUPS" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="GroupExists" Modifier="Public" Name="GroupExists" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="GroupExists">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_GROUPS" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByClientId" GetMethodModifier="Public" GetMethodName="GetDataByClientId" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByClientId" UserSourceName="GetDataByClientId">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        T1.GUID, T1.NAME, T1.ECM_FK_ID, T1.AD_SYNC, T1.INTERNAL, T1.ACTIVE, T1.COMMENT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN
+FROM            TBDD_GROUPS AS T1 INNER JOIN
+                         TBDD_GROUPS_CLIENT AS T2 ON T1.GUID = T2.GROUP_ID
+WHERE        (T2.CLIENT_ID = @CLIENT_ID)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="CLIENT_ID" ColumnName="CLIENT_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CLIENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CLIENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_GROUPS" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByClientId_NotInClient" GetMethodModifier="Public" GetMethodName="GetDataByClientId_NotInClient" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByClientId_NotInClient" UserSourceName="GetDataByClientId_NotInClient">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        *
+FROM            TBDD_GROUPS
+WHERE        (GUID NOT IN
+                             (SELECT DISTINCT T.GUID
+                               FROM            TBDD_GROUPS AS T INNER JOIN
+                                                         TBDD_GROUPS_CLIENT AS T1 ON T.GUID = T1.GROUP_ID
+                               WHERE        (T1.CLIENT_ID = @CLIENT_ID)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="CLIENT_ID" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CLIENT_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_GROUPS" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByModuleId" GetMethodModifier="Public" GetMethodName="GetDataByModuleId" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByModuleId" UserSourceName="GetDataByModuleId">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        T1.GUID, T1.NAME, T1.ECM_FK_ID, T1.AD_SYNC, T1.INTERNAL, T1.ACTIVE, T1.COMMENT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN
+FROM            TBDD_GROUPS AS T1 INNER JOIN
+                         TBDD_GROUPS_MODULES AS T2 ON T1.GUID = T2.GROUP_ID
+WHERE        (T2.MODULE_ID = @MODULE_ID)
+</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="MODULE_ID" ColumnName="MODULE_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_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_GROUPS" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByModuleId_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="GetDataByModuleId_NotInModule">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        *
+FROM            TBDD_GROUPS
+WHERE        (GUID NOT IN
+                             (SELECT DISTINCT T.GUID
+                               FROM            TBDD_GROUPS AS T INNER JOIN
+                                                         TBDD_GROUPS_MODULES AS T1 ON T.GUID = T1.GROUP_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_GROUPS" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="GroupExists" Modifier="Public" Name="GroupExists" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="GroupExists">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>SELECT        GUID
-FROM            TBDD_USER_GROUPS
+FROM            TBDD_GROUPS
 WHERE        (NAME = @NAME)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -968,6 +1025,158 @@ WHERE T.USERNAME = @USERNAME AND T2.IS_ADMIN = 1 AND T3.SHORT_NAME = 'UM'</Comma
               </DbSource>
             </Sources>
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBDD_GROUPS_MODULESTableAdapter" GeneratorDataComponentClassName="TBDD_GROUPS_MODULESTableAdapter" Name="TBDD_GROUPS_MODULES" UserDataComponentName="TBDD_GROUPS_MODULESTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_GROUPS_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="true">
+                    <CommandText>DELETE FROM TBDD_GROUPS_MODULES
+WHERE        (MODULE_ID = @Original_MODULE_ID) AND (GROUP_ID = @Original_GROUP_ID)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_MODULE_ID" ColumnName="MODULE_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_MODULE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="MODULE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GROUP_ID" ColumnName="GROUP_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GROUP_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GROUP_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO TBDD_GROUPS_MODULES
+                         (MODULE_ID, GROUP_ID, COMMENT, ADDED_WHO)
+VALUES        (@MODULE_ID,@GROUP_ID,@COMMENT,@ADDED_WHO); 
+SELECT GUID, MODULE_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS_MODULES WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="MODULE_ID" ColumnName="MODULE_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_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="GROUP_ID" ColumnName="GROUP_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GROUP_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GROUP_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_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="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_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" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        TBDD_GROUPS_MODULES.*
+FROM            TBDD_GROUPS_MODULES</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE [TBDD_GROUPS_MODULES] SET [MODULE_ID] = @MODULE_ID, [GROUP_ID] = @GROUP_ID, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([MODULE_ID] = @Original_MODULE_ID) AND ([GROUP_ID] = @Original_GROUP_ID) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+SELECT GUID, MODULE_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS_MODULES WHERE (GUID = @GUID)</CommandText>
+                    <Parameters>
+                      <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="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@GROUP_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GROUP_ID" 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="false" 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" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <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="" 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="Int32" Direction="Input" ParameterName="@Original_GROUP_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GROUP_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_MODULES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="GUID" DataSetColumn="GUID" />
+              <Mapping SourceColumn="MODULE_ID" DataSetColumn="MODULE_ID" />
+              <Mapping SourceColumn="GROUP_ID" DataSetColumn="GROUP_ID" />
+              <Mapping SourceColumn="COMMENT" DataSetColumn="COMMENT" />
+              <Mapping SourceColumn="ADDED_WHO" DataSetColumn="ADDED_WHO" />
+              <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
+              <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
+              <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBDD_GROUPS_CLIENTTableAdapter" GeneratorDataComponentClassName="TBDD_GROUPS_CLIENTTableAdapter" Name="TBDD_GROUPS_CLIENT" UserDataComponentName="TBDD_GROUPS_CLIENTTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" 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="true">
+                    <CommandText>DELETE FROM TBDD_GROUPS_CLIENT
+WHERE        (CLIENT_ID = @Original_CLIENT_ID) AND (GROUP_ID = @Original_GROUP_ID)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_CLIENT_ID" ColumnName="CLIENT_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_CLIENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CLIENT_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GROUP_ID" ColumnName="GROUP_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GROUP_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GROUP_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO TBDD_GROUPS_CLIENT
+                         (CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO)
+VALUES        (@CLIENT_ID,@GROUP_ID,@COMMENT,@ADDED_WHO); 
+SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS_CLIENT WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="CLIENT_ID" ColumnName="CLIENT_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CLIENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CLIENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GROUP_ID" ColumnName="GROUP_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GROUP_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GROUP_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" 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="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" 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" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        TBDD_GROUPS_CLIENT.*
+FROM            TBDD_GROUPS_CLIENT</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE [TBDD_GROUPS_CLIENT] SET [CLIENT_ID] = @CLIENT_ID, [GROUP_ID] = @GROUP_ID, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([CLIENT_ID] = @Original_CLIENT_ID) AND ([GROUP_ID] = @Original_GROUP_ID) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS_CLIENT WHERE (GUID = @GUID)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@CLIENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CLIENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@GROUP_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GROUP_ID" 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="false" 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" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <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="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_CLIENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CLIENT_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GROUP_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GROUP_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="GUID" DataSetColumn="GUID" />
+              <Mapping SourceColumn="CLIENT_ID" DataSetColumn="CLIENT_ID" />
+              <Mapping SourceColumn="GROUP_ID" DataSetColumn="GROUP_ID" />
+              <Mapping SourceColumn="COMMENT" DataSetColumn="COMMENT" />
+              <Mapping SourceColumn="ADDED_WHO" DataSetColumn="ADDED_WHO" />
+              <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
+              <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
+              <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
@@ -976,7 +1185,7 @@ WHERE T.USERNAME = @USERNAME AND T2.IS_ADMIN = 1 AND T3.SHORT_NAME = 'UM'</Comma
   <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_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:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1012,7 +1221,7 @@ WHERE T.USERNAME = @USERNAME AND T2.IS_ADMIN = 1 AND T3.SHORT_NAME = 'UM'</Comma
               <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
               <xs:element name="INTERNAL" msprop:Generator_ColumnVarNameInTable="columnINTERNAL" msprop:Generator_ColumnPropNameInRow="INTERNAL" msprop:Generator_ColumnPropNameInTable="INTERNALColumn" msprop:Generator_UserColumnName="INTERNAL" type="xs:boolean" default="false" />
               <xs:element name="AD_SYNC" msprop:Generator_ColumnVarNameInTable="columnAD_SYNC" msprop:Generator_ColumnPropNameInRow="AD_SYNC" msprop:Generator_ColumnPropNameInTable="AD_SYNCColumn" msprop:Generator_UserColumnName="AD_SYNC" type="xs:boolean" />
-              <xs:element name="ECM_FK_ID" msprop:Generator_ColumnVarNameInTable="columnECM_FK_ID" msprop:Generator_ColumnPropNameInRow="ECM_FK_ID" msprop:Generator_ColumnPropNameInTable="ECM_FK_IDColumn" msprop:Generator_UserColumnName="ECM_FK_ID" type="xs:int" minOccurs="0" />
+              <xs:element name="ECM_FK_ID" msprop:Generator_ColumnVarNameInTable="columnECM_FK_ID" msprop:Generator_ColumnPropNameInRow="ECM_FK_ID" msprop:Generator_ColumnPropNameInTable="ECM_FK_IDColumn" msprop:Generator_UserColumnName="ECM_FK_ID" type="xs:int" />
               <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
             </xs:sequence>
           </xs:complexType>
@@ -1383,10 +1592,74 @@ WHERE T.USERNAME = @USERNAME AND T2.IS_ADMIN = 1 AND T3.SHORT_NAME = 'UM'</Comma
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="TBDD_GROUPS_MODULES" msprop:Generator_TableClassName="TBDD_GROUPS_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_MODULES" msprop:Generator_TablePropName="TBDD_GROUPS_MODULES" msprop:Generator_RowDeletingName="TBDD_GROUPS_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_MODULESRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_MODULES" msprop:Generator_RowChangedName="TBDD_GROUPS_MODULESRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_MODULESRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_MODULESRow">
+          <xs: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" />
+              <xs:element name="MODULE_ID" msprop:Generator_ColumnVarNameInTable="columnMODULE_ID" msprop:Generator_ColumnPropNameInRow="MODULE_ID" msprop:Generator_ColumnPropNameInTable="MODULE_IDColumn" msprop:Generator_UserColumnName="MODULE_ID" type="xs:int" />
+              <xs:element name="GROUP_ID" msprop:Generator_ColumnVarNameInTable="columnGROUP_ID" msprop:Generator_ColumnPropNameInRow="GROUP_ID" msprop:Generator_ColumnPropNameInTable="GROUP_IDColumn" msprop:Generator_UserColumnName="GROUP_ID" type="xs:int" />
+              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="200" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TBDD_GROUPS_CLIENT" msprop:Generator_TableClassName="TBDD_GROUPS_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_CLIENT" msprop:Generator_TablePropName="TBDD_GROUPS_CLIENT" msprop:Generator_RowDeletingName="TBDD_GROUPS_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_CLIENTRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_CLIENT" msprop:Generator_RowChangedName="TBDD_GROUPS_CLIENTRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_CLIENTRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_CLIENTRow">
+          <xs: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" />
+              <xs:element name="CLIENT_ID" msprop:Generator_ColumnVarNameInTable="columnCLIENT_ID" msprop:Generator_ColumnPropNameInRow="CLIENT_ID" msprop:Generator_ColumnPropNameInTable="CLIENT_IDColumn" msprop:Generator_UserColumnName="CLIENT_ID" type="xs:int" />
+              <xs:element name="GROUP_ID" msprop:Generator_ColumnVarNameInTable="columnGROUP_ID" msprop:Generator_ColumnPropNameInRow="GROUP_ID" msprop:Generator_ColumnPropNameInTable="GROUP_IDColumn" msprop:Generator_UserColumnName="GROUP_ID" type="xs:int" />
+              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="200" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
-      <xs:selector xpath=".//mstns:TBDD_USER_GROUPS" />
+      <xs:selector xpath=".//mstns:TBDD_GROUPS" />
       <xs:field xpath="mstns:GUID" />
     </xs:unique>
     <xs:unique name="TBDD_GROUPS_USER_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
@@ -1413,15 +1686,27 @@ WHERE T.USERNAME = @USERNAME AND T2.IS_ADMIN = 1 AND T3.SHORT_NAME = 'UM'</Comma
       <xs:selector xpath=".//mstns:TBDD_USER" />
       <xs:field xpath="mstns:GUID" />
     </xs:unique>
+    <xs:unique name="TBDD_GROUPS_MODULES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:TBDD_GROUPS_MODULES" />
+      <xs:field xpath="mstns:GUID" />
+    </xs:unique>
+    <xs:unique name="TBDD_GROUPS_CLIENT_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:TBDD_GROUPS_CLIENT" />
+      <xs:field xpath="mstns:GUID" />
+    </xs:unique>
   </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_ParentPropName="TBDD_USER_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_USER_GROUPS" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_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_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_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_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_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_RelationVarName="relationFK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_ParentPropName="TBDD_MODULESRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_ParentPropName="TBDD_CLIENTRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

DDUserManager/DDUserManager/UserDataSet.xss

@@ -4,96 +4,162 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="23" ViewPortY="-22" 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="7" X="47" Y="-21" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBDD_GROUPS" ZOrder="1" X="589" Y="-4" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="2" X="50" Y="312" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="3" X="412" Y="407" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBDD_MODULES" ZOrder="4" X="1046" Y="-25" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_MODULES" ZOrder="14" X="1446" Y="-26" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="5" X="1045" Y="334" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="15" X="825" Y="338" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBDD_CLIENT" ZOrder="11" X="447" Y="503" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBDD_CLIENT" ZOrder="11" X="95" Y="723" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="13" X="730" Y="596" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="2" X="56" Y="474" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBDD_USER" ZOrder="6" X="538" Y="-27" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
+    <Shape ID="DesignTable:TBDD_USER" ZOrder="4" X="28" Y="-22" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
-    <Shape ID="DesignTable:TBLOCAL_ADUSERS" ZOrder="3" X="1158" Y="607" Height="105" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
+    <Shape ID="DesignTable:TBDD_GROUPS_MODULES" ZOrder="10" X="782" Y="608" Height="229" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBLOCAL_ADGROUPS" ZOrder="1" X="1092" Y="729" Height="48" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
+    <Shape ID="DesignTable:TBDD_GROUPS_CLIENT" ZOrder="7" X="1573" Y="274" Height="229" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:TBLOCAL_ADUSERS" ZOrder="13" X="1158" Y="607" Height="105" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
+    <Shape ID="DesignTable:TBLOCAL_ADGROUPS" ZOrder="12" X="1092" Y="729" Height="48" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_GROUP_ID" ZOrder="15" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_GROUP_ID" ZOrder="21" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>347</X>
+          <X>889</X>
-          <Y>239</Y>
+          <Y>282</Y>
         </Point>
         <Point>
-          <X>386</X>
+          <X>1327</X>
-          <Y>239</Y>
+          <Y>282</Y>
         </Point>
         <Point>
-          <X>386</X>
+          <X>1327</X>
-          <Y>320</Y>
+          <Y>441</Y>
         </Point>
         <Point>
-          <X>344</X>
+          <X>706</X>
-          <Y>320</Y>
+          <Y>441</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_USER_MODULES_MODULE_ID" ZOrder="14" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_USER_MODULES_MODULE_ID" ZOrder="20" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>1159</X>
+          <X>1463</X>
-          <Y>318</Y>
+          <Y>317</Y>
         </Point>
         <Point>
-          <X>1159</X>
+          <X>1463</X>
-          <Y>334</Y>
+          <Y>361</Y>
+        </Point>
+        <Point>
+          <X>1103</X>
+          <Y>361</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_GROUP_ID" ZOrder="12" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_GROUP_ID" ZOrder="19" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>671</X>
+          <X>205</X>
-          <Y>691</Y>
+          <Y>723</Y>
         </Point>
         <Point>
-          <X>730</X>
+          <X>205</X>
-          <Y>691</Y>
+          <Y>665</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="10" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="18" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>538</X>
+          <X>328</X>
-          <Y>403</Y>
+          <Y>433</Y>
         </Point>
         <Point>
-          <X>344</X>
+          <X>412</X>
-          <Y>403</Y>
+          <Y>433</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_USER_MODULES2_USER_ID" ZOrder="9" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_USER_MODULES2_USER_ID" ZOrder="17" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>838</X>
+          <X>328</X>
-          <Y>382</Y>
+          <Y>391</Y>
         </Point>
         <Point>
-          <X>1045</X>
+          <X>825</X>
-          <Y>382</Y>
+          <Y>391</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_USER_ID" ZOrder="8" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_USER_ID" ZOrder="16" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>784</X>
+          <X>48</X>
-          <Y>430</Y>
+          <Y>435</Y>
         </Point>
         <Point>
-          <X>784</X>
+          <X>48</X>
-          <Y>596</Y>
+          <Y>491</Y>
+        </Point>
+        <Point>
+          <X>56</X>
+          <Y>491</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_GROUP_ID" ZOrder="9" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>835</X>
+          <Y>358</Y>
+        </Point>
+        <Point>
+          <X>835</X>
+          <Y>608</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_MODULE_ID" ZOrder="8" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>1471</X>
+          <Y>317</Y>
+        </Point>
+        <Point>
+          <X>1471</X>
+          <Y>633</Y>
+        </Point>
+        <Point>
+          <X>1079</X>
+          <Y>633</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_CLIENT_ID" ZOrder="6" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>302</X>
+          <Y>723</Y>
+        </Point>
+        <Point>
+          <X>302</X>
+          <Y>353</Y>
+        </Point>
+        <Point>
+          <X>1573</X>
+          <Y>353</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_GROUP_ID" ZOrder="5" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>889</X>
+          <Y>358</Y>
+        </Point>
+        <Point>
+          <X>1573</X>
+          <Y>358</Y>
         </Point>
       </RoutePoints>
     </Connector>

DDUserManager/DDUserManager/frmADImport_Groups.Designer.vb

@@ -22,18 +22,22 @@ Partial Class frmADImport_Groups
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmADImport_Groups))
         Me.gridAD_Groups = New DevExpress.XtraGrid.GridControl()
-        Me.TBLOCAL_ADGROUPSBindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBLOCAL_ADGROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.UserDataSet = New DDUserManager.UserDataSet()
         Me.viewAD_Groups = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.colGROUPNAME = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.btnImport = New System.Windows.Forms.Button()
-        Me.TbdD_USER_GROUPSTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USER_GROUPSTableAdapter()
+        Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBDD_GROUPSTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_GROUPSTableAdapter()
+        Me.TableAdapterManager = New DDUserManager.UserDataSetTableAdapters.TableAdapterManager()
         CType(Me.gridAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBLOCAL_ADGROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.UserDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'gridAD_Groups
@@ -43,7 +47,7 @@ Partial Class frmADImport_Groups
         Me.gridAD_Groups.Location = New System.Drawing.Point(0, 0)
         Me.gridAD_Groups.MainView = Me.viewAD_Groups
         Me.gridAD_Groups.Name = "gridAD_Groups"
-        Me.gridAD_Groups.Size = New System.Drawing.Size(1130, 613)
+        Me.gridAD_Groups.Size = New System.Drawing.Size(1146, 613)
         Me.gridAD_Groups.TabIndex = 0
         Me.gridAD_Groups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAD_Groups})
         '
@@ -78,22 +82,39 @@ Partial Class frmADImport_Groups
         Me.btnImport.Enabled = False
         Me.btnImport.Image = Global.DDUserManager.My.Resources.Resources.group_go
         Me.btnImport.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnImport.Location = New System.Drawing.Point(939, 619)
+        Me.btnImport.Location = New System.Drawing.Point(955, 641)
         Me.btnImport.Name = "btnImport"
         Me.btnImport.Size = New System.Drawing.Size(179, 27)
         Me.btnImport.TabIndex = 1
         Me.btnImport.Text = "Import starten"
         Me.btnImport.UseVisualStyleBackColor = True
         '
-        'TbdD_USER_GROUPSTableAdapter
+        'TBDD_GROUPSBindingSource
         '
-        Me.TbdD_USER_GROUPSTableAdapter.ClearBeforeFill = True
+        Me.TBDD_GROUPSBindingSource.DataMember = "TBDD_GROUPS"
+        Me.TBDD_GROUPSBindingSource.DataSource = Me.UserDataSet
+        '
+        'TBDD_GROUPSTableAdapter
+        '
+        Me.TBDD_GROUPSTableAdapter.ClearBeforeFill = True
+        '
+        'TableAdapterManager
+        '
+        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.TBDD_CLIENT_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Me.TBDD_GROUPSTableAdapter
+        Me.TableAdapterManager.TBDD_MODULESTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_USER_MODULESTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
+        Me.TableAdapterManager.UpdateOrder = DDUserManager.UserDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
         'frmADImport_Groups
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1130, 658)
+        Me.ClientSize = New System.Drawing.Size(1146, 680)
         Me.Controls.Add(Me.btnImport)
         Me.Controls.Add(Me.gridAD_Groups)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -103,6 +124,7 @@ Partial Class frmADImport_Groups
         CType(Me.TBLOCAL_ADGROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.UserDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -113,5 +135,7 @@ Partial Class frmADImport_Groups
     Friend WithEvents TBLOCAL_ADGROUPSBindingSource As BindingSource
     Friend WithEvents colGROUPNAME As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents btnImport As Button
-    Friend WithEvents TbdD_USER_GROUPSTableAdapter As UserDataSetTableAdapters.TBDD_USER_GROUPSTableAdapter
+    Friend WithEvents TBDD_GROUPSBindingSource As BindingSource
+    Friend WithEvents TBDD_GROUPSTableAdapter As UserDataSetTableAdapters.TBDD_GROUPSTableAdapter
+    Friend WithEvents TableAdapterManager As UserDataSetTableAdapters.TableAdapterManager
 End Class

DDUserManager/DDUserManager/frmADImport_Groups.resx

@@ -123,8 +123,14 @@
   <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>258, 17</value>
   </metadata>
-  <metadata name="TbdD_USER_GROUPSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>626, 17</value>
+  </metadata>
+  <metadata name="TBDD_GROUPSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>840, 17</value>
+  </metadata>
+  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1048, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

DDUserManager/DDUserManager/frmADImport_Groups.vb

@@ -3,6 +3,10 @@ Imports DevExpress.XtraGrid.Views.Grid
 
 Public Class frmADImport_Groups
     Private Sub frmADImport_Groups_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        'TODO: Diese Codezeile lädt Daten in die Tabelle "UserDataSet.TBDD_GROUPS". Sie können sie bei Bedarf verschieben oder entfernen.
+        Me.TBDD_GROUPSTableAdapter.Fill(Me.UserDataSet.TBDD_GROUPS)
+        'TODO: Diese Codezeile lädt Daten in die Tabelle "UserDataSet.TBDD_GROUPS". Sie können sie bei Bedarf verschieben oder entfernen.
+        Me.TBDD_GROUPSTableAdapter.Fill(Me.UserDataSet.TBDD_GROUPS)
         Try
             Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(Environment.UserName)
 
@@ -31,10 +35,19 @@ Public Class frmADImport_Groups
             Dim internal As Boolean = False
             Dim sync As Boolean = True
 
-            If IsNothing(TbdD_USER_GROUPSTableAdapter.GroupExists(groupRow.GROUPNAME)) Then
+
-                TbdD_USER_GROUPSTableAdapter.Insert(name, Environment.UserName)
+
+            If IsNothing(TBDD_GROUPSTableAdapter.GroupExists(groupRow.GROUPNAME)) Then
+                'TBDD_GROUPSTableAdapter.Insert(name, Environment.UserName)
+
                 importedGroups = importedGroups + 1
             End If
+
+            'If IsNothing(TBDD_GROUPSTableAdapter.GroupExists(groupRow.GROUPNAME)) Then
+            '    TBDD_GROUPSTableAdapter.Insert(name, Environment.UserName)
+
+            '    importedGroups = importedGroups + 1
+            'End If
         Next
 
         If importedGroups = 0 Then

DDUserManager/DDUserManager/frmADImport_Users.Designer.vb

@@ -168,7 +168,7 @@ Partial Class frmADImport_Users
         Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_MODULESTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_USER_MODULESTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_USERTableAdapter = Me.TBDD_USERTableAdapter
         Me.TableAdapterManager.UpdateOrder = DDUserManager.UserDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete

DDUserManager/DDUserManager/frmMain.resx

@@ -225,17 +225,20 @@
   <metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>136, 17</value>
   </metadata>
-  <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="TBDD_MODULESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1158, 95</value>
+    <value>1295, 56</value>
   </metadata>
-  <metadata name="TBDD_USER_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>489, 56</value>
+    <value>17, 56</value>
   </metadata>
   <metadata name="TBDD_CLIENTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>268, 95</value>
+    <value>439, 56</value>
+  </metadata>
+  <metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>136, 17</value>
+  </metadata>
+  <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
   <metadata name="TBDD_USERBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>693, 17</value>
@@ -329,8 +332,29 @@
         SUVORK5CYII=
 </value>
   </data>
-  <metadata name="TBDD_USER_GROUPSBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="TBDD_GROUPSBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>672, 95</value>
+    <value>843, 56</value>
+  </metadata>
+  <metadata name="TBDD_CLIENTBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1073, 56</value>
+  </metadata>
+  <metadata name="TBDD_MODULESBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 95</value>
+  </metadata>
+  <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="TBDD_MODULESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1295, 56</value>
+  </metadata>
+  <metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="TBDD_CLIENTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>439, 56</value>
+  </metadata>
+  <metadata name="TBDD_GROUPSBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>843, 56</value>
   </metadata>
   <data name="BindingNavigatorAddNewItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -396,34 +420,34 @@
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="TBDD_USER_GROUPSBindingNavigatorSaveItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="TBDD_GROUPSBindingNavigatorSaveItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
         dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="ToolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnImportGroups.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALlSURBVDhPhZJpSNNxGMf/HRQURBCVrlLU7LASrzCPGGMl
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALlSURBVDhPhZJ5SJNxGMffDgoKIohKrRQ1O6zEK8wjxliJ
-        llFZrWEea6kzNY+akcd0nnmUbTr9OxWdY815TeeZWKCJV16pmQaCvkhd9CZMDErdt6l/yhDsA8+r3/fz
+        ZVRWa5jHWupMzaNm5DF9PfMo23T6OhWdY815TeeZWKCJV16pmQaC/pG66J8wMSiPb1NfyhDsA89fv+/n
-        8DwPP+J/xNyicYfzzOemlYcwKTNelIWaFrEsLHZQz5sT6kpjtipMlmdKDbG+pEFmYiqyOUU++7Jnqu0w
+        4XkefsT/iL5lwBvKNZudUh7ChMxoQRZiUsg2N99BP29OiIsBq0VhvDRdoo/1JQ00FdORzSn03pc1XWWL
-        2+yPHz2ZmFU7YUZ1BKN5Zt+oyOaQN/dkaoeaMddJYnFIjvkuEtPvm/A6yXqKimzODTcWL1/4SPd9uArL
+        mSY//OjOwIzaEdOqIxjJNf1GRzaHurknQzvYhNkOCguDcsx1Uph634jXiVaTdGRzbriy+ST5aPn7UCWW
-        49VYGNVA25aNBB+6mor8C49xlJvLpc9lezNAcpiLgewz/cInwb+0aj4+1yZAWxeLDukDWPqearLkW+6m
+        xqowP6KBtjUL8d4MNR35Fz7zKC+Hx5jN8mKC4rIWAjhn+sgnQb+0agE+18RDWxuDdukDWPicarQQWOym
-        tDU4zqbMXDp9WezJwPoqFoVBkp+M9JxYCJ8/Ru3Hl0hpTcRpwbESW6HhLkonCBHbuqMg8Dqq430xViqA
+        tTW4TiasHAZjSezBxPoqEoVCkpeEtOwYkM8fo+bjSyS3JOC08FixDam/i9YJQsSxas8PuI6qOB+Mlgih
-        ks9CtjcT0oALkA0JEKJ0hL/MGql94aj8VIRwTQgcAu1ISicIyW3TyolW1YaDqaIZEA1Gwk9uh4T6O2BL
+        FLCR5cWC1P8CZINCBCsd4CezQkpvGCo+FSJMEwz7AFuK1glCctukYrxFteFgqigmRAMR8JXbIr7uDjjS
-        TyCyOwBc8i4myaug9I0HC1OeR6jiHALktuAWWUFQw0JFXxYiKq/hosgAHiI2Zguv/G2w1SYrShgV8udg
+        E4jo8gePuosJ6ipofePBQpXnEaI4B3+5DXiFlhBWs1Hem4nwimu4KNKDu4iDmYIrfxtstc6MJCOD/xws
-        wQp7aAZJqAdyVsWyPjHEbyIg787AfaULzgp36joK3PzXbMcyv8v8d/NtX4CnFWrEFqvgq993RX7REob0
+        SGEHzQAFdX/2qljaK4b4TTjkXem4r3TGWXLncnu+q9+a7VDqe1nwbq71C/C0XI2YIhV8dPuuyC+aQ5HW
-        5mCkNPEQX89FYmMApO1J8CpxhrmQWCJM3PJZrLCGhbrxZSSPAf69gE8b4Fl4EuW9Yij1P1DelYHizjR9
+        FITkRj7i6nhIaPCHtC0RnsVOMCOJRcLYNY/NDq2frx1bQtIo4NcDeLcCHgUnUdYjhlL3A+Wd6SjqSNU1
-        kyDktSeCp3SFUSzxlRZNWBEjQoul/ioJ+DVacJoBjkYHT5UO7nmmuJR1GEzRATg92wsfmSPIt/G4p3CB
+        CURuWwL4ShcYxhBfDaIIS2KYNF/sq5RAUK0FtwngapbhoVqGW64JLmUeBkt0AI7P9sJb5gDqbRzuKZyh
-        XtQaRBEWq9NPZNFnq1IewiOuB7wWgPtKP4EG8K4DvBoAdtok4vipsEneDo6cCeMYYpomII6vyitMyHkO
+        E7V6kYT56vTjmYyZyuSHcI/tBr8Z4L3STaABvGoBz3qAkzqBWEEKrJO2gytnwSiamDIQEsdX5RXG5Xz7
-        jQnu0fYshcYuvA+MuBF9fQBDMAx69ADMXMunJHzf+P1BW34axWzDwRjChFL1EMRvm7XL1ad4XbkAAAAA
+        hni3KDu2QmMb1gtm7LCuPoApHAIjqh+mLmWTEoFP3P7ALT8No7fhYDRhTKs6COI3IvPLoUkp30UAAAAA
         SUVORK5CYII=
 </value>
   </data>
   <metadata name="TBDD_CLIENTBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>936, 95</value>
+    <value>1073, 56</value>
   </metadata>
   <data name="BindingNavigatorAddNewItem2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -497,7 +521,7 @@
 </value>
   </data>
   <metadata name="TBDD_MODULESBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>234, 134</value>
+    <value>17, 95</value>
   </metadata>
   <data name="BindingNavigatorMoveFirstItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -552,31 +576,37 @@
     <value>1152, 17</value>
   </metadata>
   <metadata name="TBDD_CLIENT_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>1394, 17</value>
   </metadata>
   <metadata name="TBDD_CLIENT_USERTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>256, 56</value>
+    <value>1633, 17</value>
   </metadata>
-  <metadata name="TBDD_USER_GROUPSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="TBDD_GROUPSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>736, 56</value>
+    <value>231, 56</value>
   </metadata>
   <metadata name="TBDD_CLIENTTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>473, 95</value>
+    <value>644, 56</value>
   </metadata>
   <metadata name="TBDD_MODULESTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 134</value>
+    <value>1518, 56</value>
   </metadata>
   <metadata name="TBDD_USER_MODULESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>473, 134</value>
+    <value>256, 95</value>
   </metadata>
   <metadata name="TBDD_USER_MODULESTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>729, 134</value>
+    <value>512, 95</value>
   </metadata>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>980, 134</value>
+    <value>763, 95</value>
+  </metadata>
+  <metadata name="TBDD_GROUPS_MODULESTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>880, 95</value>
+  </metadata>
+  <metadata name="TBDD_GROUPS_CLIENTTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1406, 95</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>201</value>
+    <value>106</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

DDUserManager/DDUserManager/frmMain.vb

@@ -1,7 +1,6 @@
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DDUserManager.UserDataSet
-Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
 
 ''' <summary>
 ''' Anmerkungen:
@@ -10,207 +9,117 @@ Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
 ''' </summary>
 Public Class frmMain
     Private CurrentUser As TBDD_USERRow = Nothing
+    Private DragDropManager As ClassDragDrop = Nothing
 
     Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Try
         If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) Then
             Dim userRow As TBDD_USERRow = GetCurrentUserRow(Environment.UserName)
             tsLabelUser.Text = $"Angemeldeter Benutzer: {userRow.USERNAME}"
             CurrentUser = userRow
 
+            ' Grunddaten aus Tabellen laden
+            ' Davon abhängige Daten werden in den `focusedRowChanged`-Events der Grids geladen
             LoadData()
 
+            'Spalten an Inhalte anpassen
             gvUsers.BestFitColumns()
+            viewClients_AllClients.BestFitColumns()
+            viewGroups_AllGroups.BestFitColumns()
+
+            ' Dragdrop Events für Grids anlegen
+            DragDropManager = New ClassDragDrop()
+            DragDropManager.AddGridView(viewGroups_AvailableUsers)
+            DragDropManager.AddGridView(viewGroups_AssignedUsers)
+            DragDropManager.AddGridView(viewModules_AvailableUsers)
+            DragDropManager.AddGridView(viewModules_AssignedUsers)
+            DragDropManager.AddGridView(viewClients_AvailableUsers)
+            DragDropManager.AddGridView(viewClients_AssignedUsers)
+            DragDropManager.AddGridView(viewClientsGroups_AssignedGroups)
+            DragDropManager.AddGridView(viewClientsGroups_AvailableGroups)
+            DragDropManager.AddGridView(viewModulesGroups_AssignedGroups)
+            DragDropManager.AddGridView(viewModulesGroups_AvailableGroups)
 
-                gvClients_AllClients.BestFitColumns()
-                gvGroups_AllGroups.BestFitColumns()
         Else
             MsgBox($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt. {vbCrLf & vbCrLf}Bitte kontaktieren Sie den Administrator, wenn dies ein Fehler ist.", MsgBoxStyle.Critical, "UserManager")
             Application.Exit()
         End If
-        Catch ex As Exception
-            MessageBox.Show($"Error while loading: {ex.Message}", "UserManager", MessageBoxButtons.OK, MessageBoxIcon.Hand)
-        End Try
     End Sub
 
-    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+    Private Sub btnImportUsers_Click(sender As Object, e As EventArgs) Handles btnImportUsers.Click
         Dim frm As New frmADImport_Users()
         frm.ShowDialog()
 
         LoadData()
     End Sub
 
-    Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click
+    Private Sub btnImportGroups_Click(sender As Object, e As EventArgs) Handles btnImportGroups.Click
         Dim frm As New frmADImport_Groups()
         frm.ShowDialog()
 
         LoadData()
     End Sub
 
-    Private Sub grvwAllGroups_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles gvGroups_AllGroups.FocusedRowChanged
+    Private Sub grvwAllGroups_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles viewGroups_AllGroups.FocusedRowChanged
         If e.FocusedRowHandle < 0 Then
             Exit Sub
         End If
 
-        Dim groupId As Integer = GetSelectedGroupId()
+        Dim group As TBDD_GROUPSRow = GetSelectedGroup()
-        Dim group As TBDD_USER_GROUPSRow = GetSelectedGroup()
 
         labelGroups_AssignedUsers.Text = String.Format("Benutzer in {0}:", group.NAME)
 
-        gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(groupId)
+        gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(group.GUID)
-        gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(groupId)
+        gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(group.GUID)
     End Sub
 
-    Private Sub gvClients_AllClients_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles gvClients_AllClients.FocusedRowChanged
+    Private Sub gvClients_AllClients_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles viewClients_AllClients.FocusedRowChanged
         If e.FocusedRowHandle < 0 Then
             Exit Sub
         End If
 
-        Dim clientId As Integer = GetSelectedClientId()
+        Dim client As TBDD_CLIENTRow = GetSelectedClient()
 
-        gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(clientId)
+        gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(client.GUID)
-        gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(clientId)
+        gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(client.GUID)
     End Sub
 
-    Private Sub gvModules_AllModules_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles gvModules_AllModules.FocusedRowChanged
+    Private Sub gvModules_AllModules_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles viewModules_AllModules.FocusedRowChanged
         If e.FocusedRowHandle < 0 Then
             Exit Sub
         End If
 
-        Dim moduleId As Integer = GetSelectedModuleId()
+        Dim [module] As TBDD_MODULESRow = GetSelectedModule()
 
-        gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(moduleId)
+        gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId([module].GUID)
-        gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(moduleId)
+        gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId([module].GUID)
+    End Sub
+
+    Private Sub viewClientsGroups_AllClients_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles viewClientsGroups_AllClients.FocusedRowChanged
+        If e.FocusedRowHandle < 0 Then
+            Exit Sub
+        End If
+
+        Dim client As TBDD_CLIENTRow = GetSelectedClient(ItemType.Group)
+
+        gridClientsGroups_AssignedGroups.DataSource = GetAssignedGroupsByClientId(client.GUID)
+        gridClientsGroups_AvailableGroups.DataSource = GetAvailableGroupsByClientId(client.GUID)
+    End Sub
+
+    Private Sub viewModulesGroups_AllModules_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles viewModulesGroups_AllModules.FocusedRowChanged
+        If e.FocusedRowHandle < 0 Then
+            Exit Sub
+        End If
+
+        Dim [module] As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
+
+        gridModulesGroups_AssignedGroups.DataSource = GetAssignedGroupsByModuleId([module].GUID)
+        gridModulesGroups_AvailableGroups.DataSource = GetAvailableGroupsByModuleId([module].GUID)
     End Sub
 
     Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
         LoadData()
     End Sub
 
-    Private Sub btnGroups_AddUsers_Click(sender As Object, e As EventArgs) Handles btnGroups_AddUsers.Click
-        Dim selectedUserHandles = gvGroups_AvailableUsers.GetSelectedRows().ToList()
-        Dim selectedGroup As TBDD_USER_GROUPSRow = GetSelectedGroup()
-
-        For Each handle As Integer In selectedUserHandles
-            Dim rowView As DataRowView = gvGroups_AvailableUsers.GetRow(handle)
-            Dim userrow As TBDD_USERRow = rowView.Row
-            TBDD_GROUPS_USERTableAdapter.Insert(userrow.GUID, selectedGroup.GUID, $"Assign User {userrow.USERNAME} to Group {selectedGroup.NAME}", Environment.UserName)
-        Next
-
-        listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
-
-        gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(selectedGroup.GUID)
-        gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(selectedGroup.GUID)
-        gvGroups_AvailableUsers.ClearSelection()
-        gvGroups_AssignedUsers.ClearSelection()
-
-        UpdateSavedLabel()
-    End Sub
-
-    Private Sub btnGroups_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnGroups_RemoveUsers.Click
-        Dim selectedUserHandles = gvGroups_AssignedUsers.GetSelectedRows().ToList()
-        Dim selectedGroup As TBDD_USER_GROUPSRow = GetSelectedGroup()
-
-        For Each handle As Integer In selectedUserHandles
-            Dim rowView As DataRowView = gvGroups_AssignedUsers.GetRow(handle)
-            Dim userRow As TBDD_USERRow = rowView.Row
-            TBDD_GROUPS_USERTableAdapter.Delete(userRow.GUID, selectedGroup.GUID)
-        Next
-
-        listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
-
-        gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(selectedGroup.GUID)
-        gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(selectedGroup.GUID)
-        gvGroups_AvailableUsers.ClearSelection()
-        gvGroups_AssignedUsers.ClearSelection()
-
-        UpdateSavedLabel()
-    End Sub
-
-    Private Sub btnClients_AddUsers_Click(sender As Object, e As EventArgs) Handles btnClients_AddUsers.Click
-        Dim selectedUserHandles = gvGroups_AssignedUsers.GetSelectedRows().ToList()
-        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
-
-        For Each handle As Integer In selectedUserHandles
-            Dim rowView As DataRowView = gvGroups_AssignedUsers.GetRow(handle)
-            Dim userRow As TBDD_USERRow = rowView.Row
-            TBDD_CLIENT_USERTableAdapter.Insert(userRow.GUID, selectedClient.GUID, $"Assign User {userRow.USERNAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
-        Next
-
-        listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
-
-        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
-        gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(selectedClient.GUID)
-        gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(selectedClient.GUID)
-        gvClients_AssignedUsers.ClearSelection()
-        gvClients_AvailableUsers.ClearSelection()
-
-        UpdateSavedLabel()
-    End Sub
-
-    Private Sub btnClients_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnClients_RemoveUsers.Click
-        Dim selectedUserHandles = gvGroups_AssignedUsers.GetSelectedRows().ToList()
-        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
-
-        For Each handle As Integer In selectedUserHandles
-            Dim rowView As DataRowView = gvGroups_AssignedUsers.GetRow(handle)
-            Dim userRow As TBDD_USERRow = rowView.Row
-            TBDD_CLIENT_USERTableAdapter.Delete(userRow.GUID, selectedClient.GUID)
-        Next
-
-        listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
-
-        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
-        gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(selectedClient.GUID)
-        gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(selectedClient.GUID)
-        gvClients_AssignedUsers.ClearSelection()
-        gvClients_AvailableUsers.ClearSelection()
-
-        UpdateSavedLabel()
-    End Sub
-
-    Private Sub btnModules_AddUsers_Click(sender As Object, e As EventArgs) Handles btnModules_AddUsers.Click
-        Dim selectedUserHandles = gvModules_AssignedUsers.GetSelectedRows().ToList()
-        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
-
-        For Each handle As Integer In selectedUserHandles
-            Dim rowView As DataRowView = gvModules_AssignedUsers.GetRow(handle)
-            Dim userRow As TBDD_USERRow = rowView.Row
-            TBDD_CLIENT_USERTableAdapter.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()
-
-        UpdateSavedLabel()
-    End Sub
-
-    Private Sub btnModules_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnModules_RemoveUsers.Click
-        Dim selectedUserHandles = gvModules_AssignedUsers.GetSelectedRows().ToList()
-        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
-
-        For Each handle As Integer In selectedUserHandles
-            Dim rowView As DataRowView = gvModules_AssignedUsers.GetRow(handle)
-            Dim userRow As TBDD_USERRow = rowView.Row
-            TBDD_USER_MODULESTableAdapter.Delete(userRow.GUID, selectedModule.GUID)
-        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()
-
-        UpdateSavedLabel()
-    End Sub
-
 #Region "UI Helpers"
     Private Sub UpdateSavedLabel()
         If tsLabelSaved.Visible = False Then
@@ -247,10 +156,10 @@ Public Class frmMain
         End Try
     End Function
 
-    Private Function GetGroupsForUser(username As String) As TBDD_USER_GROUPSDataTable
+    Private Function GetGroupsForUser(username As String) As TBDD_GROUPSDataTable
         Try
-            Dim dt As New TBDD_USER_GROUPSDataTable()
+            Dim dt As New TBDD_GROUPSDataTable()
-            TBDD_USER_GROUPSTableAdapter.FillByUsername(dt, username)
+            TBDD_GROUPSTableAdapter.FillByUsername(dt, username)
 
             Return dt
         Catch ex As Exception
@@ -277,10 +186,10 @@ Public Class frmMain
         UpdateSavedLabel()
     End Sub
 
-    Private Sub TBDD_USER_GROUPSBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBDD_USER_GROUPSBindingNavigatorSaveItem.Click
+    Private Sub TBDD_GROUPSBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBDD_GROUPSBindingNavigatorSaveItem.Click
         Validate()
-        TBDD_USER_GROUPSBindingSource.EndEdit()
+        TBDD_GROUPSBindingSource.EndEdit()
-        TBDD_USER_GROUPSTableAdapter.Update(UserDataSet.TBDD_USER_GROUPS)
+        TBDD_GROUPSTableAdapter.Update(UserDataSet.TBDD_GROUPS)
 
         UpdateSavedLabel()
     End Sub
@@ -304,12 +213,13 @@ Public Class frmMain
 #Region "Database Helpers"
     Private Sub LoadData()
         Try
+            TBDD_USERTableAdapter.Fill(UserDataSet.TBDD_USER)
+            TBDD_GROUPSTableAdapter.Fill(UserDataSet.TBDD_GROUPS)
             TBDD_CLIENTTableAdapter.Fill(UserDataSet.TBDD_CLIENT)
-            TBDD_USER_GROUPSTableAdapter.Fill(UserDataSet.TBDD_USER_GROUPS)
+            TBDD_MODULESTableAdapter.Fill(UserDataSet.TBDD_MODULES)
+
             TBDD_CLIENT_USERTableAdapter.Fill(UserDataSet.TBDD_CLIENT_USER)
             TBDD_GROUPS_USERTableAdapter.Fill(UserDataSet.TBDD_GROUPS_USER)
-            TBDD_USERTableAdapter.Fill(UserDataSet.TBDD_USER)
-            TBDD_MODULESTableAdapter.Fill(UserDataSet.TBDD_MODULES)
             TBDD_USER_MODULESTableAdapter.Fill(UserDataSet.TBDD_USER_MODULES)
         Catch ex As Exception
             MsgBox($"Error while loading UserData: {ex.Message}")
@@ -357,57 +267,124 @@ Public Class frmMain
 
         Return dt
     End Function
+
+    Private Function GetAssignedGroupsByClientId(clientId As Integer) As TBDD_GROUPSDataTable
+        Return TBDD_GROUPSTableAdapter.GetDataByClientId(clientId)
+    End Function
+
+    Private Function GetAvailableGroupsByClientId(clientId As Integer) As TBDD_GROUPSDataTable
+        Return TBDD_GROUPSTableAdapter.GetDataByClientId_NotInClient(clientId)
+    End Function
+
+    Private Function GetAssignedGroupsByModuleId(moduleId As Integer) As TBDD_GROUPSDataTable
+        Return TBDD_GROUPSTableAdapter.GetDataByModuleId(moduleId)
+    End Function
+
+    Private Function GetAvailableGroupsByModuleId(moduleId As Integer) As TBDD_GROUPSDataTable
+        Return TBDD_GROUPSTableAdapter.GetDataByModuleId_NotInModule(moduleId)
+    End Function
+
+    Private Sub ReloadUsersForGroup(groupId As Integer)
+        gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(groupId)
+        gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(groupId)
+        viewGroups_AvailableUsers.ClearSelection()
+        viewGroups_AssignedUsers.ClearSelection()
+    End Sub
+
+    Private Sub ReloadUsersForClient(clientId As Integer)
+        gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(clientId)
+        gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(clientId)
+        viewClients_AssignedUsers.ClearSelection()
+        viewClients_AvailableUsers.ClearSelection()
+    End Sub
+
+    Private Sub ReloadUsersForModule(moduleId As Integer)
+        gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(moduleId)
+        gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(moduleId)
+        viewModules_AssignedUsers.ClearSelection()
+        viewModules_AvailableUsers.ClearSelection()
+    End Sub
+
+    Private Sub ReloadGroupsForClient(clientId As Integer)
+        gridClientsGroups_AssignedGroups.DataSource = GetAssignedGroupsByClientId(clientId)
+        gridClientsGroups_AvailableGroups.DataSource = GetAvailableGroupsByClientId(clientId)
+        viewClientsGroups_AssignedGroups.ClearSelection()
+        viewClientsGroups_AvailableGroups.ClearSelection()
+    End Sub
+
+    Private Sub ReloadGroupsForModule(moduleId As Integer)
+        gridModulesGroups_AssignedGroups.DataSource = GetAssignedGroupsByModuleId(moduleId)
+        gridModulesGroups_AvailableGroups.DataSource = GetAvailableGroupsByModuleId(moduleId)
+        viewModulesGroups_AssignedGroups.ClearSelection()
+        viewModulesGroups_AvailableGroups.ClearSelection()
+    End Sub
 #End Region
 #Region "Grid Helpers"
-    Private Function GetSelectedGroup() As TBDD_USER_GROUPSRow
+    Enum ItemType
-        Dim groupRowIndex = gvGroups_AllGroups.GetSelectedRows().First()
+        User = 0
-        Dim selectedGroupView As DataRowView = gvGroups_AllGroups.GetRow(groupRowIndex)
+        Group = 1
-        Dim selectedGroup As TBDD_USER_GROUPSRow = selectedGroupView.Row
+        Client = 2
+        [Module] = 4
+    End Enum
+
+    Private Function GetSelectedGroup(Optional type As ItemType = ItemType.User) As TBDD_GROUPSRow
+        Dim grid As GridView
+
+        Select Case type
+            Case ItemType.User
+                grid = viewGroups_AllGroups
+            Case Else
+                Return Nothing
+        End Select
+
+        Dim groupRowIndex = grid.GetSelectedRows().First()
+        Dim selectedGroupView As DataRowView = grid.GetRow(groupRowIndex)
+        Dim selectedGroup As TBDD_GROUPSRow = selectedGroupView.Row
 
         Return selectedGroup
     End Function
 
-    Private Function GetSelectedGroupId() As Integer
+    Private Function GetSelectedClient(Optional type As ItemType = ItemType.User) As TBDD_CLIENTRow
-        Dim selectedGroup As TBDD_USER_GROUPSRow = GetSelectedGroup()
+        Dim grid As GridView
-        Dim groupId As Integer = selectedGroup.GUID
 
-        Return groupId
+        Select Case type
-    End Function
+            Case ItemType.User
+                grid = viewClients_AllClients
+            Case ItemType.Group
+                grid = viewClientsGroups_AllClients
+            Case Else
+                Return Nothing
+        End Select
 
-    Private Function GetSelectedClient() As TBDD_CLIENTRow
+        Dim clientRowIndex = grid.GetSelectedRows().First()
-        Dim clientRowIndex = gvClients_AllClients.GetSelectedRows().First()
+        Dim selectedClientView As DataRowView = grid.GetRow(clientRowIndex)
-        Dim selectedClientView As DataRowView = gvClients_AllClients.GetRow(clientRowIndex)
         Dim selectedClient As TBDD_CLIENTRow = selectedClientView.Row
 
         Return selectedClient
     End Function
 
-    Private Function GetSelectedClientId() As Integer
+    Private Function GetSelectedModule(Optional type As ItemType = ItemType.User) As TBDD_MODULESRow
-        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
+        Dim grid As GridView
-        Dim clientId As Integer = selectedClient.GUID
 
-        Return clientId
+        Select Case type
+            Case ItemType.User
+                grid = viewModules_AllModules
+            Case ItemType.Group
+                grid = viewModulesGroups_AllModules
+            Case Else
+                Return Nothing
+        End Select
+
+        Dim moduleRowIndex = grid.GetSelectedRows().First()
+        Dim selectedModuleView As DataRowView = grid.GetRow(moduleRowIndex)
+        Dim selectedModule As TBDD_MODULESRow = selectedModuleView.Row
+
+        Return selectedModule
     End Function
 
-    Private Function GetSelectedModule() As TBDD_MODULESRow
+    Private Function GetModifiedRowsFromDragDropData(grid As GridControl, data As IDataObject) As List(Of DataRow)
-        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) As List(Of TBDD_USERRow)
         Dim table As DataTable = grid.DataSource
-        Dim selectedGroup As TBDD_USER_GROUPSRow = GetSelectedGroup()
+        Dim modifiedRows As New List(Of DataRow)
-        Dim modifiedRows As New List(Of TBDD_USERRow)
 
         If data.GetDataPresent(GetType(GridView)) Then
             Dim view As GridView = data.GetData(GetType(GridView))
@@ -420,9 +397,9 @@ Public Class frmMain
             ' Die ausgewählten Rows auslesen und gridUsersAssigned hinzufügen 
             For Each rowIndex As Integer In view.GetSelectedRows()
                 Dim rowView As DataRowView = view.GetRow(rowIndex)
-                Dim row As TBDD_USERRow = rowView.Row
+                Dim row As DataRow = rowView.Row
 
-                If Not table.Rows.Contains(row.GUID) Then
+                If Not table.Rows.Contains(row.Item("GUID")) Then
                     modifiedRows.Add(row)
                 End If
             Next
@@ -430,6 +407,13 @@ Public Class frmMain
         ElseIf data.GetDataPresent(GetType(TBDD_USERRow)) Then
             Dim row As TBDD_USERRow = data.GetData(GetType(TBDD_USERRow))
 
+            If Not table.Rows.Contains(row.GUID) Then
+                modifiedRows.Add(row)
+            End If
+
+        ElseIf data.GetDataPresent(GetType(TBDD_GROUPSRow)) Then
+            Dim row As TBDD_GROUPSRow = data.GetData(GetType(TBDD_GROUPSRow))
+
             If Not table.Rows.Contains(row.GUID) Then
                 modifiedRows.Add(row)
             End If
@@ -438,79 +422,11 @@ Public Class frmMain
         Return modifiedRows
     End Function
 #End Region
-#Region "DragDrop Events for Groups, Clients, Modules"
+#Region "Events for Groups"
-    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, 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))
-
-        If ModifierKeys <> Keys.None Then
-            Return
-        End If
-
-        If e.Button = MouseButtons.Left And hitInfo.RowHandle >= 0 Then
-            downHitInfo = hitInfo
-        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, gvModules_AssignedUsers.MouseMove, gvModules_AvailableUsers.MouseMove
-        Dim view As GridView = sender
-        Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y))
-
-        If e.Button = MouseButtons.Left And Not IsNothing(downHitInfo) Then
-            Dim dragSize As Size = SystemInformation.DragSize
-            Dim dragRect As New Rectangle(New Point(downHitInfo.HitPoint.X - dragSize.Width / 2, downHitInfo.HitPoint.Y - dragSize.Height / 2), dragSize)
-
-            ' DragRect ist ein kleines Rechteck, dessen Mitte der Punkt ist, wo die Maus geklickt wurde.
-            ' Es soll verhindern, dass durch schnelles Klicken unbeabsichtigt Drag'n'Drop Operationen initiiert werden
-            ' Siehe: https://msdn.microsoft.com/en-us/library/system.windows.forms.systeminformation.dragsize(v=vs.110).aspx
-            If Not dragRect.Contains(New Point(e.X, e.Y)) Then
-                ' dragDropData enhält eine einzelne Row oder den kompletten View,
-                ' jenachdem, wie die Drag'n'Drop Operation gestartet wurde.
-                Dim dragDropData As Object
-
-                ' Wenn keine Zeile markiert ist
-                If downHitInfo.RowHandle < 0 Then
-                    Exit Sub
-                End If
-
-                ' Wenn zwar eine Zeile markiert ist, aber keine über die Checkbox angehakt wurde,
-                ' wird die markierte Zeile übergeben.
-                ' Wenn 1 oder n Zeilen über die Checkbox angehakt wurde, werden diese übergeben
-                If view.GetSelectedRows().Length = 0 Then
-                    Dim row As TBDD_USERRow = view.GetDataRow(downHitInfo.RowHandle)
-                    dragDropData = row
-                Else
-                    dragDropData = view
-                End If
-
-                view.GridControl.DoDragDrop(dragDropData, DragDropEffects.Move)
-                downHitInfo = Nothing
-
-                DevExpress.Utils.DXMouseEventArgs.GetMouseArgs(e).Handled = True
-            End If
-        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, 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))
-
-        If selectedUsersDropped Or singleUserDropped Then
-            e.Effect = DragDropEffects.Move
-        Else
-            e.Effect = DragDropEffects.None
-        End If
-    End Sub
-#End Region
-#Region "DragDrop Events for Groups"
     Private Sub gridUsersAvailable_DragDrop(sender As Object, e As DragEventArgs) Handles gridGroups_AvailableUsers.DragDrop
         Dim grid As GridControl = sender
-        Dim table As DataTable = grid.DataSource
         Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
-        Dim selectedGroup As TBDD_USER_GROUPSRow = GetSelectedGroup()
+        Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
 
         ' Zeilen in Oberfläche und in Datenbank einfügen
         For Each userRow As TBDD_USERRow In userRowsToBeDeleted
@@ -519,20 +435,14 @@ Public Class frmMain
 
         listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
 
-        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
+        ReloadUsersForGroup(selectedGroup.GUID)
-        gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(selectedGroup.GUID)
-        gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(selectedGroup.GUID)
-        gvGroups_AvailableUsers.ClearSelection()
-        gvGroups_AssignedUsers.ClearSelection()
-
         UpdateSavedLabel()
     End Sub
 
     Private Sub gridUsersAssigned_DragDrop(sender As Object, e As DragEventArgs) Handles gridGroups_AssignedUsers.DragDrop
         Dim grid As GridControl = sender
-        Dim table As DataTable = grid.DataSource
         Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
-        Dim selectedGroup As TBDD_USER_GROUPSRow = GetSelectedGroup()
+        Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
 
         ' Zeilen in Oberfläche und in Datenbank einfügen
         For Each userRow As TBDD_USERRow In userRowsToBeInserted
@@ -542,18 +452,45 @@ Public Class frmMain
         listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
 
         ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
-        gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(selectedGroup.GUID)
+        ReloadUsersForGroup(selectedGroup.GUID)
-        gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(selectedGroup.GUID)
+        UpdateSavedLabel()
-        gvGroups_AvailableUsers.ClearSelection()
+    End Sub
-        gvGroups_AssignedUsers.ClearSelection()
 
+    Private Sub btnGroups_AddUsers_Click(sender As Object, e As EventArgs) Handles btnGroups_AddUsers.Click
+        Dim selectedUserHandles = viewGroups_AvailableUsers.GetSelectedRows().ToList()
+        Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
+
+        For Each handle As Integer In selectedUserHandles
+            Dim rowView As DataRowView = viewGroups_AvailableUsers.GetRow(handle)
+            Dim userrow As TBDD_USERRow = rowView.Row
+            TBDD_GROUPS_USERTableAdapter.Insert(userrow.GUID, selectedGroup.GUID, $"Assign User {userrow.USERNAME} to Group {selectedGroup.NAME}", Environment.UserName)
+        Next
+
+        listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
+
+        ReloadUsersForGroup(selectedGroup.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub btnGroups_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnGroups_RemoveUsers.Click
+        Dim selectedUserHandles = viewGroups_AssignedUsers.GetSelectedRows().ToList()
+        Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
+
+        For Each handle As Integer In selectedUserHandles
+            Dim rowView As DataRowView = viewGroups_AssignedUsers.GetRow(handle)
+            Dim userRow As TBDD_USERRow = rowView.Row
+            TBDD_GROUPS_USERTableAdapter.Delete(userRow.GUID, selectedGroup.GUID)
+        Next
+
+        listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
+
+        ReloadUsersForGroup(selectedGroup.GUID)
         UpdateSavedLabel()
     End Sub
 #End Region
 #Region "DragDrop Events for Clients"
     Private Sub gridClients_AvailableUsers_DragDrop(sender As Object, e As DragEventArgs) Handles gridClients_AvailableUsers.DragDrop
         Dim grid As GridControl = sender
-        Dim table As DataTable = grid.DataSource
         Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
         Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
 
@@ -563,18 +500,12 @@ Public Class frmMain
 
         listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
 
-        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
+        ReloadUsersForClient(selectedClient.GUID)
-        gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(selectedClient.GUID)
-        gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(selectedClient.GUID)
-        gvClients_AssignedUsers.ClearSelection()
-        gvClients_AvailableUsers.ClearSelection()
-
         UpdateSavedLabel()
     End Sub
 
     Private Sub gridClients_AssignedUsers_DragDrop(sender As Object, e As DragEventArgs) Handles gridClients_AssignedUsers.DragDrop
         Dim grid As GridControl = sender
-        Dim table As DataTable = grid.DataSource
         Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
         Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
 
@@ -585,19 +516,74 @@ Public Class frmMain
 
         listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
 
-        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
+        ReloadUsersForClient(selectedClient.GUID)
-        gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(selectedClient.GUID)
+        UpdateSavedLabel()
-        gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(selectedClient.GUID)
+    End Sub
-        gvClients_AssignedUsers.ClearSelection()
-        gvClients_AvailableUsers.ClearSelection()
 
+    Private Sub btnClients_AddUsers_Click(sender As Object, e As EventArgs) Handles btnClients_AddUsers.Click
+        Dim selectedUserHandles = viewGroups_AssignedUsers.GetSelectedRows().ToList()
+        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
+
+        For Each handle As Integer In selectedUserHandles
+            Dim rowView As DataRowView = viewGroups_AssignedUsers.GetRow(handle)
+            Dim userRow As TBDD_USERRow = rowView.Row
+            TBDD_CLIENT_USERTableAdapter.Insert(userRow.GUID, selectedClient.GUID, $"Assign User {userRow.USERNAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
+        Next
+
+        listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
+
+        ReloadUsersForClient(selectedClient.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub btnClients_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnClients_RemoveUsers.Click
+        Dim selectedUserHandles = viewGroups_AssignedUsers.GetSelectedRows().ToList()
+        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
+
+        For Each handle As Integer In selectedUserHandles
+            Dim rowView As DataRowView = viewGroups_AssignedUsers.GetRow(handle)
+            Dim userRow As TBDD_USERRow = rowView.Row
+            TBDD_CLIENT_USERTableAdapter.Delete(userRow.GUID, selectedClient.GUID)
+        Next
+
+        listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
+
+        ReloadUsersForClient(selectedClient.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub btnClients_AddGroups_Click(sender As Object, e As EventArgs) Handles btnClients_AddGroups.Click
+        Dim selectedGroupHandles = viewClientsGroups_AvailableGroups.GetSelectedRows().ToList()
+        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient(ItemType.Group)
+
+        For Each handle As Integer In selectedGroupHandles
+            Dim rowView As DataRowView = viewClientsGroups_AvailableGroups.GetRow(handle)
+            Dim groupRow As TBDD_GROUPSRow = rowView.Row
+            TBDD_GROUPS_CLIENTTableAdapter.Insert(selectedClient.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
+        Next
+
+        ReloadGroupsForClient(selectedClient.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub btnClients_RemoveGroups_Click(sender As Object, e As EventArgs) Handles btnClients_RemoveGroups.Click
+        Dim selectedGroupHandles = viewClientsGroups_AvailableGroups.GetSelectedRows().ToList()
+        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient(ItemType.Group)
+
+        For Each handle As Integer In selectedGroupHandles
+            Dim rowView As DataRowView = viewClientsGroups_AvailableGroups.GetRow(handle)
+            Dim groupRow As TBDD_GROUPSRow = rowView.Row
+
+            TBDD_GROUPS_CLIENTTableAdapter.Delete(selectedClient.GUID, groupRow.GUID)
+        Next
+
+        ReloadGroupsForClient(selectedClient.GUID)
         UpdateSavedLabel()
     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()
 
@@ -609,6 +595,9 @@ Public Class frmMain
 
             If result = DialogResult.No Then
                 Exit Sub
+            Else
+                MsgBox("Sie haben Sich selbst aus dem UserManager entfernt. Die Anwendung wird jetzt beendet")
+                Application.Exit()
             End If
         End If
 
@@ -618,18 +607,12 @@ Public Class frmMain
 
         listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
 
-        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
+        ReloadUsersForModule(selectedModule.GUID)
-        gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(selectedModule.GUID)
-        gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(selectedModule.GUID)
-        gvModules_AssignedUsers.ClearSelection()
-        gvModules_AvailableUsers.ClearSelection()
-
         UpdateSavedLabel()
     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()
 
@@ -640,16 +623,120 @@ Public Class frmMain
 
         listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
 
-        ' Verfügbare Benutzer aktualisieren und Checkboxen leeren
+        ReloadUsersForModule(selectedModule.GUID)
-        gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(selectedModule.GUID)
+        UpdateSavedLabel()
-        gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(selectedModule.GUID)
+    End Sub
-        gvModules_AssignedUsers.ClearSelection()
+    Private Sub btnModules_AddUsers_Click(sender As Object, e As EventArgs) Handles btnModules_AddUsers.Click
-        gvModules_AvailableUsers.ClearSelection()
+        Dim selectedUserHandles = viewModules_AvailableUsers.GetSelectedRows().ToList()
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
 
+        For Each handle As Integer In selectedUserHandles
+            Dim rowView As DataRowView = viewModules_AvailableUsers.GetRow(handle)
+            Dim userRow As TBDD_USERRow = rowView.Row
+            TBDD_CLIENT_USERTableAdapter.Insert(userRow.GUID, selectedModule.GUID, $"Assign User {userRow.USERNAME} to Module {selectedModule.NAME}", Environment.UserName)
+        Next
+
+        listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
+
+        ReloadUsersForModule(selectedModule.GUID)
+        UpdateSavedLabel()
+    End Sub
+    Private Sub btnModules_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnModules_RemoveUsers.Click
+        Dim selectedUserHandles = viewModules_AssignedUsers.GetSelectedRows().ToList()
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
+
+        For Each handle As Integer In selectedUserHandles
+            Dim rowView As DataRowView = viewModules_AssignedUsers.GetRow(handle)
+            Dim userRow As TBDD_USERRow = rowView.Row
+            TBDD_USER_MODULESTableAdapter.Delete(userRow.GUID, selectedModule.GUID)
+        Next
+
+        listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
+
+        ReloadUsersForModule(selectedModule.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub gridClientsGroups_AssignedGroups_DragDrop(sender As Object, e As DragEventArgs) Handles gridClientsGroups_AssignedGroups.DragDrop
+        Dim grid As GridControl = sender
+        Dim groupRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
+        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
+
+        For Each groupRow As TBDD_GROUPSRow In groupRowsToBeInserted
+            TBDD_GROUPS_CLIENTTableAdapter.Insert(selectedClient.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
+        Next
+
+        ReloadGroupsForClient(selectedClient.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub gridClientsGroups_AvailableGroups_DragDrop(sender As Object, e As DragEventArgs) Handles gridClientsGroups_AvailableGroups.DragDrop
+        Dim grid As GridControl = sender
+        Dim groupRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
+        Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
+
+        For Each groupRow As TBDD_GROUPSRow In groupRowsToBeDeleted
+            TBDD_GROUPS_CLIENTTableAdapter.Delete(selectedClient.GUID, groupRow.GUID)
+        Next
+
+        ReloadGroupsForClient(selectedClient.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub gridModulesGroups_AvailableGroups_DragDrop(sender As Object, e As DragEventArgs) Handles gridModulesGroups_AvailableGroups.DragDrop
+        Dim grid As GridControl = sender
+        Dim groupRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
+
+        For Each groupRow As TBDD_GROUPSRow In groupRowsToBeDeleted
+            TBDD_GROUPS_MODULESTableAdapter.Delete(selectedModule.GUID, groupRow.GUID)
+        Next
+
+        ReloadGroupsForModule(selectedModule.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub gridModulesGroups_AssignedGroups_DragDrop(sender As Object, e As DragEventArgs) Handles gridModulesGroups_AssignedGroups.DragDrop
+        Dim grid As GridControl = sender
+        Dim groupRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
+
+        For Each groupRow As TBDD_GROUPSRow In groupRowsToBeInserted
+            TBDD_GROUPS_MODULESTableAdapter.Insert(selectedModule.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Module {selectedModule.NAME}", Environment.UserName)
+        Next
+
+        ReloadGroupsForModule(selectedModule.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub btnModules_AddGroups_Click(sender As Object, e As EventArgs) Handles btnModules_AddGroups.Click
+        Dim selectedGroupHandles = viewModulesGroups_AssignedGroups.GetSelectedRows().ToList()
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
+
+        For Each handle As Integer In selectedGroupHandles
+            Dim rowView As DataRowView = viewModulesGroups_AssignedGroups.GetRow(handle)
+            Dim groupRow As TBDD_GROUPSRow = rowView.Row
+            TBDD_GROUPS_MODULESTableAdapter.Insert(groupRow.GUID, selectedModule.GUID, $"Assign Group {groupRow.NAME} to Module {selectedModule.NAME}", Environment.UserName)
+        Next
+
+        ReloadGroupsForModule(selectedModule.GUID)
+        UpdateSavedLabel()
+    End Sub
+
+    Private Sub btnModules_RemoveGroups_Click(sender As Object, e As EventArgs) Handles btnModules_RemoveGroups.Click
+        Dim selectedGroupHandles = viewModulesGroups_AssignedGroups.GetSelectedRows().ToList()
+        Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
+
+        For Each handle As Integer In selectedGroupHandles
+            Dim rowView As DataRowView = viewModulesGroups_AssignedGroups.GetRow(handle)
+            Dim groupRow As TBDD_GROUPSRow = rowView.Row
+            TBDD_GROUPS_MODULESTableAdapter.Delete(groupRow.GUID, selectedModule.GUID)
+        Next
+
+        ReloadGroupsForModule(selectedModule.GUID)
         UpdateSavedLabel()
     End Sub
 
 
-
 #End Region
 End Class