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

MS

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber 2018-10-01 16:24:32 +02:00
parent f87bc98be7
commit e9f3211de1
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DDUserManager/DDUserManager/frmADImport_Users.vb
View File

@ -28,10 +28,10 @@ Public Class frmADImport_Users
For Each user As UserPrincipal In usersForGroup
Dim row As TBLOCAL_ADUSERSRow = UserDataSet.TBLOCAL_ADUSERS.NewTBLOCAL_ADUSERSRow()
row.NAME = user.Surname
row.PRENAME = user.GivenName
row.USERNAME = user.SamAccountName
row.EMAIL = user.EmailAddress
row.NAME = IIf((IsDBNull(user.Surname) Or IsNothing(user.Surname)), "", user.Surname)
row.PRENAME = IIf((IsDBNull(user.GivenName) Or IsNothing(user.GivenName)), "", user.GivenName)
row.USERNAME = IIf((IsDBNull(user.SamAccountName) Or IsNothing(user.SamAccountName)), "", user.SamAccountName)
row.EMAIL = IIf((IsDBNull(user.EmailAddress) Or IsNothing(user.EmailAddress)), "", user.EmailAddress)
UserDataSet.TBLOCAL_ADUSERS.AddTBLOCAL_ADUSERSRow(row)
Next
@ -52,9 +52,9 @@ Public Class frmADImport_Users
Dim userRow As TBLOCAL_ADUSERSRow = rowView.Row
Dim Username As String = userRow.USERNAME
Dim Prename As String = IIf(IsDBNull(userRow.PRENAME), Nothing, userRow.PRENAME)
Dim Name As String = IIf(IsDBNull(userRow.NAME), Nothing, userRow.NAME)
Dim Email As String = IIf(IsDBNull(userRow.EMAIL), Nothing, userRow.EMAIL)
Dim Prename As String = userRow.PRENAME
Dim Name As String = userRow.NAME
Dim Email As String = userRow.EMAIL
If Not ClassData.UserExists(Username) Then

7
DDUserManager/DDUserManager/frmMain.vb
View File

@ -351,8 +351,11 @@ Public Class frmMain
Private Function GetAssignedUsersByGroupId(groupId As Integer) As TBDD_USERDataTable
Try
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByGroupId(dt, groupId)
Dim sql = String.Format("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 " &
"FROM TBDD_USER AS T1 INNER JOIN " &
" TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID " &
"WHERE (T2.GROUP_ID = {0})", groupId)
clsDatabase.Return_Datatable(sql)
Return dt
Catch ex As Exception
ShowErrorMessage($"Error in GetAssignedUsersByGroupId with groupId {groupId}", ex)