From 954902b126fb58be41288126fe2ef37838cbc84f Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 4 Oct 2018 12:15:09 +0200 Subject: [PATCH] jj version 1.0.0.3: fix groups assigned users display --- .../DDUserManager/My Project/AssemblyInfo.vb | 2 +- DDUserManager/DDUserManager/frmMain.vb | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index 376bcb3..e97578c 100644 --- a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb +++ b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index d31cc8d..5dbf231 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -3,6 +3,7 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DDUserManager.UserDataSet Imports DDUserManager.DS_ChangeS Imports DD_LIB_Standards +Imports System.Reflection ''' ''' Anmerkungen: @@ -14,6 +15,7 @@ Public Class frmMain Private CurrentUser As TBDD_USERRow = Nothing Private CurrentUserId As Integer + Private CurrentVersion As String Private DragDropManager As ClassDragDrop = Nothing @@ -22,8 +24,10 @@ Public Class frmMain Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try NLog.LogManager.Configuration = ClassNLog.GetLoggerConfigFor(MODULE_NAME) + CurrentVersion = Assembly.GetEntryAssembly().GetName().Version.ToString() - logger.Info("Starting UserManager v" & Application.ProductVersion) + + logger.Info("Starting UserManager v" & CurrentVersion) logger.Info($"Current Username: {Environment.UserName}") If InitDatabase() = False Then @@ -75,7 +79,7 @@ Public Class frmMain End If tsLabelUser.Text = $"Angemeldeter Benutzer: {Environment.UserName}" - tsLabelVersion.Text = $"Version {Application.ProductVersion}" + tsLabelVersion.Text = $"Version {CurrentVersion}" lblADRootNode.Text = String.Format(lblADRootNode.Text, Environment.UserDomainName) txtADRootNode.Text = ActiveDirectoryRootNode @@ -393,11 +397,8 @@ Public Class frmMain Private Function GetAssignedUsersByGroupId(groupId As Integer) As TBDD_USERDataTable Try Dim dt As New TBDD_USERDataTable() - 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) + TBDD_USERTableAdapter.FillByGroupId(dt, groupId) + Return dt Catch ex As Exception ShowErrorMessage($"Error in GetAssignedUsersByGroupId with groupId {groupId}", ex)