From 744a68c8d9cc2892de50224de89c6df2f5555541 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 6 Nov 2019 09:54:43 +0100 Subject: [PATCH 01/16] jj --- .../DDUserManager/ClassActiveDirectory.vb | 51 ++++++++++++------- .../DDUserManager/frmADImport_Groups.vb | 2 + 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/DDUserManager/DDUserManager/ClassActiveDirectory.vb b/DDUserManager/DDUserManager/ClassActiveDirectory.vb index c40d721..8138932 100644 --- a/DDUserManager/DDUserManager/ClassActiveDirectory.vb +++ b/DDUserManager/DDUserManager/ClassActiveDirectory.vb @@ -149,26 +149,41 @@ Public Class ClassActiveDirectory objectCategory = "" End Try - If Not String.IsNullOrEmpty(groupName) Then - Dim isExcluded = excludedGroupNames.Where(Function(excludedGroup) - Return (groupName.Contains(excludedGroup) Or groupName.StartsWith(excludedGroup)) - End Function).Any() - - If Not isExcluded Then - groups.Add(New GroupResult() With { - .SAMAccountName = groupName, - .CN = cn, - .Description = description, - .DistinguishedName = distinguishedName, - .Name = name, - .ObjectCategory = objectCategory, - .ObjectClass = objectClass - }) - End If - End If + 'If Not String.IsNullOrEmpty(groupName) Then + ' Dim isExcluded = excludedGroupNames.Where(Function(excludedGroup) + ' Return (groupName.Contains(excludedGroup) Or groupName.StartsWith(excludedGroup)) + ' End Function).Any() + + ' If Not isExcluded Then + ' groups.Add(New GroupResult() With { + ' .SAMAccountName = groupName, + ' .CN = cn, + ' .Description = description, + ' .DistinguishedName = distinguishedName, + ' .Name = name, + ' .ObjectCategory = objectCategory, + ' .ObjectClass = objectClass + ' }) + ' End If + 'End If + + logger.Info("Adding Group '{0}'", groupName) + + 'If Not String.IsNullOrEmpty(groupName) Then + groups.Add(New GroupResult() With { + .SAMAccountName = groupName, + .CN = cn, + .Description = description, + .DistinguishedName = distinguishedName, + .Name = name, + .ObjectCategory = objectCategory, + .ObjectClass = objectClass + }) + 'End If + Catch ex As Exception - 'MsgBox("Error while fetching Active Directory groups", MsgBoxStyle.Critical) logger.Error(ex) + Continue For End Try Next diff --git a/DDUserManager/DDUserManager/frmADImport_Groups.vb b/DDUserManager/DDUserManager/frmADImport_Groups.vb index 118161b..ae6f600 100644 --- a/DDUserManager/DDUserManager/frmADImport_Groups.vb +++ b/DDUserManager/DDUserManager/frmADImport_Groups.vb @@ -7,6 +7,8 @@ Public Class frmADImport_Groups Try Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(My.Settings.AD_GROUP_QUERY) + logger.Info("Found {0} groups", groups.Count) + UserDataSet.TBLOCAL_ADGROUPS.Clear() For Each group As ClassActiveDirectory.GroupResult In groups From 707caaac02ca5e337c57e7662e927f69fd9372c9 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 6 Nov 2019 09:57:34 +0100 Subject: [PATCH 02/16] version 1.0.0.4 --- DDUserManager/DDUserManager/My Project/AssemblyInfo.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index e97578c..6761f1d 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: ' - + From e9bb4b309f2d61779bef4a6e23fe210dcfd426d8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 6 Nov 2019 10:00:15 +0100 Subject: [PATCH 03/16] fix installer --- DDUserManager/SetupWix/Product.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DDUserManager/SetupWix/Product.wxs b/DDUserManager/SetupWix/Product.wxs index c4e01db..d3f79d7 100644 --- a/DDUserManager/SetupWix/Product.wxs +++ b/DDUserManager/SetupWix/Product.wxs @@ -80,7 +80,7 @@ - + From c6f839bef843999829447f5c935b287dd7da6e0d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 6 Nov 2019 10:00:32 +0100 Subject: [PATCH 04/16] fix settings loading --- DDUserManager/DDUserManager/ModuleRuntime.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DDUserManager/DDUserManager/ModuleRuntime.vb b/DDUserManager/DDUserManager/ModuleRuntime.vb index 22e868d..220705e 100644 --- a/DDUserManager/DDUserManager/ModuleRuntime.vb +++ b/DDUserManager/DDUserManager/ModuleRuntime.vb @@ -9,12 +9,12 @@ Module ModuleRuntime Public Function SaveMySettingsValue(name As String, value As String, type As String) Try - Dim DT As DataTable + Dim DT As DataTable = Nothing If type = "ConfigMain" Then DT = GetTablefromXML(ConfigPath) End If - If Not DT Is Nothing Then + If Not IsNothing(DT) Then For Each Row As DataRow In DT.Rows If Row.Item("ConfigName") = name Then Row.Item("Value") = value @@ -34,7 +34,7 @@ Module ModuleRuntime End Function - Private Function GetTablefromXML(path As String) + Private Function GetTablefromXML(path As String) As DataTable Try Dim DS As New DataSet DS.ReadXml(path) From 4f77749c9a767c660689782bfc0d1092958199d4 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Nov 2019 10:56:54 +0100 Subject: [PATCH 05/16] clean up, add config module, use logger module, use database module --- DDUserManager/DDUserManager/App.config | 16 +- DDUserManager/DDUserManager/ClassData.vb | 37 ++-- .../DDUserManager/DDUserManager.vbproj | 21 ++- DDUserManager/DDUserManager/ModuleRuntime.vb | 161 +----------------- DDUserManager/DDUserManager/UserConfig.vb | 11 ++ .../DDUserManager/frmADImport_Groups.vb | 11 +- .../DDUserManager/frmADImport_Users.vb | 17 +- .../DDUserManager/frmConfigDatabase.vb | 19 ++- .../DDUserManager/frmMain.Designer.vb | 66 ++++++- DDUserManager/DDUserManager/frmMain.vb | 131 ++++++++------ 10 files changed, 237 insertions(+), 253 deletions(-) create mode 100644 DDUserManager/DDUserManager/UserConfig.vb diff --git a/DDUserManager/DDUserManager/App.config b/DDUserManager/DDUserManager/App.config index 8005d0b..1b93a2f 100644 --- a/DDUserManager/DDUserManager/App.config +++ b/DDUserManager/DDUserManager/App.config @@ -1,25 +1,23 @@ - -
+ +
- -
+ +
- + - + - + diff --git a/DDUserManager/DDUserManager/ClassData.vb b/DDUserManager/DDUserManager/ClassData.vb index 1e9222d..3f2df71 100644 --- a/DDUserManager/DDUserManager/ClassData.vb +++ b/DDUserManager/DDUserManager/ClassData.vb @@ -1,67 +1,72 @@ -Imports DD_LIB_Standards +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging Public Class ClassData - Public Sub New() + Private _logger As Logger + Private _database As MSSQLServer + Public Sub New(LogConfig As LogConfig, Database As MSSQLServer) + _logger = LogConfig.GetLogger() + _database = Database End Sub - Private Shared Function IntToBool(int As Integer) As Boolean + Private Function IntToBool(int As Integer) As Boolean Return int >= 1 End Function - Private Shared Function BoolToInt(bool As Boolean) As Integer + Private Function BoolToInt(bool As Boolean) As Integer Return IIf(bool, 1, 0) End Function - Public Shared Function GroupExists(groupName As String) As Boolean + Public Function GroupExists(groupName As String) As Boolean Try Dim sql As String = $"SELECT COUNT(GUID) FROM TBDD_GROUPS WHERE NAME = '{groupName}'" - Dim result = clsDatabase.Execute_Scalar(sql) + Dim result = _database.GetScalarValue(sql) Return IntToBool(result) Catch ex As Exception - clsLogger.Add($"Error in GroupExists: {ex.Message}") + _logger.Error($"Error in GroupExists: {ex.Message}") Return Nothing End Try End Function - Public Shared Function UserExists(userName As String) As Boolean + Public Function UserExists(userName As String) As Boolean Try Dim sql As String = $"SELECT COUNT(GUID) FROM TBDD_USER WHERE USERNAME = '{userName}'" - Dim result = clsDatabase.Execute_Scalar(sql) + Dim result = _database.GetScalarValue(sql) Return IntToBool(result) Catch ex As Exception - clsLogger.Add($"Error in UserExists: {ex.Message}") + _logger.Error($"Error in UserExists: {ex.Message}") Return Nothing End Try End Function - Public Shared Function InsertUser(username As String, prename As String, name As String, email As String) + Public Function InsertUser(username As String, prename As String, name As String, email As String) Try Dim addedWho As String = Environment.UserName Dim sql As String = $"INSERT INTO TBDD_USER (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO) VALUES ('{prename}','{name}','{username}','{email}','{addedWho}')" - Dim result = clsDatabase.Execute_non_Query(sql) + Dim result = _database.ExecuteNonQuery(sql) Return True Catch ex As Exception - clsLogger.Add($"Error in InsertUser: {ex.Message}") + _logger.Error(ex) Return False End Try End Function - Public Shared Function InsertGroup(name As String, Optional ECM_FK_ID As Integer = 1, Optional adSync As Boolean = True, Optional internal As Boolean = False, Optional active As Boolean = True) + Public Function InsertGroup(name As String, Optional ECM_FK_ID As Integer = 1, Optional adSync As Boolean = True, Optional internal As Boolean = False, Optional active As Boolean = True) Try Dim addedWho As String = Environment.UserName Dim sql As String = $"INSERT INTO TBDD_GROUPS (NAME, ADDED_WHO, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE) VALUES ('{name}', '{addedWho}', {ECM_FK_ID}, {BoolToInt(adSync)}, {BoolToInt(internal)}, {BoolToInt(active)} )" - Dim result = clsDatabase.Execute_non_Query(sql) + Dim result = _database.ExecuteNonQuery(sql) Return True Catch ex As Exception - clsLogger.Add($"Error in InsertGroup: {ex.Message}") + _logger.Error(ex) Return False End Try End Function diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj b/DDUserManager/DDUserManager/DDUserManager.vbproj index 07125f3..c4fbbd6 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj @@ -11,7 +11,7 @@ DDUserManager 512 WindowsForms - v4.5.2 + v4.6.1 true @@ -51,9 +51,6 @@ user.ico - - P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll - @@ -62,6 +59,21 @@ + + ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll + + + ..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll + + + ..\..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll + + + ..\..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + + + ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll + P:\Visual Studio Projekte\Bibliotheken\NLog\NLog.dll @@ -152,6 +164,7 @@ Settings.settings True + True True diff --git a/DDUserManager/DDUserManager/ModuleRuntime.vb b/DDUserManager/DDUserManager/ModuleRuntime.vb index 220705e..fe0d018 100644 --- a/DDUserManager/DDUserManager/ModuleRuntime.vb +++ b/DDUserManager/DDUserManager/ModuleRuntime.vb @@ -1,160 +1,17 @@ Imports System.IO -Imports DD_LIB_Standards +Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Filesystem +Imports DigitalData.Modules.Logging Module ModuleRuntime Public MyConnectionString As String + Public MyDatabase As MSSQLServer + Public MyLogConfig As LogConfig + Public MyLogger As Logger + Public MyConfig As ConfigManager(Of UserConfig) + Public LogErrorsOnly As Boolean = True Public ConfigPath As String = Path.Combine(Application.UserAppDataPath, "UserConfig.xml") Public ActiveDirectoryRootNode As String = $"LDAP://{Environment.UserDomainName}" - - Public Function SaveMySettingsValue(name As String, value As String, type As String) - Try - Dim DT As DataTable = Nothing - If type = "ConfigMain" Then - DT = GetTablefromXML(ConfigPath) - End If - - If Not IsNothing(DT) Then - For Each Row As DataRow In DT.Rows - If Row.Item("ConfigName") = name Then - Row.Item("Value") = value - End If - Next - DT.AcceptChanges() - DT.WriteXml(ConfigPath) - Else - MsgBox("Setting could not be saved! Check logfile.", MsgBoxStyle.Critical) - End If - - Catch ex As Exception - MsgBox("Error in SaveConfigValue" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - Return False - End Try - Return True - - End Function - - Private Function GetTablefromXML(path As String) As DataTable - Try - Dim DS As New DataSet - DS.ReadXml(path) - Return DS.Tables(0) - Catch ex As Exception - MsgBox("Error in GetTablefromXML" & vbNewLine & ex.Message & vbNewLine & "ConfigPath: " & vbNewLine & path, MsgBoxStyle.Critical) - clsLogger.Add("Error in GetTablefromXML: " & ex.Message, True) - clsLogger.Add(">> ConfigPath: " & ConfigPath, False) - Return Nothing - End Try - End Function - - Public Function MySettings_Load() - Try - Dim DT As DataTable - 'if file doesn't exist, create the file with its default xml table - If Not File.Exists(ConfigPath) Then - clsLogger.Add(">> ConfigFile was created in: " & ConfigPath, False) - DT = CreateConfigTable() - DT.WriteXml(ConfigPath) - clsLogger.Add(">> Defaultvalues were saved.", False) - End If - DT = GetTablefromXML(ConfigPath) - If DT Is Nothing Then - MsgBox("Configuration could not be loaded!! Check LogFile!", MsgBoxStyle.Critical) - Return False - End If - For Each Row As DataRow In DT.Rows - Select Case Row.Item("ConfigName") - Case "MyConnectionString" - Dim connstring As String - 'Den ConnectonString mit verschlüsseltem PW laden - Dim csb As New SqlClient.SqlConnectionStringBuilder - csb.ConnectionString = Row.Item("Value") - If Not csb.ConnectionString = "" Then - If csb.ConnectionString.Contains("Password=") Then - 'sa- - 'Jetzt das Passwort entschlüsseln - Dim PWplainText As String - Dim wrapper As New clsEncryption("!35452didalog=") - ' DecryptData throws if the wrong password is used. - Try - PWplainText = wrapper.DecryptData(csb.Password) - connstring = Row.Item("Value").ToString.Replace(csb.Password, PWplainText) - Catch ex As Exception - clsLogger.Add("- the Password '" & csb.Password & "' could not be decrypted", False) - connstring = "" - End Try - - Else - 'Windows-Auth - connstring = Row.Item("Value").ToString - End If - - MyConnectionString = connstring - Else - MyConnectionString = "" - End If - Case "LogErrorsOnly" - LogErrorsOnly = CBool(Row.Item("Value")) - Case "ActiveDirectoryRootNode" - Dim rootNode As String = Row.Item("Value") - - If rootNode <> String.Empty Then - ActiveDirectoryRootNode = rootNode - End If - End Select - Next - - Catch ex As Exception - MsgBox("Error in LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - clsLogger.Add("Error in LoadMyConfig: " & ex.Message, True) - Return False - End Try - Return True - - End Function - - Private Function CreateConfigTable() As DataTable - Try - ' Create sample Customers table, in order - ' to demonstrate the behavior of the DataTableReader. - Dim table As New DataTable - table.TableName = "MyConfig" - - ' Create two columns, ID and Name. - Dim idColumn As DataColumn = table.Columns.Add("ID", - GetType(System.Int32)) - - idColumn.AutoIncrement = True - idColumn.AutoIncrementSeed = 0 - idColumn.AutoIncrementStep = 1 - table.Columns.Add("ConfigName", GetType(System.String)) - table.Columns.Add("Value", GetType(System.String)) - 'Set the ID column as the primary key column. - table.PrimaryKey = New DataColumn() {idColumn} - - Dim newRow As DataRow - - newRow = table.NewRow() - newRow.Item("ConfigName") = "MyConnectionString" - newRow.Item("Value") = "" - table.Rows.Add(newRow) - - newRow = table.NewRow() - newRow.Item("ConfigName") = "LogErrorsOnly" - newRow.Item("Value") = "True" - table.Rows.Add(newRow) - - newRow = table.NewRow() - newRow.Item("ConfigName") = "ActiveDirectoryRootNode" - newRow.Item("Value") = "" - table.Rows.Add(newRow) - - table.AcceptChanges() - clsLogger.Add(">> CreateConfigTable su...", False) - Return table - Catch ex As Exception - MsgBox("Error in CreateConfigTable" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - Return Nothing - End Try - End Function End Module diff --git a/DDUserManager/DDUserManager/UserConfig.vb b/DDUserManager/DDUserManager/UserConfig.vb new file mode 100644 index 0000000..0253d7e --- /dev/null +++ b/DDUserManager/DDUserManager/UserConfig.vb @@ -0,0 +1,11 @@ +Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Filesystem + +Public Class UserConfig + + Public Property ConnectionString As String = "" + Public Property LogErrorsOnly As Boolean = True + Public Property AdGroupFilter As String = "(&(objectClass=group) (samAccountName=*))" + Public Property AdUserFilter As String = "" + Public Property ActiveDirectoryRootNode As String = $"LDAP://{Environment.UserDomainName}" +End Class diff --git a/DDUserManager/DDUserManager/frmADImport_Groups.vb b/DDUserManager/DDUserManager/frmADImport_Groups.vb index ae6f600..18a5eac 100644 --- a/DDUserManager/DDUserManager/frmADImport_Groups.vb +++ b/DDUserManager/DDUserManager/frmADImport_Groups.vb @@ -1,10 +1,15 @@ Imports DevExpress.XtraGrid.Views.Grid +Imports DigitalData.Modules.Logging Public Class frmADImport_Groups - Private Shared logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() + Private logger As Logger + Private data As ClassData Private Sub frmADImport_Groups_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try + logger = MyLogConfig.GetLogger() + data = New ClassData(MyLogConfig, MyDatabase) + Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(My.Settings.AD_GROUP_QUERY) logger.Info("Found {0} groups", groups.Count) @@ -36,8 +41,8 @@ Public Class frmADImport_Groups Dim internal As Boolean = False Dim sync As Boolean = True - If Not ClassData.GroupExists(groupRow.GROUPNAME) Then - ClassData.InsertGroup(groupRow.GROUPNAME) + If Not data.GroupExists(groupRow.GROUPNAME) Then + data.InsertGroup(groupRow.GROUPNAME) importedGroups = importedGroups + 1 End If Next diff --git a/DDUserManager/DDUserManager/frmADImport_Users.vb b/DDUserManager/DDUserManager/frmADImport_Users.vb index 94408a5..d425640 100644 --- a/DDUserManager/DDUserManager/frmADImport_Users.vb +++ b/DDUserManager/DDUserManager/frmADImport_Users.vb @@ -1,15 +1,18 @@ -Imports System.DirectoryServices -Imports System.DirectoryServices.AccountManagement -Imports DDUserManager.UserDataSet +Imports DDUserManager.UserDataSet Imports DevExpress.XtraGrid.Views.Grid -Imports DD_LIB_Standards +Imports DigitalData.Modules.Logging Public Class frmADImport_Users - Private Shared logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() + Private logger As Logger + Private data As ClassData + Private Sub frmADImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try + logger = MyLogConfig.GetLogger() + data = New ClassData(MyLogConfig, MyDatabase) + Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(My.Settings.AD_GROUP_QUERY) gridAD_Groups.DataSource = groups.Select(Of String)(Function(g) @@ -63,8 +66,8 @@ Public Class frmADImport_Users Dim Email As String = IIf(IsDBNull(userRow.EMAIL), Nothing, userRow.EMAIL) - If Not ClassData.UserExists(Username) Then - If ClassData.InsertUser(Username, Prename, Name, Email) Then + If Not data.UserExists(Username) Then + If data.InsertUser(Username, Prename, Name, Email) Then importedUsers = importedUsers + 1 Else Throw New Exception($"Could not insert user {Username} into Database. Check the log.") diff --git a/DDUserManager/DDUserManager/frmConfigDatabase.vb b/DDUserManager/DDUserManager/frmConfigDatabase.vb index 68caf65..126e4db 100644 --- a/DDUserManager/DDUserManager/frmConfigDatabase.vb +++ b/DDUserManager/DDUserManager/frmConfigDatabase.vb @@ -1,11 +1,16 @@ -Imports System.IO -Imports DD_LIB_Standards +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Filesystem +Imports DigitalData.Modules.Logging Public Class frmConfigDatabase Private ConnectionChanged As Boolean = False Private Sub frmConfigDatabase_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If MyLogConfig Is Nothing Then + MyLogConfig = New LogConfig(LogConfig.PathType.AppData) + End If + If Not MyConnectionString = String.Empty Then ConnectionChanged = False @@ -95,17 +100,21 @@ Public Class frmConfigDatabase ConnectionChanged = True 'Set the construction string MyConnectionString = con - clsDatabase.Init(MyConnectionString) + + + MyDatabase = New MSSQLServer(MyLogConfig, MyConnectionString) + My.Settings.Save() If chkbxUserAut.Checked = False Then - Dim wrapper As New clsEncryption("!35452didalog=") + Dim wrapper As New EncryptionLegacy("!35452didalog=") Dim cipherText As String = wrapper.EncryptData(Me.txtPasswort.Text) Dim pw As String = cipherText con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & pw & ";" End If - SaveMySettingsValue("MyConnectionString", con, "ConfigMain") + MyConfig.Config.ConnectionString = con + MyConfig.Save() Dim csb As New SqlClient.SqlConnectionStringBuilder csb.ConnectionString = MyConnectionString diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index 36bba75..332d324 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -356,6 +356,11 @@ Partial Class frmMain Me.TableAdapterManager1 = New DDUserManager.DS_ChangeSTableAdapters.TableAdapterManager() Me.TBDD_GROUPS_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_GROUPS_USERTableAdapter() Me.QueriesTableAdapter1 = New DDUserManager.UserDataSetTableAdapters.QueriesTableAdapter() + Me.Button3 = New System.Windows.Forms.Button() + Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.Button4 = New System.Windows.Forms.Button() + Me.txtLDAPUserQuery = New System.Windows.Forms.TextBox() + Me.Button5 = New System.Windows.Forms.Button() GUIDLabel = New System.Windows.Forms.Label() PRENAMELabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() @@ -517,6 +522,7 @@ Partial Class frmMain CType(Me.TBDD_CLIENT_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_USER_MODULESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() + Me.GroupBox3.SuspendLayout() Me.SuspendLayout() ' 'GUIDLabel @@ -3500,6 +3506,7 @@ Partial Class frmMain 'tabPageSettings ' Me.tabPageSettings.Controls.Add(Me.Button2) + Me.tabPageSettings.Controls.Add(Me.GroupBox3) Me.tabPageSettings.Controls.Add(Me.GroupBox2) Me.tabPageSettings.Controls.Add(Me.GroupBox1) Me.tabPageSettings.Controls.Add(Me.btnOpenLogDir) @@ -3523,6 +3530,7 @@ Partial Class frmMain ' 'GroupBox2 ' + Me.GroupBox2.Controls.Add(Me.Button3) Me.GroupBox2.Controls.Add(Me.btnDebugGroupQuery) Me.GroupBox2.Controls.Add(Me.txtLDAPGroupQuery) Me.GroupBox2.Location = New System.Drawing.Point(486, 17) @@ -3530,7 +3538,7 @@ Partial Class frmMain Me.GroupBox2.Size = New System.Drawing.Size(700, 200) Me.GroupBox2.TabIndex = 5 Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "LDAP Gruppenabfrage" + Me.GroupBox2.Text = "LDAP Filter für Gruppenabfrage" ' 'btnDebugGroupQuery ' @@ -3730,6 +3738,55 @@ Partial Class frmMain ' Me.TBDD_GROUPS_USERTableAdapter.ClearBeforeFill = True ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(438, 171) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(112, 23) + Me.Button3.TabIndex = 7 + Me.Button3.Text = "Speichern" + Me.Button3.UseVisualStyleBackColor = True + ' + 'GroupBox3 + ' + Me.GroupBox3.Controls.Add(Me.Button4) + Me.GroupBox3.Controls.Add(Me.Button5) + Me.GroupBox3.Controls.Add(Me.txtLDAPUserQuery) + Me.GroupBox3.Location = New System.Drawing.Point(486, 239) + Me.GroupBox3.Name = "GroupBox3" + Me.GroupBox3.Size = New System.Drawing.Size(700, 200) + Me.GroupBox3.TabIndex = 5 + Me.GroupBox3.TabStop = False + Me.GroupBox3.Text = "LDAP Filter für Benutzerabfrage" + ' + 'Button4 + ' + Me.Button4.Location = New System.Drawing.Point(438, 171) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(112, 23) + Me.Button4.TabIndex = 7 + Me.Button4.Text = "Speichern" + Me.Button4.UseVisualStyleBackColor = True + ' + 'txtLDAPUserQuery + ' + Me.txtLDAPUserQuery.Location = New System.Drawing.Point(6, 20) + Me.txtLDAPUserQuery.Multiline = True + Me.txtLDAPUserQuery.Name = "txtLDAPUserQuery" + Me.txtLDAPUserQuery.ScrollBars = System.Windows.Forms.ScrollBars.Vertical + Me.txtLDAPUserQuery.Size = New System.Drawing.Size(688, 145) + Me.txtLDAPUserQuery.TabIndex = 2 + Me.txtLDAPUserQuery.Text = "(&(objectClass=group) (samAccountName=*))" + ' + 'Button5 + ' + Me.Button5.Location = New System.Drawing.Point(556, 171) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(138, 23) + Me.Button5.TabIndex = 6 + Me.Button5.Text = "Abfrage starten" + Me.Button5.UseVisualStyleBackColor = True + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3884,6 +3941,8 @@ Partial Class frmMain CType(Me.TBDD_USER_MODULESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() + Me.GroupBox3.ResumeLayout(False) + Me.GroupBox3.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -4189,4 +4248,9 @@ Partial Class frmMain Friend WithEvents btnDebugGroupQuery As Button Friend WithEvents txtLDAPGroupQuery As TextBox Friend WithEvents QueriesTableAdapter1 As UserDataSetTableAdapters.QueriesTableAdapter + Friend WithEvents Button3 As Button + Friend WithEvents GroupBox3 As GroupBox + Friend WithEvents Button4 As Button + Friend WithEvents txtLDAPUserQuery As TextBox + Friend WithEvents Button5 As Button End Class diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index f64caca..3cf53d9 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -1,9 +1,10 @@ Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid Imports DDUserManager.UserDataSet -Imports DDUserManager.DS_ChangeS -Imports DD_LIB_Standards +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Config Imports System.Reflection +Imports DigitalData.Modules.Filesystem ''' ''' Anmerkungen: @@ -19,32 +20,32 @@ Public Class frmMain Private DragDropManager As ClassDragDrop = Nothing - Private Shared logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() - Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - NLog.LogManager.Configuration = ClassNLog.GetLoggerConfigFor(MODULE_NAME) + MyLogConfig = New LogConfig(LogConfig.PathType.AppData) + MyLogger = MyLogConfig.GetLogger() + MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.UserAppDataPath) + + LoadConfig(MyConfig) + CurrentVersion = Assembly.GetEntryAssembly().GetName().Version.ToString() txtLDAPGroupQuery.DataBindings.Add(New Binding("Text", My.Settings, "AD_GROUP_QUERY")) + MyLogger.Info("Starting UserManager v" & CurrentVersion) + MyLogger.Info($"Current Username: {Environment.UserName}") - logger.Info("Starting UserManager v" & CurrentVersion) - logger.Info($"Current Username: {Environment.UserName}") - - If InitDatabase() = False Then - MsgBox($"Unexpected error in Database Init(1). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager") - logger.Fatal($"Unexpected error in Database Init(1). {vbCrLf & vbCrLf}Please contact Your admin.") - Application.Exit() - Exit Sub - End If If MyConnectionString = "" Then - MsgBox($"Unexpected error in Database Init(2). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager") - logger.Fatal($"Unexpected error in Database Init(2). {vbCrLf & vbCrLf}Please contact Your admin.") + frmConfigDatabase.ShowDialog() + + 'MsgBox($"Unexpected error in Database Init(2). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager") + 'MyLogger.Error($"Unexpected error in Database Init(2). {vbCrLf & vbCrLf}Please contact Your admin.") Application.Exit() Exit Sub End If + MyDatabase = New DigitalData.Modules.Database.MSSQLServer(MyLogConfig, MyConnectionString) + TBDD_CLIENTTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_CLIENT_USERTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString @@ -56,11 +57,11 @@ Public Class frmMain TBDD_USER_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','UM',{1})", Environment.UserName, 1) - Dim DT_CHECKUSER_MODULE As DataTable = clsDatabase.Return_Datatable(sql) + Dim DT_CHECKUSER_MODULE As DataTable = MyDatabase.GetDatatable(sql) If DT_CHECKUSER_MODULE.Rows.Count = 0 Then 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") - logger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.") + MyLogger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.") Application.ExitThread() End If @@ -69,7 +70,7 @@ Public Class frmMain If userId = 0 Then MsgBox($"Der Benutzer '{Environment.UserName}' ist nicht in der Benutzerverwaltung vorhanden. {vbCrLf & vbCrLf}Bitte kontaktieren Sie den Administrator, wenn dies ein Fehler ist.", MsgBoxStyle.Critical, "UserManager") - logger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht in der Benutzerverwaltung vorhanden.") + MyLogger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht in der Benutzerverwaltung vorhanden.") Application.ExitThread() End If @@ -112,51 +113,55 @@ Public Class frmMain DragDropManager.AddGridView(viewModulesGroups_AvailableGroups) 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") - logger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.") + MyLogger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.") Application.ExitThread() End If If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) <> 1 Then 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") - logger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.") + MyLogger.Warn($"Der Benutzer '{Environment.UserName}' ist nicht zur Benutzerverwaltung berechtigt.") Application.ExitThread() End If Catch ex As Exception MsgBox("Unexpected Error while loading. Please check the log.", MsgBoxStyle.Critical, "User Manager") - logger.Fatal(ex, "Unexpected Error while loading.") + MyLogger.Fatal(ex, "Unexpected Error while loading.") End Try End Sub - Public Function InitDatabase() - Try - Dim dbResult As Boolean - - MySettings_Load() + Private Sub LoadConfig(ConfigManager As ConfigManager(Of UserConfig)) + Dim oConnectionString As String = "" + Dim csb As New SqlClient.SqlConnectionStringBuilder + csb.ConnectionString = ConfigManager.Config.ConnectionString + + If Not csb.ConnectionString = "" Then + If csb.ConnectionString.Contains("Password=") Then + 'sa- + 'Jetzt das Passwort entschlüsseln + Dim PWplainText As String + Dim wrapper As New EncryptionLegacy("!35452didalog=") + ' DecryptData throws if the wrong password is used. + Try + PWplainText = wrapper.DecryptData(csb.Password) + oConnectionString = ConfigManager.Config.ConnectionString.Replace(csb.Password, PWplainText) + Catch ex As Exception + MyLogger.Error(ex) + MyLogger.Warn("- the Password '" & csb.Password & "' could not be decrypted", False) + oConnectionString = "" + End Try - clsDatabase.GUI = True - If MyConnectionString <> String.Empty Then - dbResult = clsDatabase.Init(MyConnectionString) Else - frmConfigDatabase.ShowDialog() - dbResult = clsDatabase.Init(MyConnectionString) + 'Windows-Auth + oConnectionString = ConfigManager.Config.ConnectionString End If - clsDatabase.Init(MyConnectionString) - If dbResult = False Then - If clsLogger.LOGG_MSG <> String.Empty Then - Throw New Exception("Error while Initializing database:" & vbNewLine & clsLogger.LOGG_MSG) - Else - Throw New Exception("Find more information in the logfile.") - End If - End If - Return True - Catch ex As Exception - logger.Fatal(ex, "Unexpected Error in Init Database:") - MsgBox("Unexpected Error in Init Database:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + MyConnectionString = oConnectionString + Else + MyConnectionString = "" + End If - Return False - End Try - End Function + LogErrorsOnly = MyConfig.Config.LogErrorsOnly + ActiveDirectoryRootNode = MyConfig.Config.ActiveDirectoryRootNode + End Sub Private Sub btnImportUsers_Click(sender As Object, e As EventArgs) Handles btnImportUsers.Click Dim frm As New frmADImport_Users() @@ -1036,7 +1041,7 @@ Public Class frmMain #End Region Private Sub ShowErrorMessage(errorText As String, ex As Exception) - logger.Error(ex, errorText) + MyLogger.Error(ex, errorText) MsgBox(errorText & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, "User Manager") End Sub @@ -1069,8 +1074,9 @@ Public Class frmMain Process.Start(ClassNLog.GetLogPathFor(MODULE_NAME)) End Sub - Private Sub txtADRootNode_Leave(sender As Object, e As EventArgs) Handles txtADRootNode.Leave, txtLDAPGroupQuery.Leave - SaveMySettingsValue("ActiveDirectoryRootNode", txtADRootNode.Text, "ConfigMain") + Private Sub txtADRootNode_Leave(sender As Object, e As EventArgs) Handles txtADRootNode.Leave, txtLDAPGroupQuery.Leave, txtLDAPUserQuery.Leave + MyConfig.Config.ActiveDirectoryRootNode = txtADRootNode.Text + MyConfig.Save() End Sub @@ -1081,8 +1087,10 @@ Public Class frmMain If ClassActiveDirectory.ConnectionTest(txtADRootNode.Text) Then MsgBox("Verbindung erfolgreich aufgebaut!", MsgBoxStyle.Information) - SaveMySettingsValue("ActiveDirectoryRootNode", txtADRootNode.Text, "ConfigMain") - logger.Info($"New ActiveDirectory Path saved: {txtADRootNode.Text}") + MyConfig.Config.ActiveDirectoryRootNode = txtADRootNode.Text + MyConfig.Save() + + MyLogger.Info($"New ActiveDirectory Path saved: {txtADRootNode.Text}") End If End Sub @@ -1090,9 +1098,7 @@ Public Class frmMain Process.Start("https://didalog.de/support") End Sub - Private Async Sub btnDebugQuery_Click(sender As Object, e As EventArgs) Handles btnDebugGroupQuery.Click - My.Settings.Save() - + Private Async Sub btnDebugQuery_Click(sender As Object, e As EventArgs) Handles btnDebugGroupQuery.Click, Button5.Click btnDebugGroupQuery.Text = "Abfrage läuft..." btnDebugGroupQuery.Enabled = False @@ -1116,7 +1122,7 @@ Public Class frmMain If MessageBox.Show(oMessage, "Benutzer löschen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then Dim osql = $"EXEC PRDD_DELETE_USER {oUserId}" - If clsDatabase.Execute_Scalar(osql) = -1 Then + If MyDatabase.GetScalarValue(osql) = -1 Then MessageBox.Show("Fehler beim Löschen des Benutzers.", "Benutzer löschen", MessageBoxButtons.OK, MessageBoxIcon.Warning) Else UpdateSavedLabel() @@ -1124,4 +1130,17 @@ Public Class frmMain End If End If End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click, Button4.Click + MyConfig.Config.AdGroupFilter = txtLDAPGroupQuery.Text + MyConfig.Save() + End Sub + + Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged + If e.Page.Name = tabPageSettings.Name Then + txtADRootNode.Text = MyConfig.Config.ActiveDirectoryRootNode + txtLDAPGroupQuery.Text = MyConfig.Config.AdGroupFilter + txtLDAPUserQuery.Text = MyConfig.Config.AdUserFilter + End If + End Sub End Class From a64d3461a7fd6545539214b1824f2b277fd229e3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Nov 2019 15:10:35 +0100 Subject: [PATCH 06/16] update to devexpress 18, finish migration to active directory interface --- .../DDUserManager/ClassActiveDirectory.vb | 230 -------------- .../DDUserManager/DDUserManager.vbproj | 37 ++- .../DDUserManager/DDUserManager.vbproj.bak | 297 ++++++++++++++++++ .../DDUserManager/My Project/licenses.licx | 2 +- .../My Project/licenses.licx.bak | 1 + DDUserManager/DDUserManager/UserConfig.vb | 8 +- DDUserManager/DDUserManager/frmADDebug.vb | 17 - ...igner.vb => frmADDebug_Groups.Designer.vb} | 21 +- ...frmADDebug.resx => frmADDebug_Groups.resx} | 0 .../DDUserManager/frmADDebug_Groups.vb | 18 ++ .../frmADDebug_Users.Designer.vb | 59 ++++ .../DDUserManager/frmADDebug_Users.resx | 120 +++++++ .../DDUserManager/frmADDebug_Users.vb | 18 ++ .../DDUserManager/frmADImport_Groups.vb | 11 +- .../DDUserManager/frmADImport_Users.vb | 15 +- .../DDUserManager/frmMain.Designer.vb | 165 +++++----- DDUserManager/DDUserManager/frmMain.vb | 21 +- 17 files changed, 659 insertions(+), 381 deletions(-) delete mode 100644 DDUserManager/DDUserManager/ClassActiveDirectory.vb create mode 100644 DDUserManager/DDUserManager/DDUserManager.vbproj.bak create mode 100644 DDUserManager/DDUserManager/My Project/licenses.licx.bak delete mode 100644 DDUserManager/DDUserManager/frmADDebug.vb rename DDUserManager/DDUserManager/{frmADDebug.Designer.vb => frmADDebug_Groups.Designer.vb} (80%) rename DDUserManager/DDUserManager/{frmADDebug.resx => frmADDebug_Groups.resx} (100%) create mode 100644 DDUserManager/DDUserManager/frmADDebug_Groups.vb create mode 100644 DDUserManager/DDUserManager/frmADDebug_Users.Designer.vb create mode 100644 DDUserManager/DDUserManager/frmADDebug_Users.resx create mode 100644 DDUserManager/DDUserManager/frmADDebug_Users.vb diff --git a/DDUserManager/DDUserManager/ClassActiveDirectory.vb b/DDUserManager/DDUserManager/ClassActiveDirectory.vb deleted file mode 100644 index 8138932..0000000 --- a/DDUserManager/DDUserManager/ClassActiveDirectory.vb +++ /dev/null @@ -1,230 +0,0 @@ -Imports System.DirectoryServices -Imports System.DirectoryServices.AccountManagement - -Public Class ClassActiveDirectory - Private Shared logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() - - Private Shared excludedGroupNames As New List(Of String) From { - "Abgelehnte", - "DHCP", - "Distributed COM", - "Dns", - "Domänen-Gäste", - "Domänencomput", - "Domänencontroller", - "Druck", - "Einstellungen eingehender", - "Erstellungen", - "Ereignis", - "Gäst", - "Hyper-V", - "IIS_", - "Klonbare", - "Konten-Oper", - "Kryptografie", - "Leistungs", - "Netzwerkskon", - "PrivUser", - "Protected User", - "Prä-Windows", - "RAS- und IAS-Server", - "RDS-", - "Remoteverwaltungs", - "Replikations", - "Reporting", - "Richtlinien-Ersteller", - "SQLAccess", - "Schreibgeschützte Domänen", - "Schlüsseladministratoren", - "Server-Operatore", - "Sicherungs", - "Storage", - "System Managed", - "Terminalserver-Liz", - "WinRMR", - "Windows-Auth", - "Unternehme", - "Zertifikat", - "Zugriffssteuerungs", - "Zulässige" - } - - Public Class GroupResult - Public SAMAccountName As String - Public ObjectClass As String - Public CN As String - Public Description As String - Public DistinguishedName As String - Public Name As String - Public ObjectCategory As String - - Public Overrides Function ToString() As String - Return $"SAMAccountName={SAMAccountName}, ObjectClass={ObjectClass}, CN={CN}, Description={Description}, DistinguishedName={DistinguishedName}, Name={Name}, ObjectCategory={ObjectCategory}" - End Function - End Class - - Public Shared Function ConnectionTest(path As String) - Try - Dim de As New DirectoryEntry(path) - de.Username = Nothing - de.Password = Nothing - de.AuthenticationType = AuthenticationTypes.Secure - de.RefreshCache() - - Return True - Catch ex As Exception - MsgBox($"Verbindungstest fehlgeschlagen. Bitte überprüfen sie den ActiveDirectory Pfad. Der zurückgelieferte Fehler lautet:{vbCrLf}{ex.Message}", MsgBoxStyle.Exclamation) - logger.Error(ex, $"Connection Test failed for path '{path}'") - Return False - End Try - End Function - - Private Shared Function GetDirectoryEntry() - Dim de As New DirectoryEntry(ActiveDirectoryRootNode) - de.Username = Nothing - de.Password = Nothing - de.AuthenticationType = AuthenticationTypes.Secure - - Return de - End Function - - Public Shared Function GetDirectorySearch(rootNode As DirectoryEntry) As DirectorySearcher - Dim dirEntry As DirectoryEntry = GetDirectoryEntry() - Dim dirSearcher As DirectorySearcher = New DirectorySearcher(dirEntry) - Return dirSearcher - End Function - - Public Shared Function GetActiveDirectoryGroups(Optional query As String = "(&(objectClass=group) (samAccountName=*))") As List(Of GroupResult) - Dim groups As New List(Of GroupResult) - Dim deSearch = GetDirectorySearch(GetDirectoryEntry()) - - deSearch.SearchScope = SearchScope.Subtree - deSearch.Filter = query - deSearch.SizeLimit = 50000 - - Dim results As SearchResultCollection = deSearch.FindAll() - For Each r As SearchResult In results - Try - Dim groupName, objectClass, cn, description, distinguishedName, name, objectCategory As String - Try - groupName = r.Properties.Item("samaccountname").Item(0) - Catch ex As Exception - logger.Error(ex) - groupName = "" - End Try - Try - objectClass = r.Properties.Item("objectClass").Item(0) - Catch ex As Exception - logger.Error(ex) - objectClass = "" - End Try - Try - cn = r.Properties.Item("cn").Item(0) - Catch ex As Exception - logger.Error(ex) - cn = "" - End Try - Try - description = r.Properties.Item("description").Item(0) - Catch ex As Exception - logger.Error(ex) - description = "" - End Try - Try - distinguishedName = r.Properties.Item("distinguishedName").Item(0) - Catch ex As Exception - logger.Error(ex) - distinguishedName = "" - End Try - Try - name = r.Properties.Item("name").Item(0) - Catch ex As Exception - logger.Error(ex) - name = "" - End Try - Try - objectCategory = r.Properties.Item("objectCategory").Item(0) - Catch ex As Exception - logger.Error(ex) - objectCategory = "" - End Try - - 'If Not String.IsNullOrEmpty(groupName) Then - ' Dim isExcluded = excludedGroupNames.Where(Function(excludedGroup) - ' Return (groupName.Contains(excludedGroup) Or groupName.StartsWith(excludedGroup)) - ' End Function).Any() - - ' If Not isExcluded Then - ' groups.Add(New GroupResult() With { - ' .SAMAccountName = groupName, - ' .CN = cn, - ' .Description = description, - ' .DistinguishedName = distinguishedName, - ' .Name = name, - ' .ObjectCategory = objectCategory, - ' .ObjectClass = objectClass - ' }) - ' End If - 'End If - - logger.Info("Adding Group '{0}'", groupName) - - 'If Not String.IsNullOrEmpty(groupName) Then - groups.Add(New GroupResult() With { - .SAMAccountName = groupName, - .CN = cn, - .Description = description, - .DistinguishedName = distinguishedName, - .Name = name, - .ObjectCategory = objectCategory, - .ObjectClass = objectClass - }) - 'End If - - Catch ex As Exception - logger.Error(ex) - Continue For - End Try - Next - - Return groups - End Function - - Public Shared Function GetActiveDirectoryUsersForGroup(groupName As String) As List(Of ADUser) - 'Dim users As New List(Of UserPrincipal) - Dim users As New List(Of ADUser) - - Using context As New PrincipalContext(ContextType.Domain) - Using group As GroupPrincipal = GroupPrincipal.FindByIdentity(context, IdentityType.Name, groupName) - Using members = group.GetMembers(True) - - For Each member As UserPrincipal In members - If TypeOf member Is UserPrincipal Then - 'users.Add(member) - - users.Add(New ADUser() With { - .Username = member.SamAccountName, - .Surname = member.Surname, - .GivenName = member.GivenName, - .MiddleName = member.MiddleName, - .Email = member.EmailAddress - }) - End If - Next - - End Using - End Using - End Using - - Return users - End Function - - Public Class ADUser - Public Username As String - Public Surname As String - Public GivenName As String - Public MiddleName As String - Public Email As String - Public Path As String - End Class -End Class diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj b/DDUserManager/DDUserManager/DDUserManager.vbproj index c4fbbd6..2db510a 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj @@ -51,14 +51,15 @@ user.ico - - - - - - - - + + + + + + + + + ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll @@ -108,7 +109,6 @@ - @@ -117,10 +117,16 @@ True DS_ChangeS.xsd - - frmADDebug.vb + + frmADDebug_Groups.vb - + + Form + + + frmADDebug_Users.vb + + Form @@ -175,8 +181,11 @@ - - frmADDebug.vb + + frmADDebug_Groups.vb + + + frmADDebug_Users.vb frmConfigDatabase.vb diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj.bak b/DDUserManager/DDUserManager/DDUserManager.vbproj.bak new file mode 100644 index 0000000..0f423b1 --- /dev/null +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj.bak @@ -0,0 +1,297 @@ + + + + + Debug + AnyCPU + {87122913-C196-46BC-A7CD-27F7E201E55F} + WinExe + DDUserManager.My.MyApplication + DDUserManager + DDUserManager + 512 + WindowsForms + v4.6.1 + true + + + + AnyCPU + true + full + true + true + bin\Debug\ + DDUserManager.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + DDUserManager.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + user.ico + + + + + + + + + + + + + + + + + + + ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll + + + ..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll + + + ..\..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll + + + ..\..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + + + ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll + + + P:\Visual Studio Projekte\Bibliotheken\NLog\NLog.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + DS_ChangeS.xsd + + + frmADDebug_Groups.vb + + + Form + + + frmADDebug_Users.vb + + + Form + + + frmConfigDatabase.vb + + + Form + + + frmADImport_Groups.vb + + + Form + + + frmADImport_Users.vb + + + Form + + + Form + + + frmMain.vb + Form + + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + True + True + UserDataSet.xsd + + + UserDataSet.xsd + + + + + frmADDebug_Groups.vb + + + frmADDebug_Users.vb + + + frmConfigDatabase.vb + + + frmADImport_Groups.vb + + + frmADImport_Users.vb + + + frmMain.vb + Designer + + + + VbMyResourcesResXFileCodeGenerator + My.Resources + Designer + Resources.Designer.vb + + + + + DS_ChangeS.xsd + + + Designer + MSDataSetGenerator + DS_ChangeS.Designer.vb + + + DS_ChangeS.xsd + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + UserDataSet.xsd + + + Designer + MSDataSetGenerator + UserDataSet.Designer.vb + + + UserDataSet.xsd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DDUserManager/DDUserManager/My Project/licenses.licx b/DDUserManager/DDUserManager/My Project/licenses.licx index 4308626..824a99f 100644 --- a/DDUserManager/DDUserManager/My Project/licenses.licx +++ b/DDUserManager/DDUserManager/My Project/licenses.licx @@ -1 +1 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/DDUserManager/DDUserManager/My Project/licenses.licx.bak b/DDUserManager/DDUserManager/My Project/licenses.licx.bak new file mode 100644 index 0000000..4308626 --- /dev/null +++ b/DDUserManager/DDUserManager/My Project/licenses.licx.bak @@ -0,0 +1 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/DDUserManager/DDUserManager/UserConfig.vb b/DDUserManager/DDUserManager/UserConfig.vb index 0253d7e..6db245b 100644 --- a/DDUserManager/DDUserManager/UserConfig.vb +++ b/DDUserManager/DDUserManager/UserConfig.vb @@ -1,11 +1,11 @@ Imports DigitalData.Modules.Config -Imports DigitalData.Modules.Filesystem +Imports DigitalData.Modules.Interfaces Public Class UserConfig Public Property ConnectionString As String = "" Public Property LogErrorsOnly As Boolean = True - Public Property AdGroupFilter As String = "(&(objectClass=group) (samAccountName=*))" - Public Property AdUserFilter As String = "" - Public Property ActiveDirectoryRootNode As String = $"LDAP://{Environment.UserDomainName}" + Public Property AdGroupFilter As String = ActiveDirectoryInterface.DEFAULT_GROUP_FILTER + Public Property AdUserFilter As String = ActiveDirectoryInterface.DEFAULT_USER_FILTER + Public Property AdRootPath As String = $"LDAP://{Environment.UserDomainName}" End Class diff --git a/DDUserManager/DDUserManager/frmADDebug.vb b/DDUserManager/DDUserManager/frmADDebug.vb deleted file mode 100644 index 82f1ade..0000000 --- a/DDUserManager/DDUserManager/frmADDebug.vb +++ /dev/null @@ -1,17 +0,0 @@ -Imports DDUserManager.ClassActiveDirectory - -Public Class frmADDebug - Public Property DebugData As List(Of GroupResult) - - Private Sub frmADDebug_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Dim table As New UserDataSet.TBLOCAL_DEBUG_GROUPSDataTable() - - For Each group In DebugData - table.AddTBLOCAL_DEBUG_GROUPSRow(group.SAMAccountName, group.CN, group.ObjectClass, group.ObjectCategory, group.Description, group.DistinguishedName, group.Name) - Next - - - Me.Text = $"{table.Rows.Count} Gruppen" - GridControl1.DataSource = table - End Sub -End Class \ No newline at end of file diff --git a/DDUserManager/DDUserManager/frmADDebug.Designer.vb b/DDUserManager/DDUserManager/frmADDebug_Groups.Designer.vb similarity index 80% rename from DDUserManager/DDUserManager/frmADDebug.Designer.vb rename to DDUserManager/DDUserManager/frmADDebug_Groups.Designer.vb index b06fb40..b205ea5 100644 --- a/DDUserManager/DDUserManager/frmADDebug.Designer.vb +++ b/DDUserManager/DDUserManager/frmADDebug_Groups.Designer.vb @@ -1,9 +1,9 @@ - _ -Partial Class frmADDebug + +Partial Class frmADDebug_Groups Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmADDebug 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() @@ -34,8 +34,8 @@ Partial Class frmADDebug Me.GridControl1.Location = New System.Drawing.Point(0, 0) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(800, 450) - Me.GridControl1.TabIndex = 1 + Me.GridControl1.Size = New System.Drawing.Size(284, 261) + Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' 'GridView1 @@ -43,14 +43,11 @@ Partial Class frmADDebug Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" ' - 'frmADDebug + 'frmADDebug_Groups ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) + Me.ClientSize = New System.Drawing.Size(284, 261) Me.Controls.Add(Me.GridControl1) - Me.Name = "frmADDebug" - Me.Text = "frmADDebug" + Me.Name = "frmADDebug_Groups" CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) diff --git a/DDUserManager/DDUserManager/frmADDebug.resx b/DDUserManager/DDUserManager/frmADDebug_Groups.resx similarity index 100% rename from DDUserManager/DDUserManager/frmADDebug.resx rename to DDUserManager/DDUserManager/frmADDebug_Groups.resx diff --git a/DDUserManager/DDUserManager/frmADDebug_Groups.vb b/DDUserManager/DDUserManager/frmADDebug_Groups.vb new file mode 100644 index 0000000..a329d5b --- /dev/null +++ b/DDUserManager/DDUserManager/frmADDebug_Groups.vb @@ -0,0 +1,18 @@ +Imports DigitalData.Modules.Interfaces + +Public Class frmADDebug_Groups + Public Property DebugData As List(Of ADGroup) + + Private Sub frmADDebug_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim table As New UserDataSet.TBLOCAL_DEBUG_GROUPSDataTable() + + For Each oGroup In DebugData + table.AddTBLOCAL_DEBUG_GROUPSRow(oGroup.SAMAccountName, oGroup.CN, oGroup.ObjectClass, oGroup.ObjectCategory, oGroup.Description, oGroup.DistinguishedName, oGroup.Name) + Next + + Text = $"{table.Rows.Count} Gruppen" + TopMost = True + + GridControl1.DataSource = table + End Sub +End Class \ No newline at end of file diff --git a/DDUserManager/DDUserManager/frmADDebug_Users.Designer.vb b/DDUserManager/DDUserManager/frmADDebug_Users.Designer.vb new file mode 100644 index 0000000..fc7c7a2 --- /dev/null +++ b/DDUserManager/DDUserManager/frmADDebug_Users.Designer.vb @@ -0,0 +1,59 @@ + +Partial Class frmADDebug_Users + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'GridControl1 + ' + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(284, 261) + Me.GridControl1.TabIndex = 0 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'frmADDebug_Users + ' + Me.ClientSize = New System.Drawing.Size(284, 261) + Me.Controls.Add(Me.GridControl1) + Me.Name = "frmADDebug_Users" + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView +End Class diff --git a/DDUserManager/DDUserManager/frmADDebug_Users.resx b/DDUserManager/DDUserManager/frmADDebug_Users.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DDUserManager/DDUserManager/frmADDebug_Users.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/DDUserManager/DDUserManager/frmADDebug_Users.vb b/DDUserManager/DDUserManager/frmADDebug_Users.vb new file mode 100644 index 0000000..8598596 --- /dev/null +++ b/DDUserManager/DDUserManager/frmADDebug_Users.vb @@ -0,0 +1,18 @@ +Imports DigitalData.Modules.Interfaces + +Public Class frmADDebug_Users + Public Property DebugData As List(Of ADUser) + + Private Sub frmADDebug_Users_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim table As New UserDataSet.TBLOCAL_ADUSERSDataTable() + + For Each oUser In DebugData + table.AddTBLOCAL_ADUSERSRow(oUser.samAccountName, oUser.GivenName, oUser.Surname, oUser.Email) + Next + + Text = $"{table.Rows.Count} Benutzer" + TopMost = True + + GridControl1.DataSource = table + End Sub +End Class \ No newline at end of file diff --git a/DDUserManager/DDUserManager/frmADImport_Groups.vb b/DDUserManager/DDUserManager/frmADImport_Groups.vb index 18a5eac..b0d2924 100644 --- a/DDUserManager/DDUserManager/frmADImport_Groups.vb +++ b/DDUserManager/DDUserManager/frmADImport_Groups.vb @@ -1,23 +1,26 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Interfaces Public Class frmADImport_Groups Private logger As Logger Private data As ClassData + Private activeDirectory As ActiveDirectoryInterface Private Sub frmADImport_Groups_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try logger = MyLogConfig.GetLogger() data = New ClassData(MyLogConfig, MyDatabase) + activeDirectory = New ActiveDirectoryInterface(MyLogConfig, MyConfig.Config.AdRootPath) - Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(My.Settings.AD_GROUP_QUERY) + Dim oGroups = activeDirectory.ListGroups(MyConfig.Config.AdGroupFilter) - logger.Info("Found {0} groups", groups.Count) + logger.Info("Found {0} groups", oGroups.Count) UserDataSet.TBLOCAL_ADGROUPS.Clear() - For Each group As ClassActiveDirectory.GroupResult In groups - UserDataSet.TBLOCAL_ADGROUPS.AddTBLOCAL_ADGROUPSRow(group.SAMAccountName) + For Each oGroup As ADGroup In oGroups + UserDataSet.TBLOCAL_ADGROUPS.AddTBLOCAL_ADGROUPSRow(oGroup.SAMAccountName) Next lbGroupsCount.Text = String.Format(lbGroupsCount.Text, UserDataSet.TBLOCAL_ADGROUPS.Rows.Count) diff --git a/DDUserManager/DDUserManager/frmADImport_Users.vb b/DDUserManager/DDUserManager/frmADImport_Users.vb index d425640..e93fc28 100644 --- a/DDUserManager/DDUserManager/frmADImport_Users.vb +++ b/DDUserManager/DDUserManager/frmADImport_Users.vb @@ -1,23 +1,24 @@ Imports DDUserManager.UserDataSet Imports DevExpress.XtraGrid.Views.Grid +Imports DigitalData.Modules.Interfaces Imports DigitalData.Modules.Logging Public Class frmADImport_Users Private logger As Logger Private data As ClassData + Private activeDirectory As ActiveDirectoryInterface Private Sub frmADImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try logger = MyLogConfig.GetLogger() data = New ClassData(MyLogConfig, MyDatabase) + activeDirectory = New ActiveDirectoryInterface(MyLogConfig, MyConfig.Config.AdRootPath) - Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(My.Settings.AD_GROUP_QUERY) + Dim oGroups = activeDirectory.ListGroups(MyConfig.Config.AdGroupFilter) - gridAD_Groups.DataSource = groups.Select(Of String)(Function(g) - Return g.SAMAccountName - End Function) + gridAD_Groups.DataSource = oGroups.Select(Function(g) g.SAMAccountName) viewAD_Groups.Columns.Item(0).Caption = "Gruppe" Catch ex As Exception logger.Error(ex, $"Error while loading initial groups") @@ -29,16 +30,16 @@ Public Class frmADImport_Users Dim groupName As String = viewAD_Groups.GetRow(e.FocusedRowHandle) Try - Dim usersForGroup As List(Of ClassActiveDirectory.ADUser) = ClassActiveDirectory.GetActiveDirectoryUsersForGroup(groupName) + Dim oUsers = activeDirectory.ListUsers(groupName, MyConfig.Config.AdUserFilter) UserDataSet.TBLOCAL_ADUSERS.Clear() - For Each user As ClassActiveDirectory.ADUser In usersForGroup + For Each user As ADUser In oUsers Dim row As TBLOCAL_ADUSERSRow = UserDataSet.TBLOCAL_ADUSERS.NewTBLOCAL_ADUSERSRow() row.NAME = user.Surname row.PRENAME = user.GivenName - row.USERNAME = user.Username + row.USERNAME = user.samAccountName row.EMAIL = user.Email UserDataSet.TBLOCAL_ADUSERS.AddTBLOCAL_ADUSERSRow(row) diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index 332d324..9d821aa 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -22,7 +22,6 @@ Partial Class frmMain 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim GUIDLabel As System.Windows.Forms.Label Dim PRENAMELabel As System.Windows.Forms.Label Dim NAMELabel As System.Windows.Forms.Label @@ -63,7 +62,7 @@ Partial Class frmMain Me.Label8 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.LANGUAGEComboBox = New System.Windows.Forms.ComboBox() - Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource() Me.UserDataSet = New DDUserManager.UserDataSet() Me.DATE_FORMATComboBox = New System.Windows.Forms.ComboBox() Me.TextBox2 = New System.Windows.Forms.TextBox() @@ -80,12 +79,12 @@ Partial Class frmMain Me.Label12 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.listModules = New System.Windows.Forms.ListBox() - Me.TBDD_MODULESBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_MODULESBindingSource = New System.Windows.Forms.BindingSource() Me.listGroups = New System.Windows.Forms.ListBox() - Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource() Me.Label2 = New System.Windows.Forms.Label() Me.listClients = New System.Windows.Forms.ListBox() - Me.TBDD_CLIENTBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_CLIENTBindingSource = New System.Windows.Forms.BindingSource() Me.GridUsers = New DevExpress.XtraGrid.GridControl() Me.gvUsers = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colPRENAME = New DevExpress.XtraGrid.Columns.GridColumn() @@ -117,7 +116,7 @@ Partial Class frmMain Me.labelGroups_AssignedUsers = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() Me.gridGroups_AllGroups = New DevExpress.XtraGrid.GridControl() - Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource() Me.DS_ChangeS = New DDUserManager.DS_ChangeS() Me.viewGroups_AllGroups = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colNAME2 = New DevExpress.XtraGrid.Columns.GridColumn() @@ -178,7 +177,7 @@ Partial Class frmMain Me.GridColumn11 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn12 = New DevExpress.XtraGrid.Columns.GridColumn() Me.Label9 = New System.Windows.Forms.Label() - Me.TBDD_USERBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) + Me.TBDD_USERBindingNavigator = New System.Windows.Forms.BindingNavigator() Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() @@ -257,7 +256,7 @@ Partial Class frmMain Me.colNAME10 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colSHORT_NAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.Label16 = New System.Windows.Forms.Label() - Me.TBDD_GROUPSBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) + Me.TBDD_GROUPSBindingNavigator = New System.Windows.Forms.BindingNavigator() Me.BindingNavigatorCountItem1 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMoveFirstItem1 = New System.Windows.Forms.ToolStripButton() @@ -288,7 +287,7 @@ Partial Class frmMain Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.TBDD_CLIENTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) + Me.TBDD_CLIENTBindingNavigator = New System.Windows.Forms.BindingNavigator() Me.BindingNavigatorAddNewItem2 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem2 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem2 = New System.Windows.Forms.ToolStripButton() @@ -313,7 +312,7 @@ Partial Class frmMain Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn10 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.TBDD_MODULESBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) + Me.TBDD_MODULESBindingNavigator = New System.Windows.Forms.BindingNavigator() Me.BindingNavigatorCountItem3 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem3 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem3 = New System.Windows.Forms.ToolStripButton() @@ -326,7 +325,12 @@ Partial Class frmMain Me.tabPageRights = New DevExpress.XtraTab.XtraTabPage() Me.tabPageSettings = New DevExpress.XtraTab.XtraTabPage() Me.Button2 = New System.Windows.Forms.Button() + Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.Label20 = New System.Windows.Forms.Label() + Me.Button4 = New System.Windows.Forms.Button() + Me.txtLDAPUserQuery = New System.Windows.Forms.TextBox() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.Button3 = New System.Windows.Forms.Button() Me.btnDebugGroupQuery = New System.Windows.Forms.Button() Me.txtLDAPGroupQuery = New System.Windows.Forms.TextBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() @@ -336,14 +340,14 @@ Partial Class frmMain Me.btnOpenLogDir = New System.Windows.Forms.Button() Me.btnOpenConfigDir = New System.Windows.Forms.Button() Me.btnConfigConnections = New System.Windows.Forms.Button() - Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource() Me.TBDD_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USERTableAdapter() Me.TableAdapterManager = New DDUserManager.UserDataSetTableAdapters.TableAdapterManager() - Me.TBDD_CLIENT_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_CLIENT_USERBindingSource = New System.Windows.Forms.BindingSource() Me.TBDD_CLIENT_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_CLIENT_USERTableAdapter() Me.TBDD_CLIENTTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_CLIENTTableAdapter() Me.TBDD_MODULESTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_MODULESTableAdapter() - Me.TBDD_USER_MODULESBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_USER_MODULESBindingSource = New System.Windows.Forms.BindingSource() Me.TBDD_USER_MODULESTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USER_MODULESTableAdapter() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tsLabelUser = New System.Windows.Forms.ToolStripStatusLabel() @@ -356,11 +360,6 @@ Partial Class frmMain Me.TableAdapterManager1 = New DDUserManager.DS_ChangeSTableAdapters.TableAdapterManager() Me.TBDD_GROUPS_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_GROUPS_USERTableAdapter() Me.QueriesTableAdapter1 = New DDUserManager.UserDataSetTableAdapters.QueriesTableAdapter() - Me.Button3 = New System.Windows.Forms.Button() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.Button4 = New System.Windows.Forms.Button() - Me.txtLDAPUserQuery = New System.Windows.Forms.TextBox() - Me.Button5 = New System.Windows.Forms.Button() GUIDLabel = New System.Windows.Forms.Label() PRENAMELabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() @@ -516,13 +515,13 @@ Partial Class frmMain CType(Me.TBDD_MODULESBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() Me.TBDD_MODULESBindingNavigator.SuspendLayout() Me.tabPageSettings.SuspendLayout() + Me.GroupBox3.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox1.SuspendLayout() CType(Me.TBDD_GROUPS_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CLIENT_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_USER_MODULESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() - Me.GroupBox3.SuspendLayout() Me.SuspendLayout() ' 'GUIDLabel @@ -833,7 +832,7 @@ Partial Class frmMain Me.tabPageUsers.AutoScroll = True Me.tabPageUsers.Controls.Add(Me.SplitContainer1) Me.tabPageUsers.Controls.Add(Me.TBDD_USERBindingNavigator) - Me.tabPageUsers.Image = Global.DDUserManager.My.Resources.Resources.user + Me.tabPageUsers.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.user Me.tabPageUsers.Name = "tabPageUsers" Me.tabPageUsers.Size = New System.Drawing.Size(1193, 784) Me.tabPageUsers.Text = "Benutzer" @@ -1199,7 +1198,7 @@ Partial Class frmMain 'tabGroupAssign ' Me.tabGroupAssign.Controls.Add(Me.SplitContainerUserGroups1) - Me.tabGroupAssign.Image = Global.DDUserManager.My.Resources.Resources.group + Me.tabGroupAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.group Me.tabGroupAssign.Name = "tabGroupAssign" Me.tabGroupAssign.Size = New System.Drawing.Size(1187, 349) Me.tabGroupAssign.Text = "Gruppen Zuordnung" @@ -1498,7 +1497,7 @@ Partial Class frmMain 'tabClientAssign ' Me.tabClientAssign.Controls.Add(Me.SplitContainer4) - Me.tabClientAssign.Image = Global.DDUserManager.My.Resources.Resources.book + Me.tabClientAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book Me.tabClientAssign.Name = "tabClientAssign" Me.tabClientAssign.Size = New System.Drawing.Size(1187, 349) Me.tabClientAssign.Text = "Mandanten Zuordnung" @@ -1779,7 +1778,7 @@ Partial Class frmMain 'tabModuleAssign ' Me.tabModuleAssign.Controls.Add(Me.SplitContainer6) - Me.tabModuleAssign.Image = Global.DDUserManager.My.Resources.Resources.plugin + Me.tabModuleAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin Me.tabModuleAssign.Name = "tabModuleAssign" Me.tabModuleAssign.Size = New System.Drawing.Size(1187, 349) Me.tabModuleAssign.Text = "Modul Zuordnung" @@ -2194,7 +2193,7 @@ Partial Class frmMain ' Me.tabPageGroups.Controls.Add(Me.SplitContainer3) Me.tabPageGroups.Controls.Add(Me.TBDD_GROUPSBindingNavigator) - Me.tabPageGroups.Image = Global.DDUserManager.My.Resources.Resources.group + Me.tabPageGroups.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.group Me.tabPageGroups.Name = "tabPageGroups" Me.tabPageGroups.Size = New System.Drawing.Size(1193, 784) Me.tabPageGroups.Text = "Gruppen" @@ -2411,7 +2410,7 @@ Partial Class frmMain 'XtraTabPage1 ' Me.XtraTabPage1.Controls.Add(Me.SplitContainer5) - Me.XtraTabPage1.Image = Global.DDUserManager.My.Resources.Resources.book + Me.XtraTabPage1.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book Me.XtraTabPage1.Name = "XtraTabPage1" Me.XtraTabPage1.Size = New System.Drawing.Size(1190, 349) Me.XtraTabPage1.Text = "Mandanten Zuordnung" @@ -2650,7 +2649,7 @@ Partial Class frmMain 'XtraTabPage2 ' Me.XtraTabPage2.Controls.Add(Me.SplitContainer7) - Me.XtraTabPage2.Image = Global.DDUserManager.My.Resources.Resources.plugin + Me.XtraTabPage2.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin Me.XtraTabPage2.Name = "XtraTabPage2" Me.XtraTabPage2.Size = New System.Drawing.Size(1190, 349) Me.XtraTabPage2.Text = "Modul Zuordnung" @@ -3012,7 +3011,7 @@ Partial Class frmMain Me.tabPageClients.Controls.Add(Me.Panel17) Me.tabPageClients.Controls.Add(Me.gridClients) Me.tabPageClients.Controls.Add(Me.TBDD_CLIENTBindingNavigator) - Me.tabPageClients.Image = Global.DDUserManager.My.Resources.Resources.book + Me.tabPageClients.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book Me.tabPageClients.Name = "tabPageClients" Me.tabPageClients.Size = New System.Drawing.Size(1193, 784) Me.tabPageClients.Text = "Mandanten" @@ -3295,7 +3294,7 @@ Partial Class frmMain Me.tabPageModules.Controls.Add(Me.Panel18) Me.tabPageModules.Controls.Add(Me.gridModules) Me.tabPageModules.Controls.Add(Me.TBDD_MODULESBindingNavigator) - Me.tabPageModules.Image = Global.DDUserManager.My.Resources.Resources.plugin + Me.tabPageModules.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin Me.tabPageModules.Name = "tabPageModules" Me.tabPageModules.Size = New System.Drawing.Size(1193, 784) Me.tabPageModules.Text = "Module" @@ -3497,7 +3496,7 @@ Partial Class frmMain ' 'tabPageRights ' - Me.tabPageRights.Image = Global.DDUserManager.My.Resources.Resources.key + Me.tabPageRights.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.key Me.tabPageRights.Name = "tabPageRights" Me.tabPageRights.PageEnabled = False Me.tabPageRights.Size = New System.Drawing.Size(1193, 784) @@ -3512,7 +3511,7 @@ Partial Class frmMain Me.tabPageSettings.Controls.Add(Me.btnOpenLogDir) Me.tabPageSettings.Controls.Add(Me.btnOpenConfigDir) Me.tabPageSettings.Controls.Add(Me.btnConfigConnections) - Me.tabPageSettings.Image = Global.DDUserManager.My.Resources.Resources.cog + Me.tabPageSettings.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.cog Me.tabPageSettings.Name = "tabPageSettings" Me.tabPageSettings.Size = New System.Drawing.Size(1193, 784) Me.tabPageSettings.Text = "Einstellungen" @@ -3528,6 +3527,46 @@ Partial Class frmMain Me.Button2.Text = "Support Tool aufrufen" Me.Button2.UseVisualStyleBackColor = True ' + 'GroupBox3 + ' + Me.GroupBox3.Controls.Add(Me.Label20) + Me.GroupBox3.Controls.Add(Me.Button4) + Me.GroupBox3.Controls.Add(Me.txtLDAPUserQuery) + Me.GroupBox3.Location = New System.Drawing.Point(486, 239) + Me.GroupBox3.Name = "GroupBox3" + Me.GroupBox3.Size = New System.Drawing.Size(700, 200) + Me.GroupBox3.TabIndex = 5 + Me.GroupBox3.TabStop = False + Me.GroupBox3.Text = "LDAP Filter für Benutzerabfrage" + ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.Location = New System.Drawing.Point(6, 176) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(381, 13) + Me.Label20.TabIndex = 8 + Me.Label20.Text = "Benutzen Sie @SAMACCOUNTNAME als Platzhalter für den Aktuellen Benutzer" + ' + 'Button4 + ' + Me.Button4.Location = New System.Drawing.Point(582, 171) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(112, 23) + Me.Button4.TabIndex = 7 + Me.Button4.Text = "Speichern" + Me.Button4.UseVisualStyleBackColor = True + ' + 'txtLDAPUserQuery + ' + Me.txtLDAPUserQuery.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtLDAPUserQuery.Location = New System.Drawing.Point(6, 20) + Me.txtLDAPUserQuery.Multiline = True + Me.txtLDAPUserQuery.Name = "txtLDAPUserQuery" + Me.txtLDAPUserQuery.ScrollBars = System.Windows.Forms.ScrollBars.Vertical + Me.txtLDAPUserQuery.Size = New System.Drawing.Size(688, 145) + Me.txtLDAPUserQuery.TabIndex = 2 + ' 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.Button3) @@ -3540,6 +3579,15 @@ Partial Class frmMain Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "LDAP Filter für Gruppenabfrage" ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(438, 171) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(112, 23) + Me.Button3.TabIndex = 7 + Me.Button3.Text = "Speichern" + Me.Button3.UseVisualStyleBackColor = True + ' 'btnDebugGroupQuery ' Me.btnDebugGroupQuery.Location = New System.Drawing.Point(556, 171) @@ -3551,13 +3599,13 @@ Partial Class frmMain ' 'txtLDAPGroupQuery ' + Me.txtLDAPGroupQuery.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtLDAPGroupQuery.Location = New System.Drawing.Point(6, 20) Me.txtLDAPGroupQuery.Multiline = True Me.txtLDAPGroupQuery.Name = "txtLDAPGroupQuery" Me.txtLDAPGroupQuery.ScrollBars = System.Windows.Forms.ScrollBars.Vertical Me.txtLDAPGroupQuery.Size = New System.Drawing.Size(688, 145) Me.txtLDAPGroupQuery.TabIndex = 2 - Me.txtLDAPGroupQuery.Text = "(&(objectClass=group) (samAccountName=*))" ' 'GroupBox1 ' @@ -3738,55 +3786,6 @@ Partial Class frmMain ' Me.TBDD_GROUPS_USERTableAdapter.ClearBeforeFill = True ' - 'Button3 - ' - Me.Button3.Location = New System.Drawing.Point(438, 171) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(112, 23) - Me.Button3.TabIndex = 7 - Me.Button3.Text = "Speichern" - Me.Button3.UseVisualStyleBackColor = True - ' - 'GroupBox3 - ' - Me.GroupBox3.Controls.Add(Me.Button4) - Me.GroupBox3.Controls.Add(Me.Button5) - Me.GroupBox3.Controls.Add(Me.txtLDAPUserQuery) - Me.GroupBox3.Location = New System.Drawing.Point(486, 239) - Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(700, 200) - Me.GroupBox3.TabIndex = 5 - Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "LDAP Filter für Benutzerabfrage" - ' - 'Button4 - ' - Me.Button4.Location = New System.Drawing.Point(438, 171) - Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(112, 23) - Me.Button4.TabIndex = 7 - Me.Button4.Text = "Speichern" - Me.Button4.UseVisualStyleBackColor = True - ' - 'txtLDAPUserQuery - ' - Me.txtLDAPUserQuery.Location = New System.Drawing.Point(6, 20) - Me.txtLDAPUserQuery.Multiline = True - Me.txtLDAPUserQuery.Name = "txtLDAPUserQuery" - Me.txtLDAPUserQuery.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtLDAPUserQuery.Size = New System.Drawing.Size(688, 145) - Me.txtLDAPUserQuery.TabIndex = 2 - Me.txtLDAPUserQuery.Text = "(&(objectClass=group) (samAccountName=*))" - ' - 'Button5 - ' - Me.Button5.Location = New System.Drawing.Point(556, 171) - Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(138, 23) - Me.Button5.TabIndex = 6 - Me.Button5.Text = "Abfrage starten" - Me.Button5.UseVisualStyleBackColor = True - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3932,6 +3931,8 @@ Partial Class frmMain Me.TBDD_MODULESBindingNavigator.ResumeLayout(False) Me.TBDD_MODULESBindingNavigator.PerformLayout() Me.tabPageSettings.ResumeLayout(False) + Me.GroupBox3.ResumeLayout(False) + Me.GroupBox3.PerformLayout() Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() Me.GroupBox1.ResumeLayout(False) @@ -3941,8 +3942,6 @@ Partial Class frmMain CType(Me.TBDD_USER_MODULESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() - Me.GroupBox3.ResumeLayout(False) - Me.GroupBox3.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -4252,5 +4251,5 @@ Partial Class frmMain Friend WithEvents GroupBox3 As GroupBox Friend WithEvents Button4 As Button Friend WithEvents txtLDAPUserQuery As TextBox - Friend WithEvents Button5 As Button + Friend WithEvents Label20 As Label End Class diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 3cf53d9..cbc083f 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -5,6 +5,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Config Imports System.Reflection Imports DigitalData.Modules.Filesystem +Imports DigitalData.Modules.Interfaces ''' ''' Anmerkungen: @@ -160,7 +161,7 @@ Public Class frmMain End If LogErrorsOnly = MyConfig.Config.LogErrorsOnly - ActiveDirectoryRootNode = MyConfig.Config.ActiveDirectoryRootNode + ActiveDirectoryRootNode = MyConfig.Config.AdRootPath End Sub Private Sub btnImportUsers_Click(sender As Object, e As EventArgs) Handles btnImportUsers.Click @@ -1075,19 +1076,19 @@ Public Class frmMain End Sub Private Sub txtADRootNode_Leave(sender As Object, e As EventArgs) Handles txtADRootNode.Leave, txtLDAPGroupQuery.Leave, txtLDAPUserQuery.Leave - MyConfig.Config.ActiveDirectoryRootNode = txtADRootNode.Text + MyConfig.Config.AdRootPath = txtADRootNode.Text MyConfig.Save() End Sub Private Sub btnADConnectionTest_Click(sender As Object, e As EventArgs) Handles btnADConnectionTest.Click Dim ldapPAth = IIf(txtADRootNode.Text = String.Empty, ActiveDirectoryRootNode, txtADRootNode.Text) + Dim oActiveDirectory As New ActiveDirectoryInterface(MyLogConfig, ldapPAth) - - If ClassActiveDirectory.ConnectionTest(txtADRootNode.Text) Then + If oActiveDirectory.Authenticate() Then MsgBox("Verbindung erfolgreich aufgebaut!", MsgBoxStyle.Information) - MyConfig.Config.ActiveDirectoryRootNode = txtADRootNode.Text + MyConfig.Config.AdRootPath = txtADRootNode.Text MyConfig.Save() MyLogger.Info($"New ActiveDirectory Path saved: {txtADRootNode.Text}") @@ -1098,13 +1099,15 @@ Public Class frmMain Process.Start("https://didalog.de/support") End Sub - Private Async Sub btnDebugQuery_Click(sender As Object, e As EventArgs) Handles btnDebugGroupQuery.Click, Button5.Click + Private Async Sub btnDebugQuery_Click(sender As Object, e As EventArgs) Handles btnDebugGroupQuery.Click btnDebugGroupQuery.Text = "Abfrage läuft..." btnDebugGroupQuery.Enabled = False + Dim oActiveDirectory As New ActiveDirectoryInterface(MyLogConfig, MyConfig.Config.AdRootPath) + Await Task.Run(Sub() - Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(txtLDAPGroupQuery.Text) - Dim frm As New frmADDebug() + Dim groups = oActiveDirectory.ListGroups(MyConfig.Config.AdGroupFilter) + Dim frm As New frmADDebug_Groups() frm.DebugData = groups frm.ShowDialog() @@ -1138,7 +1141,7 @@ Public Class frmMain Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged If e.Page.Name = tabPageSettings.Name Then - txtADRootNode.Text = MyConfig.Config.ActiveDirectoryRootNode + txtADRootNode.Text = MyConfig.Config.AdRootPath txtLDAPGroupQuery.Text = MyConfig.Config.AdGroupFilter txtLDAPUserQuery.Text = MyConfig.Config.AdUserFilter End If From 7a2ff1a9784f032815007790cabf07d86098ff1b Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 12 Nov 2019 10:57:55 +0100 Subject: [PATCH 07/16] remove ClassNLog in favor of logging module, remove calls to logger.fatal --- DDUserManager/DDUserManager/ClassNLog.vb | 27 ------------------- .../DDUserManager/DDUserManager.vbproj | 2 -- DDUserManager/DDUserManager/frmMain.vb | 6 ++--- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 DDUserManager/DDUserManager/ClassNLog.vb diff --git a/DDUserManager/DDUserManager/ClassNLog.vb b/DDUserManager/DDUserManager/ClassNLog.vb deleted file mode 100644 index 6e7d425..0000000 --- a/DDUserManager/DDUserManager/ClassNLog.vb +++ /dev/null @@ -1,27 +0,0 @@ -Public Class ClassNLog - Public Shared Function GetLogPathFor(moduleName As String) - Dim localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) - Return IO.Path.Combine(localAppData, "Digital Data", "UserManager", "Log") - End Function - - Public Shared Function GetLoggerConfigFor(moduleName As String) - Dim loggerConfig = New NLog.Config.LoggingConfiguration() - Dim logFileName = Environment.UserName & "-${date:format=yyyy-MM-dd}.log" - Dim logPath As String = IO.Path.Combine(GetLogPathFor(moduleName), logFileName) - - Dim logFileInfo As New NLog.Targets.FileTarget("logFileInfo") With { - .FileName = logPath, - .Layout = "${longdate}|${level:uppercase=true}|${logger}|${message}" - } - - Dim logFileError As New NLog.Targets.FileTarget("logFileError") With { - .FileName = logPath, - .Layout = "${longdate}|${level:uppercase=true}|${logger}|${message}|${exception:format=message}" & vbCrLf & "${exception:format=toString}" - } - - loggerConfig.AddRule(NLog.LogLevel.Debug, NLog.LogLevel.Warn, logFileInfo) - loggerConfig.AddRule(NLog.LogLevel.Error, NLog.LogLevel.Fatal, logFileError) - - Return loggerConfig - End Function -End Class diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj b/DDUserManager/DDUserManager/DDUserManager.vbproj index 2db510a..f9954f7 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj @@ -55,7 +55,6 @@ - @@ -111,7 +110,6 @@ - True True diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index cbc083f..0157713 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -125,7 +125,7 @@ Public Class frmMain End If Catch ex As Exception MsgBox("Unexpected Error while loading. Please check the log.", MsgBoxStyle.Critical, "User Manager") - MyLogger.Fatal(ex, "Unexpected Error while loading.") + MyLogger.Error(ex, "Unexpected Error while loading.") End Try End Sub @@ -1072,7 +1072,7 @@ Public Class frmMain End Sub Private Sub btnOpenLogDir_Click(sender As Object, e As EventArgs) Handles btnOpenLogDir.Click - Process.Start(ClassNLog.GetLogPathFor(MODULE_NAME)) + Process.Start(MyLogConfig.LogDirectory) End Sub Private Sub txtADRootNode_Leave(sender As Object, e As EventArgs) Handles txtADRootNode.Leave, txtLDAPGroupQuery.Leave, txtLDAPUserQuery.Leave @@ -1135,7 +1135,7 @@ Public Class frmMain End Sub Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click, Button4.Click - MyConfig.Config.AdGroupFilter = txtLDAPGroupQuery.Text + MyConfig.Config.AdUserFilter = txtLDAPUserQuery.Text MyConfig.Save() End Sub From dddb80e0ab6fec93a6c6be0575cd6944ca0eb854 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 12 Nov 2019 15:58:33 +0100 Subject: [PATCH 08/16] use commonappdata --- DDUserManager/DDUserManager/frmMain.vb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 0157713..e71e56c 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -25,7 +25,7 @@ Public Class frmMain Try MyLogConfig = New LogConfig(LogConfig.PathType.AppData) MyLogger = MyLogConfig.GetLogger() - MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.UserAppDataPath) + MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.CommonAppDataPath) LoadConfig(MyConfig) @@ -1068,7 +1068,8 @@ Public Class frmMain End Sub Private Sub btnOpenConfigDir_Click(sender As Object, e As EventArgs) Handles btnOpenConfigDir.Click - Process.Start(Application.UserAppDataPath()) + Dim oConfigDir = IO.Directory.GetParent(MyConfig.UserConfigPath).FullName + Process.Start(oConfigDir) End Sub Private Sub btnOpenLogDir_Click(sender As Object, e As EventArgs) Handles btnOpenLogDir.Click From e3469078e802eddc21e85e9651fce3b52f65f669 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 12 Nov 2019 15:59:13 +0100 Subject: [PATCH 09/16] version 1.0.0.5 --- DDUserManager/DDUserManager/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index 6761f1d..137a118 100644 --- a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb +++ b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + From 6797615884390f0c4ff079044d590af3dc6e29e4 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 20 May 2020 14:57:29 +0200 Subject: [PATCH 10/16] update to devexpress 19.2 --- DDUserManager/DDUserManager.sln | 12 +- DDUserManager/DDUserManager/App.config | 22 +- .../DDUserManager/DDUserManager.vbproj | 27 ++- .../DDUserManager/DDUserManager.vbproj.bak | 21 +- .../DDUserManager/My Project/AssemblyInfo.vb | 2 +- .../My Project/Settings.Designer.vb | 25 +- .../My Project/Settings.settings | 13 +- .../DDUserManager/My Project/licenses.licx | 2 +- .../My Project/licenses.licx.bak | 2 +- .../DDUserManager/frmMain.Designer.vb | 217 ++++++++++-------- DDUserManager/DDUserManager/frmMain.resx | 203 ++++++++++++++++ DDUserManager/DDUserManager/frmMain.vb | 6 +- DDUserManager/DDUserManager/packages.config | 4 + DDUserManager/SetupVS19/Config.wxi | 21 ++ DDUserManager/SetupVS19/Product.wxs | 175 ++++++++++++++ DDUserManager/SetupVS19/SetupVS19.wixproj | 63 +++++ DDUserManager/SetupWix/Product.wxs | 24 +- 17 files changed, 650 insertions(+), 189 deletions(-) create mode 100644 DDUserManager/DDUserManager/packages.config create mode 100644 DDUserManager/SetupVS19/Config.wxi create mode 100644 DDUserManager/SetupVS19/Product.wxs create mode 100644 DDUserManager/SetupVS19/SetupVS19.wixproj diff --git a/DDUserManager/DDUserManager.sln b/DDUserManager/DDUserManager.sln index d83702f..0840b9d 100644 --- a/DDUserManager/DDUserManager.sln +++ b/DDUserManager/DDUserManager.sln @@ -1,12 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2020 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDUserManager", "DDUserManager\DDUserManager.vbproj", "{87122913-C196-46BC-A7CD-27F7E201E55F}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWix", "SetupWix\SetupWix.wixproj", "{BCE990D1-E422-4096-A4BE-6E940FB25127}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -29,6 +31,12 @@ Global {BCE990D1-E422-4096-A4BE-6E940FB25127}.Release|Any CPU.ActiveCfg = Release|x86 {BCE990D1-E422-4096-A4BE-6E940FB25127}.Release|x86.ActiveCfg = Release|x86 {BCE990D1-E422-4096-A4BE-6E940FB25127}.Release|x86.Build.0 = Release|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Debug|Any CPU.ActiveCfg = Debug|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Debug|x86.ActiveCfg = Debug|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Debug|x86.Build.0 = Debug|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Release|Any CPU.ActiveCfg = Release|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Release|x86.ActiveCfg = Release|x86 + {93D47F6E-A8A5-44F1-9534-3FFCA5ED3C17}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DDUserManager/DDUserManager/App.config b/DDUserManager/DDUserManager/App.config index 1b93a2f..9721a27 100644 --- a/DDUserManager/DDUserManager/App.config +++ b/DDUserManager/DDUserManager/App.config @@ -1,30 +1,18 @@ - -
- - -
+ +
- - - + - - - - - - - - - (&(objectClass=group) (samAccountName=*)) + + diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj b/DDUserManager/DDUserManager/DDUserManager.vbproj index f9954f7..9d0f29f 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj @@ -51,14 +51,14 @@ user.ico - - - - - - - - + + + + + + + + ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll @@ -74,17 +74,23 @@ ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll - - P:\Visual Studio Projekte\Bibliotheken\NLog\NLog.dll + + + ..\packages\NLog.4.7.2\lib\net45\NLog.dll + + + + + @@ -228,6 +234,7 @@ Settings.Designer.vb + UserDataSet.xsd diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj.bak b/DDUserManager/DDUserManager/DDUserManager.vbproj.bak index 0f423b1..b824241 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj.bak +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj.bak @@ -51,20 +51,13 @@ user.ico - - - - + - - - - ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll @@ -81,17 +74,23 @@ ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll - - P:\Visual Studio Projekte\Bibliotheken\NLog\NLog.dll + + + ..\packages\NLog.4.7.2\lib\net45\NLog.dll + + + + + @@ -117,7 +116,6 @@ - True True @@ -236,6 +234,7 @@ Settings.Designer.vb + UserDataSet.xsd diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index 137a118..9b3aec7 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/My Project/Settings.Designer.vb b/DDUserManager/DDUserManager/My Project/Settings.Designer.vb index 8fb2a52..17d912e 100644 --- a/DDUserManager/DDUserManager/My Project/Settings.Designer.vb +++ b/DDUserManager/DDUserManager/My Project/Settings.Designer.vb @@ -56,35 +56,12 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("")> _ Public ReadOnly Property DD_ECMConnectionString() As String Get Return CType(Me("DD_ECMConnectionString"),String) End Get End Property - - _ - Public ReadOnly Property AD_GROUP_QUERY() As String - Get - Return CType(Me("AD_GROUP_QUERY"),String) - End Get - End Property - - _ - Public Property AD_USER_QUERY() As String - Get - Return CType(Me("AD_USER_QUERY"),String) - End Get - Set - Me("AD_USER_QUERY") = value - End Set - End Property End Class End Namespace diff --git a/DDUserManager/DDUserManager/My Project/Settings.settings b/DDUserManager/DDUserManager/My Project/Settings.settings index 494437e..5338c76 100644 --- a/DDUserManager/DDUserManager/My Project/Settings.settings +++ b/DDUserManager/DDUserManager/My Project/Settings.settings @@ -2,18 +2,7 @@ - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> - <ProviderName>System.Data.SqlClient</ProviderName> -</SerializableConnectionString> - Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - - - (&(objectClass=group) (samAccountName=*)) - - + diff --git a/DDUserManager/DDUserManager/My Project/licenses.licx b/DDUserManager/DDUserManager/My Project/licenses.licx index 824a99f..fb06462 100644 --- a/DDUserManager/DDUserManager/My Project/licenses.licx +++ b/DDUserManager/DDUserManager/My Project/licenses.licx @@ -1 +1 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/DDUserManager/DDUserManager/My Project/licenses.licx.bak b/DDUserManager/DDUserManager/My Project/licenses.licx.bak index 4308626..824a99f 100644 --- a/DDUserManager/DDUserManager/My Project/licenses.licx.bak +++ b/DDUserManager/DDUserManager/My Project/licenses.licx.bak @@ -1 +1 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index 9d821aa..5a0c30d 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmMain 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim GUIDLabel As System.Windows.Forms.Label Dim PRENAMELabel As System.Windows.Forms.Label Dim NAMELabel As System.Windows.Forms.Label @@ -62,7 +63,7 @@ Partial Class frmMain Me.Label8 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.LANGUAGEComboBox = New System.Windows.Forms.ComboBox() - Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.UserDataSet = New DDUserManager.UserDataSet() Me.DATE_FORMATComboBox = New System.Windows.Forms.ComboBox() Me.TextBox2 = New System.Windows.Forms.TextBox() @@ -79,12 +80,12 @@ Partial Class frmMain Me.Label12 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.listModules = New System.Windows.Forms.ListBox() - Me.TBDD_MODULESBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_MODULESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.listGroups = New System.Windows.Forms.ListBox() - Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.Label2 = New System.Windows.Forms.Label() Me.listClients = New System.Windows.Forms.ListBox() - Me.TBDD_CLIENTBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_CLIENTBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridUsers = New DevExpress.XtraGrid.GridControl() Me.gvUsers = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colPRENAME = New DevExpress.XtraGrid.Columns.GridColumn() @@ -116,7 +117,7 @@ Partial Class frmMain Me.labelGroups_AssignedUsers = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() Me.gridGroups_AllGroups = New DevExpress.XtraGrid.GridControl() - Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource() + Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource(Me.components) Me.DS_ChangeS = New DDUserManager.DS_ChangeS() Me.viewGroups_AllGroups = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colNAME2 = New DevExpress.XtraGrid.Columns.GridColumn() @@ -177,7 +178,7 @@ Partial Class frmMain Me.GridColumn11 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn12 = New DevExpress.XtraGrid.Columns.GridColumn() Me.Label9 = New System.Windows.Forms.Label() - Me.TBDD_USERBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBDD_USERBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() @@ -256,7 +257,7 @@ Partial Class frmMain Me.colNAME10 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colSHORT_NAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.Label16 = New System.Windows.Forms.Label() - Me.TBDD_GROUPSBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBDD_GROUPSBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorCountItem1 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMoveFirstItem1 = New System.Windows.Forms.ToolStripButton() @@ -287,7 +288,7 @@ Partial Class frmMain Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.TBDD_CLIENTBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBDD_CLIENTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem2 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem2 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem2 = New System.Windows.Forms.ToolStripButton() @@ -312,7 +313,7 @@ Partial Class frmMain Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn10 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.TBDD_MODULESBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBDD_MODULESBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorCountItem3 = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem3 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem3 = New System.Windows.Forms.ToolStripButton() @@ -340,14 +341,14 @@ Partial Class frmMain Me.btnOpenLogDir = New System.Windows.Forms.Button() Me.btnOpenConfigDir = New System.Windows.Forms.Button() Me.btnConfigConnections = New System.Windows.Forms.Button() - Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USERTableAdapter() Me.TableAdapterManager = New DDUserManager.UserDataSetTableAdapters.TableAdapterManager() - Me.TBDD_CLIENT_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_CLIENT_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_CLIENT_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_CLIENT_USERTableAdapter() Me.TBDD_CLIENTTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_CLIENTTableAdapter() Me.TBDD_MODULESTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_MODULESTableAdapter() - Me.TBDD_USER_MODULESBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_USER_MODULESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_USER_MODULESTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USER_MODULESTableAdapter() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tsLabelUser = New System.Windows.Forms.ToolStripStatusLabel() @@ -833,8 +834,10 @@ Partial Class frmMain Me.tabPageUsers.Controls.Add(Me.SplitContainer1) Me.tabPageUsers.Controls.Add(Me.TBDD_USERBindingNavigator) Me.tabPageUsers.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.user + Me.tabPageUsers.ImageOptions.SvgImage = CType(resources.GetObject("tabPageUsers.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageUsers.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageUsers.Name = "tabPageUsers" - Me.tabPageUsers.Size = New System.Drawing.Size(1193, 784) + Me.tabPageUsers.Size = New System.Drawing.Size(1197, 783) Me.tabPageUsers.Text = "Benutzer" ' 'SplitContainer1 @@ -854,8 +857,8 @@ Partial Class frmMain ' Me.SplitContainer1.Panel2.Controls.Add(Me.XtraTabControl2) Me.SplitContainer1.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.SplitContainer1.Size = New System.Drawing.Size(1193, 759) - Me.SplitContainer1.SplitterDistance = 375 + Me.SplitContainer1.Size = New System.Drawing.Size(1197, 758) + Me.SplitContainer1.SplitterDistance = 374 Me.SplitContainer1.TabIndex = 63 ' 'SplitContainer2 @@ -907,8 +910,8 @@ Partial Class frmMain Me.SplitContainer2.Panel2.Controls.Add(Me.Label2) Me.SplitContainer2.Panel2.Controls.Add(Me.listClients) Me.SplitContainer2.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.SplitContainer2.Size = New System.Drawing.Size(793, 375) - Me.SplitContainer2.SplitterDistance = 181 + Me.SplitContainer2.Size = New System.Drawing.Size(797, 374) + Me.SplitContainer2.SplitterDistance = 180 Me.SplitContainer2.TabIndex = 63 ' 'Label8 @@ -1138,7 +1141,7 @@ Partial Class frmMain Me.GridUsers.Location = New System.Drawing.Point(0, 0) Me.GridUsers.MainView = Me.gvUsers Me.GridUsers.Name = "GridUsers" - Me.GridUsers.Size = New System.Drawing.Size(400, 375) + Me.GridUsers.Size = New System.Drawing.Size(400, 374) Me.GridUsers.TabIndex = 58 Me.GridUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.gvUsers}) ' @@ -1191,7 +1194,7 @@ Partial Class frmMain Me.XtraTabControl2.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.tabGroupAssign - Me.XtraTabControl2.Size = New System.Drawing.Size(1193, 380) + Me.XtraTabControl2.Size = New System.Drawing.Size(1197, 380) Me.XtraTabControl2.TabIndex = 0 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabGroupAssign, Me.tabClientAssign, Me.tabModuleAssign}) ' @@ -1199,8 +1202,10 @@ Partial Class frmMain ' Me.tabGroupAssign.Controls.Add(Me.SplitContainerUserGroups1) Me.tabGroupAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.group + Me.tabGroupAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabGroupAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabGroupAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabGroupAssign.Name = "tabGroupAssign" - Me.tabGroupAssign.Size = New System.Drawing.Size(1187, 349) + Me.tabGroupAssign.Size = New System.Drawing.Size(1195, 348) Me.tabGroupAssign.Text = "Gruppen Zuordnung" ' 'SplitContainerUserGroups1 @@ -1221,8 +1226,8 @@ Partial Class frmMain Me.SplitContainerUserGroups1.Panel2.Controls.Add(Me.Panel2) Me.SplitContainerUserGroups1.Panel2.Controls.Add(Me.Panel1) Me.SplitContainerUserGroups1.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.SplitContainerUserGroups1.Size = New System.Drawing.Size(1187, 349) - Me.SplitContainerUserGroups1.SplitterDistance = 434 + Me.SplitContainerUserGroups1.Size = New System.Drawing.Size(1195, 348) + Me.SplitContainerUserGroups1.SplitterDistance = 436 Me.SplitContainerUserGroups1.TabIndex = 8 ' 'Panel3 @@ -1234,7 +1239,7 @@ Partial Class frmMain Me.Panel3.Controls.Add(Me.labelGroups_AvailableUsers) Me.Panel3.Location = New System.Drawing.Point(0, 0) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(320, 349) + Me.Panel3.Size = New System.Drawing.Size(322, 348) Me.Panel3.TabIndex = 10 ' 'gridGroups_AvailableUsers @@ -1244,7 +1249,7 @@ Partial Class frmMain Me.gridGroups_AvailableUsers.Location = New System.Drawing.Point(0, 30) Me.gridGroups_AvailableUsers.MainView = Me.viewGroups_AvailableUsers Me.gridGroups_AvailableUsers.Name = "gridGroups_AvailableUsers" - Me.gridGroups_AvailableUsers.Size = New System.Drawing.Size(320, 319) + Me.gridGroups_AvailableUsers.Size = New System.Drawing.Size(322, 318) Me.gridGroups_AvailableUsers.TabIndex = 5 Me.gridGroups_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups_AvailableUsers, Me.GridView1}) ' @@ -1306,7 +1311,7 @@ Partial Class frmMain Me.labelGroups_AvailableUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.labelGroups_AvailableUsers.Location = New System.Drawing.Point(0, 0) Me.labelGroups_AvailableUsers.Name = "labelGroups_AvailableUsers" - Me.labelGroups_AvailableUsers.Size = New System.Drawing.Size(320, 30) + Me.labelGroups_AvailableUsers.Size = New System.Drawing.Size(322, 30) Me.labelGroups_AvailableUsers.TabIndex = 7 Me.labelGroups_AvailableUsers.Text = "Nicht zugeordnete Benutzer:" Me.labelGroups_AvailableUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1316,7 +1321,7 @@ Partial Class frmMain Me.btnGroups_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnGroups_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnGroups_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnGroups_AddUsers.Location = New System.Drawing.Point(328, 108) + Me.btnGroups_AddUsers.Location = New System.Drawing.Point(330, 108) Me.btnGroups_AddUsers.Name = "btnGroups_AddUsers" Me.btnGroups_AddUsers.Size = New System.Drawing.Size(103, 50) Me.btnGroups_AddUsers.TabIndex = 9 @@ -1328,7 +1333,7 @@ Partial Class frmMain Me.btnGroups_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnGroups_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnGroups_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnGroups_RemoveUsers.Location = New System.Drawing.Point(329, 164) + Me.btnGroups_RemoveUsers.Location = New System.Drawing.Point(331, 164) Me.btnGroups_RemoveUsers.Name = "btnGroups_RemoveUsers" Me.btnGroups_RemoveUsers.Size = New System.Drawing.Size(103, 50) Me.btnGroups_RemoveUsers.TabIndex = 8 @@ -1342,7 +1347,7 @@ Partial Class frmMain Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(326, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(423, 349) + Me.Panel2.Size = New System.Drawing.Size(429, 348) Me.Panel2.TabIndex = 9 ' 'gridGroups_AssignedUsers @@ -1352,7 +1357,7 @@ Partial Class frmMain Me.gridGroups_AssignedUsers.Location = New System.Drawing.Point(0, 30) Me.gridGroups_AssignedUsers.MainView = Me.viewGroups_AssignedUsers Me.gridGroups_AssignedUsers.Name = "gridGroups_AssignedUsers" - Me.gridGroups_AssignedUsers.Size = New System.Drawing.Size(423, 319) + Me.gridGroups_AssignedUsers.Size = New System.Drawing.Size(429, 318) Me.gridGroups_AssignedUsers.TabIndex = 5 Me.gridGroups_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups_AssignedUsers, Me.GridView3}) ' @@ -1416,7 +1421,7 @@ Partial Class frmMain Me.labelGroups_AssignedUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.labelGroups_AssignedUsers.Location = New System.Drawing.Point(0, 0) Me.labelGroups_AssignedUsers.Name = "labelGroups_AssignedUsers" - Me.labelGroups_AssignedUsers.Size = New System.Drawing.Size(423, 30) + Me.labelGroups_AssignedUsers.Size = New System.Drawing.Size(429, 30) Me.labelGroups_AssignedUsers.TabIndex = 7 Me.labelGroups_AssignedUsers.Text = "Aktuelle Benutzer in Gruppe: {0}" Me.labelGroups_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1428,7 +1433,7 @@ Partial Class frmMain Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(326, 349) + Me.Panel1.Size = New System.Drawing.Size(326, 348) Me.Panel1.TabIndex = 8 ' 'gridGroups_AllGroups @@ -1438,7 +1443,7 @@ Partial Class frmMain Me.gridGroups_AllGroups.Location = New System.Drawing.Point(0, 30) Me.gridGroups_AllGroups.MainView = Me.viewGroups_AllGroups Me.gridGroups_AllGroups.Name = "gridGroups_AllGroups" - Me.gridGroups_AllGroups.Size = New System.Drawing.Size(326, 319) + Me.gridGroups_AllGroups.Size = New System.Drawing.Size(326, 318) Me.gridGroups_AllGroups.TabIndex = 6 Me.gridGroups_AllGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups_AllGroups}) ' @@ -1498,8 +1503,10 @@ Partial Class frmMain ' Me.tabClientAssign.Controls.Add(Me.SplitContainer4) Me.tabClientAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book + Me.tabClientAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabClientAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabClientAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabClientAssign.Name = "tabClientAssign" - Me.tabClientAssign.Size = New System.Drawing.Size(1187, 349) + Me.tabClientAssign.Size = New System.Drawing.Size(1191, 352) Me.tabClientAssign.Text = "Mandanten Zuordnung" ' 'SplitContainer4 @@ -1520,8 +1527,8 @@ Partial Class frmMain Me.SplitContainer4.Panel2.Controls.Add(Me.Panel4) Me.SplitContainer4.Panel2.Controls.Add(Me.Panel5) Me.SplitContainer4.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.SplitContainer4.Size = New System.Drawing.Size(1187, 349) - Me.SplitContainer4.SplitterDistance = 434 + Me.SplitContainer4.Size = New System.Drawing.Size(1191, 352) + Me.SplitContainer4.SplitterDistance = 435 Me.SplitContainer4.TabIndex = 0 ' 'Panel6 @@ -1533,7 +1540,7 @@ Partial Class frmMain Me.Panel6.Controls.Add(Me.Label7) Me.Panel6.Location = New System.Drawing.Point(0, 0) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(320, 349) + Me.Panel6.Size = New System.Drawing.Size(321, 352) Me.Panel6.TabIndex = 12 ' 'gridClients_AvailableUsers @@ -1543,7 +1550,7 @@ Partial Class frmMain Me.gridClients_AvailableUsers.Location = New System.Drawing.Point(0, 30) Me.gridClients_AvailableUsers.MainView = Me.viewClients_AvailableUsers Me.gridClients_AvailableUsers.Name = "gridClients_AvailableUsers" - Me.gridClients_AvailableUsers.Size = New System.Drawing.Size(320, 319) + Me.gridClients_AvailableUsers.Size = New System.Drawing.Size(321, 322) Me.gridClients_AvailableUsers.TabIndex = 0 Me.gridClients_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AvailableUsers}) ' @@ -1599,7 +1606,7 @@ Partial Class frmMain Me.Label7.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.Location = New System.Drawing.Point(0, 0) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(320, 30) + Me.Label7.Size = New System.Drawing.Size(321, 30) Me.Label7.TabIndex = 2 Me.Label7.Text = "Nicht zugeordnete Benutzer:" Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1609,7 +1616,7 @@ Partial Class frmMain Me.btnClients_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnClients_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnClients_AddUsers.Location = New System.Drawing.Point(328, 108) + Me.btnClients_AddUsers.Location = New System.Drawing.Point(329, 108) Me.btnClients_AddUsers.Name = "btnClients_AddUsers" Me.btnClients_AddUsers.Size = New System.Drawing.Size(103, 50) Me.btnClients_AddUsers.TabIndex = 11 @@ -1621,7 +1628,7 @@ Partial Class frmMain Me.btnClients_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnClients_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnClients_RemoveUsers.Location = New System.Drawing.Point(329, 164) + Me.btnClients_RemoveUsers.Location = New System.Drawing.Point(330, 164) Me.btnClients_RemoveUsers.Name = "btnClients_RemoveUsers" Me.btnClients_RemoveUsers.Size = New System.Drawing.Size(103, 50) Me.btnClients_RemoveUsers.TabIndex = 10 @@ -1635,7 +1642,7 @@ Partial Class frmMain Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(326, 0) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(423, 349) + Me.Panel4.Size = New System.Drawing.Size(426, 352) Me.Panel4.TabIndex = 0 ' 'gridClients_AssignedUsers @@ -1645,7 +1652,7 @@ Partial Class frmMain Me.gridClients_AssignedUsers.Location = New System.Drawing.Point(0, 30) Me.gridClients_AssignedUsers.MainView = Me.viewClients_AssignedUsers Me.gridClients_AssignedUsers.Name = "gridClients_AssignedUsers" - Me.gridClients_AssignedUsers.Size = New System.Drawing.Size(423, 319) + Me.gridClients_AssignedUsers.Size = New System.Drawing.Size(426, 322) Me.gridClients_AssignedUsers.TabIndex = 0 Me.gridClients_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AssignedUsers}) ' @@ -1702,7 +1709,7 @@ Partial Class frmMain Me.labelClients_AssignedUsers.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelClients_AssignedUsers.Location = New System.Drawing.Point(0, 0) Me.labelClients_AssignedUsers.Name = "labelClients_AssignedUsers" - Me.labelClients_AssignedUsers.Size = New System.Drawing.Size(423, 30) + Me.labelClients_AssignedUsers.Size = New System.Drawing.Size(426, 30) Me.labelClients_AssignedUsers.TabIndex = 2 Me.labelClients_AssignedUsers.Text = "Zugeordnete Benutzer zu Mandant {0}:" Me.labelClients_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1714,7 +1721,7 @@ Partial Class frmMain Me.Panel5.Dock = System.Windows.Forms.DockStyle.Left Me.Panel5.Location = New System.Drawing.Point(0, 0) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(326, 349) + Me.Panel5.Size = New System.Drawing.Size(326, 352) Me.Panel5.TabIndex = 1 ' 'gridClients_AllClients @@ -1724,7 +1731,7 @@ Partial Class frmMain Me.gridClients_AllClients.Location = New System.Drawing.Point(0, 30) Me.gridClients_AllClients.MainView = Me.viewClients_AllClients Me.gridClients_AllClients.Name = "gridClients_AllClients" - Me.gridClients_AllClients.Size = New System.Drawing.Size(326, 319) + Me.gridClients_AllClients.Size = New System.Drawing.Size(326, 322) Me.gridClients_AllClients.TabIndex = 0 Me.gridClients_AllClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AllClients}) ' @@ -1779,8 +1786,10 @@ Partial Class frmMain ' Me.tabModuleAssign.Controls.Add(Me.SplitContainer6) Me.tabModuleAssign.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin + Me.tabModuleAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabModuleAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabModuleAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabModuleAssign.Name = "tabModuleAssign" - Me.tabModuleAssign.Size = New System.Drawing.Size(1187, 349) + Me.tabModuleAssign.Size = New System.Drawing.Size(1191, 352) Me.tabModuleAssign.Text = "Modul Zuordnung" ' 'SplitContainer6 @@ -1801,8 +1810,8 @@ Partial Class frmMain Me.SplitContainer6.Panel2.Controls.Add(Me.Panel8) Me.SplitContainer6.Panel2.Controls.Add(Me.Panel7) Me.SplitContainer6.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.SplitContainer6.Size = New System.Drawing.Size(1187, 349) - Me.SplitContainer6.SplitterDistance = 434 + Me.SplitContainer6.Size = New System.Drawing.Size(1191, 352) + Me.SplitContainer6.SplitterDistance = 435 Me.SplitContainer6.TabIndex = 0 ' 'btnModules_AddUsers @@ -1810,7 +1819,7 @@ Partial Class frmMain Me.btnModules_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnModules_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnModules_AddUsers.Location = New System.Drawing.Point(328, 108) + Me.btnModules_AddUsers.Location = New System.Drawing.Point(329, 108) Me.btnModules_AddUsers.Name = "btnModules_AddUsers" Me.btnModules_AddUsers.Size = New System.Drawing.Size(103, 50) Me.btnModules_AddUsers.TabIndex = 13 @@ -1822,7 +1831,7 @@ Partial Class frmMain Me.btnModules_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnModules_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnModules_RemoveUsers.Location = New System.Drawing.Point(329, 164) + Me.btnModules_RemoveUsers.Location = New System.Drawing.Point(330, 164) Me.btnModules_RemoveUsers.Name = "btnModules_RemoveUsers" Me.btnModules_RemoveUsers.Size = New System.Drawing.Size(103, 50) Me.btnModules_RemoveUsers.TabIndex = 12 @@ -1838,7 +1847,7 @@ Partial Class frmMain Me.Panel9.Controls.Add(Me.Label10) Me.Panel9.Location = New System.Drawing.Point(0, 0) Me.Panel9.Name = "Panel9" - Me.Panel9.Size = New System.Drawing.Size(320, 349) + Me.Panel9.Size = New System.Drawing.Size(321, 352) Me.Panel9.TabIndex = 9 ' 'gridModules_AvailableUsers @@ -1848,7 +1857,7 @@ Partial Class frmMain Me.gridModules_AvailableUsers.Location = New System.Drawing.Point(0, 30) Me.gridModules_AvailableUsers.MainView = Me.viewModules_AvailableUsers Me.gridModules_AvailableUsers.Name = "gridModules_AvailableUsers" - Me.gridModules_AvailableUsers.Size = New System.Drawing.Size(320, 319) + Me.gridModules_AvailableUsers.Size = New System.Drawing.Size(321, 322) Me.gridModules_AvailableUsers.TabIndex = 6 Me.gridModules_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AvailableUsers, Me.GridView8}) ' @@ -1910,7 +1919,7 @@ Partial Class frmMain Me.Label10.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label10.Location = New System.Drawing.Point(0, 0) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(320, 30) + Me.Label10.Size = New System.Drawing.Size(321, 30) Me.Label10.TabIndex = 8 Me.Label10.Text = "Nicht zugeordnete Benutzer:" Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1922,7 +1931,7 @@ Partial Class frmMain Me.Panel8.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel8.Location = New System.Drawing.Point(326, 0) Me.Panel8.Name = "Panel8" - Me.Panel8.Size = New System.Drawing.Size(423, 349) + Me.Panel8.Size = New System.Drawing.Size(426, 352) Me.Panel8.TabIndex = 10 ' 'gridModules_AssignedUsers @@ -1932,7 +1941,7 @@ Partial Class frmMain Me.gridModules_AssignedUsers.Location = New System.Drawing.Point(0, 30) Me.gridModules_AssignedUsers.MainView = Me.viewModules_AssignedUsers Me.gridModules_AssignedUsers.Name = "gridModules_AssignedUsers" - Me.gridModules_AssignedUsers.Size = New System.Drawing.Size(423, 319) + Me.gridModules_AssignedUsers.Size = New System.Drawing.Size(426, 322) Me.gridModules_AssignedUsers.TabIndex = 6 Me.gridModules_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AssignedUsers, Me.GridView10}) ' @@ -1994,7 +2003,7 @@ Partial Class frmMain Me.labelModules_AssignedUsers.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelModules_AssignedUsers.Location = New System.Drawing.Point(0, 0) Me.labelModules_AssignedUsers.Name = "labelModules_AssignedUsers" - Me.labelModules_AssignedUsers.Size = New System.Drawing.Size(423, 30) + Me.labelModules_AssignedUsers.Size = New System.Drawing.Size(426, 30) Me.labelModules_AssignedUsers.TabIndex = 8 Me.labelModules_AssignedUsers.Text = "Zugeordnete Benutzer zu Modul {0}:" Me.labelModules_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2006,7 +2015,7 @@ Partial Class frmMain Me.Panel7.Dock = System.Windows.Forms.DockStyle.Left Me.Panel7.Location = New System.Drawing.Point(0, 0) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(326, 349) + Me.Panel7.Size = New System.Drawing.Size(326, 352) Me.Panel7.TabIndex = 9 ' 'gridModules_AllModules @@ -2016,7 +2025,7 @@ Partial Class frmMain Me.gridModules_AllModules.Location = New System.Drawing.Point(0, 30) Me.gridModules_AllModules.MainView = Me.viewModules_AllModules Me.gridModules_AllModules.Name = "gridModules_AllModules" - Me.gridModules_AllModules.Size = New System.Drawing.Size(326, 319) + Me.gridModules_AllModules.Size = New System.Drawing.Size(326, 322) Me.gridModules_AllModules.TabIndex = 7 Me.gridModules_AllModules.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AllModules}) ' @@ -2074,7 +2083,7 @@ Partial Class frmMain Me.TBDD_USERBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.TBDD_USERBindingNavigator.Name = "TBDD_USERBindingNavigator" Me.TBDD_USERBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBDD_USERBindingNavigator.Size = New System.Drawing.Size(1193, 25) + Me.TBDD_USERBindingNavigator.Size = New System.Drawing.Size(1197, 25) Me.TBDD_USERBindingNavigator.TabIndex = 1 Me.TBDD_USERBindingNavigator.Text = "BindingNavigator1" ' @@ -2121,6 +2130,7 @@ Partial Class frmMain ' Me.BindingNavigatorPositionItem.AccessibleName = "Position" Me.BindingNavigatorPositionItem.AutoSize = False + Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem.Text = "0" @@ -2194,8 +2204,10 @@ Partial Class frmMain Me.tabPageGroups.Controls.Add(Me.SplitContainer3) Me.tabPageGroups.Controls.Add(Me.TBDD_GROUPSBindingNavigator) Me.tabPageGroups.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.group + Me.tabPageGroups.ImageOptions.SvgImage = CType(resources.GetObject("tabPageGroups.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageGroups.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageGroups.Name = "tabPageGroups" - Me.tabPageGroups.Size = New System.Drawing.Size(1193, 784) + Me.tabPageGroups.Size = New System.Drawing.Size(1197, 787) Me.tabPageGroups.Text = "Gruppen" ' 'SplitContainer3 @@ -2412,7 +2424,7 @@ Partial Class frmMain Me.XtraTabPage1.Controls.Add(Me.SplitContainer5) Me.XtraTabPage1.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1190, 349) + Me.XtraTabPage1.Size = New System.Drawing.Size(1194, 352) Me.XtraTabPage1.Text = "Mandanten Zuordnung" ' 'SplitContainer5 @@ -2431,8 +2443,8 @@ Partial Class frmMain ' Me.SplitContainer5.Panel2.Controls.Add(Me.Panel12) Me.SplitContainer5.Panel2.Controls.Add(Me.Panel11) - Me.SplitContainer5.Size = New System.Drawing.Size(1190, 349) - Me.SplitContainer5.SplitterDistance = 435 + Me.SplitContainer5.Size = New System.Drawing.Size(1194, 352) + Me.SplitContainer5.SplitterDistance = 436 Me.SplitContainer5.TabIndex = 0 ' 'btnClients_AddGroups @@ -2440,7 +2452,7 @@ Partial Class frmMain Me.btnClients_AddGroups.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_AddGroups.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnClients_AddGroups.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnClients_AddGroups.Location = New System.Drawing.Point(329, 108) + Me.btnClients_AddGroups.Location = New System.Drawing.Point(330, 108) Me.btnClients_AddGroups.Name = "btnClients_AddGroups" Me.btnClients_AddGroups.Size = New System.Drawing.Size(103, 50) Me.btnClients_AddGroups.TabIndex = 15 @@ -2452,7 +2464,7 @@ Partial Class frmMain Me.btnClients_RemoveGroups.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_RemoveGroups.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnClients_RemoveGroups.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnClients_RemoveGroups.Location = New System.Drawing.Point(330, 164) + Me.btnClients_RemoveGroups.Location = New System.Drawing.Point(331, 164) Me.btnClients_RemoveGroups.Name = "btnClients_RemoveGroups" Me.btnClients_RemoveGroups.Size = New System.Drawing.Size(103, 50) Me.btnClients_RemoveGroups.TabIndex = 14 @@ -2468,7 +2480,7 @@ Partial Class frmMain Me.Panel10.Controls.Add(Me.Label5) Me.Panel10.Location = New System.Drawing.Point(0, 0) Me.Panel10.Name = "Panel10" - Me.Panel10.Size = New System.Drawing.Size(320, 366) + Me.Panel10.Size = New System.Drawing.Size(321, 369) Me.Panel10.TabIndex = 0 ' 'gridClientsGroups_AvailableGroups @@ -2478,7 +2490,7 @@ Partial Class frmMain Me.gridClientsGroups_AvailableGroups.Location = New System.Drawing.Point(0, 30) Me.gridClientsGroups_AvailableGroups.MainView = Me.viewClientsGroups_AvailableGroups Me.gridClientsGroups_AvailableGroups.Name = "gridClientsGroups_AvailableGroups" - Me.gridClientsGroups_AvailableGroups.Size = New System.Drawing.Size(320, 336) + Me.gridClientsGroups_AvailableGroups.Size = New System.Drawing.Size(321, 339) Me.gridClientsGroups_AvailableGroups.TabIndex = 0 Me.gridClientsGroups_AvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClientsGroups_AvailableGroups}) ' @@ -2518,7 +2530,7 @@ Partial Class frmMain Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label5.Location = New System.Drawing.Point(0, 0) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(320, 30) + Me.Label5.Size = New System.Drawing.Size(321, 30) Me.Label5.TabIndex = 1 Me.Label5.Text = "Nicht zugeordnete Gruppen:" Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2530,7 +2542,7 @@ Partial Class frmMain Me.Panel12.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel12.Location = New System.Drawing.Point(326, 0) Me.Panel12.Name = "Panel12" - Me.Panel12.Size = New System.Drawing.Size(425, 349) + Me.Panel12.Size = New System.Drawing.Size(428, 352) Me.Panel12.TabIndex = 0 ' 'gridClientsGroups_AssignedGroups @@ -2540,7 +2552,7 @@ Partial Class frmMain Me.gridClientsGroups_AssignedGroups.Location = New System.Drawing.Point(0, 30) Me.gridClientsGroups_AssignedGroups.MainView = Me.viewClientsGroups_AssignedGroups Me.gridClientsGroups_AssignedGroups.Name = "gridClientsGroups_AssignedGroups" - Me.gridClientsGroups_AssignedGroups.Size = New System.Drawing.Size(425, 319) + Me.gridClientsGroups_AssignedGroups.Size = New System.Drawing.Size(428, 322) Me.gridClientsGroups_AssignedGroups.TabIndex = 0 Me.gridClientsGroups_AssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClientsGroups_AssignedGroups}) ' @@ -2581,7 +2593,7 @@ Partial Class frmMain Me.labelClients_AssignedGroups.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelClients_AssignedGroups.Location = New System.Drawing.Point(0, 0) Me.labelClients_AssignedGroups.Name = "labelClients_AssignedGroups" - Me.labelClients_AssignedGroups.Size = New System.Drawing.Size(425, 30) + Me.labelClients_AssignedGroups.Size = New System.Drawing.Size(428, 30) Me.labelClients_AssignedGroups.TabIndex = 1 Me.labelClients_AssignedGroups.Text = "Zugeordnete Gruppen zu Mandant {0}" Me.labelClients_AssignedGroups.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2593,7 +2605,7 @@ Partial Class frmMain Me.Panel11.Dock = System.Windows.Forms.DockStyle.Left Me.Panel11.Location = New System.Drawing.Point(0, 0) Me.Panel11.Name = "Panel11" - Me.Panel11.Size = New System.Drawing.Size(326, 349) + Me.Panel11.Size = New System.Drawing.Size(326, 352) Me.Panel11.TabIndex = 0 ' 'gridClientsGroups_AllClients @@ -2603,7 +2615,7 @@ Partial Class frmMain Me.gridClientsGroups_AllClients.Location = New System.Drawing.Point(0, 30) Me.gridClientsGroups_AllClients.MainView = Me.viewClientsGroups_AllClients Me.gridClientsGroups_AllClients.Name = "gridClientsGroups_AllClients" - Me.gridClientsGroups_AllClients.Size = New System.Drawing.Size(326, 319) + Me.gridClientsGroups_AllClients.Size = New System.Drawing.Size(326, 322) Me.gridClientsGroups_AllClients.TabIndex = 0 Me.gridClientsGroups_AllClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClientsGroups_AllClients}) ' @@ -2651,7 +2663,7 @@ Partial Class frmMain Me.XtraTabPage2.Controls.Add(Me.SplitContainer7) Me.XtraTabPage2.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1190, 349) + Me.XtraTabPage2.Size = New System.Drawing.Size(1194, 352) Me.XtraTabPage2.Text = "Modul Zuordnung" ' 'SplitContainer7 @@ -2670,8 +2682,8 @@ Partial Class frmMain ' Me.SplitContainer7.Panel2.Controls.Add(Me.Panel15) Me.SplitContainer7.Panel2.Controls.Add(Me.Panel14) - Me.SplitContainer7.Size = New System.Drawing.Size(1190, 349) - Me.SplitContainer7.SplitterDistance = 435 + Me.SplitContainer7.Size = New System.Drawing.Size(1194, 352) + Me.SplitContainer7.SplitterDistance = 436 Me.SplitContainer7.TabIndex = 0 ' 'btnModules_AddGroups @@ -2679,7 +2691,7 @@ Partial Class frmMain Me.btnModules_AddGroups.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_AddGroups.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnModules_AddGroups.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnModules_AddGroups.Location = New System.Drawing.Point(329, 108) + Me.btnModules_AddGroups.Location = New System.Drawing.Point(330, 108) Me.btnModules_AddGroups.Name = "btnModules_AddGroups" Me.btnModules_AddGroups.Size = New System.Drawing.Size(103, 50) Me.btnModules_AddGroups.TabIndex = 17 @@ -2691,7 +2703,7 @@ Partial Class frmMain Me.btnModules_RemoveGroups.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_RemoveGroups.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnModules_RemoveGroups.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnModules_RemoveGroups.Location = New System.Drawing.Point(330, 164) + Me.btnModules_RemoveGroups.Location = New System.Drawing.Point(331, 164) Me.btnModules_RemoveGroups.Name = "btnModules_RemoveGroups" Me.btnModules_RemoveGroups.Size = New System.Drawing.Size(103, 50) Me.btnModules_RemoveGroups.TabIndex = 16 @@ -2707,7 +2719,7 @@ Partial Class frmMain Me.Panel13.Controls.Add(Me.Label15) Me.Panel13.Location = New System.Drawing.Point(0, 0) Me.Panel13.Name = "Panel13" - Me.Panel13.Size = New System.Drawing.Size(321, 349) + Me.Panel13.Size = New System.Drawing.Size(322, 352) Me.Panel13.TabIndex = 0 ' 'gridModulesGroups_AvailableGroups @@ -2717,7 +2729,7 @@ Partial Class frmMain Me.gridModulesGroups_AvailableGroups.Location = New System.Drawing.Point(0, 30) Me.gridModulesGroups_AvailableGroups.MainView = Me.viewModulesGroups_AvailableGroups Me.gridModulesGroups_AvailableGroups.Name = "gridModulesGroups_AvailableGroups" - Me.gridModulesGroups_AvailableGroups.Size = New System.Drawing.Size(321, 319) + Me.gridModulesGroups_AvailableGroups.Size = New System.Drawing.Size(322, 322) Me.gridModulesGroups_AvailableGroups.TabIndex = 0 Me.gridModulesGroups_AvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModulesGroups_AvailableGroups}) ' @@ -2757,7 +2769,7 @@ Partial Class frmMain Me.Label15.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label15.Location = New System.Drawing.Point(0, 0) Me.Label15.Name = "Label15" - Me.Label15.Size = New System.Drawing.Size(321, 30) + Me.Label15.Size = New System.Drawing.Size(322, 30) Me.Label15.TabIndex = 1 Me.Label15.Text = "Nicht zugeordnete Gruppen:" Me.Label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2769,7 +2781,7 @@ Partial Class frmMain Me.Panel15.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel15.Location = New System.Drawing.Point(326, 0) Me.Panel15.Name = "Panel15" - Me.Panel15.Size = New System.Drawing.Size(425, 349) + Me.Panel15.Size = New System.Drawing.Size(428, 352) Me.Panel15.TabIndex = 1 ' 'gridModulesGroups_AssignedGroups @@ -2779,7 +2791,7 @@ Partial Class frmMain Me.gridModulesGroups_AssignedGroups.Location = New System.Drawing.Point(0, 30) Me.gridModulesGroups_AssignedGroups.MainView = Me.viewModulesGroups_AssignedGroups Me.gridModulesGroups_AssignedGroups.Name = "gridModulesGroups_AssignedGroups" - Me.gridModulesGroups_AssignedGroups.Size = New System.Drawing.Size(425, 319) + Me.gridModulesGroups_AssignedGroups.Size = New System.Drawing.Size(428, 322) Me.gridModulesGroups_AssignedGroups.TabIndex = 1 Me.gridModulesGroups_AssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModulesGroups_AssignedGroups}) ' @@ -2820,7 +2832,7 @@ Partial Class frmMain Me.labelModules_AssignedGroups.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelModules_AssignedGroups.Location = New System.Drawing.Point(0, 0) Me.labelModules_AssignedGroups.Name = "labelModules_AssignedGroups" - Me.labelModules_AssignedGroups.Size = New System.Drawing.Size(425, 30) + Me.labelModules_AssignedGroups.Size = New System.Drawing.Size(428, 30) Me.labelModules_AssignedGroups.TabIndex = 0 Me.labelModules_AssignedGroups.Text = "Zugeordnete Gruppen zu Modul {0}" Me.labelModules_AssignedGroups.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2832,7 +2844,7 @@ Partial Class frmMain Me.Panel14.Dock = System.Windows.Forms.DockStyle.Left Me.Panel14.Location = New System.Drawing.Point(0, 0) Me.Panel14.Name = "Panel14" - Me.Panel14.Size = New System.Drawing.Size(326, 349) + Me.Panel14.Size = New System.Drawing.Size(326, 352) Me.Panel14.TabIndex = 0 ' 'gridModulesGroups_AllModules @@ -2842,7 +2854,7 @@ Partial Class frmMain Me.gridModulesGroups_AllModules.Location = New System.Drawing.Point(0, 30) Me.gridModulesGroups_AllModules.MainView = Me.viewModulesGroups_AllModules Me.gridModulesGroups_AllModules.Name = "gridModulesGroups_AllModules" - Me.gridModulesGroups_AllModules.Size = New System.Drawing.Size(326, 319) + Me.gridModulesGroups_AllModules.Size = New System.Drawing.Size(326, 322) Me.gridModulesGroups_AllModules.TabIndex = 1 Me.gridModulesGroups_AllModules.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModulesGroups_AllModules}) ' @@ -2900,7 +2912,7 @@ Partial Class frmMain Me.TBDD_GROUPSBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem1 Me.TBDD_GROUPSBindingNavigator.Name = "TBDD_GROUPSBindingNavigator" Me.TBDD_GROUPSBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem1 - Me.TBDD_GROUPSBindingNavigator.Size = New System.Drawing.Size(1193, 25) + Me.TBDD_GROUPSBindingNavigator.Size = New System.Drawing.Size(1197, 25) Me.TBDD_GROUPSBindingNavigator.TabIndex = 0 Me.TBDD_GROUPSBindingNavigator.Text = "BindingNavigator1" ' @@ -2947,6 +2959,7 @@ Partial Class frmMain ' Me.BindingNavigatorPositionItem1.AccessibleName = "Position" Me.BindingNavigatorPositionItem1.AutoSize = False + Me.BindingNavigatorPositionItem1.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem1.Name = "BindingNavigatorPositionItem1" Me.BindingNavigatorPositionItem1.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem1.Text = "0" @@ -3012,8 +3025,10 @@ Partial Class frmMain Me.tabPageClients.Controls.Add(Me.gridClients) Me.tabPageClients.Controls.Add(Me.TBDD_CLIENTBindingNavigator) Me.tabPageClients.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.book + Me.tabPageClients.ImageOptions.SvgImage = CType(resources.GetObject("tabPageClients.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageClients.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageClients.Name = "tabPageClients" - Me.tabPageClients.Size = New System.Drawing.Size(1193, 784) + Me.tabPageClients.Size = New System.Drawing.Size(1197, 787) Me.tabPageClients.Text = "Mandanten" ' 'Panel17 @@ -3039,7 +3054,7 @@ Partial Class frmMain Me.Panel17.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel17.Location = New System.Drawing.Point(400, 25) Me.Panel17.Name = "Panel17" - Me.Panel17.Size = New System.Drawing.Size(793, 759) + Me.Panel17.Size = New System.Drawing.Size(797, 762) Me.Panel17.TabIndex = 20 ' 'Label18 @@ -3138,7 +3153,7 @@ Partial Class frmMain Me.gridClients.Location = New System.Drawing.Point(0, 25) Me.gridClients.MainView = Me.GridView4 Me.gridClients.Name = "gridClients" - Me.gridClients.Size = New System.Drawing.Size(400, 759) + Me.gridClients.Size = New System.Drawing.Size(400, 762) Me.gridClients.TabIndex = 19 Me.gridClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) ' @@ -3192,7 +3207,7 @@ Partial Class frmMain Me.TBDD_CLIENTBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem2 Me.TBDD_CLIENTBindingNavigator.Name = "TBDD_CLIENTBindingNavigator" Me.TBDD_CLIENTBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem2 - Me.TBDD_CLIENTBindingNavigator.Size = New System.Drawing.Size(1193, 25) + Me.TBDD_CLIENTBindingNavigator.Size = New System.Drawing.Size(1197, 25) Me.TBDD_CLIENTBindingNavigator.TabIndex = 4 Me.TBDD_CLIENTBindingNavigator.Text = "BindingNavigator2" ' @@ -3248,6 +3263,7 @@ Partial Class frmMain ' Me.BindingNavigatorPositionItem2.AccessibleName = "Position" Me.BindingNavigatorPositionItem2.AutoSize = False + Me.BindingNavigatorPositionItem2.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem2.Name = "BindingNavigatorPositionItem2" Me.BindingNavigatorPositionItem2.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem2.Text = "0" @@ -3295,8 +3311,10 @@ Partial Class frmMain Me.tabPageModules.Controls.Add(Me.gridModules) Me.tabPageModules.Controls.Add(Me.TBDD_MODULESBindingNavigator) Me.tabPageModules.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.plugin + Me.tabPageModules.ImageOptions.SvgImage = CType(resources.GetObject("tabPageModules.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageModules.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageModules.Name = "tabPageModules" - Me.tabPageModules.Size = New System.Drawing.Size(1193, 784) + Me.tabPageModules.Size = New System.Drawing.Size(1197, 783) Me.tabPageModules.Text = "Module" ' 'Panel18 @@ -3313,7 +3331,7 @@ Partial Class frmMain Me.Panel18.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel18.Location = New System.Drawing.Point(400, 25) Me.Panel18.Name = "Panel18" - Me.Panel18.Size = New System.Drawing.Size(793, 759) + Me.Panel18.Size = New System.Drawing.Size(797, 758) Me.Panel18.TabIndex = 40 ' 'Label19 @@ -3369,7 +3387,7 @@ Partial Class frmMain Me.gridModules.Location = New System.Drawing.Point(0, 25) Me.gridModules.MainView = Me.GridView5 Me.gridModules.Name = "gridModules" - Me.gridModules.Size = New System.Drawing.Size(400, 759) + Me.gridModules.Size = New System.Drawing.Size(400, 758) Me.gridModules.TabIndex = 39 Me.gridModules.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView5}) ' @@ -3423,7 +3441,7 @@ Partial Class frmMain Me.TBDD_MODULESBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem3 Me.TBDD_MODULESBindingNavigator.Name = "TBDD_MODULESBindingNavigator" Me.TBDD_MODULESBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem3 - Me.TBDD_MODULESBindingNavigator.Size = New System.Drawing.Size(1193, 25) + Me.TBDD_MODULESBindingNavigator.Size = New System.Drawing.Size(1197, 25) Me.TBDD_MODULESBindingNavigator.TabIndex = 38 Me.TBDD_MODULESBindingNavigator.Text = "BindingNavigator1" ' @@ -3461,6 +3479,7 @@ Partial Class frmMain ' Me.BindingNavigatorPositionItem3.AccessibleName = "Position" Me.BindingNavigatorPositionItem3.AutoSize = False + Me.BindingNavigatorPositionItem3.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem3.Name = "BindingNavigatorPositionItem3" Me.BindingNavigatorPositionItem3.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem3.Text = "0" @@ -3497,9 +3516,11 @@ Partial Class frmMain 'tabPageRights ' Me.tabPageRights.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.key + Me.tabPageRights.ImageOptions.SvgImage = CType(resources.GetObject("tabPageRights.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageRights.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageRights.Name = "tabPageRights" Me.tabPageRights.PageEnabled = False - Me.tabPageRights.Size = New System.Drawing.Size(1193, 784) + Me.tabPageRights.Size = New System.Drawing.Size(1197, 783) Me.tabPageRights.Text = "Rechte" ' 'tabPageSettings @@ -3512,8 +3533,10 @@ Partial Class frmMain Me.tabPageSettings.Controls.Add(Me.btnOpenConfigDir) Me.tabPageSettings.Controls.Add(Me.btnConfigConnections) Me.tabPageSettings.ImageOptions.Image = Global.DDUserManager.My.Resources.Resources.cog + Me.tabPageSettings.ImageOptions.SvgImage = CType(resources.GetObject("tabPageSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.tabPageSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageSettings.Name = "tabPageSettings" - Me.tabPageSettings.Size = New System.Drawing.Size(1193, 784) + Me.tabPageSettings.Size = New System.Drawing.Size(1197, 787) Me.tabPageSettings.Text = "Einstellungen" ' 'Button2 diff --git a/DDUserManager/DDUserManager/frmMain.resx b/DDUserManager/DDUserManager/frmMain.resx index bda8c14..204b8f6 100644 --- a/DDUserManager/DDUserManager/frmMain.resx +++ b/DDUserManager/DDUserManager/frmMain.resx @@ -234,6 +234,75 @@ 906, 134 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ3VzdG9tZXJzIj4NCiAgICA8cGF0 + aCBkPSJNMTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNywwLjksMS42YzAsMCww + LDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjlzNC4yLTIuNiw0LjctNC45ICAgVjEzYzEsMC4x + LDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAuNC0wLjQtMC40LTAu + NS0wLjNDMjMuMiw0LjgsMjAuMyw1LDIwLjMsNVMyMCwyLDE0LjgsMiAgIEMxMCwyLDkuNCw2LDEwLjUs + OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y + LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs + MjAsMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAG0CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkJvb2siPg0KICAgIDxwYXRoIGQ9Ik05LDZoMTdWNWMw + LTAuNi0wLjQtMS0xLTFIOUM3LjMsNCw2LDUuMyw2LDd2MThjMCwxLjcsMS4zLDMsMywzaDE2YzAuNiww + LDEtMC40LDEtMVY4SDlDOC40LDgsOCw3LjYsOCw3ICAgUzguNCw2LDksNnoiIGNsYXNzPSJHcmVlbiIg + Lz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGcEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJQcm9kdWN0X3g1Rl9H + cm91cCI+DQogICAgPHBhdGggZD0iTTE2LDcuNGw0LTRWMTBoLTRWNy40eiBNMjYsMTcuNFYzMGw0LTRW + MTMuNEwyNiwxNy40eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAg + IDxwYXRoIGQ9Ik0xNC42LDZIMmw0LTRoMTIuNkwxNC42LDZ6IE0xNiwxMmwtNCw0aDEyLjZsNC00SDE2 + eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8L2c+DQogICAgPGcgY2xhc3M9InN0MSI+DQogICAgICA8 + cGF0aCBkPSJNMTQsMTEuMmwtNCw0VjE4djJIMlY4aDEyVjExLjJ6IE0xMiwzMGgxMlYxOEgxMlYzMHoi + IGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L + + 693, 17 @@ -307,6 +376,30 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOoDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW1wbG95ZWVzIj4NCiAgICA8cGF0 + aCBkPSJNMTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNywwLjksMS42YzAsMCww + LDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjlzNC4yLTIuNiw0LjctNC45ICAgVjEzYzEsMC4x + LDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAuNC0wLjQtMC40LTAu + NS0wLjNDMjMuMiw0LjgsMjAuMyw1LDIwLjMsNVMyMCwyLDE0LjgsMiAgIEMxMCwyLDkuNCw2LDEwLjUs + OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y + LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs + MjAsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -400,6 +493,30 @@ E7V6kYT56vTjmYyZyuSHcI/tBr8Z4L3STaABvGoBz3qAkzqBWEEKrJO2gytnwSiamDIQEsdX5RXG5Xz7 hni3KDu2QmMb1gtm7LCuPoApHAIjqh+mLmWTEoFP3P7ALT8No7fhYDRhTKs6COI3IvPLoUkp30UAAAAA SUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ3VzdG9tZXJzIj4NCiAgICA8cGF0 + aCBkPSJNMTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNywwLjksMS42YzAsMCww + LDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjlzNC4yLTIuNiw0LjctNC45ICAgVjEzYzEsMC4x + LDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAuNC0wLjQtMC40LTAu + NS0wLjNDMjMuMiw0LjgsMjAuMyw1LDIwLjMsNVMyMCwyLDE0LjgsMiAgIEMxMCwyLDkuNCw2LDEwLjUs + OS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXogTTIwLDE4Yy0wLjgsMS41LTIuMSw0LTQsNHMtMy4y + LTIuNS00LTRjLTIuMywzLjUtOCwxLTgsOC41VjMwaDI0di0zLjUgICBDMjgsMTkuMSwyMi4zLDIxLjQs + MjAsMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= @@ -474,6 +591,24 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAG0CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkJvb2siPg0KICAgIDxwYXRoIGQ9Ik05LDZoMTdWNWMw + LTAuNi0wLjQtMS0xLTFIOUM3LjMsNCw2LDUuMyw2LDd2MThjMCwxLjcsMS4zLDMsMywzaDE2YzAuNiww + LDEtMC40LDEtMVY4SDlDOC40LDgsOCw3LjYsOCw3ICAgUzguNCw2LDksNnoiIGNsYXNzPSJHcmVlbiIg + Lz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -517,6 +652,74 @@ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGcEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJQcm9kdWN0X3g1Rl9H + cm91cCI+DQogICAgPHBhdGggZD0iTTE2LDcuNGw0LTRWMTBoLTRWNy40eiBNMjYsMTcuNFYzMGw0LTRW + MTMuNEwyNiwxNy40eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAg + IDxwYXRoIGQ9Ik0xNC42LDZIMmw0LTRoMTIuNkwxNC42LDZ6IE0xNiwxMmwtNCw0aDEyLjZsNC00SDE2 + eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8L2c+DQogICAgPGcgY2xhc3M9InN0MSI+DQogICAgICA8 + cGF0aCBkPSJNMTQsMTEuMmwtNCw0VjE4djJIMlY4aDEyVjExLjJ6IE0xMiwzMGgxMlYxOEgxMlYzMHoi + IGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIECAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5 + QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IktleSI+DQogICAgPHBhdGggZD0iTTIwLDRjLTQuNCwwLTgs + My42LTgsOGMwLDEuMiwwLjMsMi4zLDAuNywzLjNMNCwyNHY0aDR2LTJoMnYtMmgybDQuNy00LjdjMSww + LjUsMi4xLDAuNywzLjMsMC43ICAgYzQuNCwwLDgtMy42LDgtOFMyNC40LDQsMjAsNHogTTIyLDEyYy0x + LjEsMC0yLTAuOS0yLTJjMC0xLjEsMC45LTIsMi0yczIsMC45LDIsMkMyNCwxMS4xLDIzLjEsMTIsMjIs + MTJ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w + LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu + NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3 + LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww + LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww + LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz + LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x + NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y + LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index e71e56c..bb5a318 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -23,15 +23,15 @@ Public Class frmMain Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - MyLogConfig = New LogConfig(LogConfig.PathType.AppData) + MyLogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName) MyLogger = MyLogConfig.GetLogger() - MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.CommonAppDataPath) + MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.CommonAppDataPath, Application.CommonAppDataPath) LoadConfig(MyConfig) CurrentVersion = Assembly.GetEntryAssembly().GetName().Version.ToString() - txtLDAPGroupQuery.DataBindings.Add(New Binding("Text", My.Settings, "AD_GROUP_QUERY")) + 'txtLDAPGroupQuery.DataBindings.Add(New Binding("Text", My.Settings, "AD_GROUP_QUERY")) MyLogger.Info("Starting UserManager v" & CurrentVersion) MyLogger.Info($"Current Username: {Environment.UserName}") diff --git a/DDUserManager/DDUserManager/packages.config b/DDUserManager/DDUserManager/packages.config new file mode 100644 index 0000000..f8dbc83 --- /dev/null +++ b/DDUserManager/DDUserManager/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/DDUserManager/SetupVS19/Config.wxi b/DDUserManager/SetupVS19/Config.wxi new file mode 100644 index 0000000..1c3bed2 --- /dev/null +++ b/DDUserManager/SetupVS19/Config.wxi @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DDUserManager/SetupVS19/Product.wxs b/DDUserManager/SetupVS19/Product.wxs new file mode 100644 index 0000000..7de4b66 --- /dev/null +++ b/DDUserManager/SetupVS19/Product.wxs @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DISABLE_DESKTOP_ICON + + + + + DISABLE_STARTMENU_ICON + + + + + + + + + + + + 1 + + 1 + 1 + NOT WIXUI_DONTVALIDATEPATH + "1"]]> + WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" + 1 + 1 + + 1 + "1"]]> + + 1 + + + diff --git a/DDUserManager/SetupVS19/SetupVS19.wixproj b/DDUserManager/SetupVS19/SetupVS19.wixproj new file mode 100644 index 0000000..b9f5735 --- /dev/null +++ b/DDUserManager/SetupVS19/SetupVS19.wixproj @@ -0,0 +1,63 @@ + + + + Debug + x86 + 3.10 + 93d47f6e-a8a5-44f1-9534-3ffca5ed3c17 + 2.0 + SetupVS19 + Package + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + -b "$(SolutionDir)DDUserManager\bin\$(Configuration)" + + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + + + + C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUtilExtension.dll + WixUtilExtension + + + C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll + WixUIExtension + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DDUserManager/SetupWix/Product.wxs b/DDUserManager/SetupWix/Product.wxs index d3f79d7..2aac9da 100644 --- a/DDUserManager/SetupWix/Product.wxs +++ b/DDUserManager/SetupWix/Product.wxs @@ -96,18 +96,22 @@ - - - - - - - - + + + + + + + + - - + + + + + + From 36bbac5e5d78a02eaf0f81e8d08dde9612da9959 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 2 Jul 2020 11:23:39 +0200 Subject: [PATCH 11/16] update installer --- DDUserManager/SetupVS19/Product.wxs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DDUserManager/SetupVS19/Product.wxs b/DDUserManager/SetupVS19/Product.wxs index 7de4b66..ce57b36 100644 --- a/DDUserManager/SetupVS19/Product.wxs +++ b/DDUserManager/SetupVS19/Product.wxs @@ -97,13 +97,19 @@ + + + + + + From 30c3c907fd0c9e697e4f9dbf68ea81c519863229 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 2 Jul 2020 11:36:39 +0200 Subject: [PATCH 12/16] Version 1.0.2.0 --- .../DDUserManager/My Project/AssemblyInfo.vb | 6 +- .../DDUserManager/frmMain.Designer.vb | 64 +++++++++---------- DDUserManager/DDUserManager/frmMain.vb | 6 ++ 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index 9b3aec7..7468686 100644 --- a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb +++ b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb @@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices - - + + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index 5a0c30d..648cc94 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -911,7 +911,7 @@ Partial Class frmMain Me.SplitContainer2.Panel2.Controls.Add(Me.listClients) Me.SplitContainer2.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.SplitContainer2.Size = New System.Drawing.Size(797, 374) - Me.SplitContainer2.SplitterDistance = 180 + Me.SplitContainer2.SplitterDistance = 179 Me.SplitContainer2.TabIndex = 63 ' 'Label8 @@ -1506,7 +1506,7 @@ Partial Class frmMain Me.tabClientAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabClientAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.tabClientAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabClientAssign.Name = "tabClientAssign" - Me.tabClientAssign.Size = New System.Drawing.Size(1191, 352) + Me.tabClientAssign.Size = New System.Drawing.Size(1195, 348) Me.tabClientAssign.Text = "Mandanten Zuordnung" ' 'SplitContainer4 @@ -1527,8 +1527,8 @@ Partial Class frmMain Me.SplitContainer4.Panel2.Controls.Add(Me.Panel4) Me.SplitContainer4.Panel2.Controls.Add(Me.Panel5) Me.SplitContainer4.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.SplitContainer4.Size = New System.Drawing.Size(1191, 352) - Me.SplitContainer4.SplitterDistance = 435 + Me.SplitContainer4.Size = New System.Drawing.Size(1195, 348) + Me.SplitContainer4.SplitterDistance = 436 Me.SplitContainer4.TabIndex = 0 ' 'Panel6 @@ -1540,7 +1540,7 @@ Partial Class frmMain Me.Panel6.Controls.Add(Me.Label7) Me.Panel6.Location = New System.Drawing.Point(0, 0) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(321, 352) + Me.Panel6.Size = New System.Drawing.Size(322, 348) Me.Panel6.TabIndex = 12 ' 'gridClients_AvailableUsers @@ -1550,7 +1550,7 @@ Partial Class frmMain Me.gridClients_AvailableUsers.Location = New System.Drawing.Point(0, 30) Me.gridClients_AvailableUsers.MainView = Me.viewClients_AvailableUsers Me.gridClients_AvailableUsers.Name = "gridClients_AvailableUsers" - Me.gridClients_AvailableUsers.Size = New System.Drawing.Size(321, 322) + Me.gridClients_AvailableUsers.Size = New System.Drawing.Size(322, 318) Me.gridClients_AvailableUsers.TabIndex = 0 Me.gridClients_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AvailableUsers}) ' @@ -1606,7 +1606,7 @@ Partial Class frmMain Me.Label7.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.Location = New System.Drawing.Point(0, 0) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(321, 30) + Me.Label7.Size = New System.Drawing.Size(322, 30) Me.Label7.TabIndex = 2 Me.Label7.Text = "Nicht zugeordnete Benutzer:" Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1616,7 +1616,7 @@ Partial Class frmMain Me.btnClients_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnClients_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnClients_AddUsers.Location = New System.Drawing.Point(329, 108) + Me.btnClients_AddUsers.Location = New System.Drawing.Point(330, 108) Me.btnClients_AddUsers.Name = "btnClients_AddUsers" Me.btnClients_AddUsers.Size = New System.Drawing.Size(103, 50) Me.btnClients_AddUsers.TabIndex = 11 @@ -1628,7 +1628,7 @@ Partial Class frmMain Me.btnClients_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnClients_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnClients_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnClients_RemoveUsers.Location = New System.Drawing.Point(330, 164) + Me.btnClients_RemoveUsers.Location = New System.Drawing.Point(331, 164) Me.btnClients_RemoveUsers.Name = "btnClients_RemoveUsers" Me.btnClients_RemoveUsers.Size = New System.Drawing.Size(103, 50) Me.btnClients_RemoveUsers.TabIndex = 10 @@ -1642,7 +1642,7 @@ Partial Class frmMain Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(326, 0) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(426, 352) + Me.Panel4.Size = New System.Drawing.Size(429, 348) Me.Panel4.TabIndex = 0 ' 'gridClients_AssignedUsers @@ -1652,7 +1652,7 @@ Partial Class frmMain Me.gridClients_AssignedUsers.Location = New System.Drawing.Point(0, 30) Me.gridClients_AssignedUsers.MainView = Me.viewClients_AssignedUsers Me.gridClients_AssignedUsers.Name = "gridClients_AssignedUsers" - Me.gridClients_AssignedUsers.Size = New System.Drawing.Size(426, 322) + Me.gridClients_AssignedUsers.Size = New System.Drawing.Size(429, 318) Me.gridClients_AssignedUsers.TabIndex = 0 Me.gridClients_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AssignedUsers}) ' @@ -1709,7 +1709,7 @@ Partial Class frmMain Me.labelClients_AssignedUsers.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelClients_AssignedUsers.Location = New System.Drawing.Point(0, 0) Me.labelClients_AssignedUsers.Name = "labelClients_AssignedUsers" - Me.labelClients_AssignedUsers.Size = New System.Drawing.Size(426, 30) + Me.labelClients_AssignedUsers.Size = New System.Drawing.Size(429, 30) Me.labelClients_AssignedUsers.TabIndex = 2 Me.labelClients_AssignedUsers.Text = "Zugeordnete Benutzer zu Mandant {0}:" Me.labelClients_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1721,7 +1721,7 @@ Partial Class frmMain Me.Panel5.Dock = System.Windows.Forms.DockStyle.Left Me.Panel5.Location = New System.Drawing.Point(0, 0) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(326, 352) + Me.Panel5.Size = New System.Drawing.Size(326, 348) Me.Panel5.TabIndex = 1 ' 'gridClients_AllClients @@ -1731,7 +1731,7 @@ Partial Class frmMain Me.gridClients_AllClients.Location = New System.Drawing.Point(0, 30) Me.gridClients_AllClients.MainView = Me.viewClients_AllClients Me.gridClients_AllClients.Name = "gridClients_AllClients" - Me.gridClients_AllClients.Size = New System.Drawing.Size(326, 322) + Me.gridClients_AllClients.Size = New System.Drawing.Size(326, 318) Me.gridClients_AllClients.TabIndex = 0 Me.gridClients_AllClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AllClients}) ' @@ -1789,7 +1789,7 @@ Partial Class frmMain Me.tabModuleAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabModuleAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.tabModuleAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabModuleAssign.Name = "tabModuleAssign" - Me.tabModuleAssign.Size = New System.Drawing.Size(1191, 352) + Me.tabModuleAssign.Size = New System.Drawing.Size(1195, 348) Me.tabModuleAssign.Text = "Modul Zuordnung" ' 'SplitContainer6 @@ -1810,8 +1810,8 @@ Partial Class frmMain Me.SplitContainer6.Panel2.Controls.Add(Me.Panel8) Me.SplitContainer6.Panel2.Controls.Add(Me.Panel7) Me.SplitContainer6.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.SplitContainer6.Size = New System.Drawing.Size(1191, 352) - Me.SplitContainer6.SplitterDistance = 435 + Me.SplitContainer6.Size = New System.Drawing.Size(1195, 348) + Me.SplitContainer6.SplitterDistance = 436 Me.SplitContainer6.TabIndex = 0 ' 'btnModules_AddUsers @@ -1819,7 +1819,7 @@ Partial Class frmMain Me.btnModules_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right Me.btnModules_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnModules_AddUsers.Location = New System.Drawing.Point(329, 108) + Me.btnModules_AddUsers.Location = New System.Drawing.Point(330, 108) Me.btnModules_AddUsers.Name = "btnModules_AddUsers" Me.btnModules_AddUsers.Size = New System.Drawing.Size(103, 50) Me.btnModules_AddUsers.TabIndex = 13 @@ -1831,7 +1831,7 @@ Partial Class frmMain Me.btnModules_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnModules_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red Me.btnModules_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnModules_RemoveUsers.Location = New System.Drawing.Point(330, 164) + Me.btnModules_RemoveUsers.Location = New System.Drawing.Point(331, 164) Me.btnModules_RemoveUsers.Name = "btnModules_RemoveUsers" Me.btnModules_RemoveUsers.Size = New System.Drawing.Size(103, 50) Me.btnModules_RemoveUsers.TabIndex = 12 @@ -1847,7 +1847,7 @@ Partial Class frmMain Me.Panel9.Controls.Add(Me.Label10) Me.Panel9.Location = New System.Drawing.Point(0, 0) Me.Panel9.Name = "Panel9" - Me.Panel9.Size = New System.Drawing.Size(321, 352) + Me.Panel9.Size = New System.Drawing.Size(322, 348) Me.Panel9.TabIndex = 9 ' 'gridModules_AvailableUsers @@ -1857,7 +1857,7 @@ Partial Class frmMain Me.gridModules_AvailableUsers.Location = New System.Drawing.Point(0, 30) Me.gridModules_AvailableUsers.MainView = Me.viewModules_AvailableUsers Me.gridModules_AvailableUsers.Name = "gridModules_AvailableUsers" - Me.gridModules_AvailableUsers.Size = New System.Drawing.Size(321, 322) + Me.gridModules_AvailableUsers.Size = New System.Drawing.Size(322, 318) Me.gridModules_AvailableUsers.TabIndex = 6 Me.gridModules_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AvailableUsers, Me.GridView8}) ' @@ -1919,7 +1919,7 @@ Partial Class frmMain Me.Label10.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label10.Location = New System.Drawing.Point(0, 0) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(321, 30) + Me.Label10.Size = New System.Drawing.Size(322, 30) Me.Label10.TabIndex = 8 Me.Label10.Text = "Nicht zugeordnete Benutzer:" Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1931,7 +1931,7 @@ Partial Class frmMain Me.Panel8.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel8.Location = New System.Drawing.Point(326, 0) Me.Panel8.Name = "Panel8" - Me.Panel8.Size = New System.Drawing.Size(426, 352) + Me.Panel8.Size = New System.Drawing.Size(429, 348) Me.Panel8.TabIndex = 10 ' 'gridModules_AssignedUsers @@ -1941,7 +1941,7 @@ Partial Class frmMain Me.gridModules_AssignedUsers.Location = New System.Drawing.Point(0, 30) Me.gridModules_AssignedUsers.MainView = Me.viewModules_AssignedUsers Me.gridModules_AssignedUsers.Name = "gridModules_AssignedUsers" - Me.gridModules_AssignedUsers.Size = New System.Drawing.Size(426, 322) + Me.gridModules_AssignedUsers.Size = New System.Drawing.Size(429, 318) Me.gridModules_AssignedUsers.TabIndex = 6 Me.gridModules_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AssignedUsers, Me.GridView10}) ' @@ -2003,7 +2003,7 @@ Partial Class frmMain Me.labelModules_AssignedUsers.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.labelModules_AssignedUsers.Location = New System.Drawing.Point(0, 0) Me.labelModules_AssignedUsers.Name = "labelModules_AssignedUsers" - Me.labelModules_AssignedUsers.Size = New System.Drawing.Size(426, 30) + Me.labelModules_AssignedUsers.Size = New System.Drawing.Size(429, 30) Me.labelModules_AssignedUsers.TabIndex = 8 Me.labelModules_AssignedUsers.Text = "Zugeordnete Benutzer zu Modul {0}:" Me.labelModules_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -2015,7 +2015,7 @@ Partial Class frmMain Me.Panel7.Dock = System.Windows.Forms.DockStyle.Left Me.Panel7.Location = New System.Drawing.Point(0, 0) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(326, 352) + Me.Panel7.Size = New System.Drawing.Size(326, 348) Me.Panel7.TabIndex = 9 ' 'gridModules_AllModules @@ -2025,7 +2025,7 @@ Partial Class frmMain Me.gridModules_AllModules.Location = New System.Drawing.Point(0, 30) Me.gridModules_AllModules.MainView = Me.viewModules_AllModules Me.gridModules_AllModules.Name = "gridModules_AllModules" - Me.gridModules_AllModules.Size = New System.Drawing.Size(326, 322) + Me.gridModules_AllModules.Size = New System.Drawing.Size(326, 318) Me.gridModules_AllModules.TabIndex = 7 Me.gridModules_AllModules.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AllModules}) ' @@ -2207,7 +2207,7 @@ Partial Class frmMain Me.tabPageGroups.ImageOptions.SvgImage = CType(resources.GetObject("tabPageGroups.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.tabPageGroups.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageGroups.Name = "tabPageGroups" - Me.tabPageGroups.Size = New System.Drawing.Size(1197, 787) + Me.tabPageGroups.Size = New System.Drawing.Size(1197, 783) Me.tabPageGroups.Text = "Gruppen" ' 'SplitContainer3 @@ -3028,7 +3028,7 @@ Partial Class frmMain Me.tabPageClients.ImageOptions.SvgImage = CType(resources.GetObject("tabPageClients.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.tabPageClients.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageClients.Name = "tabPageClients" - Me.tabPageClients.Size = New System.Drawing.Size(1197, 787) + Me.tabPageClients.Size = New System.Drawing.Size(1197, 783) Me.tabPageClients.Text = "Mandanten" ' 'Panel17 @@ -3054,7 +3054,7 @@ Partial Class frmMain Me.Panel17.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel17.Location = New System.Drawing.Point(400, 25) Me.Panel17.Name = "Panel17" - Me.Panel17.Size = New System.Drawing.Size(797, 762) + Me.Panel17.Size = New System.Drawing.Size(797, 758) Me.Panel17.TabIndex = 20 ' 'Label18 @@ -3153,7 +3153,7 @@ Partial Class frmMain Me.gridClients.Location = New System.Drawing.Point(0, 25) Me.gridClients.MainView = Me.GridView4 Me.gridClients.Name = "gridClients" - Me.gridClients.Size = New System.Drawing.Size(400, 762) + Me.gridClients.Size = New System.Drawing.Size(400, 758) Me.gridClients.TabIndex = 19 Me.gridClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) ' @@ -3536,7 +3536,7 @@ Partial Class frmMain Me.tabPageSettings.ImageOptions.SvgImage = CType(resources.GetObject("tabPageSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.tabPageSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.tabPageSettings.Name = "tabPageSettings" - Me.tabPageSettings.Size = New System.Drawing.Size(1197, 787) + Me.tabPageSettings.Size = New System.Drawing.Size(1197, 783) Me.tabPageSettings.Text = "Einstellungen" ' 'Button2 diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index bb5a318..3570fc5 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -26,7 +26,12 @@ Public Class frmMain MyLogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName) MyLogger = MyLogConfig.GetLogger() MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.CommonAppDataPath, Application.CommonAppDataPath) + Catch ex As Exception + MsgBox($"Unexpected error while setting up logging! Exiting.{vbNewLine}{vbNewLine}Message:{ex.Message}{vbNewLine}Stacktrace:{vbNewLine}{ex.StackTrace}", MsgBoxStyle.Critical, Text) + Application.Exit() + End Try + Try LoadConfig(MyConfig) CurrentVersion = Assembly.GetEntryAssembly().GetName().Version.ToString() @@ -126,6 +131,7 @@ Public Class frmMain Catch ex As Exception MsgBox("Unexpected Error while loading. Please check the log.", MsgBoxStyle.Critical, "User Manager") MyLogger.Error(ex, "Unexpected Error while loading.") + Application.ExitThread() End Try End Sub From 3029df9d8f3f6848b63740e93b3a820747618134 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 2 Jul 2020 11:42:32 +0200 Subject: [PATCH 13/16] fix Nlog reference --- DDUserManager/SetupVS19/Product.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DDUserManager/SetupVS19/Product.wxs b/DDUserManager/SetupVS19/Product.wxs index ce57b36..64bcb93 100644 --- a/DDUserManager/SetupVS19/Product.wxs +++ b/DDUserManager/SetupVS19/Product.wxs @@ -121,7 +121,7 @@ - + From 06ddee8c63bf144d3baec9f0ce63f264f8c4394f Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 2 Jul 2020 11:42:40 +0200 Subject: [PATCH 14/16] version 1.0.2.1 --- DDUserManager/DDUserManager/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index 7468686..a1aa7a8 100644 --- a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb +++ b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + From ef93d0487d03913dce61043504b9a01d31f3891b Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 2 Jul 2020 12:29:40 +0200 Subject: [PATCH 15/16] fix: delete group_users entries before deleting group --- DDUserManager/DDUserManager/App.config | 8 +- .../DDUserManager/DS_ChangeS.Designer.vb | 344 ++- DDUserManager/DDUserManager/DS_ChangeS.xsd | 45 +- .../My Project/Settings.Designer.vb | 16 +- .../My Project/Settings.settings | 10 +- .../DDUserManager/UserDataSet.Designer.vb | 2063 ++++++++--------- DDUserManager/DDUserManager/UserDataSet.xsd | 88 +- DDUserManager/DDUserManager/UserDataSet.xss | 2 +- DDUserManager/DDUserManager/frmMain.vb | 14 + 9 files changed, 1230 insertions(+), 1360 deletions(-) diff --git a/DDUserManager/DDUserManager/App.config b/DDUserManager/DDUserManager/App.config index 9721a27..47e2de3 100644 --- a/DDUserManager/DDUserManager/App.config +++ b/DDUserManager/DDUserManager/App.config @@ -5,14 +5,18 @@
- + + + - + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd diff --git a/DDUserManager/DDUserManager/DS_ChangeS.Designer.vb b/DDUserManager/DDUserManager/DS_ChangeS.Designer.vb index a97b9b7..a272d0a 100644 --- a/DDUserManager/DDUserManager/DS_ChangeS.Designer.vb +++ b/DDUserManager/DDUserManager/DS_ChangeS.Designer.vb @@ -30,7 +30,7 @@ Partial Public Class DS_ChangeS Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -42,7 +42,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context, false) If (Me.IsBinarySerialized(info, context) = true) Then @@ -77,7 +77,7 @@ Partial Public Class DS_ChangeS End Sub _ Public ReadOnly Property TBDD_GROUPS() As TBDD_GROUPSDataTable @@ -87,7 +87,7 @@ Partial Public Class DS_ChangeS End Property _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -100,7 +100,7 @@ Partial Public Class DS_ChangeS End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -109,7 +109,7 @@ Partial Public Class DS_ChangeS End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -118,7 +118,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -126,7 +126,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As DS_ChangeS = CType(MyBase.Clone,DS_ChangeS) cln.InitVars @@ -135,19 +135,19 @@ Partial Public Class DS_ChangeS End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Me.Reset @@ -171,7 +171,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) @@ -180,13 +180,13 @@ Partial Public Class DS_ChangeS End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) Me.tableTBDD_GROUPS = CType(MyBase.Tables("TBDD_GROUPS"),TBDD_GROUPSDataTable) If (initTable = true) Then @@ -197,7 +197,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "DS_ChangeS" Me.Prefix = "" @@ -209,13 +209,13 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_GROUPS() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then Me.InitVars @@ -223,7 +223,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As DS_ChangeS = New DS_ChangeS() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() @@ -272,7 +272,7 @@ Partial Public Class DS_ChangeS Return type End Function - _ + _ Public Delegate Sub TBDD_GROUPSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_GROUPSRowChangeEvent) ''' @@ -306,7 +306,7 @@ Partial Public Class DS_ChangeS Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_GROUPS" @@ -316,7 +316,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -334,14 +334,14 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -349,7 +349,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnNAME @@ -357,7 +357,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ECM_FK_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnECM_FK_ID @@ -365,7 +365,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property AD_SYNCColumn() As Global.System.Data.DataColumn Get Return Me.columnAD_SYNC @@ -373,7 +373,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property INTERNALColumn() As Global.System.Data.DataColumn Get Return Me.columnINTERNAL @@ -381,7 +381,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn Get Return Me.columnACTIVE @@ -389,7 +389,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -397,7 +397,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -405,7 +405,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -413,7 +413,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -421,7 +421,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -429,7 +429,7 @@ Partial Public Class DS_ChangeS End Property _ Public ReadOnly Property Count() As Integer Get @@ -438,33 +438,33 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_GROUPSRow Get Return CType(Me.Rows(index),TBDD_GROUPSRow) End Get End Property - _ + _ Public Event TBDD_GROUPSRowChanging As TBDD_GROUPSRowChangeEventHandler - _ + _ Public Event TBDD_GROUPSRowChanged As TBDD_GROUPSRowChangeEventHandler - _ + _ Public Event TBDD_GROUPSRowDeleting As TBDD_GROUPSRowChangeEventHandler - _ + _ Public Event TBDD_GROUPSRowDeleted As TBDD_GROUPSRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_GROUPSRow(ByVal row As TBDD_GROUPSRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_GROUPSRow(ByVal NAME As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_GROUPSRow Dim rowTBDD_GROUPSRow As TBDD_GROUPSRow = CType(Me.NewRow,TBDD_GROUPSRow) Dim columnValuesArray() As Object = New Object() {Nothing, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} @@ -474,13 +474,13 @@ Partial Public Class DS_ChangeS End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_GROUPSRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_GROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_GROUPSDataTable = CType(MyBase.Clone,TBDD_GROUPSDataTable) cln.InitVars @@ -488,13 +488,13 @@ Partial Public Class DS_ChangeS End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_GROUPSDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnNAME = MyBase.Columns("NAME") @@ -510,7 +510,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -554,25 +554,25 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_GROUPSRow() As TBDD_GROUPSRow Return CType(Me.NewRow,TBDD_GROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_GROUPSRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_GROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_GROUPSRowChangedEvent) Is Nothing) Then @@ -581,7 +581,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_GROUPSRowChangingEvent) Is Nothing) Then @@ -590,7 +590,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_GROUPSRowDeletedEvent) Is Nothing) Then @@ -599,7 +599,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_GROUPSRowDeletingEvent) Is Nothing) Then @@ -608,13 +608,13 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_GROUPSRow(ByVal row As TBDD_GROUPSRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -689,14 +689,14 @@ Partial Public Class DS_ChangeS Private tableTBDD_GROUPS As TBDD_GROUPSDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_GROUPS = CType(Me.Table,TBDD_GROUPSDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS.GUIDColumn),Integer) @@ -707,7 +707,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property NAME() As String Get Try @@ -722,7 +722,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ECM_FK_ID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS.ECM_FK_IDColumn),Integer) @@ -733,7 +733,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property AD_SYNC() As Boolean Get Return CType(Me(Me.tableTBDD_GROUPS.AD_SYNCColumn),Boolean) @@ -744,7 +744,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property INTERNAL() As Boolean Get Return CType(Me(Me.tableTBDD_GROUPS.INTERNALColumn),Boolean) @@ -755,7 +755,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ACTIVE() As Boolean Get Return CType(Me(Me.tableTBDD_GROUPS.ACTIVEColumn),Boolean) @@ -766,7 +766,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -781,7 +781,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Try @@ -796,7 +796,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -811,7 +811,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -826,7 +826,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -841,73 +841,73 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsNAMENull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.NAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetNAMENull() Me(Me.tableTBDD_GROUPS.NAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_GROUPS.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.ADDED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHONull() Me(Me.tableTBDD_GROUPS.ADDED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_GROUPS.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBDD_GROUPS.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_GROUPS.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub @@ -916,7 +916,7 @@ Partial Public Class DS_ChangeS ''' '''Row event argument class ''' - _ + _ Public Class TBDD_GROUPSRowChangeEvent Inherits Global.System.EventArgs @@ -925,7 +925,7 @@ Partial Public Class DS_ChangeS Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_GROUPSRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -933,7 +933,7 @@ Partial Public Class DS_ChangeS End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_GROUPSRow Get Return Me.eventRow @@ -941,7 +941,7 @@ Partial Public Class DS_ChangeS End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -975,14 +975,14 @@ Namespace DS_ChangeSTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -993,7 +993,7 @@ Namespace DS_ChangeSTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -1023,7 +1023,7 @@ Namespace DS_ChangeSTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -1051,7 +1051,7 @@ Namespace DS_ChangeSTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -1062,7 +1062,7 @@ Namespace DS_ChangeSTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -1073,7 +1073,7 @@ Namespace DS_ChangeSTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -1093,34 +1093,10 @@ Namespace DS_ChangeSTableAdapters Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1"& _ - " AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_"& _ - "ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTER"& _ - "NAL) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] I"& _ - "S NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADD"& _ - "ED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHE"& _ - "N = 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 ([C"& _ - "HANGED_WHEN] = @Original_CHANGED_WHEN)))" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBDD_GROUPS_USER WHERE (GROUP_ID = @Original_GUID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"DELETE FROM TBDD_"& _ + "GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ECM_FK_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_AD_SYNC", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_INTERNAL", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", 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_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (NAME, ECM_FK_ID, AD_SYNC, INTE"& _ @@ -1155,14 +1131,14 @@ Namespace DS_ChangeSTableAdapters End Sub _ + 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(7) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -1232,7 +1208,7 @@ Namespace DS_ChangeSTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As DS_ChangeS.TBDD_GROUPSDataTable) As Integer @@ -1245,7 +1221,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function GetData() As DS_ChangeS.TBDD_GROUPSDataTable @@ -1256,7 +1232,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function FillByClientId(ByVal dataTable As DS_ChangeS.TBDD_GROUPSDataTable, ByVal CLIENT_ID As Integer) As Integer @@ -1270,7 +1246,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function GetDataByClientId(ByVal CLIENT_ID As Integer) As DS_ChangeS.TBDD_GROUPSDataTable @@ -1282,7 +1258,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function FillByClientId_NotInClient(ByVal dataTable As DS_ChangeS.TBDD_GROUPSDataTable, ByVal CLIENT_ID As Integer) As Integer @@ -1296,7 +1272,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function GetDataByClientId_NotInClient(ByVal CLIENT_ID As Integer) As DS_ChangeS.TBDD_GROUPSDataTable @@ -1308,7 +1284,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function FillByModuleId(ByVal dataTable As DS_ChangeS.TBDD_GROUPSDataTable, ByVal MODULE_ID As Integer) As Integer @@ -1322,7 +1298,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function GetDataByModuleId(ByVal MODULE_ID As Integer) As DS_ChangeS.TBDD_GROUPSDataTable @@ -1334,7 +1310,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function FillByModuleId_NotInModule(ByVal dataTable As DS_ChangeS.TBDD_GROUPSDataTable, ByVal MODULE_ID As Integer) As Integer @@ -1348,7 +1324,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function GetDataByModuleId_NotInModule(ByVal MODULE_ID As Integer) As DS_ChangeS.TBDD_GROUPSDataTable @@ -1360,7 +1336,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function FillByUsername(ByVal dataTable As DS_ChangeS.TBDD_GROUPSDataTable, ByVal USERNAME As String) As Integer @@ -1378,7 +1354,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function GetDataByUsername(ByVal USERNAME As String) As DS_ChangeS.TBDD_GROUPSDataTable @@ -1394,85 +1370,39 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As DS_ChangeS.TBDD_GROUPSDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As DS_ChangeS) As Integer Return Me.Adapter.Update(dataSet, "TBDD_GROUPS") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_NAME As String, ByVal Original_ECM_FK_ID As Integer, ByVal Original_AD_SYNC As Boolean, ByVal Original_INTERNAL As Boolean, ByVal Original_ACTIVE As Boolean, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) - If (Original_NAME Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(2).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_NAME,String) - End If - Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_ECM_FK_ID,Integer) - Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_AD_SYNC,Boolean) - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_INTERNAL,Boolean) - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_ACTIVE,Boolean) - If (Original_COMMENT Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(8).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_COMMENT,String) - End If - If (Original_ADDED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHO,String) - End If - If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_ADDED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value - End If - If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(14).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_CHANGED_WHO,String) - End If - If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(15).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_CHANGED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(15).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(16).Value = Global.System.DBNull.Value - End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -1489,7 +1419,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String) As Integer @@ -1523,7 +1453,7 @@ Namespace DS_ChangeSTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal NAME As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer @@ -1564,9 +1494,9 @@ Namespace DS_ChangeSTableAdapters End Function _ - Public Overloads Overridable Function GroupExists(ByVal NAME As String) As Global.System.Nullable(Of Integer) + Public Overloads Overridable Function GroupExists(ByVal NAME As String) As Object Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(6) If (NAME Is Nothing) Then command.Parameters(0).Value = Global.System.DBNull.Value @@ -1588,14 +1518,14 @@ Namespace DS_ChangeSTableAdapters End Try If ((returnValue Is Nothing) _ OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then - Return New Global.System.Nullable(Of Integer)() + Return Nothing Else - Return New Global.System.Nullable(Of Integer)(CType(returnValue,Integer)) + Return CType(returnValue,Object) End If End Function _ Public Overloads Overridable Function InsertGroup(ByVal NAME As String, ByVal ADDED_WHO As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean) As Integer @@ -1651,7 +1581,7 @@ Namespace DS_ChangeSTableAdapters Private _connection As Global.System.Data.IDbConnection _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property UpdateOrder() As UpdateOrderOption Get Return Me._updateOrder @@ -1662,7 +1592,7 @@ Namespace DS_ChangeSTableAdapters End Property _ @@ -1676,7 +1606,7 @@ Namespace DS_ChangeSTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property BackupDataSetBeforeUpdate() As Boolean Get Return Me._backupDataSetBeforeUpdate @@ -1687,7 +1617,7 @@ Namespace DS_ChangeSTableAdapters End Property _ Public Property Connection() As Global.System.Data.IDbConnection Get @@ -1706,7 +1636,7 @@ Namespace DS_ChangeSTableAdapters End Property _ Public ReadOnly Property TableAdapterInstanceCount() As Integer Get @@ -1722,7 +1652,7 @@ Namespace DS_ChangeSTableAdapters '''Update rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As DS_ChangeS, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then @@ -1741,7 +1671,7 @@ Namespace DS_ChangeSTableAdapters '''Insert rows in top-down order. '''
 _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As DS_ChangeS, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then @@ -1759,7 +1689,7 @@ Namespace DS_ChangeSTableAdapters '''Delete rows in bottom-up order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DS_ChangeS, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then @@ -1777,7 +1707,7 @@ Namespace DS_ChangeSTableAdapters '''Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRealUpdatedRows(ByVal updatedRows() As Global.System.Data.DataRow, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Global.System.Data.DataRow() If ((updatedRows Is Nothing) _ OrElse (updatedRows.Length < 1)) Then @@ -1803,7 +1733,7 @@ Namespace DS_ChangeSTableAdapters '''Update all changes to the dataset. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overridable Function UpdateAll(ByVal dataSet As DS_ChangeS) As Integer If (dataSet Is Nothing) Then Throw New Global.System.ArgumentNullException("dataSet") @@ -1938,13 +1868,13 @@ Namespace DS_ChangeSTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Sub SortSelfReferenceRows(ByVal rows() As Global.System.Data.DataRow, ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) Global.System.Array.Sort(Of Global.System.Data.DataRow)(rows, New SelfReferenceComparer(relation, childFirst)) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Function MatchTableAdapterConnection(ByVal inputConnection As Global.System.Data.IDbConnection) As Boolean If (Not (Me._connection) Is Nothing) Then Return true @@ -1962,7 +1892,7 @@ Namespace DS_ChangeSTableAdapters ''' '''Update Order Option ''' - _ + _ Public Enum UpdateOrderOption InsertUpdateDelete = 0 @@ -1973,7 +1903,7 @@ Namespace DS_ChangeSTableAdapters ''' '''Used to sort self-referenced table's rows ''' - _ + _ Private Class SelfReferenceComparer Inherits Object Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow) @@ -1983,7 +1913,7 @@ Namespace DS_ChangeSTableAdapters Private _childFirst As Integer _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) MyBase.New Me._relation = relation @@ -1995,7 +1925,7 @@ Namespace DS_ChangeSTableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRoot(ByVal row As Global.System.Data.DataRow, ByRef distance As Integer) As Global.System.Data.DataRow Global.System.Diagnostics.Debug.Assert((Not (row) Is Nothing)) Dim root As Global.System.Data.DataRow = row @@ -2034,7 +1964,7 @@ Namespace DS_ChangeSTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Compare(ByVal row1 As Global.System.Data.DataRow, ByVal row2 As Global.System.Data.DataRow) As Integer Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow).Compare If Object.ReferenceEquals(row1, row2) Then Return 0 diff --git a/DDUserManager/DDUserManager/DS_ChangeS.xsd b/DDUserManager/DDUserManager/DS_ChangeS.xsd index 83bf3e4..09e39b6 100644 --- a/DDUserManager/DDUserManager/DS_ChangeS.xsd +++ b/DDUserManager/DDUserManager/DS_ChangeS.xsd @@ -2,35 +2,22 @@ - + - + + - + - - DELETE FROM [TBDD_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTERNAL) AND ([ACTIVE] = @Original_ACTIVE) 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))) + + DELETE FROM TBDD_GROUPS_USER WHERE (GROUP_ID = @Original_GUID) +DELETE FROM TBDD_GROUPS +WHERE (GUID = @Original_GUID) - - - - - - - - - - - - - - - - @@ -92,7 +79,7 @@ SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADD - + 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 @@ -105,7 +92,7 @@ WHERE (T2.CLIENT_ID = @CLIENT_ID) - + SELECT * @@ -122,7 +109,7 @@ WHERE (GUID NOT IN - + 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 @@ -135,7 +122,7 @@ WHERE (T2.MODULE_ID = @MODULE_ID) - + SELECT * @@ -151,7 +138,7 @@ WHERE (GUID NOT IN - + 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) @@ -161,7 +148,7 @@ WHERE (GUID NOT IN - + SELECT GUID @@ -173,7 +160,7 @@ WHERE (NAME = @NAME) - + INSERT INTO TBDD_GROUPS @@ -200,7 +187,7 @@ VALUES (@NAME,@ADDED_WHO,@ECM_FK_ID,@AD_SYNC,@INTERNAL,@ACTIVE) - + diff --git a/DDUserManager/DDUserManager/My Project/Settings.Designer.vb b/DDUserManager/DDUserManager/My Project/Settings.Designer.vb index 17d912e..fa409cf 100644 --- a/DDUserManager/DDUserManager/My Project/Settings.Designer.vb +++ b/DDUserManager/DDUserManager/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -56,12 +56,24 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ + "rity Info=True;User ID=sa;Password=dd")> _ Public ReadOnly Property DD_ECMConnectionString() As String Get Return CType(Me("DD_ECMConnectionString"),String) End Get End Property + + _ + Public ReadOnly Property DD_ECM_TESTConnectionString() As String + Get + Return CType(Me("DD_ECM_TESTConnectionString"),String) + End Get + End Property End Class End Namespace diff --git a/DDUserManager/DDUserManager/My Project/Settings.settings b/DDUserManager/DDUserManager/My Project/Settings.settings index 5338c76..42f82fb 100644 --- a/DDUserManager/DDUserManager/My Project/Settings.settings +++ b/DDUserManager/DDUserManager/My Project/Settings.settings @@ -3,7 +3,15 @@ - + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> + <ProviderName>System.Data.SqlClient</ProviderName> +</SerializableConnectionString> + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd \ No newline at end of file diff --git a/DDUserManager/DDUserManager/UserDataSet.Designer.vb b/DDUserManager/DDUserManager/UserDataSet.Designer.vb index 78e63b3..db8d61a 100644 --- a/DDUserManager/DDUserManager/UserDataSet.Designer.vb +++ b/DDUserManager/DDUserManager/UserDataSet.Designer.vb @@ -72,7 +72,7 @@ Partial Public Class UserDataSet Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -84,7 +84,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context, false) If (Me.IsBinarySerialized(info, context) = true) Then @@ -152,7 +152,7 @@ Partial Public Class UserDataSet End Sub _ Public ReadOnly Property TBDD_GROUPS_USER() As TBDD_GROUPS_USERDataTable @@ -162,7 +162,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBDD_MODULES() As TBDD_MODULESDataTable @@ -172,7 +172,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBDD_USER_MODULES() As TBDD_USER_MODULESDataTable @@ -182,7 +182,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBDD_CLIENT() As TBDD_CLIENTDataTable @@ -192,7 +192,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBDD_CLIENT_USER() As TBDD_CLIENT_USERDataTable @@ -202,7 +202,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBDD_USER() As TBDD_USERDataTable @@ -212,7 +212,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBDD_GROUPS_MODULES() As TBDD_GROUPS_MODULESDataTable @@ -222,7 +222,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBDD_GROUPS_CLIENT() As TBDD_GROUPS_CLIENTDataTable @@ -232,7 +232,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBDD_GROUPS() As TBDD_GROUPSDataTable @@ -242,7 +242,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBLOCAL_ADUSERS() As TBLOCAL_ADUSERSDataTable @@ -252,7 +252,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBLOCAL_ADGROUPS() As TBLOCAL_ADGROUPSDataTable @@ -262,7 +262,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property TBLOCAL_DEBUG_GROUPS() As TBLOCAL_DEBUG_GROUPSDataTable @@ -272,7 +272,7 @@ Partial Public Class UserDataSet End Property _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -285,7 +285,7 @@ Partial Public Class UserDataSet End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -294,7 +294,7 @@ Partial Public Class UserDataSet End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -303,7 +303,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -311,7 +311,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As UserDataSet = CType(MyBase.Clone,UserDataSet) cln.InitVars @@ -320,19 +320,19 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Me.Reset @@ -389,7 +389,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) @@ -398,13 +398,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) Me.tableTBDD_GROUPS_USER = CType(MyBase.Tables("TBDD_GROUPS_USER"),TBDD_GROUPS_USERDataTable) If (initTable = true) Then @@ -491,7 +491,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "UserDataSet" Me.Prefix = "" @@ -545,79 +545,79 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_GROUPS_USER() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_MODULES() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_USER_MODULES() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_CLIENT() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_CLIENT_USER() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_USER() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_GROUPS_MODULES() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_GROUPS_CLIENT() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBDD_GROUPS() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBLOCAL_ADUSERS() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBLOCAL_ADGROUPS() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBLOCAL_DEBUG_GROUPS() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then Me.InitVars @@ -625,7 +625,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As UserDataSet = New UserDataSet() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() @@ -674,40 +674,40 @@ Partial Public Class UserDataSet Return type End Function - _ + _ Public Delegate Sub TBDD_GROUPS_USERRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_GROUPS_USERRowChangeEvent) - _ + _ Public Delegate Sub TBDD_MODULESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_MODULESRowChangeEvent) - _ + _ Public Delegate Sub TBDD_USER_MODULESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_USER_MODULESRowChangeEvent) - _ + _ Public Delegate Sub TBDD_CLIENTRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_CLIENTRowChangeEvent) - _ + _ Public Delegate Sub TBDD_CLIENT_USERRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_CLIENT_USERRowChangeEvent) - _ + _ Public Delegate Sub TBDD_USERRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_USERRowChangeEvent) - _ + _ Public Delegate Sub TBDD_GROUPS_MODULESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_GROUPS_MODULESRowChangeEvent) - _ + _ Public Delegate Sub TBDD_GROUPS_CLIENTRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_GROUPS_CLIENTRowChangeEvent) - _ + _ Public Delegate Sub TBDD_GROUPSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_GROUPSRowChangeEvent) - _ + _ Public Delegate Sub TBLOCAL_ADUSERSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBLOCAL_ADUSERSRowChangeEvent) - _ + _ Public Delegate Sub TBLOCAL_ADGROUPSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBLOCAL_ADGROUPSRowChangeEvent) - _ + _ Public Delegate Sub TBLOCAL_DEBUG_GROUPSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBLOCAL_DEBUG_GROUPSRowChangeEvent) ''' @@ -735,7 +735,7 @@ Partial Public Class UserDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_GROUPS_USER" @@ -745,7 +745,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -763,14 +763,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -778,7 +778,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property USER_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnUSER_ID @@ -786,7 +786,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GROUP_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnGROUP_ID @@ -794,7 +794,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -802,7 +802,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -810,7 +810,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -818,7 +818,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -826,7 +826,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -834,7 +834,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -843,33 +843,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_GROUPS_USERRow Get Return CType(Me.Rows(index),TBDD_GROUPS_USERRow) End Get End Property - _ + _ Public Event TBDD_GROUPS_USERRowChanging As TBDD_GROUPS_USERRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_USERRowChanged As TBDD_GROUPS_USERRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_USERRowDeleting As TBDD_GROUPS_USERRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_USERRowDeleted As TBDD_GROUPS_USERRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_GROUPS_USERRow(ByVal row As TBDD_GROUPS_USERRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_GROUPS_USERRow(ByVal parentTBDD_USERRowByFK_TBDD_GROUPS_USER_USER_ID As TBDD_USERRow, ByVal parentTBDD_GROUPSRowByFK_TBDD_GROUPS_USER_GROUP_ID As TBDD_GROUPSRow, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_GROUPS_USERRow Dim rowTBDD_GROUPS_USERRow As TBDD_GROUPS_USERRow = CType(Me.NewRow,TBDD_GROUPS_USERRow) Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} @@ -885,13 +885,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_GROUPS_USERRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_GROUPS_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_GROUPS_USERDataTable = CType(MyBase.Clone,TBDD_GROUPS_USERDataTable) cln.InitVars @@ -899,13 +899,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_GROUPS_USERDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnUSER_ID = MyBase.Columns("USER_ID") @@ -918,7 +918,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -952,25 +952,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_GROUPS_USERRow() As TBDD_GROUPS_USERRow Return CType(Me.NewRow,TBDD_GROUPS_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_GROUPS_USERRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_GROUPS_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_GROUPS_USERRowChangedEvent) Is Nothing) Then @@ -979,7 +979,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_GROUPS_USERRowChangingEvent) Is Nothing) Then @@ -988,7 +988,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_GROUPS_USERRowDeletedEvent) Is Nothing) Then @@ -997,7 +997,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_GROUPS_USERRowDeletingEvent) Is Nothing) Then @@ -1006,13 +1006,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_GROUPS_USERRow(ByVal row As TBDD_GROUPS_USERRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -1127,7 +1127,7 @@ Partial Public Class UserDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_MODULES" @@ -1137,7 +1137,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -1155,14 +1155,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -1170,7 +1170,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnNAME @@ -1178,7 +1178,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property SHORT_NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnSHORT_NAME @@ -1186,7 +1186,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property LICENSEColumn() As Global.System.Data.DataColumn Get Return Me.columnLICENSE @@ -1194,7 +1194,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property PRODUCT_VERSIONColumn() As Global.System.Data.DataColumn Get Return Me.columnPRODUCT_VERSION @@ -1202,7 +1202,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn Get Return Me.columnACTIVE @@ -1210,7 +1210,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property VERSION_DELIMITERColumn() As Global.System.Data.DataColumn Get Return Me.columnVERSION_DELIMITER @@ -1218,7 +1218,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property FILE_DELIMITERColumn() As Global.System.Data.DataColumn Get Return Me.columnFILE_DELIMITER @@ -1226,7 +1226,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property BIT1Column() As Global.System.Data.DataColumn Get Return Me.columnBIT1 @@ -1234,7 +1234,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property BIT2Column() As Global.System.Data.DataColumn Get Return Me.columnBIT2 @@ -1242,7 +1242,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property STRING1Column() As Global.System.Data.DataColumn Get Return Me.columnSTRING1 @@ -1250,7 +1250,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property STRING2Column() As Global.System.Data.DataColumn Get Return Me.columnSTRING2 @@ -1258,7 +1258,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property BACKGROUND_IMAGEColumn() As Global.System.Data.DataColumn Get Return Me.columnBACKGROUND_IMAGE @@ -1266,7 +1266,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property PRODUCT_NAME1Column() As Global.System.Data.DataColumn Get Return Me.columnPRODUCT_NAME1 @@ -1274,7 +1274,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property PRODUCT_NAME2Column() As Global.System.Data.DataColumn Get Return Me.columnPRODUCT_NAME2 @@ -1282,7 +1282,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property VERSION_UPATE_PATHColumn() As Global.System.Data.DataColumn Get Return Me.columnVERSION_UPATE_PATH @@ -1290,7 +1290,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -1298,7 +1298,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -1306,7 +1306,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -1314,7 +1314,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -1322,7 +1322,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -1331,33 +1331,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_MODULESRow Get Return CType(Me.Rows(index),TBDD_MODULESRow) End Get End Property - _ + _ Public Event TBDD_MODULESRowChanging As TBDD_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_MODULESRowChanged As TBDD_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_MODULESRowDeleting As TBDD_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_MODULESRowDeleted As TBDD_MODULESRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_MODULESRow(ByVal row As TBDD_MODULESRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_MODULESRow( _ ByVal NAME As String, _ ByVal SHORT_NAME As String, _ @@ -1386,13 +1386,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_MODULESRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_MODULESDataTable = CType(MyBase.Clone,TBDD_MODULESDataTable) cln.InitVars @@ -1400,13 +1400,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_MODULESDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnNAME = MyBase.Columns("NAME") @@ -1431,7 +1431,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -1505,25 +1505,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_MODULESRow() As TBDD_MODULESRow Return CType(Me.NewRow,TBDD_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_MODULESRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_MODULESRowChangedEvent) Is Nothing) Then @@ -1532,7 +1532,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_MODULESRowChangingEvent) Is Nothing) Then @@ -1541,7 +1541,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_MODULESRowDeletedEvent) Is Nothing) Then @@ -1550,7 +1550,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_MODULESRowDeletingEvent) Is Nothing) Then @@ -1559,13 +1559,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_MODULESRow(ByVal row As TBDD_MODULESRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -1654,7 +1654,7 @@ Partial Public Class UserDataSet Private columnADDED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_USER_MODULES" @@ -1664,7 +1664,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -1682,14 +1682,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -1697,7 +1697,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property USER_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnUSER_ID @@ -1705,7 +1705,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property MODULE_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnMODULE_ID @@ -1713,7 +1713,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property IS_ADMINColumn() As Global.System.Data.DataColumn Get Return Me.columnIS_ADMIN @@ -1721,7 +1721,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -1729,7 +1729,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -1737,7 +1737,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -1745,7 +1745,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -1754,33 +1754,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_USER_MODULESRow Get Return CType(Me.Rows(index),TBDD_USER_MODULESRow) End Get End Property - _ + _ Public Event TBDD_USER_MODULESRowChanging As TBDD_USER_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_USER_MODULESRowChanged As TBDD_USER_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_USER_MODULESRowDeleting As TBDD_USER_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_USER_MODULESRowDeleted As TBDD_USER_MODULESRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_USER_MODULESRow(ByVal row As TBDD_USER_MODULESRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_USER_MODULESRow(ByVal parentTBDD_USERRowByFK_TBDD_USER_MODULES2_USER_ID As TBDD_USERRow, ByVal parentTBDD_MODULESRowByFK_TBDD_USER_MODULES_MODULE_ID As TBDD_MODULESRow, ByVal IS_ADMIN As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date) As TBDD_USER_MODULESRow Dim rowTBDD_USER_MODULESRow As TBDD_USER_MODULESRow = CType(Me.NewRow,TBDD_USER_MODULESRow) Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, IS_ADMIN, COMMENT, ADDED_WHO, ADDED_WHEN} @@ -1796,13 +1796,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_USER_MODULESRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_USER_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_USER_MODULESDataTable = CType(MyBase.Clone,TBDD_USER_MODULESDataTable) cln.InitVars @@ -1810,13 +1810,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_USER_MODULESDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnUSER_ID = MyBase.Columns("USER_ID") @@ -1828,7 +1828,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -1859,25 +1859,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_USER_MODULESRow() As TBDD_USER_MODULESRow Return CType(Me.NewRow,TBDD_USER_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_USER_MODULESRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_USER_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_USER_MODULESRowChangedEvent) Is Nothing) Then @@ -1886,7 +1886,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_USER_MODULESRowChangingEvent) Is Nothing) Then @@ -1895,7 +1895,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_USER_MODULESRowDeletedEvent) Is Nothing) Then @@ -1904,7 +1904,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_USER_MODULESRowDeletingEvent) Is Nothing) Then @@ -1913,13 +1913,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_USER_MODULESRow(ByVal row As TBDD_USER_MODULESRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -2016,7 +2016,7 @@ Partial Public Class UserDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_CLIENT" @@ -2026,7 +2026,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -2044,14 +2044,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -2059,7 +2059,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CLIENT_NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnCLIENT_NAME @@ -2067,7 +2067,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property SHORTNAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnSHORTNAME @@ -2075,7 +2075,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property LICENSE_PMOColumn() As Global.System.Data.DataColumn Get Return Me.columnLICENSE_PMO @@ -2083,7 +2083,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property LICENSE_GIColumn() As Global.System.Data.DataColumn Get Return Me.columnLICENSE_GI @@ -2091,7 +2091,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property LICENSE_PMColumn() As Global.System.Data.DataColumn Get Return Me.columnLICENSE_PM @@ -2099,7 +2099,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -2107,7 +2107,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -2115,7 +2115,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -2123,7 +2123,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -2131,7 +2131,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -2139,7 +2139,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -2148,33 +2148,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_CLIENTRow Get Return CType(Me.Rows(index),TBDD_CLIENTRow) End Get End Property - _ + _ Public Event TBDD_CLIENTRowChanging As TBDD_CLIENTRowChangeEventHandler - _ + _ Public Event TBDD_CLIENTRowChanged As TBDD_CLIENTRowChangeEventHandler - _ + _ Public Event TBDD_CLIENTRowDeleting As TBDD_CLIENTRowChangeEventHandler - _ + _ Public Event TBDD_CLIENTRowDeleted As TBDD_CLIENTRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_CLIENTRow(ByVal row As TBDD_CLIENTRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_CLIENTRow(ByVal CLIENT_NAME As String, ByVal SHORTNAME As String, ByVal LICENSE_PMO As String, ByVal LICENSE_GI As String, ByVal LICENSE_PM As String, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_CLIENTRow Dim rowTBDD_CLIENTRow As TBDD_CLIENTRow = CType(Me.NewRow,TBDD_CLIENTRow) Dim columnValuesArray() As Object = New Object() {Nothing, CLIENT_NAME, SHORTNAME, LICENSE_PMO, LICENSE_GI, LICENSE_PM, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} @@ -2184,13 +2184,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_CLIENTRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_CLIENTRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_CLIENTDataTable = CType(MyBase.Clone,TBDD_CLIENTDataTable) cln.InitVars @@ -2198,13 +2198,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_CLIENTDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnCLIENT_NAME = MyBase.Columns("CLIENT_NAME") @@ -2220,7 +2220,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -2270,25 +2270,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_CLIENTRow() As TBDD_CLIENTRow Return CType(Me.NewRow,TBDD_CLIENTRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_CLIENTRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_CLIENTRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_CLIENTRowChangedEvent) Is Nothing) Then @@ -2297,7 +2297,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_CLIENTRowChangingEvent) Is Nothing) Then @@ -2306,7 +2306,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_CLIENTRowDeletedEvent) Is Nothing) Then @@ -2315,7 +2315,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_CLIENTRowDeletingEvent) Is Nothing) Then @@ -2324,13 +2324,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_CLIENTRow(ByVal row As TBDD_CLIENTRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -2417,7 +2417,7 @@ Partial Public Class UserDataSet Private columnADDED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_CLIENT_USER" @@ -2427,7 +2427,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -2445,14 +2445,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -2460,7 +2460,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property USER_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnUSER_ID @@ -2468,7 +2468,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CLIENT_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnCLIENT_ID @@ -2476,7 +2476,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -2484,7 +2484,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -2492,7 +2492,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -2500,7 +2500,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -2509,33 +2509,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_CLIENT_USERRow Get Return CType(Me.Rows(index),TBDD_CLIENT_USERRow) End Get End Property - _ + _ Public Event TBDD_CLIENT_USERRowChanging As TBDD_CLIENT_USERRowChangeEventHandler - _ + _ Public Event TBDD_CLIENT_USERRowChanged As TBDD_CLIENT_USERRowChangeEventHandler - _ + _ Public Event TBDD_CLIENT_USERRowDeleting As TBDD_CLIENT_USERRowChangeEventHandler - _ + _ Public Event TBDD_CLIENT_USERRowDeleted As TBDD_CLIENT_USERRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_CLIENT_USERRow(ByVal row As TBDD_CLIENT_USERRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_CLIENT_USERRow(ByVal parentTBDD_USERRowByFK_TBDD_CLIENT_USER_USER_ID As TBDD_USERRow, ByVal parentTBDD_CLIENTRowByFK_TBDD_CLIENT_USER_GROUP_ID As TBDD_CLIENTRow, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date) As TBDD_CLIENT_USERRow Dim rowTBDD_CLIENT_USERRow As TBDD_CLIENT_USERRow = CType(Me.NewRow,TBDD_CLIENT_USERRow) Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, COMMENT, ADDED_WHO, ADDED_WHEN} @@ -2551,13 +2551,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_CLIENT_USERRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_CLIENT_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_CLIENT_USERDataTable = CType(MyBase.Clone,TBDD_CLIENT_USERDataTable) cln.InitVars @@ -2565,13 +2565,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_CLIENT_USERDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnUSER_ID = MyBase.Columns("USER_ID") @@ -2582,7 +2582,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -2610,25 +2610,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_CLIENT_USERRow() As TBDD_CLIENT_USERRow Return CType(Me.NewRow,TBDD_CLIENT_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_CLIENT_USERRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_CLIENT_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_CLIENT_USERRowChangedEvent) Is Nothing) Then @@ -2637,7 +2637,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_CLIENT_USERRowChangingEvent) Is Nothing) Then @@ -2646,7 +2646,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_CLIENT_USERRowDeletedEvent) Is Nothing) Then @@ -2655,7 +2655,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_CLIENT_USERRowDeletingEvent) Is Nothing) Then @@ -2664,13 +2664,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_CLIENT_USERRow(ByVal row As TBDD_CLIENT_USERRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -2771,7 +2771,7 @@ Partial Public Class UserDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_USER" @@ -2781,7 +2781,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -2799,14 +2799,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -2814,7 +2814,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property PRENAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnPRENAME @@ -2822,7 +2822,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnNAME @@ -2830,7 +2830,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property USERNAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnUSERNAME @@ -2838,7 +2838,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property SHORTNAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnSHORTNAME @@ -2846,7 +2846,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property EMAILColumn() As Global.System.Data.DataColumn Get Return Me.columnEMAIL @@ -2854,7 +2854,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property LANGUAGEColumn() As Global.System.Data.DataColumn Get Return Me.columnLANGUAGE @@ -2862,7 +2862,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -2870,7 +2870,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property DATE_FORMATColumn() As Global.System.Data.DataColumn Get Return Me.columnDATE_FORMAT @@ -2878,7 +2878,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -2886,7 +2886,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -2894,7 +2894,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -2902,7 +2902,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -2910,7 +2910,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -2919,33 +2919,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_USERRow Get Return CType(Me.Rows(index),TBDD_USERRow) End Get End Property - _ + _ Public Event TBDD_USERRowChanging As TBDD_USERRowChangeEventHandler - _ + _ Public Event TBDD_USERRowChanged As TBDD_USERRowChangeEventHandler - _ + _ Public Event TBDD_USERRowDeleting As TBDD_USERRowChangeEventHandler - _ + _ Public Event TBDD_USERRowDeleted As TBDD_USERRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_USERRow(ByVal row As TBDD_USERRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_USERRow(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal SHORTNAME As String, ByVal EMAIL As String, ByVal LANGUAGE As String, ByVal COMMENT As String, ByVal DATE_FORMAT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_USERRow Dim rowTBDD_USERRow As TBDD_USERRow = CType(Me.NewRow,TBDD_USERRow) Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} @@ -2955,13 +2955,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_USERRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_USERDataTable = CType(MyBase.Clone,TBDD_USERDataTable) cln.InitVars @@ -2969,13 +2969,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_USERDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnPRENAME = MyBase.Columns("PRENAME") @@ -2993,7 +2993,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -3045,25 +3045,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_USERRow() As TBDD_USERRow Return CType(Me.NewRow,TBDD_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_USERRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_USERRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_USERRowChangedEvent) Is Nothing) Then @@ -3072,7 +3072,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_USERRowChangingEvent) Is Nothing) Then @@ -3081,7 +3081,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_USERRowDeletedEvent) Is Nothing) Then @@ -3090,7 +3090,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_USERRowDeletingEvent) Is Nothing) Then @@ -3099,13 +3099,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_USERRow(ByVal row As TBDD_USERRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -3196,7 +3196,7 @@ Partial Public Class UserDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_GROUPS_MODULES" @@ -3206,7 +3206,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -3224,14 +3224,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -3239,7 +3239,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property MODULE_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnMODULE_ID @@ -3247,7 +3247,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GROUP_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnGROUP_ID @@ -3255,7 +3255,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -3263,7 +3263,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -3271,7 +3271,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -3279,7 +3279,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -3287,7 +3287,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -3295,7 +3295,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -3304,33 +3304,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_GROUPS_MODULESRow Get Return CType(Me.Rows(index),TBDD_GROUPS_MODULESRow) End Get End Property - _ + _ Public Event TBDD_GROUPS_MODULESRowChanging As TBDD_GROUPS_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_MODULESRowChanged As TBDD_GROUPS_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_MODULESRowDeleting As TBDD_GROUPS_MODULESRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_MODULESRowDeleted As TBDD_GROUPS_MODULESRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_GROUPS_MODULESRow(ByVal row As TBDD_GROUPS_MODULESRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_GROUPS_MODULESRow(ByVal parentTBDD_MODULESRowByFK_TBDD_GROUPS_MODULES_MODULE_ID As TBDD_MODULESRow, ByVal parentTBDD_GROUPSRowByFK_TBDD_GROUPS_MODULES_GROUP_ID As TBDD_GROUPSRow, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_GROUPS_MODULESRow Dim rowTBDD_GROUPS_MODULESRow As TBDD_GROUPS_MODULESRow = CType(Me.NewRow,TBDD_GROUPS_MODULESRow) Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} @@ -3346,13 +3346,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_GROUPS_MODULESRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_GROUPS_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_GROUPS_MODULESDataTable = CType(MyBase.Clone,TBDD_GROUPS_MODULESDataTable) cln.InitVars @@ -3360,13 +3360,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_GROUPS_MODULESDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnMODULE_ID = MyBase.Columns("MODULE_ID") @@ -3379,7 +3379,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -3413,25 +3413,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_GROUPS_MODULESRow() As TBDD_GROUPS_MODULESRow Return CType(Me.NewRow,TBDD_GROUPS_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_GROUPS_MODULESRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_GROUPS_MODULESRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_GROUPS_MODULESRowChangedEvent) Is Nothing) Then @@ -3440,7 +3440,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_GROUPS_MODULESRowChangingEvent) Is Nothing) Then @@ -3449,7 +3449,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_GROUPS_MODULESRowDeletedEvent) Is Nothing) Then @@ -3458,7 +3458,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_GROUPS_MODULESRowDeletingEvent) Is Nothing) Then @@ -3467,13 +3467,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_GROUPS_MODULESRow(ByVal row As TBDD_GROUPS_MODULESRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -3564,7 +3564,7 @@ Partial Public Class UserDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_GROUPS_CLIENT" @@ -3574,7 +3574,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -3592,14 +3592,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -3607,7 +3607,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CLIENT_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnCLIENT_ID @@ -3615,7 +3615,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GROUP_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnGROUP_ID @@ -3623,7 +3623,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -3631,7 +3631,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -3639,7 +3639,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -3647,7 +3647,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -3655,7 +3655,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -3663,7 +3663,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -3672,33 +3672,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_GROUPS_CLIENTRow Get Return CType(Me.Rows(index),TBDD_GROUPS_CLIENTRow) End Get End Property - _ + _ Public Event TBDD_GROUPS_CLIENTRowChanging As TBDD_GROUPS_CLIENTRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_CLIENTRowChanged As TBDD_GROUPS_CLIENTRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_CLIENTRowDeleting As TBDD_GROUPS_CLIENTRowChangeEventHandler - _ + _ Public Event TBDD_GROUPS_CLIENTRowDeleted As TBDD_GROUPS_CLIENTRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_GROUPS_CLIENTRow(ByVal row As TBDD_GROUPS_CLIENTRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_GROUPS_CLIENTRow(ByVal parentTBDD_CLIENTRowByFK_TBDD_GROUPS_CLIENT_CLIENT_ID As TBDD_CLIENTRow, ByVal parentTBDD_GROUPSRowByFK_TBDD_GROUPS_CLIENT_GROUP_ID As TBDD_GROUPSRow, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_GROUPS_CLIENTRow Dim rowTBDD_GROUPS_CLIENTRow As TBDD_GROUPS_CLIENTRow = CType(Me.NewRow,TBDD_GROUPS_CLIENTRow) Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} @@ -3714,13 +3714,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_GROUPS_CLIENTRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_GROUPS_CLIENTRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_GROUPS_CLIENTDataTable = CType(MyBase.Clone,TBDD_GROUPS_CLIENTDataTable) cln.InitVars @@ -3728,13 +3728,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_GROUPS_CLIENTDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnCLIENT_ID = MyBase.Columns("CLIENT_ID") @@ -3747,7 +3747,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -3781,25 +3781,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_GROUPS_CLIENTRow() As TBDD_GROUPS_CLIENTRow Return CType(Me.NewRow,TBDD_GROUPS_CLIENTRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_GROUPS_CLIENTRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_GROUPS_CLIENTRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_GROUPS_CLIENTRowChangedEvent) Is Nothing) Then @@ -3808,7 +3808,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_GROUPS_CLIENTRowChangingEvent) Is Nothing) Then @@ -3817,7 +3817,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_GROUPS_CLIENTRowDeletedEvent) Is Nothing) Then @@ -3826,7 +3826,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_GROUPS_CLIENTRowDeletingEvent) Is Nothing) Then @@ -3835,13 +3835,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_GROUPS_CLIENTRow(ByVal row As TBDD_GROUPS_CLIENTRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -3938,7 +3938,7 @@ Partial Public Class UserDataSet Private columnACTIVE As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBDD_GROUPS" @@ -3948,7 +3948,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -3966,14 +3966,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -3981,7 +3981,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnNAME @@ -3989,7 +3989,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property INTERNALColumn() As Global.System.Data.DataColumn Get Return Me.columnINTERNAL @@ -3997,7 +3997,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property AD_SYNCColumn() As Global.System.Data.DataColumn Get Return Me.columnAD_SYNC @@ -4005,7 +4005,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn Get Return Me.columnCOMMENT @@ -4013,7 +4013,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -4021,7 +4021,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -4029,7 +4029,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -4037,7 +4037,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -4045,7 +4045,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ECM_FK_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnECM_FK_ID @@ -4053,7 +4053,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn Get Return Me.columnACTIVE @@ -4061,7 +4061,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -4070,33 +4070,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_GROUPSRow Get Return CType(Me.Rows(index),TBDD_GROUPSRow) End Get End Property - _ + _ Public Event TBDD_GROUPSRowChanging As TBDD_GROUPSRowChangeEventHandler - _ + _ Public Event TBDD_GROUPSRowChanged As TBDD_GROUPSRowChangeEventHandler - _ + _ Public Event TBDD_GROUPSRowDeleting As TBDD_GROUPSRowChangeEventHandler - _ + _ Public Event TBDD_GROUPSRowDeleted As TBDD_GROUPSRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBDD_GROUPSRow(ByVal row As TBDD_GROUPSRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBDD_GROUPSRow(ByVal NAME As String, ByVal INTERNAL As Boolean, ByVal AD_SYNC As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal ECM_FK_ID As Integer, ByVal ACTIVE As Boolean) As TBDD_GROUPSRow Dim rowTBDD_GROUPSRow As TBDD_GROUPSRow = CType(Me.NewRow,TBDD_GROUPSRow) Dim columnValuesArray() As Object = New Object() {Nothing, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ECM_FK_ID, ACTIVE} @@ -4106,13 +4106,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBDD_GROUPSRow Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_GROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBDD_GROUPSDataTable = CType(MyBase.Clone,TBDD_GROUPSDataTable) cln.InitVars @@ -4120,13 +4120,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBDD_GROUPSDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnNAME = MyBase.Columns("NAME") @@ -4142,7 +4142,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -4188,25 +4188,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBDD_GROUPSRow() As TBDD_GROUPSRow Return CType(Me.NewRow,TBDD_GROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBDD_GROUPSRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBDD_GROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBDD_GROUPSRowChangedEvent) Is Nothing) Then @@ -4215,7 +4215,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBDD_GROUPSRowChangingEvent) Is Nothing) Then @@ -4224,7 +4224,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBDD_GROUPSRowDeletedEvent) Is Nothing) Then @@ -4233,7 +4233,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBDD_GROUPSRowDeletingEvent) Is Nothing) Then @@ -4242,13 +4242,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBDD_GROUPSRow(ByVal row As TBDD_GROUPSRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -4331,7 +4331,7 @@ Partial Public Class UserDataSet Private columnEMAIL As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBLOCAL_ADUSERS" @@ -4341,7 +4341,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -4359,14 +4359,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property USERNAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnUSERNAME @@ -4374,7 +4374,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property PRENAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnPRENAME @@ -4382,7 +4382,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnNAME @@ -4390,7 +4390,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property EMAILColumn() As Global.System.Data.DataColumn Get Return Me.columnEMAIL @@ -4398,7 +4398,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -4407,33 +4407,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBLOCAL_ADUSERSRow Get Return CType(Me.Rows(index),TBLOCAL_ADUSERSRow) End Get End Property - _ + _ Public Event TBLOCAL_ADUSERSRowChanging As TBLOCAL_ADUSERSRowChangeEventHandler - _ + _ Public Event TBLOCAL_ADUSERSRowChanged As TBLOCAL_ADUSERSRowChangeEventHandler - _ + _ Public Event TBLOCAL_ADUSERSRowDeleting As TBLOCAL_ADUSERSRowChangeEventHandler - _ + _ Public Event TBLOCAL_ADUSERSRowDeleted As TBLOCAL_ADUSERSRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBLOCAL_ADUSERSRow(ByVal row As TBLOCAL_ADUSERSRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBLOCAL_ADUSERSRow(ByVal USERNAME As String, ByVal PRENAME As String, ByVal NAME As String, ByVal EMAIL As String) As TBLOCAL_ADUSERSRow Dim rowTBLOCAL_ADUSERSRow As TBLOCAL_ADUSERSRow = CType(Me.NewRow,TBLOCAL_ADUSERSRow) Dim columnValuesArray() As Object = New Object() {USERNAME, PRENAME, NAME, EMAIL} @@ -4443,7 +4443,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBLOCAL_ADUSERSDataTable = CType(MyBase.Clone,TBLOCAL_ADUSERSDataTable) cln.InitVars @@ -4451,13 +4451,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBLOCAL_ADUSERSDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnUSERNAME = MyBase.Columns("USERNAME") Me.columnPRENAME = MyBase.Columns("PRENAME") @@ -4466,7 +4466,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnUSERNAME = New Global.System.Data.DataColumn("USERNAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnUSERNAME) @@ -4479,25 +4479,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBLOCAL_ADUSERSRow() As TBLOCAL_ADUSERSRow Return CType(Me.NewRow,TBLOCAL_ADUSERSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBLOCAL_ADUSERSRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBLOCAL_ADUSERSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBLOCAL_ADUSERSRowChangedEvent) Is Nothing) Then @@ -4506,7 +4506,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBLOCAL_ADUSERSRowChangingEvent) Is Nothing) Then @@ -4515,7 +4515,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBLOCAL_ADUSERSRowDeletedEvent) Is Nothing) Then @@ -4524,7 +4524,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBLOCAL_ADUSERSRowDeletingEvent) Is Nothing) Then @@ -4533,13 +4533,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBLOCAL_ADUSERSRow(ByVal row As TBLOCAL_ADUSERSRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -4616,7 +4616,7 @@ Partial Public Class UserDataSet Private columnGROUPNAME As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBLOCAL_ADGROUPS" @@ -4626,7 +4626,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -4644,14 +4644,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GROUPNAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnGROUPNAME @@ -4659,7 +4659,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -4668,33 +4668,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBLOCAL_ADGROUPSRow Get Return CType(Me.Rows(index),TBLOCAL_ADGROUPSRow) End Get End Property - _ + _ Public Event TBLOCAL_ADGROUPSRowChanging As TBLOCAL_ADGROUPSRowChangeEventHandler - _ + _ Public Event TBLOCAL_ADGROUPSRowChanged As TBLOCAL_ADGROUPSRowChangeEventHandler - _ + _ Public Event TBLOCAL_ADGROUPSRowDeleting As TBLOCAL_ADGROUPSRowChangeEventHandler - _ + _ Public Event TBLOCAL_ADGROUPSRowDeleted As TBLOCAL_ADGROUPSRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBLOCAL_ADGROUPSRow(ByVal row As TBLOCAL_ADGROUPSRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBLOCAL_ADGROUPSRow(ByVal GROUPNAME As String) As TBLOCAL_ADGROUPSRow Dim rowTBLOCAL_ADGROUPSRow As TBLOCAL_ADGROUPSRow = CType(Me.NewRow,TBLOCAL_ADGROUPSRow) Dim columnValuesArray() As Object = New Object() {GROUPNAME} @@ -4704,7 +4704,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBLOCAL_ADGROUPSDataTable = CType(MyBase.Clone,TBLOCAL_ADGROUPSDataTable) cln.InitVars @@ -4712,44 +4712,44 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBLOCAL_ADGROUPSDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGROUPNAME = MyBase.Columns("GROUPNAME") End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGROUPNAME = New Global.System.Data.DataColumn("GROUPNAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGROUPNAME) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBLOCAL_ADGROUPSRow() As TBLOCAL_ADGROUPSRow Return CType(Me.NewRow,TBLOCAL_ADGROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBLOCAL_ADGROUPSRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBLOCAL_ADGROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBLOCAL_ADGROUPSRowChangedEvent) Is Nothing) Then @@ -4758,7 +4758,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBLOCAL_ADGROUPSRowChangingEvent) Is Nothing) Then @@ -4767,7 +4767,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBLOCAL_ADGROUPSRowDeletedEvent) Is Nothing) Then @@ -4776,7 +4776,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBLOCAL_ADGROUPSRowDeletingEvent) Is Nothing) Then @@ -4785,13 +4785,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBLOCAL_ADGROUPSRow(ByVal row As TBLOCAL_ADGROUPSRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -4880,7 +4880,7 @@ Partial Public Class UserDataSet Private columnNAME As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBLOCAL_DEBUG_GROUPS" @@ -4890,7 +4890,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -4908,14 +4908,14 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property SAMACCOUNTNAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnSAMACCOUNTNAME @@ -4923,7 +4923,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CNColumn() As Global.System.Data.DataColumn Get Return Me.columnCN @@ -4931,7 +4931,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property OBJECT_CLASSColumn() As Global.System.Data.DataColumn Get Return Me.columnOBJECT_CLASS @@ -4939,7 +4939,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property OBJECT_CATEGORYColumn() As Global.System.Data.DataColumn Get Return Me.columnOBJECT_CATEGORY @@ -4947,7 +4947,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property DESCRIPTIONColumn() As Global.System.Data.DataColumn Get Return Me.columnDESCRIPTION @@ -4955,7 +4955,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property DISTINGUISHED_NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnDISTINGUISHED_NAME @@ -4963,7 +4963,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property NAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnNAME @@ -4971,7 +4971,7 @@ Partial Public Class UserDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -4980,33 +4980,33 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBLOCAL_DEBUG_GROUPSRow Get Return CType(Me.Rows(index),TBLOCAL_DEBUG_GROUPSRow) End Get End Property - _ + _ Public Event TBLOCAL_DEBUG_GROUPSRowChanging As TBLOCAL_DEBUG_GROUPSRowChangeEventHandler - _ + _ Public Event TBLOCAL_DEBUG_GROUPSRowChanged As TBLOCAL_DEBUG_GROUPSRowChangeEventHandler - _ + _ Public Event TBLOCAL_DEBUG_GROUPSRowDeleting As TBLOCAL_DEBUG_GROUPSRowChangeEventHandler - _ + _ Public Event TBLOCAL_DEBUG_GROUPSRowDeleted As TBLOCAL_DEBUG_GROUPSRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBLOCAL_DEBUG_GROUPSRow(ByVal row As TBLOCAL_DEBUG_GROUPSRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddTBLOCAL_DEBUG_GROUPSRow(ByVal SAMACCOUNTNAME As String, ByVal CN As String, ByVal OBJECT_CLASS As String, ByVal OBJECT_CATEGORY As String, ByVal DESCRIPTION As String, ByVal DISTINGUISHED_NAME As String, ByVal NAME As String) As TBLOCAL_DEBUG_GROUPSRow Dim rowTBLOCAL_DEBUG_GROUPSRow As TBLOCAL_DEBUG_GROUPSRow = CType(Me.NewRow,TBLOCAL_DEBUG_GROUPSRow) Dim columnValuesArray() As Object = New Object() {SAMACCOUNTNAME, CN, OBJECT_CLASS, OBJECT_CATEGORY, DESCRIPTION, DISTINGUISHED_NAME, NAME} @@ -5016,7 +5016,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBLOCAL_DEBUG_GROUPSDataTable = CType(MyBase.Clone,TBLOCAL_DEBUG_GROUPSDataTable) cln.InitVars @@ -5024,13 +5024,13 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBLOCAL_DEBUG_GROUPSDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnSAMACCOUNTNAME = MyBase.Columns("SAMACCOUNTNAME") Me.columnCN = MyBase.Columns("CN") @@ -5042,7 +5042,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnSAMACCOUNTNAME = New Global.System.Data.DataColumn("SAMACCOUNTNAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnSAMACCOUNTNAME) @@ -5061,25 +5061,25 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBLOCAL_DEBUG_GROUPSRow() As TBLOCAL_DEBUG_GROUPSRow Return CType(Me.NewRow,TBLOCAL_DEBUG_GROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBLOCAL_DEBUG_GROUPSRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBLOCAL_DEBUG_GROUPSRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBLOCAL_DEBUG_GROUPSRowChangedEvent) Is Nothing) Then @@ -5088,7 +5088,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBLOCAL_DEBUG_GROUPSRowChangingEvent) Is Nothing) Then @@ -5097,7 +5097,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBLOCAL_DEBUG_GROUPSRowDeletedEvent) Is Nothing) Then @@ -5106,7 +5106,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBLOCAL_DEBUG_GROUPSRowDeletingEvent) Is Nothing) Then @@ -5115,13 +5115,13 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBLOCAL_DEBUG_GROUPSRow(ByVal row As TBLOCAL_DEBUG_GROUPSRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -5196,14 +5196,14 @@ Partial Public Class UserDataSet Private tableTBDD_GROUPS_USER As TBDD_GROUPS_USERDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_GROUPS_USER = CType(Me.Table,TBDD_GROUPS_USERDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_USER.GUIDColumn),Integer) @@ -5214,7 +5214,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property USER_ID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_USER.USER_IDColumn),Integer) @@ -5225,7 +5225,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GROUP_ID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_USER.GROUP_IDColumn),Integer) @@ -5236,7 +5236,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -5251,7 +5251,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Return CType(Me(Me.tableTBDD_GROUPS_USER.ADDED_WHOColumn),String) @@ -5262,7 +5262,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -5277,7 +5277,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -5292,7 +5292,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -5307,7 +5307,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_USERRow() As TBDD_USERRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_GROUPS_USER_USER_ID")),TBDD_USERRow) @@ -5318,7 +5318,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_GROUPSRow() As TBDD_GROUPSRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_GROUPS_USER_GROUP_ID")),TBDD_GROUPSRow) @@ -5329,49 +5329,49 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_USER.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_GROUPS_USER.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_USER.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_GROUPS_USER.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_USER.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBDD_GROUPS_USER.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_USER.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_GROUPS_USER.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub @@ -5386,14 +5386,14 @@ Partial Public Class UserDataSet Private tableTBDD_MODULES As TBDD_MODULESDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_MODULES = CType(Me.Table,TBDD_MODULESDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_MODULES.GUIDColumn),Integer) @@ -5404,7 +5404,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property NAME() As String Get Try @@ -5419,7 +5419,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property SHORT_NAME() As String Get Try @@ -5434,7 +5434,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property LICENSE() As String Get Return CType(Me(Me.tableTBDD_MODULES.LICENSEColumn),String) @@ -5445,7 +5445,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property PRODUCT_VERSION() As String Get Return CType(Me(Me.tableTBDD_MODULES.PRODUCT_VERSIONColumn),String) @@ -5456,7 +5456,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ACTIVE() As Boolean Get Return CType(Me(Me.tableTBDD_MODULES.ACTIVEColumn),Boolean) @@ -5467,7 +5467,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property VERSION_DELIMITER() As String Get Return CType(Me(Me.tableTBDD_MODULES.VERSION_DELIMITERColumn),String) @@ -5478,7 +5478,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property FILE_DELIMITER() As String Get Return CType(Me(Me.tableTBDD_MODULES.FILE_DELIMITERColumn),String) @@ -5489,7 +5489,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property BIT1() As Boolean Get Return CType(Me(Me.tableTBDD_MODULES.BIT1Column),Boolean) @@ -5500,7 +5500,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property BIT2() As Boolean Get Return CType(Me(Me.tableTBDD_MODULES.BIT2Column),Boolean) @@ -5511,7 +5511,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property STRING1() As String Get Try @@ -5526,7 +5526,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property STRING2() As String Get Try @@ -5541,7 +5541,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property BACKGROUND_IMAGE() As Byte() Get Try @@ -5556,7 +5556,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property PRODUCT_NAME1() As String Get Return CType(Me(Me.tableTBDD_MODULES.PRODUCT_NAME1Column),String) @@ -5567,7 +5567,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property PRODUCT_NAME2() As String Get Try @@ -5582,7 +5582,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property VERSION_UPATE_PATH() As String Get Return CType(Me(Me.tableTBDD_MODULES.VERSION_UPATE_PATHColumn),String) @@ -5593,7 +5593,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Try @@ -5608,7 +5608,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -5623,7 +5623,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -5638,7 +5638,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -5653,127 +5653,127 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsNAMENull() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.NAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetNAMENull() Me(Me.tableTBDD_MODULES.NAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsSHORT_NAMENull() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.SHORT_NAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetSHORT_NAMENull() Me(Me.tableTBDD_MODULES.SHORT_NAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsSTRING1Null() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.STRING1Column) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetSTRING1Null() Me(Me.tableTBDD_MODULES.STRING1Column) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsSTRING2Null() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.STRING2Column) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetSTRING2Null() Me(Me.tableTBDD_MODULES.STRING2Column) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsBACKGROUND_IMAGENull() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.BACKGROUND_IMAGEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetBACKGROUND_IMAGENull() Me(Me.tableTBDD_MODULES.BACKGROUND_IMAGEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsPRODUCT_NAME2Null() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.PRODUCT_NAME2Column) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetPRODUCT_NAME2Null() Me(Me.tableTBDD_MODULES.PRODUCT_NAME2Column) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.ADDED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHONull() Me(Me.tableTBDD_MODULES.ADDED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_MODULES.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBDD_MODULES.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_MODULES.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_MODULES.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_USER_MODULESRows() As TBDD_USER_MODULESRow() If (Me.Table.ChildRelations("FK_TBDD_USER_MODULES_MODULE_ID") Is Nothing) Then Return New TBDD_USER_MODULESRow(-1) {} @@ -5783,7 +5783,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_GROUPS_MODULESRows() As TBDD_GROUPS_MODULESRow() If (Me.Table.ChildRelations("FK_TBDD_GROUPS_MODULES_MODULE_ID") Is Nothing) Then Return New TBDD_GROUPS_MODULESRow(-1) {} @@ -5802,14 +5802,14 @@ Partial Public Class UserDataSet Private tableTBDD_USER_MODULES As TBDD_USER_MODULESDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_USER_MODULES = CType(Me.Table,TBDD_USER_MODULESDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_USER_MODULES.GUIDColumn),Integer) @@ -5820,7 +5820,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property USER_ID() As Integer Get Return CType(Me(Me.tableTBDD_USER_MODULES.USER_IDColumn),Integer) @@ -5831,7 +5831,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property MODULE_ID() As Integer Get Return CType(Me(Me.tableTBDD_USER_MODULES.MODULE_IDColumn),Integer) @@ -5842,7 +5842,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property IS_ADMIN() As Boolean Get Return CType(Me(Me.tableTBDD_USER_MODULES.IS_ADMINColumn),Boolean) @@ -5853,7 +5853,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -5868,7 +5868,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Try @@ -5883,7 +5883,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -5898,7 +5898,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_MODULESRow() As TBDD_MODULESRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_USER_MODULES_MODULE_ID")),TBDD_MODULESRow) @@ -5909,7 +5909,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_USERRow() As TBDD_USERRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_USER_MODULES2_USER_ID")),TBDD_USERRow) @@ -5920,37 +5920,37 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_USER_MODULES.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_USER_MODULES.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_USER_MODULES.ADDED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHONull() Me(Me.tableTBDD_USER_MODULES.ADDED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_USER_MODULES.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_USER_MODULES.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub @@ -5965,14 +5965,14 @@ Partial Public Class UserDataSet Private tableTBDD_CLIENT As TBDD_CLIENTDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_CLIENT = CType(Me.Table,TBDD_CLIENTDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_CLIENT.GUIDColumn),Integer) @@ -5983,7 +5983,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CLIENT_NAME() As String Get Return CType(Me(Me.tableTBDD_CLIENT.CLIENT_NAMEColumn),String) @@ -5994,7 +5994,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property SHORTNAME() As String Get Try @@ -6009,7 +6009,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property LICENSE_PMO() As String Get Return CType(Me(Me.tableTBDD_CLIENT.LICENSE_PMOColumn),String) @@ -6020,7 +6020,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property LICENSE_GI() As String Get Return CType(Me(Me.tableTBDD_CLIENT.LICENSE_GIColumn),String) @@ -6031,7 +6031,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property LICENSE_PM() As String Get Return CType(Me(Me.tableTBDD_CLIENT.LICENSE_PMColumn),String) @@ -6042,7 +6042,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -6057,7 +6057,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Return CType(Me(Me.tableTBDD_CLIENT.ADDED_WHOColumn),String) @@ -6068,7 +6068,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -6083,7 +6083,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -6098,7 +6098,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -6113,67 +6113,67 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsSHORTNAMENull() As Boolean Return Me.IsNull(Me.tableTBDD_CLIENT.SHORTNAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetSHORTNAMENull() Me(Me.tableTBDD_CLIENT.SHORTNAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_CLIENT.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_CLIENT.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_CLIENT.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_CLIENT.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_CLIENT.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBDD_CLIENT.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_CLIENT.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_CLIENT.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_CLIENT_USERRows() As TBDD_CLIENT_USERRow() If (Me.Table.ChildRelations("FK_TBDD_CLIENT_USER_GROUP_ID") Is Nothing) Then Return New TBDD_CLIENT_USERRow(-1) {} @@ -6183,7 +6183,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_GROUPS_CLIENTRows() As TBDD_GROUPS_CLIENTRow() If (Me.Table.ChildRelations("FK_TBDD_GROUPS_CLIENT_CLIENT_ID") Is Nothing) Then Return New TBDD_GROUPS_CLIENTRow(-1) {} @@ -6202,14 +6202,14 @@ Partial Public Class UserDataSet Private tableTBDD_CLIENT_USER As TBDD_CLIENT_USERDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_CLIENT_USER = CType(Me.Table,TBDD_CLIENT_USERDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_CLIENT_USER.GUIDColumn),Integer) @@ -6220,7 +6220,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property USER_ID() As Integer Get Return CType(Me(Me.tableTBDD_CLIENT_USER.USER_IDColumn),Integer) @@ -6231,7 +6231,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CLIENT_ID() As Integer Get Return CType(Me(Me.tableTBDD_CLIENT_USER.CLIENT_IDColumn),Integer) @@ -6242,7 +6242,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -6257,7 +6257,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Try @@ -6272,7 +6272,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -6287,7 +6287,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_CLIENTRow() As TBDD_CLIENTRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_CLIENT_USER_GROUP_ID")),TBDD_CLIENTRow) @@ -6298,7 +6298,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_USERRow() As TBDD_USERRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_CLIENT_USER_USER_ID")),TBDD_USERRow) @@ -6309,37 +6309,37 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_CLIENT_USER.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_CLIENT_USER.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_CLIENT_USER.ADDED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHONull() Me(Me.tableTBDD_CLIENT_USER.ADDED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_CLIENT_USER.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_CLIENT_USER.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub @@ -6354,14 +6354,14 @@ Partial Public Class UserDataSet Private tableTBDD_USER As TBDD_USERDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_USER = CType(Me.Table,TBDD_USERDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_USER.GUIDColumn),Integer) @@ -6372,7 +6372,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property PRENAME() As String Get Try @@ -6387,7 +6387,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property NAME() As String Get Try @@ -6402,7 +6402,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property USERNAME() As String Get Return CType(Me(Me.tableTBDD_USER.USERNAMEColumn),String) @@ -6413,7 +6413,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property SHORTNAME() As String Get Try @@ -6428,7 +6428,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property EMAIL() As String Get Try @@ -6443,7 +6443,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property LANGUAGE() As String Get Return CType(Me(Me.tableTBDD_USER.LANGUAGEColumn),String) @@ -6454,7 +6454,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -6469,7 +6469,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property DATE_FORMAT() As String Get Return CType(Me(Me.tableTBDD_USER.DATE_FORMATColumn),String) @@ -6480,7 +6480,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Return CType(Me(Me.tableTBDD_USER.ADDED_WHOColumn),String) @@ -6491,7 +6491,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -6506,7 +6506,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -6521,7 +6521,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -6536,103 +6536,103 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsPRENAMENull() As Boolean Return Me.IsNull(Me.tableTBDD_USER.PRENAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetPRENAMENull() Me(Me.tableTBDD_USER.PRENAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsNAMENull() As Boolean Return Me.IsNull(Me.tableTBDD_USER.NAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetNAMENull() Me(Me.tableTBDD_USER.NAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsSHORTNAMENull() As Boolean Return Me.IsNull(Me.tableTBDD_USER.SHORTNAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetSHORTNAMENull() Me(Me.tableTBDD_USER.SHORTNAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsEMAILNull() As Boolean Return Me.IsNull(Me.tableTBDD_USER.EMAILColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetEMAILNull() Me(Me.tableTBDD_USER.EMAILColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_USER.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_USER.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_USER.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_USER.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_USER.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBDD_USER.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_USER.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_USER.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_GROUPS_USERRows() As TBDD_GROUPS_USERRow() If (Me.Table.ChildRelations("FK_TBDD_GROUPS_USER_USER_ID") Is Nothing) Then Return New TBDD_GROUPS_USERRow(-1) {} @@ -6642,7 +6642,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_USER_MODULESRows() As TBDD_USER_MODULESRow() If (Me.Table.ChildRelations("FK_TBDD_USER_MODULES2_USER_ID") Is Nothing) Then Return New TBDD_USER_MODULESRow(-1) {} @@ -6652,7 +6652,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_CLIENT_USERRows() As TBDD_CLIENT_USERRow() If (Me.Table.ChildRelations("FK_TBDD_CLIENT_USER_USER_ID") Is Nothing) Then Return New TBDD_CLIENT_USERRow(-1) {} @@ -6671,14 +6671,14 @@ Partial Public Class UserDataSet Private tableTBDD_GROUPS_MODULES As TBDD_GROUPS_MODULESDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_GROUPS_MODULES = CType(Me.Table,TBDD_GROUPS_MODULESDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_MODULES.GUIDColumn),Integer) @@ -6689,7 +6689,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property MODULE_ID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_MODULES.MODULE_IDColumn),Integer) @@ -6700,7 +6700,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GROUP_ID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_MODULES.GROUP_IDColumn),Integer) @@ -6711,7 +6711,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -6726,7 +6726,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Return CType(Me(Me.tableTBDD_GROUPS_MODULES.ADDED_WHOColumn),String) @@ -6737,7 +6737,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -6752,7 +6752,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -6767,7 +6767,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -6782,7 +6782,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_MODULESRow() As TBDD_MODULESRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_GROUPS_MODULES_MODULE_ID")),TBDD_MODULESRow) @@ -6793,7 +6793,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_GROUPSRow() As TBDD_GROUPSRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_GROUPS_MODULES_GROUP_ID")),TBDD_GROUPSRow) @@ -6804,49 +6804,49 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_MODULES.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_GROUPS_MODULES.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_MODULES.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_GROUPS_MODULES.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_MODULES.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBDD_GROUPS_MODULES.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_MODULES.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_GROUPS_MODULES.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub @@ -6861,14 +6861,14 @@ Partial Public Class UserDataSet Private tableTBDD_GROUPS_CLIENT As TBDD_GROUPS_CLIENTDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_GROUPS_CLIENT = CType(Me.Table,TBDD_GROUPS_CLIENTDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_CLIENT.GUIDColumn),Integer) @@ -6879,7 +6879,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CLIENT_ID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_CLIENT.CLIENT_IDColumn),Integer) @@ -6890,7 +6890,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GROUP_ID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS_CLIENT.GROUP_IDColumn),Integer) @@ -6901,7 +6901,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -6916,7 +6916,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Return CType(Me(Me.tableTBDD_GROUPS_CLIENT.ADDED_WHOColumn),String) @@ -6927,7 +6927,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -6942,7 +6942,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -6957,7 +6957,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -6972,7 +6972,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_CLIENTRow() As TBDD_CLIENTRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_GROUPS_CLIENT_CLIENT_ID")),TBDD_CLIENTRow) @@ -6983,7 +6983,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBDD_GROUPSRow() As TBDD_GROUPSRow Get Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBDD_GROUPS_CLIENT_GROUP_ID")),TBDD_GROUPSRow) @@ -6994,49 +6994,49 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_CLIENT.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_GROUPS_CLIENT.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_CLIENT.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_GROUPS_CLIENT.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_CLIENT.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBDD_GROUPS_CLIENT.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS_CLIENT.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_GROUPS_CLIENT.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub @@ -7051,14 +7051,14 @@ Partial Public Class UserDataSet Private tableTBDD_GROUPS As TBDD_GROUPSDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBDD_GROUPS = CType(Me.Table,TBDD_GROUPSDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS.GUIDColumn),Integer) @@ -7069,7 +7069,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property NAME() As String Get Try @@ -7084,7 +7084,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property INTERNAL() As Boolean Get Return CType(Me(Me.tableTBDD_GROUPS.INTERNALColumn),Boolean) @@ -7095,7 +7095,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property AD_SYNC() As Boolean Get Return CType(Me(Me.tableTBDD_GROUPS.AD_SYNCColumn),Boolean) @@ -7106,7 +7106,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get Try @@ -7121,7 +7121,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Try @@ -7136,7 +7136,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Try @@ -7151,7 +7151,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -7166,7 +7166,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -7181,7 +7181,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ECM_FK_ID() As Integer Get Return CType(Me(Me.tableTBDD_GROUPS.ECM_FK_IDColumn),Integer) @@ -7192,7 +7192,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ACTIVE() As Boolean Get Return CType(Me(Me.tableTBDD_GROUPS.ACTIVEColumn),Boolean) @@ -7203,79 +7203,79 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsNAMENull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.NAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetNAMENull() Me(Me.tableTBDD_GROUPS.NAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCOMMENTNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.COMMENTColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCOMMENTNull() Me(Me.tableTBDD_GROUPS.COMMENTColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.ADDED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHONull() Me(Me.tableTBDD_GROUPS.ADDED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsADDED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.ADDED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetADDED_WHENNull() Me(Me.tableTBDD_GROUPS.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBDD_GROUPS.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBDD_GROUPS.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBDD_GROUPS.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_GROUPS_USERRows() As TBDD_GROUPS_USERRow() If (Me.Table.ChildRelations("FK_TBDD_GROUPS_USER_GROUP_ID") Is Nothing) Then Return New TBDD_GROUPS_USERRow(-1) {} @@ -7285,7 +7285,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_GROUPS_MODULESRows() As TBDD_GROUPS_MODULESRow() If (Me.Table.ChildRelations("FK_TBDD_GROUPS_MODULES_GROUP_ID") Is Nothing) Then Return New TBDD_GROUPS_MODULESRow(-1) {} @@ -7295,7 +7295,7 @@ Partial Public Class UserDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function GetTBDD_GROUPS_CLIENTRows() As TBDD_GROUPS_CLIENTRow() If (Me.Table.ChildRelations("FK_TBDD_GROUPS_CLIENT_GROUP_ID") Is Nothing) Then Return New TBDD_GROUPS_CLIENTRow(-1) {} @@ -7314,14 +7314,14 @@ Partial Public Class UserDataSet Private tableTBLOCAL_ADUSERS As TBLOCAL_ADUSERSDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBLOCAL_ADUSERS = CType(Me.Table,TBLOCAL_ADUSERSDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property USERNAME() As String Get Try @@ -7336,7 +7336,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property PRENAME() As String Get If Me.IsPRENAMENull Then @@ -7351,7 +7351,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property NAME() As String Get If Me.IsNAMENull Then @@ -7366,7 +7366,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property EMAIL() As String Get If Me.IsEMAILNull Then @@ -7381,49 +7381,49 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsUSERNAMENull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_ADUSERS.USERNAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetUSERNAMENull() Me(Me.tableTBLOCAL_ADUSERS.USERNAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsPRENAMENull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_ADUSERS.PRENAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetPRENAMENull() Me(Me.tableTBLOCAL_ADUSERS.PRENAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsNAMENull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_ADUSERS.NAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetNAMENull() Me(Me.tableTBLOCAL_ADUSERS.NAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsEMAILNull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_ADUSERS.EMAILColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetEMAILNull() Me(Me.tableTBLOCAL_ADUSERS.EMAILColumn) = Global.System.Convert.DBNull End Sub @@ -7438,14 +7438,14 @@ Partial Public Class UserDataSet Private tableTBLOCAL_ADGROUPS As TBLOCAL_ADGROUPSDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBLOCAL_ADGROUPS = CType(Me.Table,TBLOCAL_ADGROUPSDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GROUPNAME() As String Get Try @@ -7460,13 +7460,13 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsGROUPNAMENull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_ADGROUPS.GROUPNAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetGROUPNAMENull() Me(Me.tableTBLOCAL_ADGROUPS.GROUPNAMEColumn) = Global.System.Convert.DBNull End Sub @@ -7481,14 +7481,14 @@ Partial Public Class UserDataSet Private tableTBLOCAL_DEBUG_GROUPS As TBLOCAL_DEBUG_GROUPSDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBLOCAL_DEBUG_GROUPS = CType(Me.Table,TBLOCAL_DEBUG_GROUPSDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property SAMACCOUNTNAME() As String Get Try @@ -7503,7 +7503,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CN() As String Get Try @@ -7518,7 +7518,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property OBJECT_CLASS() As String Get Try @@ -7533,7 +7533,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property OBJECT_CATEGORY() As String Get Try @@ -7548,7 +7548,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property DESCRIPTION() As String Get Try @@ -7563,7 +7563,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property DISTINGUISHED_NAME() As String Get Try @@ -7579,7 +7579,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property NAME() As String Get Try @@ -7594,85 +7594,85 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsSAMACCOUNTNAMENull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_DEBUG_GROUPS.SAMACCOUNTNAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetSAMACCOUNTNAMENull() Me(Me.tableTBLOCAL_DEBUG_GROUPS.SAMACCOUNTNAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCNNull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_DEBUG_GROUPS.CNColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCNNull() Me(Me.tableTBLOCAL_DEBUG_GROUPS.CNColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsOBJECT_CLASSNull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_DEBUG_GROUPS.OBJECT_CLASSColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetOBJECT_CLASSNull() Me(Me.tableTBLOCAL_DEBUG_GROUPS.OBJECT_CLASSColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsOBJECT_CATEGORYNull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_DEBUG_GROUPS.OBJECT_CATEGORYColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetOBJECT_CATEGORYNull() Me(Me.tableTBLOCAL_DEBUG_GROUPS.OBJECT_CATEGORYColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsDESCRIPTIONNull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_DEBUG_GROUPS.DESCRIPTIONColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetDESCRIPTIONNull() Me(Me.tableTBLOCAL_DEBUG_GROUPS.DESCRIPTIONColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsDISTINGUISHED_NAMENull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_DEBUG_GROUPS.DISTINGUISHED_NAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetDISTINGUISHED_NAMENull() Me(Me.tableTBLOCAL_DEBUG_GROUPS.DISTINGUISHED_NAMEColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsNAMENull() As Boolean Return Me.IsNull(Me.tableTBLOCAL_DEBUG_GROUPS.NAMEColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetNAMENull() Me(Me.tableTBLOCAL_DEBUG_GROUPS.NAMEColumn) = Global.System.Convert.DBNull End Sub @@ -7681,7 +7681,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_GROUPS_USERRowChangeEvent Inherits Global.System.EventArgs @@ -7690,7 +7690,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_GROUPS_USERRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7698,7 +7698,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_GROUPS_USERRow Get Return Me.eventRow @@ -7706,7 +7706,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -7717,7 +7717,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_MODULESRowChangeEvent Inherits Global.System.EventArgs @@ -7726,7 +7726,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_MODULESRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7734,7 +7734,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_MODULESRow Get Return Me.eventRow @@ -7742,7 +7742,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -7753,7 +7753,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_USER_MODULESRowChangeEvent Inherits Global.System.EventArgs @@ -7762,7 +7762,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_USER_MODULESRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7770,7 +7770,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_USER_MODULESRow Get Return Me.eventRow @@ -7778,7 +7778,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -7789,7 +7789,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_CLIENTRowChangeEvent Inherits Global.System.EventArgs @@ -7798,7 +7798,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_CLIENTRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7806,7 +7806,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_CLIENTRow Get Return Me.eventRow @@ -7814,7 +7814,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -7825,7 +7825,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_CLIENT_USERRowChangeEvent Inherits Global.System.EventArgs @@ -7834,7 +7834,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_CLIENT_USERRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7842,7 +7842,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_CLIENT_USERRow Get Return Me.eventRow @@ -7850,7 +7850,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -7861,7 +7861,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_USERRowChangeEvent Inherits Global.System.EventArgs @@ -7870,7 +7870,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_USERRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7878,7 +7878,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_USERRow Get Return Me.eventRow @@ -7886,7 +7886,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -7897,7 +7897,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_GROUPS_MODULESRowChangeEvent Inherits Global.System.EventArgs @@ -7906,7 +7906,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_GROUPS_MODULESRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7914,7 +7914,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_GROUPS_MODULESRow Get Return Me.eventRow @@ -7922,7 +7922,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -7933,7 +7933,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_GROUPS_CLIENTRowChangeEvent Inherits Global.System.EventArgs @@ -7942,7 +7942,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_GROUPS_CLIENTRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7950,7 +7950,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_GROUPS_CLIENTRow Get Return Me.eventRow @@ -7958,7 +7958,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -7969,7 +7969,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBDD_GROUPSRowChangeEvent Inherits Global.System.EventArgs @@ -7978,7 +7978,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBDD_GROUPSRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -7986,7 +7986,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBDD_GROUPSRow Get Return Me.eventRow @@ -7994,7 +7994,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -8005,7 +8005,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBLOCAL_ADUSERSRowChangeEvent Inherits Global.System.EventArgs @@ -8014,7 +8014,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBLOCAL_ADUSERSRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -8022,7 +8022,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBLOCAL_ADUSERSRow Get Return Me.eventRow @@ -8030,7 +8030,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -8041,7 +8041,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBLOCAL_ADGROUPSRowChangeEvent Inherits Global.System.EventArgs @@ -8050,7 +8050,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBLOCAL_ADGROUPSRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -8058,7 +8058,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBLOCAL_ADGROUPSRow Get Return Me.eventRow @@ -8066,7 +8066,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -8077,7 +8077,7 @@ Partial Public Class UserDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBLOCAL_DEBUG_GROUPSRowChangeEvent Inherits Global.System.EventArgs @@ -8086,7 +8086,7 @@ Partial Public Class UserDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBLOCAL_DEBUG_GROUPSRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -8094,7 +8094,7 @@ Partial Public Class UserDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBLOCAL_DEBUG_GROUPSRow Get Return Me.eventRow @@ -8102,7 +8102,7 @@ Partial Public Class UserDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -8136,14 +8136,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -8154,7 +8154,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -8184,7 +8184,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -8212,7 +8212,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -8223,7 +8223,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -8234,7 +8234,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -8305,14 +8305,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -8329,7 +8329,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_GROUPS_USERDataTable) As Integer @@ -8342,7 +8342,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_GROUPS_USERDataTable @@ -8353,7 +8353,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByGroupId(ByVal dataTable As UserDataSet.TBDD_GROUPS_USERDataTable, ByVal GROUP_ID As Integer) As Integer @@ -8367,7 +8367,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByGroupId(ByVal GROUP_ID As Integer) As UserDataSet.TBDD_GROUPS_USERDataTable @@ -8379,35 +8379,35 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_GROUPS_USERDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_GROUPS_USER") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal USER_ID As Integer, ByVal GROUP_ID As Integer) As Integer @@ -8429,7 +8429,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal USER_ID As Integer, ByVal GROUP_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer @@ -8461,7 +8461,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -8561,7 +8561,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal USER_ID As Integer, ByVal GROUP_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal Original_USER_ID As Integer, ByVal Original_GROUP_ID As Integer, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer @@ -8592,14 +8592,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -8610,7 +8610,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -8640,7 +8640,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -8668,7 +8668,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -8679,7 +8679,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -8690,7 +8690,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -8879,14 +8879,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(2) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -8919,7 +8919,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_MODULESDataTable) As Integer @@ -8932,7 +8932,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_MODULESDataTable @@ -8943,7 +8943,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByUserId_IsAdmin(ByVal dataTable As UserDataSet.TBDD_MODULESDataTable, ByVal USER_ID As Integer) As Integer @@ -8957,7 +8957,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByUserId_IsAdmin(ByVal USER_ID As Integer) As UserDataSet.TBDD_MODULESDataTable @@ -8969,7 +8969,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByUsername(ByVal dataTable As UserDataSet.TBDD_MODULESDataTable, ByVal USERNAME As String) As Integer @@ -8987,7 +8987,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByUsername(ByVal USERNAME As String) As UserDataSet.TBDD_MODULESDataTable @@ -9003,35 +9003,35 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_MODULESDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_MODULES") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete( _ @@ -9167,7 +9167,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert( _ @@ -9289,7 +9289,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -9529,7 +9529,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -9598,14 +9598,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -9616,7 +9616,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -9646,7 +9646,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -9674,7 +9674,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -9685,7 +9685,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -9696,7 +9696,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -9760,14 +9760,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -9777,7 +9777,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_USER_MODULESDataTable) As Integer @@ -9790,7 +9790,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_USER_MODULESDataTable @@ -9801,35 +9801,35 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_USER_MODULESDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_USER_MODULES") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal USER_ID As Integer, ByVal MODULE_ID As Integer) As Integer @@ -9851,7 +9851,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal USER_ID As Integer, ByVal MODULE_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer @@ -9883,7 +9883,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal USER_ID As Integer, ByVal MODULE_ID As Integer, ByVal IS_ADMIN As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal Original_USER_ID As Integer, ByVal Original_MODULE_ID As Integer, ByVal Original_IS_ADMIN As Boolean, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal GUID As Integer) As Integer @@ -9947,7 +9947,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal USER_ID As Integer, ByVal MODULE_ID As Integer, ByVal IS_ADMIN As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal Original_USER_ID As Integer, ByVal Original_MODULE_ID As Integer, ByVal Original_IS_ADMIN As Boolean, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date)) As Integer @@ -9978,14 +9978,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -9996,7 +9996,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -10026,7 +10026,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -10054,7 +10054,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -10065,7 +10065,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -10076,7 +10076,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -10152,14 +10152,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -10179,7 +10179,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_CLIENTDataTable) As Integer @@ -10192,7 +10192,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_CLIENTDataTable @@ -10203,7 +10203,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByUsername(ByVal dataTable As UserDataSet.TBDD_CLIENTDataTable, ByVal USERNAME As String) As Integer @@ -10221,7 +10221,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByUsername(ByVal USERNAME As String) As UserDataSet.TBDD_CLIENTDataTable @@ -10237,35 +10237,35 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_CLIENTDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_CLIENT") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_CLIENT_NAME As String, ByVal Original_SHORTNAME As String, ByVal Original_LICENSE_PMO As String, ByVal Original_LICENSE_GI As String, ByVal Original_LICENSE_PM As String, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer @@ -10346,7 +10346,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal CLIENT_NAME As String, ByVal SHORTNAME As String, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer @@ -10386,7 +10386,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal CLIENT_NAME As String, ByVal SHORTNAME As String, ByVal COMMENT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer @@ -10451,14 +10451,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -10469,7 +10469,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -10499,7 +10499,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -10527,7 +10527,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -10538,7 +10538,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -10549,7 +10549,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -10610,14 +10610,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -10627,7 +10627,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_CLIENT_USERDataTable) As Integer @@ -10640,7 +10640,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_CLIENT_USERDataTable @@ -10651,35 +10651,35 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_CLIENT_USERDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_CLIENT_USER") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal USER_ID As Integer, ByVal CLIENT_ID As Integer) As Integer @@ -10701,7 +10701,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal USER_ID As Integer, ByVal CLIENT_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer @@ -10733,7 +10733,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal USER_ID As Integer, ByVal CLIENT_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal Original_USER_ID As Integer, ByVal Original_CLIENT_ID As Integer, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal GUID As Integer) As Integer @@ -10795,7 +10795,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal USER_ID As Integer, ByVal CLIENT_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal Original_USER_ID As Integer, ByVal Original_CLIENT_ID As Integer, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date)) As Integer @@ -10826,14 +10826,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -10844,7 +10844,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -10874,7 +10874,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -10902,7 +10902,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -10913,7 +10913,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -10924,7 +10924,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -10993,14 +10993,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(10) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -11108,7 +11108,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_USERDataTable) As Integer @@ -11121,7 +11121,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_USERDataTable @@ -11132,7 +11132,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByClientId(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal CLIENT_ID As Integer) As Integer @@ -11146,7 +11146,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByClientId(ByVal CLIENT_ID As Integer) As UserDataSet.TBDD_USERDataTable @@ -11158,7 +11158,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByClientId_NotInClient(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal CLIENT_ID As Integer) As Integer @@ -11172,7 +11172,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByClientId_NotInClient(ByVal CLIENT_ID As Integer) As UserDataSet.TBDD_USERDataTable @@ -11184,7 +11184,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByGroupId(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal GROUP_ID As Integer) As Integer @@ -11198,7 +11198,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByGroupId(ByVal GROUP_ID As Integer) As UserDataSet.TBDD_USERDataTable @@ -11210,7 +11210,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByGroupId_NotInGroup(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal GROUP_ID As Integer) As Integer @@ -11224,7 +11224,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByGroupId_NotInGroup(ByVal GROUP_ID As Integer) As UserDataSet.TBDD_USERDataTable @@ -11236,7 +11236,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByModuleId(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal MODULE_ID As Integer) As Integer @@ -11250,7 +11250,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByModuleId(ByVal MODULE_ID As Integer) As UserDataSet.TBDD_USERDataTable @@ -11262,7 +11262,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByModuleId_NotInModule(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal MODULE_ID As Integer) As Integer @@ -11276,7 +11276,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByModuleId_NotInModule(ByVal MODULE_ID As Integer) As UserDataSet.TBDD_USERDataTable @@ -11288,7 +11288,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByUsername(ByVal dataTable As UserDataSet.TBDD_USERDataTable, ByVal USERNAME As String) As Integer @@ -11306,7 +11306,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByUsername(ByVal USERNAME As String) As UserDataSet.TBDD_USERDataTable @@ -11322,35 +11322,35 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_USERDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_USER") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer @@ -11371,7 +11371,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal SHORTNAME As String, ByVal EMAIL As String, ByVal LANGUAGE As String, ByVal COMMENT As String, ByVal DATE_FORMAT As String, ByVal ADDED_WHO As String) As Integer @@ -11436,7 +11436,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal SHORTNAME As String, ByVal EMAIL As String, ByVal LANGUAGE As String, ByVal COMMENT As String, ByVal DATE_FORMAT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer @@ -11503,7 +11503,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function InsertUser(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal ADDED_WHO As String) As Integer @@ -11550,7 +11550,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function IsUserManagerAdmin(ByVal USERNAME As String) As Global.System.Nullable(Of Integer) Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(9) @@ -11581,7 +11581,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function UserExists(ByVal USERNAME As String) As Global.System.Nullable(Of Integer) Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(10) @@ -11635,14 +11635,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -11653,7 +11653,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -11683,7 +11683,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -11711,7 +11711,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -11722,7 +11722,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -11733,7 +11733,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -11804,14 +11804,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -11821,7 +11821,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_GROUPS_MODULESDataTable) As Integer @@ -11834,7 +11834,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_GROUPS_MODULESDataTable @@ -11845,35 +11845,35 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_GROUPS_MODULESDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_GROUPS_MODULES") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal Original_MODULE_ID As Integer, ByVal Original_GROUP_ID As Integer) As Integer @@ -11895,7 +11895,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal MODULE_ID As Integer, ByVal GROUP_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer @@ -11927,7 +11927,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -12027,7 +12027,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal MODULE_ID As Integer, ByVal GROUP_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal Original_MODULE_ID As Integer, ByVal Original_GROUP_ID As Integer, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer @@ -12058,14 +12058,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -12076,7 +12076,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -12106,7 +12106,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -12134,7 +12134,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -12145,7 +12145,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -12156,7 +12156,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -12227,14 +12227,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -12244,7 +12244,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_GROUPS_CLIENTDataTable) As Integer @@ -12257,7 +12257,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_GROUPS_CLIENTDataTable @@ -12268,35 +12268,35 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_GROUPS_CLIENTDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_GROUPS_CLIENT") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal Original_CLIENT_ID As Integer, ByVal Original_GROUP_ID As Integer) As Integer @@ -12318,7 +12318,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal CLIENT_ID As Integer, ByVal GROUP_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer @@ -12350,7 +12350,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -12450,7 +12450,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal CLIENT_ID As Integer, ByVal GROUP_ID As Integer, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal Original_CLIENT_ID As Integer, ByVal Original_GROUP_ID As Integer, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer @@ -12481,14 +12481,14 @@ Namespace UserDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -12499,7 +12499,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -12529,7 +12529,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -12557,7 +12557,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -12568,7 +12568,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -12579,7 +12579,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -12599,34 +12599,9 @@ Namespace UserDataSetTableAdapters Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1"& _ - " AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([INTERNAL] = @Original_I"& _ - "NTERNAL) AND ([AD_SYNC] = @Original_AD_SYNC) AND ((@IsNull_COMMENT = 1 AND [COMM"& _ - "ENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AN"& _ - "D [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADD"& _ - "ED_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] = @Or"& _ - "iginal_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) "& _ - "OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([ECM_FK_ID] = @Original_ECM_F"& _ - "K_ID) AND ([ACTIVE] = @Original_ACTIVE))" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBDD_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_INTERNAL", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_AD_SYNC", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ECM_FK_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + 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_GROUPS] ([NAME], [INTERNAL], [AD_SYNC], [COMMENT], [ADDED_WHO],"& _ @@ -12695,14 +12670,14 @@ Namespace UserDataSetTableAdapters End Sub _ + 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(7) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -12768,7 +12743,7 @@ Namespace UserDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UserDataSet.TBDD_GROUPSDataTable) As Integer @@ -12781,7 +12756,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UserDataSet.TBDD_GROUPSDataTable @@ -12792,7 +12767,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByClientId(ByVal dataTable As UserDataSet.TBDD_GROUPSDataTable, ByVal CLIENT_ID As Integer) As Integer @@ -12806,7 +12781,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByClientId(ByVal CLIENT_ID As Integer) As UserDataSet.TBDD_GROUPSDataTable @@ -12818,7 +12793,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByClientId_NotInClient(ByVal dataTable As UserDataSet.TBDD_GROUPSDataTable, ByVal CLIENT_ID As Integer) As Integer @@ -12832,7 +12807,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByClientId_NotInClient(ByVal CLIENT_ID As Integer) As UserDataSet.TBDD_GROUPSDataTable @@ -12844,7 +12819,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByModuleId(ByVal dataTable As UserDataSet.TBDD_GROUPSDataTable, ByVal MODULE_ID As Integer) As Integer @@ -12858,7 +12833,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByModuleId(ByVal MODULE_ID As Integer) As UserDataSet.TBDD_GROUPSDataTable @@ -12870,7 +12845,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByModuleId_NotInModule(ByVal dataTable As UserDataSet.TBDD_GROUPSDataTable, ByVal MODULE_ID As Integer) As Integer @@ -12884,7 +12859,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByModuleId_NotInModule(ByVal MODULE_ID As Integer) As UserDataSet.TBDD_GROUPSDataTable @@ -12896,7 +12871,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function FillByUsername(ByVal dataTable As UserDataSet.TBDD_GROUPSDataTable, ByVal USERNAME As String) As Integer @@ -12914,7 +12889,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function GetDataByUsername(ByVal USERNAME As String) As UserDataSet.TBDD_GROUPSDataTable @@ -12930,85 +12905,39 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UserDataSet.TBDD_GROUPSDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UserDataSet) As Integer Return Me.Adapter.Update(dataSet, "TBDD_GROUPS") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_NAME As String, ByVal Original_INTERNAL As Boolean, ByVal Original_AD_SYNC As Boolean, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_ECM_FK_ID As Integer, ByVal Original_ACTIVE As Boolean) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) - If (Original_NAME Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(2).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_NAME,String) - End If - Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_INTERNAL,Boolean) - Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_AD_SYNC,Boolean) - If (Original_COMMENT Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(6).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_COMMENT,String) - End If - If (Original_ADDED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(8).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ADDED_WHO,String) - End If - If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value - End If - If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_CHANGED_WHO,String) - End If - If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_CHANGED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(14).Value = Global.System.DBNull.Value - End If - Me.Adapter.DeleteCommand.Parameters(15).Value = CType(Original_ECM_FK_ID,Integer) - Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_ACTIVE,Boolean) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -13025,7 +12954,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal INTERNAL As Boolean, ByVal AD_SYNC As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal ECM_FK_ID As Integer, ByVal ACTIVE As Boolean) As Integer @@ -13079,7 +13008,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -13203,7 +13132,7 @@ Namespace UserDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -13232,9 +13161,9 @@ Namespace UserDataSetTableAdapters End Function _ - Public Overloads Overridable Function GroupExists(ByVal NAME As String) As Global.System.Nullable(Of Integer) + Public Overloads Overridable Function GroupExists(ByVal NAME As String) As Object Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(6) If (NAME Is Nothing) Then command.Parameters(0).Value = Global.System.DBNull.Value @@ -13256,14 +13185,14 @@ Namespace UserDataSetTableAdapters End Try If ((returnValue Is Nothing) _ OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then - Return New Global.System.Nullable(Of Integer)() + Return Nothing Else - Return New Global.System.Nullable(Of Integer)(CType(returnValue,Integer)) + Return CType(returnValue,Object) End If End Function _ Public Overloads Overridable Function InsertGroup(ByVal NAME As String, ByVal ADDED_WHO As String) As Integer @@ -13310,7 +13239,7 @@ Namespace UserDataSetTableAdapters Private _commandCollection() As Global.System.Data.IDbCommand _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.IDbCommand() Get If (Me._commandCollection Is Nothing) Then @@ -13321,7 +13250,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.IDbCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -13333,7 +13262,7 @@ Namespace UserDataSetTableAdapters 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) @@ -13395,7 +13324,7 @@ Namespace UserDataSetTableAdapters Private _connection As Global.System.Data.IDbConnection _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property UpdateOrder() As UpdateOrderOption Get Return Me._updateOrder @@ -13406,7 +13335,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13420,7 +13349,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13434,7 +13363,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13448,7 +13377,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13462,7 +13391,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13476,7 +13405,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13490,7 +13419,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13504,7 +13433,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13518,7 +13447,7 @@ Namespace UserDataSetTableAdapters End Property _ @@ -13532,7 +13461,7 @@ Namespace UserDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property BackupDataSetBeforeUpdate() As Boolean Get Return Me._backupDataSetBeforeUpdate @@ -13543,7 +13472,7 @@ Namespace UserDataSetTableAdapters End Property _ Public Property Connection() As Global.System.Data.IDbConnection Get @@ -13594,7 +13523,7 @@ Namespace UserDataSetTableAdapters End Property _ Public ReadOnly Property TableAdapterInstanceCount() As Integer Get @@ -13634,7 +13563,7 @@ Namespace UserDataSetTableAdapters '''Update rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As UserDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBDD_MODULESTableAdapter) Is Nothing) Then @@ -13725,7 +13654,7 @@ Namespace UserDataSetTableAdapters '''Insert rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As UserDataSet, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBDD_MODULESTableAdapter) Is Nothing) Then @@ -13807,7 +13736,7 @@ Namespace UserDataSetTableAdapters '''Delete rows in bottom-up order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As UserDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBDD_GROUPS_CLIENTTableAdapter) Is Nothing) Then @@ -13889,7 +13818,7 @@ Namespace UserDataSetTableAdapters '''Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRealUpdatedRows(ByVal updatedRows() As Global.System.Data.DataRow, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Global.System.Data.DataRow() If ((updatedRows Is Nothing) _ OrElse (updatedRows.Length < 1)) Then @@ -13915,7 +13844,7 @@ Namespace UserDataSetTableAdapters '''Update all changes to the dataset. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overridable Function UpdateAll(ByVal dataSet As UserDataSet) As Integer If (dataSet Is Nothing) Then Throw New Global.System.ArgumentNullException("dataSet") @@ -14194,13 +14123,13 @@ Namespace UserDataSetTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Sub SortSelfReferenceRows(ByVal rows() As Global.System.Data.DataRow, ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) Global.System.Array.Sort(Of Global.System.Data.DataRow)(rows, New SelfReferenceComparer(relation, childFirst)) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Function MatchTableAdapterConnection(ByVal inputConnection As Global.System.Data.IDbConnection) As Boolean If (Not (Me._connection) Is Nothing) Then Return true @@ -14218,7 +14147,7 @@ Namespace UserDataSetTableAdapters ''' '''Update Order Option ''' - _ + _ Public Enum UpdateOrderOption InsertUpdateDelete = 0 @@ -14229,7 +14158,7 @@ Namespace UserDataSetTableAdapters ''' '''Used to sort self-referenced table's rows ''' - _ + _ Private Class SelfReferenceComparer Inherits Object Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow) @@ -14239,7 +14168,7 @@ Namespace UserDataSetTableAdapters Private _childFirst As Integer _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) MyBase.New Me._relation = relation @@ -14251,7 +14180,7 @@ Namespace UserDataSetTableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRoot(ByVal row As Global.System.Data.DataRow, ByRef distance As Integer) As Global.System.Data.DataRow Global.System.Diagnostics.Debug.Assert((Not (row) Is Nothing)) Dim root As Global.System.Data.DataRow = row @@ -14290,7 +14219,7 @@ Namespace UserDataSetTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Compare(ByVal row1 As Global.System.Data.DataRow, ByVal row2 As Global.System.Data.DataRow) As Integer Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow).Compare If Object.ReferenceEquals(row1, row2) Then Return 0 diff --git a/DDUserManager/DDUserManager/UserDataSet.xsd b/DDUserManager/DDUserManager/UserDataSet.xsd index f25d65e..417a681 100644 --- a/DDUserManager/DDUserManager/UserDataSet.xsd +++ b/DDUserManager/DDUserManager/UserDataSet.xsd @@ -2,9 +2,10 @@ - + - + + @@ -893,28 +894,13 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + - - 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)) + + DELETE FROM TBDD_GROUPS +WHERE (GUID = @Original_GUID) - - - - - - - - - - - - - - - - - + @@ -995,7 +981,7 @@ SELECT GUID, NAME, INTERNAL, AD_SYNC, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WH - + 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 @@ -1008,7 +994,7 @@ WHERE (T2.CLIENT_ID = @CLIENT_ID) - + SELECT * @@ -1024,7 +1010,7 @@ WHERE (GUID NOT IN - + 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 @@ -1038,7 +1024,7 @@ WHERE (T2.MODULE_ID = @MODULE_ID) - + SELECT * @@ -1054,7 +1040,7 @@ WHERE (GUID NOT IN - + 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) @@ -1064,7 +1050,7 @@ WHERE (GUID NOT IN - + SELECT GUID @@ -1076,7 +1062,7 @@ WHERE (NAME = @NAME) - + INSERT INTO TBDD_GROUPS @@ -1111,7 +1097,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1143,7 +1129,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1247,7 +1233,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1272,7 +1258,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1337,7 +1323,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1361,7 +1347,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1440,7 +1426,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1450,14 +1436,14 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + - + @@ -1489,7 +1475,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1521,7 +1507,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1562,7 +1548,7 @@ VALUES (@NAME,@ADDED_WHO, 1, 1, 0, 1) - + @@ -1616,16 +1602,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 a8478c2..b40676f 100644 --- a/DDUserManager/DDUserManager/UserDataSet.xss +++ b/DDUserManager/DDUserManager/UserDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 3570fc5..f67cde2 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -1153,4 +1153,18 @@ Public Class frmMain txtLDAPUserQuery.Text = MyConfig.Config.AdUserFilter End If 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) + + UpdateSavedLabel() + Catch ex As Exception + ShowErrorMessage($"Error while deleting group", ex) + End Try + End If + End Sub End Class From 2f8f6b674756424150daf2652f5da87f856a8536 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 2 Jul 2020 12:30:17 +0200 Subject: [PATCH 16/16] Version 1.0.2.2 --- DDUserManager/DDUserManager/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index a1aa7a8..cc41fb4 100644 --- a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb +++ b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - +