Compare commits
3 Commits
7cd1acb356
...
1c6114b41e
| Author | SHA1 | Date | |
|---|---|---|---|
|
1c6114b41e | ||
|
|
75539c686f | ||
|
|
97c628dfab |
@ -1,296 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
|
||||||
<PropertyGroup>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
||||||
<ProjectGuid>{87122913-C196-46BC-A7CD-27F7E201E55F}</ProjectGuid>
|
|
||||||
<OutputType>WinExe</OutputType>
|
|
||||||
<StartupObject>DDUserManager.My.MyApplication</StartupObject>
|
|
||||||
<RootNamespace>DDUserManager</RootNamespace>
|
|
||||||
<AssemblyName>DDUserManager</AssemblyName>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
<MyType>WindowsForms</MyType>
|
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
|
||||||
<TargetFrameworkProfile />
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<DefineDebug>true</DefineDebug>
|
|
||||||
<DefineTrace>true</DefineTrace>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DocumentationFile>DDUserManager.xml</DocumentationFile>
|
|
||||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<DefineDebug>false</DefineDebug>
|
|
||||||
<DefineTrace>true</DefineTrace>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DocumentationFile>DDUserManager.xml</DocumentationFile>
|
|
||||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionExplicit>On</OptionExplicit>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionCompare>Binary</OptionCompare>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionStrict>Off</OptionStrict>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionInfer>On</OptionInfer>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<ApplicationIcon>user.ico</ApplicationIcon>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
||||||
<Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
||||||
<Reference Include="DevExpress.Sparkline.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
||||||
<Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
||||||
<Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
||||||
<Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
||||||
<Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
||||||
<Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
||||||
<Reference Include="DigitalData.Modules.Config">
|
|
||||||
<HintPath>..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Database">
|
|
||||||
<HintPath>..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Filesystem">
|
|
||||||
<HintPath>..\..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Interfaces">
|
|
||||||
<HintPath>..\..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Logging">
|
|
||||||
<HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Microsoft.CSharp" />
|
|
||||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\NLog.4.7.2\lib\net45\NLog.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System" />
|
|
||||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
|
||||||
<Reference Include="System.Configuration" />
|
|
||||||
<Reference Include="System.Data" />
|
|
||||||
<Reference Include="System.Data.Linq" />
|
|
||||||
<Reference Include="System.Deployment" />
|
|
||||||
<Reference Include="System.DirectoryServices" />
|
|
||||||
<Reference Include="System.DirectoryServices.AccountManagement" />
|
|
||||||
<Reference Include="System.Drawing" />
|
|
||||||
<Reference Include="System.IO.Compression" />
|
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
|
||||||
<Reference Include="System.ServiceModel" />
|
|
||||||
<Reference Include="System.Transactions" />
|
|
||||||
<Reference Include="System.Web.Services" />
|
|
||||||
<Reference Include="System.Windows.Forms" />
|
|
||||||
<Reference Include="System.Xml" />
|
|
||||||
<Reference Include="System.Core" />
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
|
||||||
<Reference Include="System.Net.Http" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
|
||||||
<Import Include="System" />
|
|
||||||
<Import Include="System.Collections" />
|
|
||||||
<Import Include="System.Collections.Generic" />
|
|
||||||
<Import Include="System.Data" />
|
|
||||||
<Import Include="System.Drawing" />
|
|
||||||
<Import Include="System.Diagnostics" />
|
|
||||||
<Import Include="System.Windows.Forms" />
|
|
||||||
<Import Include="System.Linq" />
|
|
||||||
<Import Include="System.Xml.Linq" />
|
|
||||||
<Import Include="System.Threading.Tasks" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="ApplicationEvents.vb" />
|
|
||||||
<Compile Include="ClassData.vb" />
|
|
||||||
<Compile Include="ClassDragDrop.vb" />
|
|
||||||
<Compile Include="DS_ChangeS.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
<DependentUpon>DS_ChangeS.xsd</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmADDebug_Groups.Designer.vb">
|
|
||||||
<DependentUpon>frmADDebug_Groups.vb</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmADDebug_Groups.vb">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmADDebug_Users.Designer.vb">
|
|
||||||
<DependentUpon>frmADDebug_Users.vb</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmADDebug_Users.vb">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmConfigDatabase.Designer.vb">
|
|
||||||
<DependentUpon>frmConfigDatabase.vb</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmConfigDatabase.vb">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmADImport_Groups.Designer.vb">
|
|
||||||
<DependentUpon>frmADImport_Groups.vb</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmADImport_Groups.vb">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmADImport_Users.Designer.vb">
|
|
||||||
<DependentUpon>frmADImport_Users.vb</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmADImport_Users.vb">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmMain.vb">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="frmMain.Designer.vb">
|
|
||||||
<DependentUpon>frmMain.vb</DependentUpon>
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="ModuleRuntime.vb" />
|
|
||||||
<Compile Include="My Project\AssemblyInfo.vb" />
|
|
||||||
<Compile Include="My Project\Application.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Application.myapp</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="My Project\Resources.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="My Project\Settings.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Settings.settings</DependentUpon>
|
|
||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="UserConfig.vb" />
|
|
||||||
<Compile Include="UserDataSet.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
<DependentUpon>UserDataSet.xsd</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="UserDataSet.vb">
|
|
||||||
<DependentUpon>UserDataSet.xsd</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<EmbeddedResource Include="frmADDebug_Groups.resx">
|
|
||||||
<DependentUpon>frmADDebug_Groups.vb</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="frmADDebug_Users.resx">
|
|
||||||
<DependentUpon>frmADDebug_Users.vb</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="frmConfigDatabase.resx">
|
|
||||||
<DependentUpon>frmConfigDatabase.vb</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="frmADImport_Groups.resx">
|
|
||||||
<DependentUpon>frmADImport_Groups.vb</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="frmADImport_Users.resx">
|
|
||||||
<DependentUpon>frmADImport_Users.vb</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="frmMain.resx">
|
|
||||||
<DependentUpon>frmMain.vb</DependentUpon>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="My Project\licenses.licx" />
|
|
||||||
<EmbeddedResource Include="My Project\Resources.resx">
|
|
||||||
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
|
|
||||||
<CustomToolNamespace>My.Resources</CustomToolNamespace>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
|
|
||||||
</EmbeddedResource>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="DS_ChangeS.xsc">
|
|
||||||
<DependentUpon>DS_ChangeS.xsd</DependentUpon>
|
|
||||||
</None>
|
|
||||||
<None Include="DS_ChangeS.xsd">
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
<Generator>MSDataSetGenerator</Generator>
|
|
||||||
<LastGenOutput>DS_ChangeS.Designer.vb</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<None Include="DS_ChangeS.xss">
|
|
||||||
<DependentUpon>DS_ChangeS.xsd</DependentUpon>
|
|
||||||
</None>
|
|
||||||
<None Include="My Project\Application.myapp">
|
|
||||||
<Generator>MyApplicationCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>Application.Designer.vb</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<None Include="My Project\Settings.settings">
|
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
|
||||||
<CustomToolNamespace>My</CustomToolNamespace>
|
|
||||||
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<None Include="App.config" />
|
|
||||||
<None Include="packages.config" />
|
|
||||||
<None Include="UserDataSet.xsc">
|
|
||||||
<DependentUpon>UserDataSet.xsd</DependentUpon>
|
|
||||||
</None>
|
|
||||||
<None Include="UserDataSet.xsd">
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
<Generator>MSDataSetGenerator</Generator>
|
|
||||||
<LastGenOutput>UserDataSet.Designer.vb</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<None Include="UserDataSet.xss">
|
|
||||||
<DependentUpon>UserDataSet.xsd</DependentUpon>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\user.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\group.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\book.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\user_add.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\plugin.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\user_go.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\key.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\group_go.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\arrow_right.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\arrow_left_red.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\disk.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\cog.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\arrow_refresh.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\database_connect.png" />
|
|
||||||
<None Include="Resources\folder.png" />
|
|
||||||
<None Include="Resources\help.png" />
|
|
||||||
<Content Include="user.ico" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
|
||||||
</Project>
|
|
||||||
26
DDUserManager/DDUserManager/UserDataSet.Designer.vb
generated
26
DDUserManager/DDUserManager/UserDataSet.Designer.vb
generated
@ -10951,12 +10951,12 @@ Namespace UserDataSetTableAdapters
|
|||||||
Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
|
Me._adapter.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 = New Global.System.Data.SqlClient.SqlCommand()
|
||||||
Me._adapter.InsertCommand.Connection = Me.Connection
|
Me._adapter.InsertCommand.Connection = Me.Connection
|
||||||
Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PRENAME, NAME, USERNAME, SHORTNA"& _
|
Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_USER" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " (PRENAME, NAME, USERNAME, SHORTNA" &
|
||||||
"ME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PRENAME,@"& _
|
"ME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VALUES (@PRENAME,@" &
|
||||||
"NAME,@USERNAME,@SHORTNAME,@EMAIL,@LANGUAGE,@COMMENT,@DATE_FORMAT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _
|
"NAME,@USERNAME,@SHORTNAME,@EMAIL,@LANGUAGE,@COMMENT,@DATE_FORMAT,@ADDED_WHO); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) &
|
||||||
"SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER"& _
|
"SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER" &
|
||||||
", COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, "& _
|
", COMMENT, WAN_ENVIRONMENT, " &
|
||||||
"PM_RIGHT_FILE_DELETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHA"& _
|
"USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHA" &
|
||||||
"NGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())"
|
"NGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())"
|
||||||
Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
|
Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
|
||||||
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
|
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
|
||||||
@ -10970,13 +10970,13 @@ Namespace UserDataSetTableAdapters
|
|||||||
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
|
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
|
||||||
Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
|
Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
|
||||||
Me._adapter.UpdateCommand.Connection = Me.Connection
|
Me._adapter.UpdateCommand.Connection = Me.Connection
|
||||||
Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PRENAME = @PRENAME, NAME = @NAME, USER"& _
|
Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_USER" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SET PRENAME = @PRENAME, NAME = @NAME, USER" &
|
||||||
"NAME = @USERNAME, SHORTNAME = @SHORTNAME, EMAIL = @EMAIL, LANGUAGE = @LANGUAGE, "& _
|
"NAME = @USERNAME, SHORTNAME = @SHORTNAME, EMAIL = @EMAIL, LANGUAGE = @LANGUAGE, " &
|
||||||
"COMMENT = @COMMENT, DATE_FORMAT = @DATE_FORMAT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANG"& _
|
"COMMENT = @COMMENT, DATE_FORMAT = @DATE_FORMAT, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " CHANG" &
|
||||||
"ED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PREN"& _
|
"ED_WHO = @CHANGED_WHO" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, PREN" &
|
||||||
"AME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_EN"& _
|
"AME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_EN" &
|
||||||
"VIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DEL"& _
|
"VIRONMENT, " &
|
||||||
"ETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED"& _
|
"USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED" &
|
||||||
"_WHEN FROM TBDD_USER WHERE (GUID = @GUID)"
|
"_WHEN FROM TBDD_USER WHERE (GUID = @GUID)"
|
||||||
Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
|
Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
|
||||||
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
|
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
|
||||||
|
|||||||
@ -37,6 +37,7 @@ Partial Class frmADImport_Users
|
|||||||
Me.colEMAIL = New DevExpress.XtraGrid.Columns.GridColumn()
|
Me.colEMAIL = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||||
Me.Panel1 = New System.Windows.Forms.Panel()
|
Me.Panel1 = New System.Windows.Forms.Panel()
|
||||||
Me.btnImport = New System.Windows.Forms.Button()
|
Me.btnImport = New System.Windows.Forms.Button()
|
||||||
|
Me.colGroupName = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||||
CType(Me.gridAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.gridAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
CType(Me.gridAD_Users, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.gridAD_Users, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
@ -58,6 +59,7 @@ Partial Class frmADImport_Users
|
|||||||
'
|
'
|
||||||
'viewAD_Groups
|
'viewAD_Groups
|
||||||
'
|
'
|
||||||
|
Me.viewAD_Groups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGroupName})
|
||||||
Me.viewAD_Groups.GridControl = Me.gridAD_Groups
|
Me.viewAD_Groups.GridControl = Me.gridAD_Groups
|
||||||
Me.viewAD_Groups.Name = "viewAD_Groups"
|
Me.viewAD_Groups.Name = "viewAD_Groups"
|
||||||
Me.viewAD_Groups.OptionsBehavior.Editable = False
|
Me.viewAD_Groups.OptionsBehavior.Editable = False
|
||||||
@ -164,6 +166,15 @@ Partial Class frmADImport_Users
|
|||||||
Me.btnImport.Text = "Import starten"
|
Me.btnImport.Text = "Import starten"
|
||||||
Me.btnImport.UseVisualStyleBackColor = True
|
Me.btnImport.UseVisualStyleBackColor = True
|
||||||
'
|
'
|
||||||
|
'colGroupName
|
||||||
|
'
|
||||||
|
Me.colGroupName.Caption = "Gruppe"
|
||||||
|
Me.colGroupName.FieldName = "Name"
|
||||||
|
Me.colGroupName.Name = "colGroupName"
|
||||||
|
Me.colGroupName.UnboundType = DevExpress.Data.UnboundColumnType.[String]
|
||||||
|
Me.colGroupName.Visible = True
|
||||||
|
Me.colGroupName.VisibleIndex = 0
|
||||||
|
'
|
||||||
'frmADImport_Users
|
'frmADImport_Users
|
||||||
'
|
'
|
||||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
@ -199,4 +210,5 @@ Partial Class frmADImport_Users
|
|||||||
Friend WithEvents colSELECTED As DevExpress.XtraGrid.Columns.GridColumn
|
Friend WithEvents colSELECTED As DevExpress.XtraGrid.Columns.GridColumn
|
||||||
Friend WithEvents btnImport As Button
|
Friend WithEvents btnImport As Button
|
||||||
Friend WithEvents Panel1 As Panel
|
Friend WithEvents Panel1 As Panel
|
||||||
|
Friend WithEvents colGroupName As DevExpress.XtraGrid.Columns.GridColumn
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@ -18,7 +18,8 @@ Public Class frmADImport_Users
|
|||||||
|
|
||||||
Dim oGroups = activeDirectory.ListGroups(MyConfig.Config.AdGroupFilter)
|
Dim oGroups = activeDirectory.ListGroups(MyConfig.Config.AdGroupFilter)
|
||||||
|
|
||||||
gridAD_Groups.DataSource = oGroups.Select(Function(g) g.SAMAccountName)
|
'gridAD_Groups.DataSource = oGroups.Select(Function(g) g.SAMAccountName)
|
||||||
|
gridAD_Groups.DataSource = oGroups
|
||||||
viewAD_Groups.Columns.Item(0).Caption = "Gruppe"
|
viewAD_Groups.Columns.Item(0).Caption = "Gruppe"
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
logger.Error(ex, $"Error while loading initial groups")
|
logger.Error(ex, $"Error while loading initial groups")
|
||||||
@ -27,29 +28,38 @@ Public Class frmADImport_Users
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub gridADGroups_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles viewAD_Groups.FocusedRowChanged
|
Private Sub gridADGroups_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles viewAD_Groups.FocusedRowChanged
|
||||||
Dim groupName As String = viewAD_Groups.GetRow(e.FocusedRowHandle)
|
Dim oGroup As ADGroup = Nothing
|
||||||
|
|
||||||
Try
|
Try
|
||||||
Dim oUsers = activeDirectory.ListUsers(groupName, MyConfig.Config.AdUserFilter)
|
oGroup = viewAD_Groups.GetRow(e.FocusedRowHandle)
|
||||||
|
|
||||||
UserDataSet.TBLOCAL_ADUSERS.Clear()
|
|
||||||
|
|
||||||
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.samAccountName
|
|
||||||
row.EMAIL = user.Email
|
|
||||||
|
|
||||||
UserDataSet.TBLOCAL_ADUSERS.AddTBLOCAL_ADUSERSRow(row)
|
|
||||||
Next
|
|
||||||
|
|
||||||
TBLOCAL_ADUSERSBindingSource.DataSource = UserDataSet.TBLOCAL_ADUSERS
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
logger.Error(ex, $"Error while loading users for group {groupName}")
|
logger.Error(ex, $"Error while loading focused group")
|
||||||
MsgBox($"Error while loading users for group {groupName}")
|
MsgBox($"Error while loading focused group", MsgBoxStyle.Critical, Text)
|
||||||
End Try
|
End Try
|
||||||
|
|
||||||
|
If Not IsNothing(oGroup) Then
|
||||||
|
Try
|
||||||
|
Dim oUsers = activeDirectory.ListUsers(oGroup.Name, MyConfig.Config.AdUserFilter)
|
||||||
|
|
||||||
|
UserDataSet.TBLOCAL_ADUSERS.Clear()
|
||||||
|
|
||||||
|
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.samAccountName
|
||||||
|
row.EMAIL = user.Email
|
||||||
|
|
||||||
|
UserDataSet.TBLOCAL_ADUSERS.AddTBLOCAL_ADUSERSRow(row)
|
||||||
|
Next
|
||||||
|
|
||||||
|
TBLOCAL_ADUSERSBindingSource.DataSource = UserDataSet.TBLOCAL_ADUSERS
|
||||||
|
Catch ex As Exception
|
||||||
|
logger.Error(ex, $"Error while loading users for group {oGroup.Name}")
|
||||||
|
MsgBox($"Error while loading users for group {oGroup.Name}")
|
||||||
|
End Try
|
||||||
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click
|
Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click
|
||||||
|
|||||||
@ -40,6 +40,7 @@ Public Class frmMain
|
|||||||
|
|
||||||
MyLogger.Info("Starting UserManager v" & CurrentVersion)
|
MyLogger.Info("Starting UserManager v" & CurrentVersion)
|
||||||
MyLogger.Info($"Current Username: {Environment.UserName}")
|
MyLogger.Info($"Current Username: {Environment.UserName}")
|
||||||
|
MyLogConfig.Debug = Not MyConfig.Config.LogErrorsOnly
|
||||||
|
|
||||||
If MyConnectionString = "" Then
|
If MyConnectionString = "" Then
|
||||||
frmConfigDatabase.ShowDialog()
|
frmConfigDatabase.ShowDialog()
|
||||||
@ -1093,12 +1094,14 @@ Public Class frmMain
|
|||||||
Dim oActiveDirectory As New ActiveDirectoryInterface(MyLogConfig, ldapPAth)
|
Dim oActiveDirectory As New ActiveDirectoryInterface(MyLogConfig, ldapPAth)
|
||||||
|
|
||||||
If oActiveDirectory.Authenticate() Then
|
If oActiveDirectory.Authenticate() Then
|
||||||
MsgBox("Verbindung erfolgreich aufgebaut!", MsgBoxStyle.Information)
|
MsgBox("Verbindung erfolgreich aufgebaut!", MsgBoxStyle.Information, Text)
|
||||||
|
|
||||||
MyConfig.Config.AdRootPath = txtADRootNode.Text
|
MyConfig.Config.AdRootPath = txtADRootNode.Text
|
||||||
MyConfig.Save()
|
MyConfig.Save()
|
||||||
|
|
||||||
MyLogger.Info($"New ActiveDirectory Path saved: {txtADRootNode.Text}")
|
MyLogger.Info($"New ActiveDirectory Path saved: {txtADRootNode.Text}")
|
||||||
|
Else
|
||||||
|
MsgBox("Verbindung konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Eingabe!", MsgBoxStyle.Critical, Text)
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user