diff --git a/DDUserManager/DDUserManager/UserDataSet.Designer.vb b/DDUserManager/DDUserManager/UserDataSet.Designer.vb
index b02e954..78e63b3 100644
--- a/DDUserManager/DDUserManager/UserDataSet.Designer.vb
+++ b/DDUserManager/DDUserManager/UserDataSet.Designer.vb
@@ -13295,6 +13295,70 @@ Namespace UserDataSetTableAdapters
End Function
End Class
+ '''
+ '''Represents the connection and commands used to retrieve and save data.
+ '''
+ _
+ Partial Public Class QueriesTableAdapter
+ Inherits Global.System.ComponentModel.Component
+
+ Private _commandCollection() As Global.System.Data.IDbCommand
+
+ _
+ Protected ReadOnly Property CommandCollection() As Global.System.Data.IDbCommand()
+ Get
+ If (Me._commandCollection Is Nothing) Then
+ Me.InitCommandCollection
+ End If
+ Return Me._commandCollection
+ End Get
+ End Property
+
+ _
+ Private Sub InitCommandCollection()
+ Me._commandCollection = New Global.System.Data.IDbCommand(0) {}
+ Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
+ CType(Me._commandCollection(0),Global.System.Data.SqlClient.SqlCommand).Connection = New Global.System.Data.SqlClient.SqlConnection(Global.DDUserManager.My.MySettings.Default.DD_ECMConnectionString)
+ CType(Me._commandCollection(0),Global.System.Data.SqlClient.SqlCommand).CommandText = "dbo.PRDD_DELETE_USER"
+ CType(Me._commandCollection(0),Global.System.Data.SqlClient.SqlCommand).CommandType = Global.System.Data.CommandType.StoredProcedure
+ CType(Me._commandCollection(0),Global.System.Data.SqlClient.SqlCommand).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@RETURN_VALUE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.ReturnValue, 10, 0, Nothing, Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+ CType(Me._commandCollection(0),Global.System.Data.SqlClient.SqlCommand).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@pUSER_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 10, 0, Nothing, Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+ End Sub
+
+ _
+ Public Overloads Overridable Function PRDD_DELETE_USER(ByVal pUSER_ID As Global.System.Nullable(Of Integer)) As Integer
+ Dim command As Global.System.Data.SqlClient.SqlCommand = CType(Me.CommandCollection(0),Global.System.Data.SqlClient.SqlCommand)
+ If (pUSER_ID.HasValue = true) Then
+ command.Parameters(1).Value = CType(pUSER_ID.Value,Integer)
+ Else
+ command.Parameters(1).Value = Global.System.DBNull.Value
+ End If
+ Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
+ If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _
+ <> Global.System.Data.ConnectionState.Open) Then
+ command.Connection.Open
+ End If
+ Dim returnValue As Integer
+ Try
+ returnValue = command.ExecuteNonQuery
+ Finally
+ If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
+ command.Connection.Close
+ End If
+ End Try
+ Return returnValue
+ End Function
+ End Class
+
'''
'''TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
'''
diff --git a/DDUserManager/DDUserManager/UserDataSet.xsd b/DDUserManager/DDUserManager/UserDataSet.xsd
index 7a7b15b..f25d65e 100644
--- a/DDUserManager/DDUserManager/UserDataSet.xsd
+++ b/DDUserManager/DDUserManager/UserDataSet.xsd
@@ -2,7 +2,7 @@
-
+
@@ -1092,14 +1092,26 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
+
+
+
+ dbo.PRDD_DELETE_USER
+
+
+
+
+
+
+
+
-
+
@@ -1131,7 +1143,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1235,7 +1247,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1260,7 +1272,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1325,7 +1337,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1349,7 +1361,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1428,7 +1440,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1438,14 +1450,14 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
-
+
@@ -1477,7 +1489,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1509,7 +1521,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1550,7 +1562,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
+
@@ -1604,16 +1616,16 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DDUserManager/DDUserManager/UserDataSet.xss b/DDUserManager/DDUserManager/UserDataSet.xss
index dd279ea..a8478c2 100644
--- a/DDUserManager/DDUserManager/UserDataSet.xss
+++ b/DDUserManager/DDUserManager/UserDataSet.xss
@@ -4,23 +4,24 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
1322
@@ -32,7 +33,7 @@
-
+
304
@@ -48,7 +49,7 @@
-
+
606
@@ -60,7 +61,7 @@
-
+
606
@@ -72,7 +73,7 @@
-
+
306
@@ -84,7 +85,7 @@
-
+
1322
@@ -100,7 +101,7 @@
-
+
511
@@ -112,7 +113,7 @@
-
+
841
@@ -128,7 +129,7 @@
-
+
902
@@ -144,7 +145,7 @@
-
+
708
diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb
index bbf7a26..edfe078 100644
--- a/DDUserManager/DDUserManager/frmMain.Designer.vb
+++ b/DDUserManager/DDUserManager/frmMain.Designer.vb
@@ -355,6 +355,7 @@ Partial Class frmMain
Me.TBDD_GROUPSTableAdapter = New DDUserManager.DS_ChangeSTableAdapters.TBDD_GROUPSTableAdapter()
Me.TableAdapterManager1 = New DDUserManager.DS_ChangeSTableAdapters.TableAdapterManager()
Me.TBDD_GROUPS_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_GROUPS_USERTableAdapter()
+ Me.QueriesTableAdapter1 = New DDUserManager.UserDataSetTableAdapters.QueriesTableAdapter()
GUIDLabel = New System.Windows.Forms.Label()
PRENAMELabel = New System.Windows.Forms.Label()
NAMELabel = New System.Windows.Forms.Label()
@@ -2059,7 +2060,7 @@ Partial Class frmMain
Me.TBDD_USERBindingNavigator.BindingSource = Me.TBDD_USERBindingSource
Me.TBDD_USERBindingNavigator.CountItem = Me.BindingNavigatorCountItem
Me.TBDD_USERBindingNavigator.CountItemFormat = "von {0} Benutzern"
- Me.TBDD_USERBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem
+ Me.TBDD_USERBindingNavigator.DeleteItem = Nothing
Me.TBDD_USERBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBDD_USERBindingNavigatorSaveItem, Me.btnImportUsers, Me.ToolStripButton2})
Me.TBDD_USERBindingNavigator.Location = New System.Drawing.Point(0, 0)
Me.TBDD_USERBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem
@@ -4187,4 +4188,5 @@ Partial Class frmMain
Friend WithEvents GroupBox2 As GroupBox
Friend WithEvents btnDebugGroupQuery As Button
Friend WithEvents txtLDAPGroupQuery As TextBox
+ Friend WithEvents QueriesTableAdapter1 As UserDataSetTableAdapters.QueriesTableAdapter
End Class
diff --git a/DDUserManager/DDUserManager/frmMain.resx b/DDUserManager/DDUserManager/frmMain.resx
index b72d482..6313187 100644
--- a/DDUserManager/DDUserManager/frmMain.resx
+++ b/DDUserManager/DDUserManager/frmMain.resx
@@ -213,41 +213,14 @@
False
-
- 693, 17
-
-
- 17, 95
-
-
- 247, 95
-
-
- 909, 95
-
-
- 136, 17
-
-
- 469, 95
-
-
- 489, 56
-
-
- 911, 56
-
136, 17
17, 17
-
- 17, 17
-
- 469, 95
+ 642, 95
489, 56
@@ -256,13 +229,10 @@
911, 56
- 1026, 134
+ 17, 173
- 906, 134
-
-
- 906, 134
+ 1162, 134
693, 17
@@ -278,18 +248,6 @@
zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
rkJggg==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
- DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
- rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
- i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
- 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
- QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
- bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
@@ -330,6 +288,18 @@
kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+ DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+ rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+ i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+ 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+ QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
@@ -340,7 +310,7 @@
- 17, 95
+ 190, 95
@@ -433,7 +403,7 @@
- 247, 95
+ 420, 95
@@ -507,7 +477,7 @@
- 909, 95
+ 1082, 95
@@ -568,32 +538,35 @@
1116, 56
- 692, 95
+ 865, 95
- 1148, 95
-
-
17, 134
+
+ 273, 134
+
- 268, 134
+ 524, 134
- 385, 134
+ 641, 134
- 654, 134
+ 910, 134
- 1246, 134
+ 237, 173
- 17, 173
+ 445, 173
1152, 17
+
+ 17, 95
+
198
diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb
index 930f396..92711ec 100644
--- a/DDUserManager/DDUserManager/frmMain.vb
+++ b/DDUserManager/DDUserManager/frmMain.vb
@@ -1109,7 +1109,18 @@ Public Class frmMain
btnDebugGroupQuery.Enabled = True
End Sub
- Private Sub GroupBox2_Enter(sender As Object, e As EventArgs) Handles GroupBox2.Enter
+ Private Sub BindingNavigatorDeleteItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem.Click
+ Dim oUsername = USERNAMETextBox.Text
+ Dim oUserId As Integer = GUIDTextBox.Text
+ Dim oMessage = String.Format("Wollen sie den Benutzer {0} löschen?", oUsername)
+ If MessageBox.Show(oMessage, "Benutzer löschen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
+ If QueriesTableAdapter1.PRDD_DELETE_USER(oUserId) = -1 Then
+ MessageBox.Show("Fehler beim Löschen des Benutzers.", "Benutzer löschen", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+ Else
+ UpdateSavedLabel()
+ LoadData()
+ End If
+ End If
End Sub
End Class