AppStd/UserManager
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stage

Browse Source
This commit is contained in:
SchreiberM
2022-10-04 10:31:29 +02:00
parent 2aac5ae3ad f931beccbc
commit c61d205959
5 changed files with 115 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DDUserManager/DDUserManager/My Project/AssemblyInfo.vb
View File

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

95
DDUserManager/DDUserManager/UserDataSet.Designer.vb generated
View File

@@ -10951,12 +10951,13 @@ Namespace UserDataSetTableAdapters
Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
Me._adapter.InsertCommand.Connection = Me.Connection
Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PRENAME, NAME, USERNAME, SHORTNA"& _
"ME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PRENAME,@"& _
"NAME,@USERNAME,@SHORTNAME,@EMAIL,@LANGUAGE,@COMMENT,@DATE_FORMAT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _
"SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_"& _
"FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (G"& _
"UID = SCOPE_IDENTITY())"
Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_USER" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " (PRENAME, NAME, USERNAME, SHORTNA" &
"ME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VALUES (@PRENAME,@" &
"NAME,@USERNAME,@SHORTNAME,@EMAIL,@LANGUAGE,@COMMENT,@DATE_FORMAT,@ADDED_WHO); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) &
"SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER" &
", COMMENT, WAN_ENVIRONMENT, " &
"USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHA" &
"NGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())"
Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -10969,12 +10970,14 @@ Namespace UserDataSetTableAdapters
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
Me._adapter.UpdateCommand.Connection = Me.Connection
Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PRENAME = @PRENAME, NAME = @NAME, USER"& _
"NAME = @USERNAME, SHORTNAME = @SHORTNAME, EMAIL = @EMAIL, LANGUAGE = @LANGUAGE, "& _
"COMMENT = @COMMENT, DATE_FORMAT = @DATE_FORMAT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANG"& _
"ED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PREN"& _
"AME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO"& _
", ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID)"
Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_USER" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SET PRENAME = @PRENAME, NAME = @NAME, USER" &
"NAME = @USERNAME, SHORTNAME = @SHORTNAME, EMAIL = @EMAIL, LANGUAGE = @LANGUAGE, " &
"COMMENT = @COMMENT, DATE_FORMAT = @DATE_FORMAT, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " CHANG" &
"ED_WHO = @CHANGED_WHO" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, PREN" &
"AME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_EN" &
"VIRONMENT, " &
"USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED" &
"_WHEN FROM TBDD_USER WHERE (GUID = @GUID)"
Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -11008,57 +11011,69 @@ Namespace UserDataSetTableAdapters
Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(1).Connection = Me.Connection
Me._commandCollection(1).CommandText = "SELECT T1.ADDED_WHEN, T1.ADDED_WHO, T1.CHANGED_WHEN, T1.CHANGED_WHO, T1.COMMENT, "& _
"T1.DATE_FORMAT, T1.EMAIL, T1.GUID, T1.LANGUAGE, T1.NAME, T1.PRENAME, T1.SHORTNAM"& _
"E, T1.USERNAME FROM TBDD_USER AS T1 INNER JOIN TBDD_CLIENT_USER AS T2 ON T1.GUID"& _
" = T2.USER_ID WHERE (T2.CLIENT_ID = @CLIENT_ID)"
Me._commandCollection(1).CommandText = "SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, "& _
"T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED"& _
"_WHO, T1.CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_USER AS T1 INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _
" TBDD_CLIENT_USER AS T2 ON T1.GUID = T2.USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (T2.CLI"& _
"ENT_ID = @CLIENT_ID)"
Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CLIENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CLIENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(2).Connection = Me.Connection
Me._commandCollection(2).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COMMENT, DATE_FORMAT, EM"& _
"AIL, GUID, LANGUAGE, NAME, PRENAME, SHORTNAME, USERNAME FROM TBDD_USER WHERE (GU"& _
"ID NOT IN (SELECT DISTINCT T.GUID FROM TBDD_USER AS T INNER JOIN TBDD_CLIENT_USE"& _
"R AS T1 ON T.GUID = T1.USER_ID WHERE (T1.CLIENT_ID = @CLIENT_ID)))"
Me._commandCollection(2).CommandText = "SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT,"& _
" DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _
"TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT DISTI"& _
"NCT T.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" FROM TBDD_USER AS T INNER "& _
"JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_CLIENT_USER "& _
"AS T1 ON T.GUID = T1.USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (T1.CL"& _
"IENT_ID = @CLIENT_ID)))"
Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CLIENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(3).Connection = Me.Connection
Me._commandCollection(3).CommandText = "SELECT T1.ADDED_WHEN, T1.ADDED_WHO, T1.CHANGED_WHEN, T1.CHANGED_WHO, T1.COMMENT, "& _
"T1.DATE_FORMAT, T1.EMAIL, T1.GUID, T1.LANGUAGE, T1.NAME, T1.PRENAME, T1.SHORTNAM"& _
"E, T1.USERNAME FROM TBDD_USER AS T1 INNER JOIN TBDD_GROUPS_USER AS T2 ON T1.GUID"& _
" = T2.USER_ID WHERE (T2.GROUP_ID = @GROUP_ID)"
Me._commandCollection(3).CommandText = "SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, "& _
"T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED"& _
"_WHO, T1.CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_USER AS T1 INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _
" TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (T2.GRO"& _
"UP_ID = @GROUP_ID)"
Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GROUP_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GROUP_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(4) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(4).Connection = Me.Connection
Me._commandCollection(4).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COMMENT, DATE_FORMAT, EM"& _
"AIL, GUID, LANGUAGE, NAME, PRENAME, SHORTNAME, USERNAME FROM TBDD_USER WHERE (GU"& _
"ID NOT IN (SELECT DISTINCT T.GUID FROM TBDD_USER AS T INNER JOIN TBDD_GROUPS_USE"& _
"R AS T1 ON T.GUID = T1.USER_ID WHERE (T1.GROUP_ID = @GROUP_ID)))"
Me._commandCollection(4).CommandText = "SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT,"& _
" DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _
"TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT DISTI"& _
"NCT T.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" FROM TBDD_USER AS T INNER "& _
"JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_GROUPS_USER "& _
"AS T1 ON T.GUID = T1.USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (T1.GR"& _
"OUP_ID = @GROUP_ID)))"
Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GROUP_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(5) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(5).Connection = Me.Connection
Me._commandCollection(5).CommandText = "SELECT T1.ADDED_WHEN, T1.ADDED_WHO, T1.CHANGED_WHEN, T1.CHANGED_WHO, T1.COMMENT, "& _
"T1.DATE_FORMAT, T1.EMAIL, T1.GUID, T1.LANGUAGE, T1.NAME, T1.PRENAME, T1.SHORTNAM"& _
"E, T1.USERNAME FROM TBDD_USER AS T1 INNER JOIN TBDD_USER_MODULES AS T2 ON T1.GUI"& _
"D = T2.USER_ID WHERE (T2.MODULE_ID = @MODULE_ID)"
Me._commandCollection(5).CommandText = "SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, "& _
"T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED"& _
"_WHO, T1.CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_USER AS T1 INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _
" TBDD_USER_MODULES AS T2 ON T1.GUID = T2.USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (T2.MO"& _
"DULE_ID = @MODULE_ID)"
Me._commandCollection(5).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(5).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MODULE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "MODULE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(6) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(6).Connection = Me.Connection
Me._commandCollection(6).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COMMENT, DATE_FORMAT, EM"& _
"AIL, GUID, LANGUAGE, NAME, PRENAME, SHORTNAME, USERNAME FROM TBDD_USER WHERE (GU"& _
"ID NOT IN (SELECT DISTINCT T.GUID FROM TBDD_USER AS T INNER JOIN TBDD_USER_MODUL"& _
"ES AS T1 ON T.GUID = T1.USER_ID WHERE (T1.MODULE_ID = @MODULE_ID)))"
Me._commandCollection(6).CommandText = "SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT,"& _
" DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _
"TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT DISTI"& _
"NCT T.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" FROM TBDD_USER AS T INNER "& _
"JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_USER_MODULES"& _
" AS T1 ON T.GUID = T1.USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (T1.M"& _
"ODULE_ID = @MODULE_ID)))"
Me._commandCollection(6).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(6).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MODULE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(7) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(7).Connection = Me.Connection
Me._commandCollection(7).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COMMENT, DATE_FORMAT, EM"& _
"AIL, GUID, LANGUAGE, NAME, PRENAME, SHORTNAME, USERNAME FROM TBDD_USER WHERE (US"& _
"ERNAME = @USERNAME)"
Me._commandCollection(7).CommandText = "SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT,"& _
" DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _
"TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (USERNAME = @USERNAME)"
Me._commandCollection(7).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(8) = New Global.System.Data.SqlClient.SqlCommand()
@@ -12658,7 +12673,7 @@ Namespace UserDataSetTableAdapters
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _
Private Sub InitConnection()
Me._connection = New Global.System.Data.SqlClient.SqlConnection()
Me._connection.ConnectionString = Global.DDUserManager.My.MySettings.Default.DD_ECMConnectionString
Me._connection.ConnectionString = Global.DDUserManager.My.MySettings.Default.DD_ECM_TESTConnectionString
End Sub
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _

12
DDUserManager/DDUserManager/frmADImport_Users.Designer.vb generated
View File

@@ -37,6 +37,7 @@ Partial Class frmADImport_Users
Me.colEMAIL = New DevExpress.XtraGrid.Columns.GridColumn()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.btnImport = New System.Windows.Forms.Button()
Me.colGroupName = New DevExpress.XtraGrid.Columns.GridColumn()
CType(Me.gridAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.gridAD_Users, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -58,6 +59,7 @@ Partial Class frmADImport_Users
'
'viewAD_Groups
'
Me.viewAD_Groups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGroupName})
Me.viewAD_Groups.GridControl = Me.gridAD_Groups
Me.viewAD_Groups.Name = "viewAD_Groups"
Me.viewAD_Groups.OptionsBehavior.Editable = False
@@ -164,6 +166,15 @@ Partial Class frmADImport_Users
Me.btnImport.Text = "Import starten"
Me.btnImport.UseVisualStyleBackColor = True
'
'colGroupName
'
Me.colGroupName.Caption = "Gruppe"
Me.colGroupName.FieldName = "Name"
Me.colGroupName.Name = "colGroupName"
Me.colGroupName.UnboundType = DevExpress.Data.UnboundColumnType.[String]
Me.colGroupName.Visible = True
Me.colGroupName.VisibleIndex = 0
'
'frmADImport_Users
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -199,4 +210,5 @@ Partial Class frmADImport_Users
Friend WithEvents colSELECTED As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents btnImport As Button
Friend WithEvents Panel1 As Panel
Friend WithEvents colGroupName As DevExpress.XtraGrid.Columns.GridColumn
End Class

20
DDUserManager/DDUserManager/frmADImport_Users.vb
View File

@@ -18,7 +18,8 @@ Public Class frmADImport_Users
Dim oGroups = activeDirectory.ListGroups(MyConfig.Config.AdGroupFilter)
gridAD_Groups.DataSource = oGroups.Select(Function(g) g.SAMAccountName)
'gridAD_Groups.DataSource = oGroups.Select(Function(g) g.SAMAccountName)
gridAD_Groups.DataSource = oGroups
viewAD_Groups.Columns.Item(0).Caption = "Gruppe"
Catch ex As Exception
logger.Error(ex, $"Error while loading initial groups")
@@ -27,10 +28,18 @@ Public Class frmADImport_Users
End Sub
Private Sub gridADGroups_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles viewAD_Groups.FocusedRowChanged
Dim groupName As String = viewAD_Groups.GetRow(e.FocusedRowHandle)
Dim oGroup As ADGroup = Nothing
Try
Dim oUsers = activeDirectory.ListUsers(groupName, MyConfig.Config.AdUserFilter)
oGroup = viewAD_Groups.GetRow(e.FocusedRowHandle)
Catch ex As Exception
logger.Error(ex, $"Error while loading focused group")
MsgBox($"Error while loading focused group", MsgBoxStyle.Critical, Text)
End Try
If Not IsNothing(oGroup) Then
Try
Dim oUsers = activeDirectory.ListUsers(oGroup.Name, MyConfig.Config.AdUserFilter)
UserDataSet.TBLOCAL_ADUSERS.Clear()
@@ -47,9 +56,10 @@ Public Class frmADImport_Users
TBLOCAL_ADUSERSBindingSource.DataSource = UserDataSet.TBLOCAL_ADUSERS
Catch ex As Exception
logger.Error(ex, $"Error while loading users for group {groupName}")
MsgBox($"Error while loading users for group {groupName}")
logger.Error(ex, $"Error while loading users for group {oGroup.Name}")
MsgBox($"Error while loading users for group {oGroup.Name}")
End Try
End If
End Sub
Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click

28
DDUserManager/DDUserManager/frmMain.vb
View File

@@ -41,6 +41,7 @@ Public Class frmMain
MyLogger.Info("Starting UserManager v" & CurrentVersion)
MyLogger.Info($"Current Username: {Environment.UserName}")
MyLogConfig.Debug = Not MyConfig.Config.LogErrorsOnly
If MyConnectionString = "" Then
frmConfigDatabase.ShowDialog()
@@ -1094,12 +1095,14 @@ Public Class frmMain
Dim oActiveDirectory As New ActiveDirectoryInterface(MyLogConfig, ldapPAth)
If oActiveDirectory.Authenticate() Then
MsgBox("Verbindung erfolgreich aufgebaut!", MsgBoxStyle.Information)
MsgBox("Verbindung erfolgreich aufgebaut!", MsgBoxStyle.Information, Text)
MyConfig.Config.AdRootPath = txtADRootNode.Text
MyConfig.Save()
MyLogger.Info($"New ActiveDirectory Path saved: {txtADRootNode.Text}")
Else
MsgBox("Verbindung konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Eingabe!", MsgBoxStyle.Critical, Text)
End If
End Sub
@@ -1114,12 +1117,11 @@ Public Class frmMain
Dim oActiveDirectory As New ActiveDirectoryInterface(MyLogConfig, MyConfig.Config.AdRootPath)
Await Task.Run(Sub()
Dim oAuth = oActiveDirectory.Authenticate()
Dim groups = oActiveDirectory.ListGroups(MyConfig.Config.AdGroupFilter)
Dim frm As New frmADDebug_Groups()
frm.DebugData = groups
frm.ShowDialog()
End Sub)
btnDebugGroupQuery.Text = "Abfrage starten"
@@ -1144,6 +1146,8 @@ Public Class frmMain
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click, Button4.Click
MyConfig.Config.AdUserFilter = txtLDAPUserQuery.Text
MyConfig.Config.AdGroupFilter = txtLDAPGroupQuery.Text
MyConfig.Save()
End Sub
@@ -1156,16 +1160,18 @@ Public Class frmMain
End Sub
Private Sub BindingNavigatorDeleteItem1_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem1.Click
If MessageBox.Show("Wollen Sie die ausgewählte Gruppe löschen? Bestehende Benutzer-Zuordnungen werden entfernt", Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
Try
Validate()
TBDD_GROUPSBindingSource1.EndEdit()
TBDD_GROUPSTableAdapter.Delete(GUIDTextBox1.Text)
Dim oGroupId = GUIDTextBox1.Text
Dim oGroupName = NAMETextBox1.Text
Dim oMessage = String.Format("Wollen sie die Gruppe {0} löschen?", oGroupName)
If MessageBox.Show(oMessage, "Gruppe löschen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
Dim osql = $"EXEC PRDD_DELETE_GROUP {oGroupId}"
If MyDatabase.GetScalarValue(osql) = -1 Then
MessageBox.Show("Fehler beim Löschen der Gruppe.", "Gruppe löschen", MessageBoxButtons.OK, MessageBoxIcon.Warning)
Else
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage($"Error while deleting group", ex)
End Try
LoadData()
End If
End If
End Sub
End Class