jj: add setup, fix assignment bugs

This commit is contained in:
Jonathan Jenne 2018-06-08 15:22:58 +02:00
parent 367eee150b
commit 39975bb875
16 changed files with 1001 additions and 747 deletions

View File

@ -5,16 +5,30 @@ VisualStudioVersion = 15.0.27130.2020
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{87122913-C196-46BC-A7CD-27F7E201E55F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87122913-C196-46BC-A7CD-27F7E201E55F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87122913-C196-46BC-A7CD-27F7E201E55F}.Debug|x86.ActiveCfg = Debug|Any CPU
{87122913-C196-46BC-A7CD-27F7E201E55F}.Debug|x86.Build.0 = Debug|Any CPU
{87122913-C196-46BC-A7CD-27F7E201E55F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{87122913-C196-46BC-A7CD-27F7E201E55F}.Release|Any CPU.Build.0 = Release|Any CPU
{87122913-C196-46BC-A7CD-27F7E201E55F}.Release|x86.ActiveCfg = Release|Any CPU
{87122913-C196-46BC-A7CD-27F7E201E55F}.Release|x86.Build.0 = Release|Any CPU
{BCE990D1-E422-4096-A4BE-6E940FB25127}.Debug|Any CPU.ActiveCfg = Debug|x86
{BCE990D1-E422-4096-A4BE-6E940FB25127}.Debug|x86.ActiveCfg = Debug|x86
{BCE990D1-E422-4096-A4BE-6E940FB25127}.Debug|x86.Build.0 = Debug|x86
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -1,5 +1,4 @@
Imports DDUserManager.UserDataSet
Imports DevExpress.XtraGrid
Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
@ -73,9 +72,6 @@ Public Class ClassDragDrop
Dim singleUserDropped As Boolean = e.Data.GetDataPresent(GetType(TBDD_USERRow))
Dim singleGroupDropped As Boolean = e.Data.GetDataPresent(GetType(TBDD_GROUPSRow))
Console.WriteLine("singleUserDropped: " & singleUserDropped)
Console.WriteLine("singleGroupDropped: " & singleGroupDropped)
If multipleDropped Or singleUserDropped Or singleGroupDropped Then
e.Effect = DragDropEffects.Move
Else

View File

@ -210,5 +210,8 @@
<ItemGroup>
<None Include="Resources\cog.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\arrow_refresh.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project>

View File

@ -70,6 +70,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property arrow_refresh() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("arrow_refresh", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

View File

@ -118,14 +118,23 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="user_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="plugin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\plugin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="book" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\book.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="user_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow_left_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow_left_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="group_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\group_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -133,25 +142,19 @@
<data name="user_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="group" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\group.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="book" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\book.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow_left_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow_left_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="plugin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\plugin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 685 B

View File

@ -2625,10 +2625,13 @@ Partial Public Class UserDataSet
Me.columnCLIENT_NAME.MaxLength = 50
Me.columnSHORTNAME.MaxLength = 30
Me.columnLICENSE_PMO.AllowDBNull = false
Me.columnLICENSE_PMO.DefaultValue = CType("",String)
Me.columnLICENSE_PMO.MaxLength = 5000
Me.columnLICENSE_GI.AllowDBNull = false
Me.columnLICENSE_GI.DefaultValue = CType("",String)
Me.columnLICENSE_GI.MaxLength = 5000
Me.columnLICENSE_PM.AllowDBNull = false
Me.columnLICENSE_PM.DefaultValue = CType("",String)
Me.columnLICENSE_PM.MaxLength = 5000
Me.columnCOMMENT.MaxLength = 200
Me.columnADDED_WHO.AllowDBNull = false
@ -10238,70 +10241,30 @@ Namespace UserDataSetTableAdapters
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_CLIENT] ([CLIENT_NAME], [SHORTNAME], [LICENSE_PMO], [LICENSE_GI"& _
"], [LICENSE_PM], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_W"& _
"HEN]) VALUES (@CLIENT_NAME, @SHORTNAME, @LICENSE_PMO, @LICENSE_GI, @LICENSE_PM, "& _
"@COMMENT, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, C"& _
"LIENT_NAME, SHORTNAME, LICENSE_PMO, LICENSE_GI, LICENSE_PM, COMMENT, ADDED_WHO, "& _
"ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_CLIENT WHERE (GUID = SCOPE_IDENT"& _
"ITY())"
Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_CLIENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (CLIENT_NAME, SHORTNAME, COMMEN"& _
"T, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@CLIENT_NAME,@SHORTNAME,@COMMENT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"S"& _
"ELECT GUID, CLIENT_NAME, SHORTNAME, LICENSE_PMO, LICENSE_GI, LICENSE_PM, COMMENT"& _
", ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_CLIENT WHERE (GUID "& _
"= SCOPE_IDENTITY())"
Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CLIENT_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CLIENT_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LICENSE_PMO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_PMO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LICENSE_GI", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_GI", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LICENSE_PM", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_PM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", 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, 0, 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_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CLIENT_NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CLIENT_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", 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.Connection = Me.Connection
Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_CLIENT] SET [CLIENT_NAME] = @CLIENT_NAME, [SHORTNAME] = @SHORTNAME, "& _
"[LICENSE_PMO] = @LICENSE_PMO, [LICENSE_GI] = @LICENSE_GI, [LICENSE_PM] = @LICENS"& _
"E_PM, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN"& _
", [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = "& _
"@Original_GUID) AND ([CLIENT_NAME] = @Original_CLIENT_NAME) AND ((@IsNull_SHORTN"& _
"AME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)) AND ([L"& _
"ICENSE_PMO] = @Original_LICENSE_PMO) AND ([LICENSE_GI] = @Original_LICENSE_GI) A"& _
"ND ([LICENSE_PM] = @Original_LICENSE_PM) AND ((@IsNull_COMMENT = 1 AND [COMMENT]"& _
" IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([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)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT G"& _
"UID, CLIENT_NAME, SHORTNAME, LICENSE_PMO, LICENSE_GI, LICENSE_PM, COMMENT, ADDED"& _
"_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_CLIENT WHERE (GUID = @GUID"& _
")"
Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_CLIENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET CLIENT_NAME = @CLIENT_NAME, SHORTNAM"& _
"E = @SHORTNAME, COMMENT = @COMMENT, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GU"& _
"ID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CLIENT_NAME, SHORTNAME, LICENSE_PMO, LICENS"& _
"E_GI, LICENSE_PM, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM"& _
" TBDD_CLIENT WHERE (GUID = @GUID)"
Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CLIENT_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CLIENT_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LICENSE_PMO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_PMO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LICENSE_GI", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_GI", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LICENSE_PM", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_PM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CLIENT_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CLIENT_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SHORTNAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LICENSE_PMO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_PMO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LICENSE_GI", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_GI", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LICENSE_PM", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LICENSE_PM", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CLIENT_NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CLIENT_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
End Sub
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@ -10502,7 +10465,7 @@ Namespace UserDataSetTableAdapters
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _
Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _
Public Overloads Overridable Function Insert(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 Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer
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
If (CLIENT_NAME Is Nothing) Then
Throw New Global.System.ArgumentNullException("CLIENT_NAME")
Else
@ -10513,45 +10476,15 @@ Namespace UserDataSetTableAdapters
Else
Me.Adapter.InsertCommand.Parameters(1).Value = CType(SHORTNAME,String)
End If
If (LICENSE_PMO Is Nothing) Then
Throw New Global.System.ArgumentNullException("LICENSE_PMO")
Else
Me.Adapter.InsertCommand.Parameters(2).Value = CType(LICENSE_PMO,String)
End If
If (LICENSE_GI Is Nothing) Then
Throw New Global.System.ArgumentNullException("LICENSE_GI")
Else
Me.Adapter.InsertCommand.Parameters(3).Value = CType(LICENSE_GI,String)
End If
If (LICENSE_PM Is Nothing) Then
Throw New Global.System.ArgumentNullException("LICENSE_PM")
Else
Me.Adapter.InsertCommand.Parameters(4).Value = CType(LICENSE_PM,String)
End If
If (COMMENT Is Nothing) Then
Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value
Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value
Else
Me.Adapter.InsertCommand.Parameters(5).Value = CType(COMMENT,String)
Me.Adapter.InsertCommand.Parameters(2).Value = CType(COMMENT,String)
End If
If (ADDED_WHO Is Nothing) Then
Throw New Global.System.ArgumentNullException("ADDED_WHO")
Else
Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String)
End If
If (ADDED_WHEN.HasValue = true) Then
Me.Adapter.InsertCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date)
Else
Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value
End If
If (CHANGED_WHO Is Nothing) Then
Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value
Else
Me.Adapter.InsertCommand.Parameters(8).Value = CType(CHANGED_WHO,String)
End If
If (CHANGED_WHEN.HasValue = true) Then
Me.Adapter.InsertCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date)
Else
Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value
Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String)
End If
Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
@ -10572,29 +10505,7 @@ Namespace UserDataSetTableAdapters
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _
Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _
Public Overloads Overridable Function Update( _
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 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_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), _
ByVal GUID As Integer) As Integer
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
If (CLIENT_NAME Is Nothing) Then
Throw New Global.System.ArgumentNullException("CLIENT_NAME")
Else
@ -10605,108 +10516,18 @@ Namespace UserDataSetTableAdapters
Else
Me.Adapter.UpdateCommand.Parameters(1).Value = CType(SHORTNAME,String)
End If
If (LICENSE_PMO Is Nothing) Then
Throw New Global.System.ArgumentNullException("LICENSE_PMO")
Else
Me.Adapter.UpdateCommand.Parameters(2).Value = CType(LICENSE_PMO,String)
End If
If (LICENSE_GI Is Nothing) Then
Throw New Global.System.ArgumentNullException("LICENSE_GI")
Else
Me.Adapter.UpdateCommand.Parameters(3).Value = CType(LICENSE_GI,String)
End If
If (LICENSE_PM Is Nothing) Then
Throw New Global.System.ArgumentNullException("LICENSE_PM")
Else
Me.Adapter.UpdateCommand.Parameters(4).Value = CType(LICENSE_PM,String)
End If
If (COMMENT Is Nothing) Then
Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value
Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value
Else
Me.Adapter.UpdateCommand.Parameters(5).Value = CType(COMMENT,String)
End If
If (ADDED_WHO Is Nothing) Then
Throw New Global.System.ArgumentNullException("ADDED_WHO")
Else
Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ADDED_WHO,String)
End If
If (ADDED_WHEN.HasValue = true) Then
Me.Adapter.UpdateCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date)
Else
Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value
Me.Adapter.UpdateCommand.Parameters(2).Value = CType(COMMENT,String)
End If
If (CHANGED_WHO Is Nothing) Then
Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value
Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value
Else
Me.Adapter.UpdateCommand.Parameters(8).Value = CType(CHANGED_WHO,String)
Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CHANGED_WHO,String)
End If
If (CHANGED_WHEN.HasValue = true) Then
Me.Adapter.UpdateCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date)
Else
Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value
End If
Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_GUID,Integer)
If (Original_CLIENT_NAME Is Nothing) Then
Throw New Global.System.ArgumentNullException("Original_CLIENT_NAME")
Else
Me.Adapter.UpdateCommand.Parameters(11).Value = CType(Original_CLIENT_NAME,String)
End If
If (Original_SHORTNAME Is Nothing) Then
Me.Adapter.UpdateCommand.Parameters(12).Value = CType(1,Object)
Me.Adapter.UpdateCommand.Parameters(13).Value = Global.System.DBNull.Value
Else
Me.Adapter.UpdateCommand.Parameters(12).Value = CType(0,Object)
Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_SHORTNAME,String)
End If
If (Original_LICENSE_PMO Is Nothing) Then
Throw New Global.System.ArgumentNullException("Original_LICENSE_PMO")
Else
Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_LICENSE_PMO,String)
End If
If (Original_LICENSE_GI Is Nothing) Then
Throw New Global.System.ArgumentNullException("Original_LICENSE_GI")
Else
Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_LICENSE_GI,String)
End If
If (Original_LICENSE_PM Is Nothing) Then
Throw New Global.System.ArgumentNullException("Original_LICENSE_PM")
Else
Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_LICENSE_PM,String)
End If
If (Original_COMMENT Is Nothing) Then
Me.Adapter.UpdateCommand.Parameters(17).Value = CType(1,Object)
Me.Adapter.UpdateCommand.Parameters(18).Value = Global.System.DBNull.Value
Else
Me.Adapter.UpdateCommand.Parameters(17).Value = CType(0,Object)
Me.Adapter.UpdateCommand.Parameters(18).Value = CType(Original_COMMENT,String)
End If
If (Original_ADDED_WHO Is Nothing) Then
Throw New Global.System.ArgumentNullException("Original_ADDED_WHO")
Else
Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_ADDED_WHO,String)
End If
If (Original_ADDED_WHEN.HasValue = true) Then
Me.Adapter.UpdateCommand.Parameters(20).Value = CType(0,Object)
Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_ADDED_WHEN.Value,Date)
Else
Me.Adapter.UpdateCommand.Parameters(20).Value = CType(1,Object)
Me.Adapter.UpdateCommand.Parameters(21).Value = Global.System.DBNull.Value
End If
If (Original_CHANGED_WHO Is Nothing) Then
Me.Adapter.UpdateCommand.Parameters(22).Value = CType(1,Object)
Me.Adapter.UpdateCommand.Parameters(23).Value = Global.System.DBNull.Value
Else
Me.Adapter.UpdateCommand.Parameters(22).Value = CType(0,Object)
Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_CHANGED_WHO,String)
End If
If (Original_CHANGED_WHEN.HasValue = true) Then
Me.Adapter.UpdateCommand.Parameters(24).Value = CType(0,Object)
Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_CHANGED_WHEN.Value,Date)
Else
Me.Adapter.UpdateCommand.Parameters(24).Value = CType(1,Object)
Me.Adapter.UpdateCommand.Parameters(25).Value = Global.System.DBNull.Value
End If
Me.Adapter.UpdateCommand.Parameters(26).Value = CType(GUID,Integer)
Me.Adapter.UpdateCommand.Parameters(4).Value = CType(Original_GUID,Integer)
Me.Adapter.UpdateCommand.Parameters(5).Value = CType(GUID,Integer)
Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
<> Global.System.Data.ConnectionState.Open) Then
@ -10721,35 +10542,6 @@ Namespace UserDataSetTableAdapters
End If
End Try
End Function
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _
Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _
Public Overloads Overridable Function Update( _
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 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_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
Return Me.Update(CLIENT_NAME, SHORTNAME, LICENSE_PMO, LICENSE_GI, LICENSE_PM, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, Original_GUID, Original_CLIENT_NAME, Original_SHORTNAME, Original_LICENSE_PMO, Original_LICENSE_GI, Original_LICENSE_PM, Original_COMMENT, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_GUID)
End Function
End Class
'''<summary>

View File

@ -554,20 +554,16 @@ SELECT GUID, USER_ID, MODULE_ID, IS_ADMIN, COMMENT, ADDED_WHO, ADDED_WHEN FROM T
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [TBDD_CLIENT] ([CLIENT_NAME], [SHORTNAME], [LICENSE_PMO], [LICENSE_GI], [LICENSE_PM], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@CLIENT_NAME, @SHORTNAME, @LICENSE_PMO, @LICENSE_GI, @LICENSE_PM, @COMMENT, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>INSERT INTO TBDD_CLIENT
(CLIENT_NAME, SHORTNAME, COMMENT, ADDED_WHO)
VALUES (@CLIENT_NAME,@SHORTNAME,@COMMENT,@ADDED_WHO);
SELECT GUID, CLIENT_NAME, SHORTNAME, LICENSE_PMO, LICENSE_GI, LICENSE_PM, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_CLIENT WHERE (GUID = SCOPE_IDENTITY())</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CLIENT_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CLIENT_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@LICENSE_PMO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_PMO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@LICENSE_GI" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_GI" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@LICENSE_PM" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_PM" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="CLIENT_NAME" ColumnName="CLIENT_NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CLIENT_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CLIENT_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SHORTNAME" ColumnName="SHORTNAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
@ -579,37 +575,18 @@ FROM TBDD_CLIENT</CommandText>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [TBDD_CLIENT] SET [CLIENT_NAME] = @CLIENT_NAME, [SHORTNAME] = @SHORTNAME, [LICENSE_PMO] = @LICENSE_PMO, [LICENSE_GI] = @LICENSE_GI, [LICENSE_PM] = @LICENSE_PM, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([CLIENT_NAME] = @Original_CLIENT_NAME) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)) AND ([LICENSE_PMO] = @Original_LICENSE_PMO) AND ([LICENSE_GI] = @Original_LICENSE_GI) AND ([LICENSE_PM] = @Original_LICENSE_PM) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([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)));
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>UPDATE TBDD_CLIENT
SET CLIENT_NAME = @CLIENT_NAME, SHORTNAME = @SHORTNAME, COMMENT = @COMMENT, CHANGED_WHO = @CHANGED_WHO
WHERE (GUID = @Original_GUID);
SELECT GUID, CLIENT_NAME, SHORTNAME, LICENSE_PMO, LICENSE_GI, LICENSE_PM, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_CLIENT WHERE (GUID = @GUID)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CLIENT_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CLIENT_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@LICENSE_PMO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_PMO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@LICENSE_GI" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_GI" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@LICENSE_PM" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_PM" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CLIENT_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CLIENT_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SHORTNAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_LICENSE_PMO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_PMO" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_LICENSE_GI" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_GI" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_LICENSE_PM" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LICENSE_PM" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="CLIENT_NAME" ColumnName="CLIENT_NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CLIENT_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CLIENT_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SHORTNAME" ColumnName="SHORTNAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_CLIENT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
@ -1405,21 +1382,21 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="LICENSE_PMO" msprop:Generator_ColumnVarNameInTable="columnLICENSE_PMO" msprop:Generator_ColumnPropNameInRow="LICENSE_PMO" msprop:Generator_ColumnPropNameInTable="LICENSE_PMOColumn" msprop:Generator_UserColumnName="LICENSE_PMO">
<xs:element name="LICENSE_PMO" msprop:Generator_ColumnVarNameInTable="columnLICENSE_PMO" msprop:Generator_ColumnPropNameInRow="LICENSE_PMO" msprop:Generator_ColumnPropNameInTable="LICENSE_PMOColumn" msprop:Generator_UserColumnName="LICENSE_PMO" default="">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="5000" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="LICENSE_GI" msprop:Generator_ColumnVarNameInTable="columnLICENSE_GI" msprop:Generator_ColumnPropNameInRow="LICENSE_GI" msprop:Generator_ColumnPropNameInTable="LICENSE_GIColumn" msprop:Generator_UserColumnName="LICENSE_GI">
<xs:element name="LICENSE_GI" msprop:Generator_ColumnVarNameInTable="columnLICENSE_GI" msprop:Generator_ColumnPropNameInRow="LICENSE_GI" msprop:Generator_ColumnPropNameInTable="LICENSE_GIColumn" msprop:Generator_UserColumnName="LICENSE_GI" default="">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="5000" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="LICENSE_PM" msprop:Generator_ColumnVarNameInTable="columnLICENSE_PM" msprop:Generator_ColumnPropNameInRow="LICENSE_PM" msprop:Generator_ColumnPropNameInTable="LICENSE_PMColumn" msprop:Generator_UserColumnName="LICENSE_PM">
<xs:element name="LICENSE_PM" msprop:Generator_ColumnVarNameInTable="columnLICENSE_PM" msprop:Generator_ColumnPropNameInRow="LICENSE_PM" msprop:Generator_ColumnPropNameInTable="LICENSE_PMColumn" msprop:Generator_UserColumnName="LICENSE_PM" default="">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="5000" />

View File

@ -4,162 +4,166 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="23" ViewPortY="-22" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="284" ViewPortY="-428" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:TBDD_GROUPS" ZOrder="1" X="589" Y="-4" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="3" X="412" Y="407" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBDD_MODULES" ZOrder="14" X="1446" Y="-26" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="15" X="825" Y="338" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:TBDD_CLIENT" ZOrder="11" X="95" Y="723" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="2" X="56" Y="474" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:TBDD_USER" ZOrder="4" X="28" Y="-22" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
<Shape ID="DesignTable:TBDD_GROUPS_MODULES" ZOrder="10" X="782" Y="608" Height="229" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBDD_GROUPS_CLIENT" ZOrder="7" X="1573" Y="274" Height="229" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBLOCAL_ADUSERS" ZOrder="13" X="1158" Y="607" Height="105" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
<Shape ID="DesignTable:TBLOCAL_ADGROUPS" ZOrder="12" X="1092" Y="729" Height="48" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
<Shape ID="DesignTable:TBDD_GROUPS" ZOrder="6" X="813" Y="-19" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="3" X="810" Y="357" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBDD_MODULES" ZOrder="15" X="1446" Y="-26" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="2" X="1142" Y="58" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:TBDD_CLIENT" ZOrder="13" X="478" Y="-418" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="7" X="80" Y="42" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:TBDD_USER" ZOrder="5" X="461" Y="-16" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
<Shape ID="DesignTable:TBDD_GROUPS_MODULES" ZOrder="12" X="1142" Y="-286" Height="229" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBDD_GROUPS_CLIENT" ZOrder="9" X="783" Y="-302" Height="229" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBLOCAL_ADUSERS" ZOrder="1" X="136" Y="-222" Height="105" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
<Shape ID="DesignTable:TBLOCAL_ADGROUPS" ZOrder="14" X="139" Y="-324" Height="48" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_GROUP_ID" ZOrder="21" LineWidth="11">
<RoutePoints>
<Point>
<X>889</X>
<Y>282</Y>
<X>1113</X>
<Y>0</Y>
</Point>
<Point>
<X>1327</X>
<Y>282</Y>
<X>1429</X>
<Y>0</Y>
</Point>
<Point>
<X>1327</X>
<Y>441</Y>
<X>1429</X>
<Y>391</Y>
</Point>
<Point>
<X>706</X>
<Y>441</Y>
<X>1104</X>
<Y>391</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_USER_MODULES_MODULE_ID" ZOrder="20" LineWidth="11">
<RoutePoints>
<Point>
<X>1463</X>
<Y>317</Y>
<X>1446</X>
<Y>163</Y>
</Point>
<Point>
<X>1463</X>
<Y>361</Y>
</Point>
<Point>
<X>1103</X>
<Y>361</Y>
<X>1420</X>
<Y>163</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_GROUP_ID" ZOrder="19" LineWidth="11">
<RoutePoints>
<Point>
<X>205</X>
<Y>723</Y>
<X>495</X>
<Y>-113</Y>
</Point>
<Point>
<X>205</X>
<Y>665</Y>
<X>495</X>
<Y>59</Y>
</Point>
<Point>
<X>340</X>
<Y>59</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="18" LineWidth="11">
<RoutePoints>
<Point>
<X>328</X>
<Y>433</Y>
<X>761</X>
<Y>383</Y>
</Point>
<Point>
<X>412</X>
<Y>433</Y>
<X>810</X>
<Y>383</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_USER_MODULES2_USER_ID" ZOrder="17" LineWidth="11">
<RoutePoints>
<Point>
<X>328</X>
<Y>391</Y>
<X>761</X>
<Y>117</Y>
</Point>
<Point>
<X>825</X>
<Y>391</Y>
<X>1142</X>
<Y>117</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_USER_ID" ZOrder="16" LineWidth="11">
<RoutePoints>
<Point>
<X>48</X>
<Y>435</Y>
<X>461</X>
<Y>137</Y>
</Point>
<Point>
<X>48</X>
<Y>491</Y>
</Point>
<Point>
<X>56</X>
<Y>491</Y>
<X>340</X>
<Y>137</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_GROUP_ID" ZOrder="9" LineWidth="11">
<Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_GROUP_ID" ZOrder="11" LineWidth="11">
<RoutePoints>
<Point>
<X>835</X>
<Y>358</Y>
<X>1096</X>
<Y>-19</Y>
</Point>
<Point>
<X>835</X>
<Y>608</Y>
<X>1096</X>
<Y>-74</Y>
</Point>
<Point>
<X>1142</X>
<Y>-74</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_MODULE_ID" ZOrder="8" LineWidth="11">
<Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_MODULE_ID" ZOrder="10" LineWidth="11">
<RoutePoints>
<Point>
<X>1471</X>
<Y>317</Y>
<X>1446</X>
<Y>-9</Y>
</Point>
<Point>
<X>1471</X>
<Y>633</Y>
<X>1421</X>
<Y>-9</Y>
</Point>
<Point>
<X>1079</X>
<Y>633</Y>
<X>1421</X>
<Y>-57</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_CLIENT_ID" ZOrder="6" LineWidth="11">
<Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_CLIENT_ID" ZOrder="4" LineWidth="11">
<RoutePoints>
<Point>
<X>302</X>
<Y>723</Y>
<X>702</X>
<Y>-207</Y>
</Point>
<Point>
<X>302</X>
<Y>353</Y>
</Point>
<Point>
<X>1573</X>
<Y>353</Y>
<X>783</X>
<Y>-207</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_GROUP_ID" ZOrder="5" LineWidth="11">
<Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_GROUP_ID" ZOrder="8" LineWidth="11">
<RoutePoints>
<Point>
<X>889</X>
<Y>358</Y>
<X>1104</X>
<Y>-19</Y>
</Point>
<Point>
<X>1573</X>
<Y>358</Y>
<X>1104</X>
<Y>-310</Y>
</Point>
<Point>
<X>1054</X>
<Y>-310</Y>
</Point>
<Point>
<X>1054</X>
<Y>-302</Y>
</Point>
</RoutePoints>
</Connector>

View File

@ -143,7 +143,7 @@ Partial Class frmMain
Me.colPRENAME3 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.colNAME4 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.colEMAIL2 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.Label8 = New System.Windows.Forms.Label()
Me.labelClients_AssignedUsers = New System.Windows.Forms.Label()
Me.Panel5 = New System.Windows.Forms.Panel()
Me.gridClients_AllClients = New DevExpress.XtraGrid.GridControl()
Me.viewClients_AllClients = New DevExpress.XtraGrid.Views.Grid.GridView()
@ -172,7 +172,7 @@ Partial Class frmMain
Me.GridColumn19 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.GridColumn20 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.GridView10 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.Label11 = New System.Windows.Forms.Label()
Me.labelModules_AssignedUsers = New System.Windows.Forms.Label()
Me.Panel7 = New System.Windows.Forms.Panel()
Me.gridModules_AllModules = New DevExpress.XtraGrid.GridControl()
Me.viewModules_AllModules = New DevExpress.XtraGrid.Views.Grid.GridView()
@ -228,7 +228,7 @@ Partial Class frmMain
Me.viewClientsGroups_AssignedGroups = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.colNAME7 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.colCOMMENT5 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.Label14 = New System.Windows.Forms.Label()
Me.labelClients_AssignedGroups = New System.Windows.Forms.Label()
Me.Panel11 = New System.Windows.Forms.Panel()
Me.gridClientsGroups_AllClients = New DevExpress.XtraGrid.GridControl()
Me.viewClientsGroups_AllClients = New DevExpress.XtraGrid.Views.Grid.GridView()
@ -250,7 +250,7 @@ Partial Class frmMain
Me.viewModulesGroups_AssignedGroups = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.colNAME9 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.colCOMMENT7 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.Label17 = New System.Windows.Forms.Label()
Me.labelModules_AssignedGroups = New System.Windows.Forms.Label()
Me.Panel14 = New System.Windows.Forms.Panel()
Me.gridModulesGroups_AllModules = New DevExpress.XtraGrid.GridControl()
Me.viewModulesGroups_AllModules = New DevExpress.XtraGrid.Views.Grid.GridView()
@ -338,6 +338,7 @@ Partial Class frmMain
Me.tsLabelSaved = New System.Windows.Forms.ToolStripStatusLabel()
Me.TBDD_GROUPS_MODULESTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_GROUPS_MODULESTableAdapter()
Me.TBDD_GROUPS_CLIENTTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_GROUPS_CLIENTTableAdapter()
Me.Button1 = New System.Windows.Forms.Button()
GUIDLabel = New System.Windows.Forms.Label()
PRENAMELabel = New System.Windows.Forms.Label()
NAMELabel = New System.Windows.Forms.Label()
@ -1306,7 +1307,7 @@ Partial Class frmMain
Me.labelGroups_AvailableUsers.Name = "labelGroups_AvailableUsers"
Me.labelGroups_AvailableUsers.Size = New System.Drawing.Size(320, 30)
Me.labelGroups_AvailableUsers.TabIndex = 7
Me.labelGroups_AvailableUsers.Text = "Nicht zugeordnete Benutzer"
Me.labelGroups_AvailableUsers.Text = "Nicht zugeordnete Benutzer:"
Me.labelGroups_AvailableUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'btnGroups_AddUsers
@ -1334,7 +1335,7 @@ Partial Class frmMain
Me.btnGroups_RemoveUsers.Name = "btnGroups_RemoveUsers"
Me.btnGroups_RemoveUsers.Size = New System.Drawing.Size(103, 50)
Me.btnGroups_RemoveUsers.TabIndex = 8
Me.btnGroups_RemoveUsers.Text = "Zuordnung aufheben"
Me.btnGroups_RemoveUsers.Text = "Zuordnung entfernen"
Me.btnGroups_RemoveUsers.UseVisualStyleBackColor = True
'
'Panel2
@ -1483,7 +1484,7 @@ Partial Class frmMain
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(326, 30)
Me.Label3.TabIndex = 7
Me.Label3.Text = "Verfügbare Gruppen"
Me.Label3.Text = "Verfügbare Gruppen:"
Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'tabClientAssign
@ -1589,7 +1590,7 @@ Partial Class frmMain
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(320, 30)
Me.Label7.TabIndex = 2
Me.Label7.Text = "Nicht zugeordnete Benutzer"
Me.Label7.Text = "Nicht zugeordnete Benutzer:"
Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'btnClients_AddUsers
@ -1603,7 +1604,7 @@ Partial Class frmMain
Me.btnClients_AddUsers.Name = "btnClients_AddUsers"
Me.btnClients_AddUsers.Size = New System.Drawing.Size(103, 50)
Me.btnClients_AddUsers.TabIndex = 11
Me.btnClients_AddUsers.Text = "Benutzer hinzufügen"
Me.btnClients_AddUsers.Text = "Zuordnen"
Me.btnClients_AddUsers.UseVisualStyleBackColor = True
'
'btnClients_RemoveUsers
@ -1617,13 +1618,13 @@ Partial Class frmMain
Me.btnClients_RemoveUsers.Name = "btnClients_RemoveUsers"
Me.btnClients_RemoveUsers.Size = New System.Drawing.Size(103, 50)
Me.btnClients_RemoveUsers.TabIndex = 10
Me.btnClients_RemoveUsers.Text = "Benutzer entfernen"
Me.btnClients_RemoveUsers.Text = "Zuordnung entfernen"
Me.btnClients_RemoveUsers.UseVisualStyleBackColor = True
'
'Panel4
'
Me.Panel4.Controls.Add(Me.gridClients_AssignedUsers)
Me.Panel4.Controls.Add(Me.Label8)
Me.Panel4.Controls.Add(Me.labelClients_AssignedUsers)
Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel4.Location = New System.Drawing.Point(326, 0)
Me.Panel4.Name = "Panel4"
@ -1687,17 +1688,17 @@ Partial Class frmMain
Me.colEMAIL2.Visible = True
Me.colEMAIL2.VisibleIndex = 4
'
'Label8
'labelClients_AssignedUsers
'
Me.Label8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
Me.Label8.Dock = System.Windows.Forms.DockStyle.Top
Me.Label8.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label8.Location = New System.Drawing.Point(0, 0)
Me.Label8.Name = "Label8"
Me.Label8.Size = New System.Drawing.Size(423, 30)
Me.Label8.TabIndex = 2
Me.Label8.Text = "Zugeordnete Benutzer zu Mandant {0}:"
Me.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
Me.labelClients_AssignedUsers.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
Me.labelClients_AssignedUsers.Dock = System.Windows.Forms.DockStyle.Top
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.TabIndex = 2
Me.labelClients_AssignedUsers.Text = "Zugeordnete Benutzer zu Mandant {0}:"
Me.labelClients_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'Panel5
'
@ -1806,7 +1807,7 @@ Partial Class frmMain
Me.btnModules_AddUsers.Name = "btnModules_AddUsers"
Me.btnModules_AddUsers.Size = New System.Drawing.Size(103, 50)
Me.btnModules_AddUsers.TabIndex = 13
Me.btnModules_AddUsers.Text = "Benutzer hinzufügen"
Me.btnModules_AddUsers.Text = "Zuordnen"
Me.btnModules_AddUsers.UseVisualStyleBackColor = True
'
'btnModules_RemoveUsers
@ -1820,7 +1821,7 @@ Partial Class frmMain
Me.btnModules_RemoveUsers.Name = "btnModules_RemoveUsers"
Me.btnModules_RemoveUsers.Size = New System.Drawing.Size(103, 50)
Me.btnModules_RemoveUsers.TabIndex = 12
Me.btnModules_RemoveUsers.Text = "Benutzer entfernen"
Me.btnModules_RemoveUsers.Text = "Zuordnung entfernen"
Me.btnModules_RemoveUsers.UseVisualStyleBackColor = True
'
'Panel9
@ -1910,7 +1911,7 @@ Partial Class frmMain
'Panel8
'
Me.Panel8.Controls.Add(Me.gridModules_AssignedUsers)
Me.Panel8.Controls.Add(Me.Label11)
Me.Panel8.Controls.Add(Me.labelModules_AssignedUsers)
Me.Panel8.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel8.Location = New System.Drawing.Point(326, 0)
Me.Panel8.Name = "Panel8"
@ -1979,17 +1980,17 @@ Partial Class frmMain
Me.GridView10.GridControl = Me.gridModules_AssignedUsers
Me.GridView10.Name = "GridView10"
'
'Label11
'labelModules_AssignedUsers
'
Me.Label11.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
Me.Label11.Dock = System.Windows.Forms.DockStyle.Top
Me.Label11.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label11.Location = New System.Drawing.Point(0, 0)
Me.Label11.Name = "Label11"
Me.Label11.Size = New System.Drawing.Size(423, 30)
Me.Label11.TabIndex = 8
Me.Label11.Text = "Zugeordnete Benutzer zu Modul {0}:"
Me.Label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
Me.labelModules_AssignedUsers.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
Me.labelModules_AssignedUsers.Dock = System.Windows.Forms.DockStyle.Top
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.TabIndex = 8
Me.labelModules_AssignedUsers.Text = "Zugeordnete Benutzer zu Modul {0}:"
Me.labelModules_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'Panel7
'
@ -2175,7 +2176,7 @@ Partial Class frmMain
'ToolStripButton2
'
Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image)
Me.ToolStripButton2.Image = Global.DDUserManager.My.Resources.Resources.arrow_refresh
Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton2.Name = "ToolStripButton2"
Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22)
@ -2421,7 +2422,7 @@ Partial Class frmMain
Me.btnClients_AddGroups.Name = "btnClients_AddGroups"
Me.btnClients_AddGroups.Size = New System.Drawing.Size(103, 50)
Me.btnClients_AddGroups.TabIndex = 15
Me.btnClients_AddGroups.Text = "Gruppe hinzufügen"
Me.btnClients_AddGroups.Text = "Zuordnen"
Me.btnClients_AddGroups.UseVisualStyleBackColor = True
'
'btnClients_RemoveGroups
@ -2431,11 +2432,11 @@ Partial Class frmMain
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(326, 164)
Me.btnClients_RemoveGroups.Location = New System.Drawing.Point(329, 164)
Me.btnClients_RemoveGroups.Name = "btnClients_RemoveGroups"
Me.btnClients_RemoveGroups.Size = New System.Drawing.Size(103, 50)
Me.btnClients_RemoveGroups.TabIndex = 14
Me.btnClients_RemoveGroups.Text = "Gruppe entfernen"
Me.btnClients_RemoveGroups.Text = "Zuordnung entfernen"
Me.btnClients_RemoveGroups.UseVisualStyleBackColor = True
'
'Panel10
@ -2497,13 +2498,13 @@ Partial Class frmMain
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(320, 30)
Me.Label5.TabIndex = 1
Me.Label5.Text = "Nicht zugeordnete Gruppen"
Me.Label5.Text = "Nicht zugeordnete Gruppen:"
Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'Panel12
'
Me.Panel12.Controls.Add(Me.gridClientsGroups_AssignedGroups)
Me.Panel12.Controls.Add(Me.Label14)
Me.Panel12.Controls.Add(Me.labelClients_AssignedGroups)
Me.Panel12.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel12.Location = New System.Drawing.Point(326, 0)
Me.Panel12.Name = "Panel12"
@ -2551,17 +2552,17 @@ Partial Class frmMain
Me.colCOMMENT5.Visible = True
Me.colCOMMENT5.VisibleIndex = 2
'
'Label14
'labelClients_AssignedGroups
'
Me.Label14.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
Me.Label14.Dock = System.Windows.Forms.DockStyle.Top
Me.Label14.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label14.Location = New System.Drawing.Point(0, 0)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(423, 30)
Me.Label14.TabIndex = 1
Me.Label14.Text = "Zugeordnete Gruppen zu Mandant {0}"
Me.Label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
Me.labelClients_AssignedGroups.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
Me.labelClients_AssignedGroups.Dock = System.Windows.Forms.DockStyle.Top
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(423, 30)
Me.labelClients_AssignedGroups.TabIndex = 1
Me.labelClients_AssignedGroups.Text = "Zugeordnete Gruppen zu Mandant {0}"
Me.labelClients_AssignedGroups.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'Panel11
'
@ -2620,7 +2621,7 @@ Partial Class frmMain
Me.Label13.Name = "Label13"
Me.Label13.Size = New System.Drawing.Size(326, 30)
Me.Label13.TabIndex = 1
Me.Label13.Text = "Verfügbare Mandanten"
Me.Label13.Text = "Verfügbare Mandanten:"
Me.Label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'XtraTabPage2
@ -2658,11 +2659,11 @@ Partial Class frmMain
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(326, 103)
Me.btnModules_AddGroups.Location = New System.Drawing.Point(328, 108)
Me.btnModules_AddGroups.Name = "btnModules_AddGroups"
Me.btnModules_AddGroups.Size = New System.Drawing.Size(103, 50)
Me.btnModules_AddGroups.TabIndex = 17
Me.btnModules_AddGroups.Text = "Gruppe hinzufügen"
Me.btnModules_AddGroups.Text = "Zuordnen"
Me.btnModules_AddGroups.UseVisualStyleBackColor = True
'
'btnModules_RemoveGroups
@ -2672,11 +2673,11 @@ Partial Class frmMain
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(324, 159)
Me.btnModules_RemoveGroups.Location = New System.Drawing.Point(329, 164)
Me.btnModules_RemoveGroups.Name = "btnModules_RemoveGroups"
Me.btnModules_RemoveGroups.Size = New System.Drawing.Size(103, 50)
Me.btnModules_RemoveGroups.TabIndex = 16
Me.btnModules_RemoveGroups.Text = "Gruppe entfernen"
Me.btnModules_RemoveGroups.Text = "Zuordnung entfernen"
Me.btnModules_RemoveGroups.UseVisualStyleBackColor = True
'
'Panel13
@ -2711,6 +2712,8 @@ Partial Class frmMain
Me.viewModulesGroups_AvailableGroups.OptionsSelection.CheckBoxSelectorColumnWidth = 30
Me.viewModulesGroups_AvailableGroups.OptionsSelection.MultiSelect = True
Me.viewModulesGroups_AvailableGroups.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect
Me.viewModulesGroups_AvailableGroups.OptionsView.ShowAutoFilterRow = True
Me.viewModulesGroups_AvailableGroups.OptionsView.ShowGroupPanel = False
'
'colNAME8
'
@ -2742,7 +2745,7 @@ Partial Class frmMain
'Panel15
'
Me.Panel15.Controls.Add(Me.gridModulesGroups_AssignedGroups)
Me.Panel15.Controls.Add(Me.Label17)
Me.Panel15.Controls.Add(Me.labelModules_AssignedGroups)
Me.Panel15.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel15.Location = New System.Drawing.Point(326, 0)
Me.Panel15.Name = "Panel15"
@ -2771,6 +2774,8 @@ Partial Class frmMain
Me.viewModulesGroups_AssignedGroups.OptionsSelection.CheckBoxSelectorColumnWidth = 30
Me.viewModulesGroups_AssignedGroups.OptionsSelection.MultiSelect = True
Me.viewModulesGroups_AssignedGroups.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect
Me.viewModulesGroups_AssignedGroups.OptionsView.ShowAutoFilterRow = True
Me.viewModulesGroups_AssignedGroups.OptionsView.ShowGroupPanel = False
'
'colNAME9
'
@ -2788,17 +2793,17 @@ Partial Class frmMain
Me.colCOMMENT7.Visible = True
Me.colCOMMENT7.VisibleIndex = 2
'
'Label17
'labelModules_AssignedGroups
'
Me.Label17.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
Me.Label17.Dock = System.Windows.Forms.DockStyle.Top
Me.Label17.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label17.Location = New System.Drawing.Point(0, 0)
Me.Label17.Name = "Label17"
Me.Label17.Size = New System.Drawing.Size(423, 30)
Me.Label17.TabIndex = 0
Me.Label17.Text = "Zugeordnete Gruppen zu Modul {0}"
Me.Label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
Me.labelModules_AssignedGroups.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
Me.labelModules_AssignedGroups.Dock = System.Windows.Forms.DockStyle.Top
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(423, 30)
Me.labelModules_AssignedGroups.TabIndex = 0
Me.labelModules_AssignedGroups.Text = "Zugeordnete Gruppen zu Modul {0}"
Me.labelModules_AssignedGroups.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'Panel14
'
@ -2829,6 +2834,8 @@ Partial Class frmMain
Me.viewModulesGroups_AllModules.OptionsBehavior.Editable = False
Me.viewModulesGroups_AllModules.OptionsBehavior.ReadOnly = True
Me.viewModulesGroups_AllModules.OptionsDetail.EnableMasterViewMode = False
Me.viewModulesGroups_AllModules.OptionsView.ShowAutoFilterRow = True
Me.viewModulesGroups_AllModules.OptionsView.ShowGroupPanel = False
'
'colNAME10
'
@ -3541,6 +3548,15 @@ Partial Class frmMain
'
Me.TBDD_GROUPS_CLIENTTableAdapter.ClearBeforeFill = True
'
'Button1
'
Me.Button1.Location = New System.Drawing.Point(1058, 0)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(137, 23)
Me.Button1.TabIndex = 6
Me.Button1.Text = "Daten neu laden"
Me.Button1.UseVisualStyleBackColor = True
'
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -3820,7 +3836,7 @@ Partial Class frmMain
Friend WithEvents viewClients_AssignedUsers As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents Label6 As Label
Friend WithEvents Label7 As Label
Friend WithEvents Label8 As Label
Friend WithEvents labelClients_AssignedUsers As Label
Friend WithEvents colCLIENT_NAME As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents colSHORTNAME As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents colCOMMENT As DevExpress.XtraGrid.Columns.GridColumn
@ -3882,7 +3898,7 @@ Partial Class frmMain
Friend WithEvents GridColumn15 As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents GridColumn16 As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents GridView8 As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents Label11 As Label
Friend WithEvents labelModules_AssignedUsers As Label
Friend WithEvents gridModules_AssignedUsers As DevExpress.XtraGrid.GridControl
Friend WithEvents viewModules_AssignedUsers As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents GridColumn17 As DevExpress.XtraGrid.Columns.GridColumn
@ -3940,7 +3956,7 @@ Partial Class frmMain
Friend WithEvents Panel12 As Panel
Friend WithEvents gridClientsGroups_AssignedGroups As DevExpress.XtraGrid.GridControl
Friend WithEvents viewClientsGroups_AssignedGroups As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents Label14 As Label
Friend WithEvents labelClients_AssignedGroups As Label
Friend WithEvents Panel11 As Panel
Friend WithEvents gridClientsGroups_AllClients As DevExpress.XtraGrid.GridControl
Friend WithEvents viewClientsGroups_AllClients As DevExpress.XtraGrid.Views.Grid.GridView
@ -3959,7 +3975,7 @@ Partial Class frmMain
Friend WithEvents Panel15 As Panel
Friend WithEvents gridModulesGroups_AssignedGroups As DevExpress.XtraGrid.GridControl
Friend WithEvents viewModulesGroups_AssignedGroups As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents Label17 As Label
Friend WithEvents labelModules_AssignedGroups As Label
Friend WithEvents Panel14 As Panel
Friend WithEvents gridModulesGroups_AllModules As DevExpress.XtraGrid.GridControl
Friend WithEvents viewModulesGroups_AllModules As DevExpress.XtraGrid.Views.Grid.GridView
@ -3974,4 +3990,5 @@ Partial Class frmMain
Friend WithEvents colCOMMENT7 As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents colNAME10 As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents colSHORT_NAME As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents Button1 As Button
End Class

View File

@ -225,6 +225,9 @@
<metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>136, 17</value>
</metadata>
<metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="TBDD_MODULESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1295, 56</value>
</metadata>
@ -234,12 +237,6 @@
<metadata name="TBDD_CLIENTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>439, 56</value>
</metadata>
<metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>136, 17</value>
</metadata>
<metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="TBDD_USERBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>693, 17</value>
</metadata>
@ -315,44 +312,6 @@
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
<data name="ToolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJtSURBVDhPldPrS1phHAdwob/DRbO10WTQBcMuc0LWKu2C
6SDJfDLDYRdZrGUuu5y08syyUqvVcrVYoxZIwWy3tlKK2qUlg73uXQS9Hb37To8PhdsY6/Pux+98eQ7P
9xze/7jzrLxDtaRKouPFyX1FkZJR6Qwd/+7epo5velNnblitCWpW1Mc1zyuhnC2DwieD8YUO9fMa5HZl
uenjiUxv68XG19oAE7JgbG8IM988mD3wYmrfDc+nRxjZHcBAuAfV3nIIm9L6aSzu7rqOb3ilCQzv2rHw
fRqTX0fweH8M3s8uuPcGwW4zsIdt6N60QO4qhsCQ4qTRuIY1jdn24T7mIpOY2ffAteOAYVGLWw4xcm3Z
yGq/gQp3CUpZGVJJ8jiNnatdVgaHQj3cic4wAwlbcFjQJ3LRNSdVL4gIdJf8dEykfHr7qGJKdFo0Kv0p
ceSd5PdkM3R1JqWOb+WpeEnapWqini8nVdMlRD4uJYVsPuHJvYWkyCUhEoeYiG3ZJKNdSGKdt27prTR/
RjWnYBSe4pPYYaJu0Wl+d8YRXSVq+aj3G9drI3TkKJ+UuhQe2eHwtiPayiDa11qj9yMM0vW55g0ybt+x
onfrAbTL1Yh+hYi+Mkwv9WBDDFfp0HYf1BOVuN6cZqaxONM7nZMJW7D4Y5ar1B+ZSKi0b6uTq1S/UIt0
05WAQCfg02hcw1pN/8P3bfAf+LhKfV9GMLrnBLtjR+9GJ5pWDKgaK8M1Y2pAUJ8sprFE6jm5uyXQCOMS
QSFbgJtMDnKsmchsSz8WNl0NpjVeNv9x8u9iP47UnpdwiRcSq1HcldVBx3/g8X4Bj5QzBMM+BqgAAAAA
SUVORK5CYII=
</value>
</data>
<metadata name="TBDD_GROUPSBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>843, 56</value>
</metadata>
<metadata name="TBDD_CLIENTBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1073, 56</value>
</metadata>
<metadata name="TBDD_MODULESBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value>
</metadata>
<metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="TBDD_MODULESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1295, 56</value>
</metadata>
<metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
<metadata name="TBDD_CLIENTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>439, 56</value>
</metadata>
<metadata name="TBDD_GROUPSBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>843, 56</value>
</metadata>
@ -606,7 +565,7 @@
<value>1406, 95</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>106</value>
<value>198</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

View File

@ -66,7 +66,7 @@ Public Class frmMain
Dim group As TBDD_GROUPSRow = GetSelectedGroup()
labelGroups_AssignedUsers.Text = String.Format("Benutzer in {0}:", group.NAME)
labelGroups_AssignedUsers.Text = String.Format("Benutzer in Gruppe {0}:", group.NAME)
gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(group.GUID)
gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(group.GUID)
@ -79,6 +79,8 @@ Public Class frmMain
Dim client As TBDD_CLIENTRow = GetSelectedClient()
labelClients_AssignedUsers.Text = String.Format("Benutzer in Mandant {0}:", client.CLIENT_NAME)
gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(client.GUID)
gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(client.GUID)
End Sub
@ -90,6 +92,8 @@ Public Class frmMain
Dim [module] As TBDD_MODULESRow = GetSelectedModule()
labelModules_AssignedUsers.Text = String.Format("Benutzer in Modul {0}:", [module].NAME)
gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId([module].GUID)
gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId([module].GUID)
End Sub
@ -101,6 +105,8 @@ Public Class frmMain
Dim client As TBDD_CLIENTRow = GetSelectedClient(ItemType.Group)
labelClients_AssignedGroups.Text = String.Format("Gruppen in Mandant {0}:", client.CLIENT_NAME)
gridClientsGroups_AssignedGroups.DataSource = GetAssignedGroupsByClientId(client.GUID)
gridClientsGroups_AvailableGroups.DataSource = GetAvailableGroupsByClientId(client.GUID)
End Sub
@ -112,6 +118,8 @@ Public Class frmMain
Dim [module] As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
labelModules_AssignedGroups.Text = String.Format("Gruppen in Modul {0}:", [module].NAME)
gridModulesGroups_AssignedGroups.DataSource = GetAssignedGroupsByModuleId([module].GUID)
gridModulesGroups_AvailableGroups.DataSource = GetAvailableGroupsByModuleId([module].GUID)
End Sub
@ -153,6 +161,8 @@ Public Class frmMain
Return dt
Catch ex As Exception
MessageBox.Show($"Error in GetClientsForUser: {ex.Message}")
Return Nothing
End Try
End Function
@ -164,6 +174,8 @@ Public Class frmMain
Return dt
Catch ex As Exception
MessageBox.Show($"Error in GetGroupsForUser: {ex.Message}")
Return Nothing
End Try
End Function
@ -175,31 +187,63 @@ Public Class frmMain
Return dt
Catch ex As Exception
MessageBox.Show($"Error in GetModulesForUser: {ex.Message}")
Return Nothing
End Try
End Function
Private Sub TBDD_USERBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBDD_USERBindingNavigatorSaveItem.Click
Validate()
TBDD_USERBindingSource.EndEdit()
TBDD_USERTableAdapter.Update(UserDataSet.TBDD_USER)
Try
Validate()
TBDD_USERBindingSource.EndEdit()
If UserDataSet.TBDD_USER.GetChanges() Is Nothing = False Then
UserDataSet.TBDD_USER.CHANGED_WHOColumn.DefaultValue = Environment.UserName
UpdateSavedLabel()
TBDD_USERBindingSource.EndEdit()
TBDD_USERTableAdapter.Update(UserDataSet.TBDD_USER)
UpdateSavedLabel()
End If
Catch ex As Exception
MsgBox("Error while saving user: " & vbCrLf & ex.Message)
End Try
End Sub
Private Sub TBDD_GROUPSBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBDD_GROUPSBindingNavigatorSaveItem.Click
Validate()
TBDD_GROUPSBindingSource.EndEdit()
TBDD_GROUPSTableAdapter.Update(UserDataSet.TBDD_GROUPS)
Try
Validate()
TBDD_GROUPSBindingSource.EndEdit()
UpdateSavedLabel()
If UserDataSet.TBDD_GROUPS.GetChanges Is Nothing = False Then
UserDataSet.TBDD_GROUPS.CHANGED_WHOColumn.DefaultValue = Environment.UserName
TBDD_GROUPSBindingSource.EndEdit()
TBDD_GROUPSTableAdapter.Update(UserDataSet.TBDD_GROUPS)
UpdateSavedLabel()
End If
Catch ex As Exception
MsgBox("Error while saving group: " & vbCrLf & ex.Message)
End Try
End Sub
Private Sub TBDD_CLIENTBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBDD_CLIENTBindingNavigatorSaveItem.Click
Validate()
TBDD_CLIENTBindingSource.EndEdit()
TBDD_CLIENTTableAdapter.Update(UserDataSet.TBDD_CLIENT)
Try
Validate()
TBDD_CLIENTBindingSource.EndEdit()
UpdateSavedLabel()
If UserDataSet.TBDD_CLIENT.GetChanges Is Nothing = False Then
UserDataSet.TBDD_CLIENT.CHANGED_WHOColumn.DefaultValue = Environment.UserName
TBDD_CLIENTBindingSource.EndEdit()
TBDD_CLIENTTableAdapter.Update(UserDataSet.TBDD_CLIENT)
UpdateSavedLabel()
End If
Catch ex As Exception
MsgBox("Error while saving client: " & vbCrLf & ex.Message)
End Try
End Sub
Private Sub TBDD_USERBindingSource_Update(sender As Object, e As EventArgs) Handles TBDD_USERBindingSource.PositionChanged, TBDD_USERBindingSource.ListChanged
@ -227,45 +271,81 @@ Public Class frmMain
End Sub
Private Function GetAvailableUsersByGroupId(groupId As Integer) As TBDD_USERDataTable
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByGroupId_NotInGroup(dt, groupId)
Try
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByGroupId_NotInGroup(dt, groupId)
Return dt
Return dt
Catch ex As Exception
ShowErrorMessage($"Error in GetAvailableUsersByGroupId with groupId {groupId}", ex)
Return Nothing
End Try
End Function
Private Function GetAssignedUsersByGroupId(groupId As Integer) As TBDD_USERDataTable
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByGroupId(dt, groupId)
Try
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByGroupId(dt, groupId)
Return dt
Return dt
Catch ex As Exception
ShowErrorMessage($"Error in GetAssignedUsersByGroupId with groupId {groupId}", ex)
Return Nothing
End Try
End Function
Private Function GetAvailableUsersByClientId(clientId As Integer) As TBDD_USERDataTable
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByClientId_NotInClient(dt, clientId)
Try
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByClientId_NotInClient(dt, clientId)
Return dt
Return dt
Catch ex As Exception
ShowErrorMessage($"Error in GetAvailableUsersByClientId with clientId {clientId}", ex)
Return Nothing
End Try
End Function
Private Function GetAssignedUsersByClientId(clientId As Integer) As TBDD_USERDataTable
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByClientId(dt, clientId)
Try
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByClientId(dt, clientId)
Return dt
Return dt
Catch ex As Exception
ShowErrorMessage($"Error in GetAssignedUsersByClientId with clientId {clientId}", ex)
Return Nothing
End Try
End Function
Private Function GetAvailableUsersByModuleId(moduleId As Integer) As TBDD_USERDataTable
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByModuleId_NotInModule(dt, moduleId)
Try
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByModuleId_NotInModule(dt, moduleId)
Return dt
Return dt
Catch ex As Exception
ShowErrorMessage($"Error in GetAvailableUsersByModuleId with moduleId {moduleId}", ex)
Return Nothing
End Try
End Function
Private Function GetAssignedUsersByModuleId(moduleId As Integer) As TBDD_USERDataTable
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByModuleId(dt, moduleId)
Try
Dim dt As New TBDD_USERDataTable()
TBDD_USERTableAdapter.FillByModuleId(dt, moduleId)
Return dt
Return dt
Catch ex As Exception
ShowErrorMessage($"Error in GetAssignedUsersByModuleId with moduleId {moduleId}", ex)
Return Nothing
End Try
End Function
Private Function GetAssignedGroupsByClientId(clientId As Integer) As TBDD_GROUPSDataTable
@ -285,38 +365,58 @@ Public Class frmMain
End Function
Private Sub ReloadUsersForGroup(groupId As Integer)
gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(groupId)
gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(groupId)
viewGroups_AvailableUsers.ClearSelection()
viewGroups_AssignedUsers.ClearSelection()
Try
gridGroups_AssignedUsers.DataSource = GetAssignedUsersByGroupId(groupId)
gridGroups_AvailableUsers.DataSource = GetAvailableUsersByGroupId(groupId)
viewGroups_AvailableUsers.ClearSelection()
viewGroups_AssignedUsers.ClearSelection()
Catch ex As Exception
ShowErrorMessage($"Error in ReloadUsersForGroup for groupId {groupId}", ex)
End Try
End Sub
Private Sub ReloadUsersForClient(clientId As Integer)
gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(clientId)
gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(clientId)
viewClients_AssignedUsers.ClearSelection()
viewClients_AvailableUsers.ClearSelection()
Try
gridClients_AssignedUsers.DataSource = GetAssignedUsersByClientId(clientId)
gridClients_AvailableUsers.DataSource = GetAvailableUsersByClientId(clientId)
viewClients_AssignedUsers.ClearSelection()
viewClients_AvailableUsers.ClearSelection()
Catch ex As Exception
ShowErrorMessage($"Error in ReloadUsersForClient for clientId {clientId}", ex)
End Try
End Sub
Private Sub ReloadUsersForModule(moduleId As Integer)
gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(moduleId)
gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(moduleId)
viewModules_AssignedUsers.ClearSelection()
viewModules_AvailableUsers.ClearSelection()
Try
gridModules_AssignedUsers.DataSource = GetAssignedUsersByModuleId(moduleId)
gridModules_AvailableUsers.DataSource = GetAvailableUsersByModuleId(moduleId)
viewModules_AssignedUsers.ClearSelection()
viewModules_AvailableUsers.ClearSelection()
Catch ex As Exception
ShowErrorMessage($"Error in ReloadUsersForModule for moduleId {moduleId}", ex)
End Try
End Sub
Private Sub ReloadGroupsForClient(clientId As Integer)
gridClientsGroups_AssignedGroups.DataSource = GetAssignedGroupsByClientId(clientId)
gridClientsGroups_AvailableGroups.DataSource = GetAvailableGroupsByClientId(clientId)
viewClientsGroups_AssignedGroups.ClearSelection()
viewClientsGroups_AvailableGroups.ClearSelection()
Try
gridClientsGroups_AssignedGroups.DataSource = GetAssignedGroupsByClientId(clientId)
gridClientsGroups_AvailableGroups.DataSource = GetAvailableGroupsByClientId(clientId)
viewClientsGroups_AssignedGroups.ClearSelection()
viewClientsGroups_AvailableGroups.ClearSelection()
Catch ex As Exception
ShowErrorMessage($"Error in ReloadGroupsForClient for clientId {clientId}", ex)
End Try
End Sub
Private Sub ReloadGroupsForModule(moduleId As Integer)
gridModulesGroups_AssignedGroups.DataSource = GetAssignedGroupsByModuleId(moduleId)
gridModulesGroups_AvailableGroups.DataSource = GetAvailableGroupsByModuleId(moduleId)
viewModulesGroups_AssignedGroups.ClearSelection()
viewModulesGroups_AvailableGroups.ClearSelection()
Try
gridModulesGroups_AssignedGroups.DataSource = GetAssignedGroupsByModuleId(moduleId)
gridModulesGroups_AvailableGroups.DataSource = GetAvailableGroupsByModuleId(moduleId)
viewModulesGroups_AssignedGroups.ClearSelection()
viewModulesGroups_AvailableGroups.ClearSelection()
Catch ex As Exception
ShowErrorMessage($"Error in ReloadGroupsForModule for moduleId {moduleId}", ex)
End Try
End Sub
#End Region
#Region "Grid Helpers"
@ -424,319 +524,405 @@ Public Class frmMain
#End Region
#Region "Events for Groups"
Private Sub gridUsersAvailable_DragDrop(sender As Object, e As DragEventArgs) Handles gridGroups_AvailableUsers.DragDrop
Dim grid As GridControl = sender
Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
Try
Dim grid As GridControl = sender
Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
' Zeilen in Oberfläche und in Datenbank einfügen
For Each userRow As TBDD_USERRow In userRowsToBeDeleted
TBDD_GROUPS_USERTableAdapter.Delete(userRow.GUID, selectedGroup.GUID)
Next
' Zeilen in Oberfläche und in Datenbank einfügen
For Each userRow As TBDD_USERRow In userRowsToBeDeleted
TBDD_GROUPS_USERTableAdapter.Delete(userRow.GUID, selectedGroup.GUID)
Next
listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
ReloadUsersForGroup(selectedGroup.GUID)
UpdateSavedLabel()
ReloadUsersForGroup(selectedGroup.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while deleting user from group", ex)
End Try
End Sub
Private Sub gridUsersAssigned_DragDrop(sender As Object, e As DragEventArgs) Handles gridGroups_AssignedUsers.DragDrop
Dim grid As GridControl = sender
Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
Try
Dim grid As GridControl = sender
Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
' Zeilen in Oberfläche und in Datenbank einfügen
For Each userRow As TBDD_USERRow In userRowsToBeInserted
TBDD_GROUPS_USERTableAdapter.Insert(userRow.GUID, selectedGroup.GUID, $"Assign User {userRow.USERNAME} to Group {selectedGroup.NAME}", Environment.UserName)
Next
' Zeilen in Oberfläche und in Datenbank einfügen
For Each userRow As TBDD_USERRow In userRowsToBeInserted
TBDD_GROUPS_USERTableAdapter.Insert(userRow.GUID, selectedGroup.GUID, $"Assign User {userRow.USERNAME} to Group {selectedGroup.NAME}", Environment.UserName)
Next
listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
' Verfügbare Benutzer aktualisieren und Checkboxen leeren
ReloadUsersForGroup(selectedGroup.GUID)
UpdateSavedLabel()
' Verfügbare Benutzer aktualisieren und Checkboxen leeren
ReloadUsersForGroup(selectedGroup.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding user to group", ex)
End Try
End Sub
Private Sub btnGroups_AddUsers_Click(sender As Object, e As EventArgs) Handles btnGroups_AddUsers.Click
Dim selectedUserHandles = viewGroups_AvailableUsers.GetSelectedRows().ToList()
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
Try
Dim selectedUserHandles = viewGroups_AvailableUsers.GetSelectedRows().ToList()
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewGroups_AvailableUsers.GetRow(handle)
Dim userrow As TBDD_USERRow = rowView.Row
TBDD_GROUPS_USERTableAdapter.Insert(userrow.GUID, selectedGroup.GUID, $"Assign User {userrow.USERNAME} to Group {selectedGroup.NAME}", Environment.UserName)
Next
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewGroups_AvailableUsers.GetRow(handle)
Dim userrow As TBDD_USERRow = rowView.Row
TBDD_GROUPS_USERTableAdapter.Insert(userrow.GUID, selectedGroup.GUID, $"Assign User {userrow.USERNAME} to Group {selectedGroup.NAME}", Environment.UserName)
Next
listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
ReloadUsersForGroup(selectedGroup.GUID)
UpdateSavedLabel()
ReloadUsersForGroup(selectedGroup.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding user to group", ex)
End Try
End Sub
Private Sub btnGroups_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnGroups_RemoveUsers.Click
Dim selectedUserHandles = viewGroups_AssignedUsers.GetSelectedRows().ToList()
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
Try
Dim selectedUserHandles = viewGroups_AssignedUsers.GetSelectedRows().ToList()
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewGroups_AssignedUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_GROUPS_USERTableAdapter.Delete(userRow.GUID, selectedGroup.GUID)
Next
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewGroups_AssignedUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_GROUPS_USERTableAdapter.Delete(userRow.GUID, selectedGroup.GUID)
Next
listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
listGroups.DataSource = GetGroupsForUser(USERNAMETextBox.Text)
ReloadUsersForGroup(selectedGroup.GUID)
UpdateSavedLabel()
ReloadUsersForGroup(selectedGroup.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while deleting user from group", ex)
End Try
End Sub
#End Region
#Region "DragDrop Events for Clients"
Private Sub gridClients_AvailableUsers_DragDrop(sender As Object, e As DragEventArgs) Handles gridClients_AvailableUsers.DragDrop
Dim grid As GridControl = sender
Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
Try
Dim grid As GridControl = sender
Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
For Each userRow As TBDD_USERRow In userRowsToBeDeleted
TBDD_CLIENT_USERTableAdapter.Delete(userRow.GUID, selectedClient.GUID)
Next
For Each userRow As TBDD_USERRow In userRowsToBeDeleted
TBDD_CLIENT_USERTableAdapter.Delete(userRow.GUID, selectedClient.GUID)
Next
listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
ReloadUsersForClient(selectedClient.GUID)
UpdateSavedLabel()
ReloadUsersForClient(selectedClient.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while deleting user from client", ex)
End Try
End Sub
Private Sub gridClients_AssignedUsers_DragDrop(sender As Object, e As DragEventArgs) Handles gridClients_AssignedUsers.DragDrop
Dim grid As GridControl = sender
Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
Try
Dim grid As GridControl = sender
Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
' Zeilen in Oberfläche und in Datenbank einfügen
For Each userRow As TBDD_USERRow In userRowsToBeInserted
TBDD_CLIENT_USERTableAdapter.Insert(userRow.GUID, selectedClient.GUID, $"Assign User {userRow.USERNAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
Next
' Zeilen in Oberfläche und in Datenbank einfügen
For Each userRow As TBDD_USERRow In userRowsToBeInserted
TBDD_CLIENT_USERTableAdapter.Insert(userRow.GUID, selectedClient.GUID, $"Assign User {userRow.USERNAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
Next
listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
ReloadUsersForClient(selectedClient.GUID)
UpdateSavedLabel()
ReloadUsersForClient(selectedClient.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding user to client", ex)
End Try
End Sub
Private Sub btnClients_AddUsers_Click(sender As Object, e As EventArgs) Handles btnClients_AddUsers.Click
Dim selectedUserHandles = viewGroups_AssignedUsers.GetSelectedRows().ToList()
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
Try
Dim selectedUserHandles = viewClients_AvailableUsers.GetSelectedRows().ToList()
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewGroups_AssignedUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_CLIENT_USERTableAdapter.Insert(userRow.GUID, selectedClient.GUID, $"Assign User {userRow.USERNAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
Next
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewClients_AvailableUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_CLIENT_USERTableAdapter.Insert(userRow.GUID, selectedClient.GUID, $"Assign User {userRow.USERNAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
Next
listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
ReloadUsersForClient(selectedClient.GUID)
UpdateSavedLabel()
ReloadUsersForClient(selectedClient.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding user to client", ex)
End Try
End Sub
Private Sub btnClients_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnClients_RemoveUsers.Click
Dim selectedUserHandles = viewGroups_AssignedUsers.GetSelectedRows().ToList()
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
Try
Dim selectedUserHandles = viewClients_AssignedUsers.GetSelectedRows().ToList()
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewGroups_AssignedUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_CLIENT_USERTableAdapter.Delete(userRow.GUID, selectedClient.GUID)
Next
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewClients_AssignedUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_CLIENT_USERTableAdapter.Delete(userRow.GUID, selectedClient.GUID)
Next
listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
listClients.DataSource = GetClientsForUser(USERNAMETextBox.Text)
ReloadUsersForClient(selectedClient.GUID)
UpdateSavedLabel()
ReloadUsersForClient(selectedClient.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while removing user from client", ex)
End Try
End Sub
Private Sub btnClients_AddGroups_Click(sender As Object, e As EventArgs) Handles btnClients_AddGroups.Click
Dim selectedGroupHandles = viewClientsGroups_AvailableGroups.GetSelectedRows().ToList()
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient(ItemType.Group)
Try
Dim selectedGroupHandles = viewClientsGroups_AvailableGroups.GetSelectedRows().ToList()
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient(ItemType.Group)
For Each handle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewClientsGroups_AvailableGroups.GetRow(handle)
Dim groupRow As TBDD_GROUPSRow = rowView.Row
TBDD_GROUPS_CLIENTTableAdapter.Insert(selectedClient.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
Next
For Each handle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewClientsGroups_AvailableGroups.GetRow(handle)
Dim groupRow As TBDD_GROUPSRow = rowView.Row
TBDD_GROUPS_CLIENTTableAdapter.Insert(selectedClient.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
Next
ReloadGroupsForClient(selectedClient.GUID)
UpdateSavedLabel()
ReloadGroupsForClient(selectedClient.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding group to client", ex)
End Try
End Sub
Private Sub btnClients_RemoveGroups_Click(sender As Object, e As EventArgs) Handles btnClients_RemoveGroups.Click
Dim selectedGroupHandles = viewClientsGroups_AvailableGroups.GetSelectedRows().ToList()
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient(ItemType.Group)
Try
Dim selectedGroupHandles = viewClientsGroups_AssignedGroups.GetSelectedRows().ToList()
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient(ItemType.Group)
For Each handle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewClientsGroups_AvailableGroups.GetRow(handle)
Dim groupRow As TBDD_GROUPSRow = rowView.Row
For Each handle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewClientsGroups_AssignedGroups.GetRow(handle)
Dim groupRow As TBDD_GROUPSRow = rowView.Row
TBDD_GROUPS_CLIENTTableAdapter.Delete(selectedClient.GUID, groupRow.GUID)
Next
TBDD_GROUPS_CLIENTTableAdapter.Delete(selectedClient.GUID, groupRow.GUID)
Next
ReloadGroupsForClient(selectedClient.GUID)
UpdateSavedLabel()
ReloadGroupsForClient(selectedClient.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while removing group from client", ex)
End Try
End Sub
#End Region
#Region "DragDrop Events for Modules"
Private Sub gridModules_AvailableUsers_DragDrop(sender As Object, e As DragEventArgs) Handles gridModules_AvailableUsers.DragDrop
Dim grid As GridControl = sender
Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
Try
Dim grid As GridControl = sender
Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
' Sicherheitsabfrage, wenn der Benutzer sich selbst aus dem UserManager-Modul entfernen will
If userRowsToBeDeleted.Any(Function(row As TBDD_USERRow)
Return row.USERNAME = Environment.UserName
End Function) And selectedModule.SHORT_NAME = "UM" Then
Dim result = MessageBox.Show("Wollen Sie sich selbst aus dem UserManager entfernen? Sie werden danach nicht in der Lage sein, den User Manager zu benutzen!", "Sicherheitsabfrage", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation)
' Sicherheitsabfrage, wenn der Benutzer sich selbst aus dem UserManager-Modul entfernen will
If userRowsToBeDeleted.Any(Function(row As TBDD_USERRow)
Return row.USERNAME = Environment.UserName
End Function) And selectedModule.SHORT_NAME = "UM" Then
Dim result = MessageBox.Show("Wollen Sie sich selbst aus dem UserManager entfernen? Sie werden danach nicht in der Lage sein, den User Manager zu benutzen!", "Sicherheitsabfrage", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation)
If result = DialogResult.No Then
Exit Sub
Else
MsgBox("Sie haben Sich selbst aus dem UserManager entfernt. Die Anwendung wird jetzt beendet")
Application.Exit()
If result = DialogResult.No Then
Exit Sub
Else
MsgBox("Sie haben Sich selbst aus dem UserManager entfernt. Die Anwendung wird jetzt beendet")
Application.Exit()
End If
End If
End If
For Each userRow As TBDD_USERRow In userRowsToBeDeleted
TBDD_USER_MODULESTableAdapter.Delete(userRow.GUID, selectedModule.GUID)
Next
For Each userRow As TBDD_USERRow In userRowsToBeDeleted
TBDD_USER_MODULESTableAdapter.Delete(userRow.GUID, selectedModule.GUID)
Next
listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
ReloadUsersForModule(selectedModule.GUID)
UpdateSavedLabel()
ReloadUsersForModule(selectedModule.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while removing user from module", ex)
End Try
End Sub
Private Sub gridModules_AssignedUsers_DragDrop(sender As Object, e As DragEventArgs) Handles gridModules_AssignedUsers.DragDrop
Dim grid As GridControl = sender
Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
Try
Dim grid As GridControl = sender
Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
' Zeilen in Oberfläche und in Datenbank einfügen
For Each userRow As TBDD_USERRow In userRowsToBeInserted
TBDD_USER_MODULESTableAdapter.Insert(userRow.GUID, selectedModule.GUID, $"Assign User {userRow.USERNAME} to Module {selectedModule.NAME}", Environment.UserName)
Next
' Zeilen in Oberfläche und in Datenbank einfügen
For Each userRow As TBDD_USERRow In userRowsToBeInserted
TBDD_USER_MODULESTableAdapter.Insert(userRow.GUID, selectedModule.GUID, $"Assign User {userRow.USERNAME} to Module {selectedModule.NAME}", Environment.UserName)
Next
listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
ReloadUsersForModule(selectedModule.GUID)
UpdateSavedLabel()
ReloadUsersForModule(selectedModule.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding user to module", ex)
End Try
End Sub
Private Sub btnModules_AddUsers_Click(sender As Object, e As EventArgs) Handles btnModules_AddUsers.Click
Dim selectedUserHandles = viewModules_AvailableUsers.GetSelectedRows().ToList()
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
Try
Dim selectedUserHandles = viewModules_AvailableUsers.GetSelectedRows().ToList()
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewModules_AvailableUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_CLIENT_USERTableAdapter.Insert(userRow.GUID, selectedModule.GUID, $"Assign User {userRow.USERNAME} to Module {selectedModule.NAME}", Environment.UserName)
Next
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewModules_AvailableUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_USER_MODULESTableAdapter.Insert(userRow.GUID, selectedModule.GUID, $"Assign User {userRow.USERNAME} to Module {selectedModule.NAME}", Environment.UserName)
Next
listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
ReloadUsersForModule(selectedModule.GUID)
UpdateSavedLabel()
ReloadUsersForModule(selectedModule.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding user to module", ex)
End Try
End Sub
Private Sub btnModules_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnModules_RemoveUsers.Click
Dim selectedUserHandles = viewModules_AssignedUsers.GetSelectedRows().ToList()
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
Try
Dim selectedUserHandles = viewModules_AssignedUsers.GetSelectedRows().ToList()
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule()
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewModules_AssignedUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_USER_MODULESTableAdapter.Delete(userRow.GUID, selectedModule.GUID)
Next
For Each handle As Integer In selectedUserHandles
Dim rowView As DataRowView = viewModules_AssignedUsers.GetRow(handle)
Dim userRow As TBDD_USERRow = rowView.Row
TBDD_USER_MODULESTableAdapter.Delete(userRow.GUID, selectedModule.GUID)
Next
listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
listModules.DataSource = GetModulesForUser(USERNAMETextBox.Text)
ReloadUsersForModule(selectedModule.GUID)
UpdateSavedLabel()
ReloadUsersForModule(selectedModule.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while removing user from module", ex)
End Try
End Sub
Private Sub gridClientsGroups_AssignedGroups_DragDrop(sender As Object, e As DragEventArgs) Handles gridClientsGroups_AssignedGroups.DragDrop
Dim grid As GridControl = sender
Dim groupRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
Try
Dim grid As GridControl = sender
Dim groupRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeInserted
TBDD_GROUPS_CLIENTTableAdapter.Insert(selectedClient.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
Next
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeInserted
TBDD_GROUPS_CLIENTTableAdapter.Insert(selectedClient.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
Next
ReloadGroupsForClient(selectedClient.GUID)
UpdateSavedLabel()
ReloadGroupsForClient(selectedClient.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding group to client", ex)
End Try
End Sub
Private Sub gridClientsGroups_AvailableGroups_DragDrop(sender As Object, e As DragEventArgs) Handles gridClientsGroups_AvailableGroups.DragDrop
Dim grid As GridControl = sender
Dim groupRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
Try
Dim grid As GridControl = sender
Dim groupRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeDeleted
TBDD_GROUPS_CLIENTTableAdapter.Delete(selectedClient.GUID, groupRow.GUID)
Next
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeDeleted
TBDD_GROUPS_CLIENTTableAdapter.Delete(selectedClient.GUID, groupRow.GUID)
Next
ReloadGroupsForClient(selectedClient.GUID)
UpdateSavedLabel()
ReloadGroupsForClient(selectedClient.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while removing group from client", ex)
End Try
End Sub
Private Sub gridModulesGroups_AvailableGroups_DragDrop(sender As Object, e As DragEventArgs) Handles gridModulesGroups_AvailableGroups.DragDrop
Dim grid As GridControl = sender
Dim groupRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
Try
Dim grid As GridControl = sender
Dim groupRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeDeleted
TBDD_GROUPS_MODULESTableAdapter.Delete(selectedModule.GUID, groupRow.GUID)
Next
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeDeleted
TBDD_GROUPS_MODULESTableAdapter.Delete(selectedModule.GUID, groupRow.GUID)
Next
ReloadGroupsForModule(selectedModule.GUID)
UpdateSavedLabel()
ReloadGroupsForModule(selectedModule.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while removing group from module", ex)
End Try
End Sub
Private Sub gridModulesGroups_AssignedGroups_DragDrop(sender As Object, e As DragEventArgs) Handles gridModulesGroups_AssignedGroups.DragDrop
Dim grid As GridControl = sender
Dim groupRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
Try
Dim grid As GridControl = sender
Dim groupRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeInserted
TBDD_GROUPS_MODULESTableAdapter.Insert(selectedModule.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Module {selectedModule.NAME}", Environment.UserName)
Next
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeInserted
TBDD_GROUPS_MODULESTableAdapter.Insert(selectedModule.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Module {selectedModule.NAME}", Environment.UserName)
Next
ReloadGroupsForModule(selectedModule.GUID)
UpdateSavedLabel()
ReloadGroupsForModule(selectedModule.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding group to module", ex)
End Try
End Sub
Private Sub btnModules_AddGroups_Click(sender As Object, e As EventArgs) Handles btnModules_AddGroups.Click
Dim selectedGroupHandles = viewModulesGroups_AssignedGroups.GetSelectedRows().ToList()
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
Try
Dim selectedGroupHandles = viewModules_AvailableUsers.GetSelectedRows().ToList()
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
For Each handle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewModulesGroups_AssignedGroups.GetRow(handle)
Dim groupRow As TBDD_GROUPSRow = rowView.Row
TBDD_GROUPS_MODULESTableAdapter.Insert(groupRow.GUID, selectedModule.GUID, $"Assign Group {groupRow.NAME} to Module {selectedModule.NAME}", Environment.UserName)
Next
For Each handle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewModules_AvailableUsers.GetRow(handle)
Dim groupRow As TBDD_GROUPSRow = rowView.Row
TBDD_GROUPS_MODULESTableAdapter.Insert(groupRow.GUID, selectedModule.GUID, $"Assign Group {groupRow.NAME} to Module {selectedModule.NAME}", Environment.UserName)
Next
ReloadGroupsForModule(selectedModule.GUID)
UpdateSavedLabel()
ReloadGroupsForModule(selectedModule.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while adding group to module", ex)
End Try
End Sub
Private Sub btnModules_RemoveGroups_Click(sender As Object, e As EventArgs) Handles btnModules_RemoveGroups.Click
Dim selectedGroupHandles = viewModulesGroups_AssignedGroups.GetSelectedRows().ToList()
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
Try
Dim selectedGroupHandles = viewModulesGroups_AssignedGroups.GetSelectedRows().ToList()
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
For Each handle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewModulesGroups_AssignedGroups.GetRow(handle)
Dim groupRow As TBDD_GROUPSRow = rowView.Row
TBDD_GROUPS_MODULESTableAdapter.Delete(groupRow.GUID, selectedModule.GUID)
Next
For Each handle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewModulesGroups_AssignedGroups.GetRow(handle)
Dim groupRow As TBDD_GROUPSRow = rowView.Row
TBDD_GROUPS_MODULESTableAdapter.Delete(groupRow.GUID, selectedModule.GUID)
Next
ReloadGroupsForModule(selectedModule.GUID)
UpdateSavedLabel()
ReloadGroupsForModule(selectedModule.GUID)
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage("Error while removing group", ex)
End Try
End Sub
Private Sub TBDD_CLIENTBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_CLIENTBindingSource.AddingNew
UserDataSet.TBDD_CLIENT.ADDED_WHOColumn.DefaultValue = Environment.UserName
End Sub
#End Region
Private Sub ShowErrorMessage(errorText As String, ex As Exception)
MsgBox(errorText & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, "Process Manager")
End Sub
End Class

View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<!-- Der Name der Haupt-EXE -->
<?define ProgramName="DDUserManager"?>
<!-- Der Volle Name des Programms -->
<?define ProductName="User Manager"?>
<!-- Der Hersteller des Programms -->
<?define Manufacturer="Digital Data"?>
<!-- Kurze Beschreibung des Programms (optional) -->
<?define Description="Beschreibung des Programms"?>
<!-- Kurzer Kommentar zum Programm (optional) -->
<?define Comments="Kommentar wie Copyright-Hinweis"?>
<!--
UPGRADE CODE
Sorgt dafür, dass Programm-Updates mit dem Installer
die alte Version ersetzen. Darf sich nicht mehr ändern,
wenn einmal festgelegt.
-->
<?define UpgradeCode="0fae5d55-da4e-47e8-b584-48f454b6a6f3"?>
</Include>

View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<UI Id="CustomUI_Database">
<Dialog Id="DatabaseDlg" Title="!(loc.InstallDirDlg_Title)" Width="370" Height="270" NoMinimize="no">
<Control Id="IPLabel" Type="Text" X="75" Y="50" Width="100" Height="15" TabSkip="no" Text="&amp;Database Server IP:" />
<Control Id="IPEdit" Type="Edit" X="75" Y="70" Width="220" Height="18" Property="DBADDRESS" Text="" />
<Control Id="DBLabel" Type="Text" X="75" Y="90" Width="100" Height="15" TabSkip="no" Text="&amp;Database Name:" />
<Control Id="DBEdit" Type="Edit" X="75" Y="110" Width="220" Height="18" Property="DBNAME" Text="DD_ECM" />
<Control Id="UserLabel" Type="Text" X="75" Y="130" Width="100" Height="15" TabSkip="no" Text="&amp;Database Username:" />
<Control Id="UserEdit" Type="Edit" X="75" Y="150" Width="220" Height="18" Property="DBUSER" Password="yes" />
<Control Id="PasswordLabel" Type="Text" X="75" Y="170" Width="100" Height="15" TabSkip="no" Text="&amp;Database Password:" />
<Control Id="PasswordEdit" Type="Edit" X="75" Y="190" Width="220" Height="18" Property="DBPASSWORD" Password="yes" />
<Control Id="InstallButton" Type="PushButton" Text="Connect" Height="17" Width="56" X="130" Y="210">
<Publish Event="NewDialog" Value="ProgressDlg"></Publish>
</Control>
<Control Id="CancelButton" Type="PushButton" X="190" Y="210" Width="56" Height="17" Cancel="yes" Text="Cancel">
<Publish Event="SpawnDialog" Value="CancelDlg" >1</Publish>
</Control>
<Control Id="Description" Type="Text" X="25" Y="6" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
<Text>Click Connect to finalise product installation</Text>
</Control>
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
<Text>{\WixUI_Font_Title}Provide Database Credentials for Digital Data Modules</Text>
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
</Dialog>
</UI>
<InstallUISequence>
<Show After="ProgressDlg" Dialog="DatabaseDlg">NOT Installed</Show>
</InstallUISequence>
</Fragment>
</Wix>

View File

@ -0,0 +1,159 @@
<?include Config.wxi?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Id="*" Name="$(var.ProductName)" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package
Id="*"
Keywords="Installer"
Description="$(var.Description)"
Comments="$(var.Comments)"
Manufacturer="$(var.Manufacturer)"
InstallerVersion="100"
Languages="1031"
Compressed="yes"
SummaryCodepage="1252"
InstallScope="perMachine"
/>
<Media Id='1' Cabinet='$(var.ProgramName).cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)' />
<Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />
<MajorUpgrade
AllowDowngrades="no"
AllowSameVersionUpgrades="no"
DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
/>
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
<Upgrade Id="$(var.UpgradeCode)">
<UpgradeVersion
Minimum="1.0.0.0" Maximum="99.0.0.0"
Property="PREVIOUSVERSIONSINSTALLED"
IncludeMinimum="yes" IncludeMaximum="no" />
</Upgrade>
<!-- Legt das Icon fest -->
<Icon Id="AppIcon.exe" SourceFile="$(var.ProgramName).exe" />
<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
<Property Id="ARPPRODUCTICON" Value="AppIcon" />
<!-- Legt die Verzeichnisstruktur fest -->
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="DDDIR" Name="$(var.Manufacturer)">
<Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
</Directory>
<Directory Id="DesktopFolder" />
</Directory>
<!-- Verknüpfung für Startmenü -->
<DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut_StartMenu" Guid="b446a59e-740d-4dab-8e16-80de6fb48167">
<Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
Name="$(var.ProductName)"
Target="[INSTALLDIR]$(var.ProgramName).exe"
WorkingDirectory="INSTALLDIR"/>
<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>
<!-- Verknüpfung für Desktop -->
<DirectoryRef Id="DesktopFolder">
<Component Id="ApplicationShortcut_Desktop" Guid="d4850175-ad31-4c0f-95ab-a4248b47fda7">
<Shortcut Id="ApplicationStartMenuShortcut_Desktop"
Name="$(var.ProductName)"
Target="[INSTALLDIR]$(var.ProgramName).exe"
WorkingDirectory="INSTALLDIR"/>
<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>
<DirectoryRef Id="INSTALLDIR">
<Component Id="MainApplicationExe" Guid="6a98ced0-c55c-4584-9de1-1f1ef87f6de9">
<File Id="MainApplicationExe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="RegistryKeys" Guid="9630254f-88a9-4e51-9844-e11749882635">
<RegistryKey Root="HKLM" Key="Software">
<RegistryKey Key="[Manufacturer]">
<RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
<RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
</RegistryKey>
</RegistryKey>
</RegistryKey>
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
</Component>
<!-- Für weitere Dateien hier Component Elemente anlegen!! -->
<!--
<Component Id="FirmaXYLib" Guid="PUT-GUID-HERE">
<File Id="FirmaXYLib" Name="FirmaXYLib.dll" KeyPath="yes" Checksum="yes"/>
</Component>
-->
</DirectoryRef>
<Feature Id="MainApplication" Title="Main Application" Level="1">
<ComponentRef Id="MainApplicationExe" />
<ComponentRef Id="RegistryKeys" />
<!-- Weitere Komponenten hier hinzufügen! -->
</Feature>
<!--
Diese Features können mit einem Parameter beim Aufruf des Installers deaktiviert werden
-->
<Feature Id="DesktopShortcut" Title="Desktop Shortcut">
<Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
<ComponentRef Id="ApplicationShortcut_Desktop"/>
</Feature>
<Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
<Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
<ComponentRef Id="ApplicationShortcut_StartMenu" />
</Feature>
<!-- Legt das Standard-Installationsverzeichnis fest-->
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
<!-- Konfiguriert die Reihenfolge der Installer-Dialoge -->
<UI>
<UIRef Id="WixUI_FeatureTree"/>
<UIRef Id="WixUI_ErrorProgressText" />
<!--<UIRef Id="CustomUI_Database"/>-->
<Publish Dialog="WelcomeDlg"
Control="Next"
Event="NewDialog"
Value="InstallDirDlg"
Order="2">1</Publish>
<Publish Dialog="InstallDirDlg"
Control="Back"
Event="NewDialog"
Value="WelcomeDlg"
Order="2">1</Publish>
<Publish Dialog="InstallDirDlg"
Control="Next"
Event="NewDialog"
Value="FeaturesDlg"
Order="2">1</Publish>
<Publish Dialog="InstallDirDlg"
Control="ChangeFolder"
Event="NewDialog"
Value="BrowseDlg"
Order="2">1</Publish>
<Publish Dialog="FeaturesDlg"
Control="Back"
Event="NewDialog"
Value="InstallDirDlg"
Order="2">1</Publish>
</UI>
</Product>
</Wix>

View File

@ -0,0 +1,69 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>bce990d1-e422-4096-a4be-6e940fb25127</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>SetupWix</OutputName>
<OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
<Cultures>de-DE;en-US</Cultures>
<LinkerAdditionalOptions>
-b "$(SolutionDir)DDUserManager\bin\$(Configuration)"
</LinkerAdditionalOptions>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="DatabaseDlg.wxs" />
<Compile Include="Product.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<Content Include="Config.wxi" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
<Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
</Target>
<Target Name="BeforeBuild">
<!-- Get the programs assembly version from the .exe file -->
<GetAssemblyIdentity AssemblyFiles="..\DDUserManager\bin\$(Configuration)\DDUserManager.exe">
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
</GetAssemblyIdentity>
<!-- Store the assembly version number in ProductVersion preprocessor variable -->
<CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
<Output TaskParameter="Value" PropertyName="DefineConstants" />
</CreateProperty>
<!-- Name the .msi file after the solution platform and assembly version e.g TestService-x86-1.4.0.0.msi -->
<CreateProperty Value="$(SolutionName)-$(Platform)-%(AsmInfo.Version)">
<Output TaskParameter="Value" PropertyName="TargetName" />
</CreateProperty>
<!-- Name the .wixpdb file after the solution platform and assembly version e.g TestService-x86-1.4.0.0.msi -->
<CreateProperty Value="$(TargetName)$(TargetPdbExt)">
<Output TaskParameter="Value" PropertyName="TargetPdbName" />
</CreateProperty>
</Target>
</Project>