diff --git a/DDUserManager/DDUserManager.sln b/DDUserManager/DDUserManager.sln index a3e112f..d83702f 100644 --- a/DDUserManager/DDUserManager.sln +++ b/DDUserManager/DDUserManager.sln @@ -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 diff --git a/DDUserManager/DDUserManager/ClassDragDrop.vb b/DDUserManager/DDUserManager/ClassDragDrop.vb index c9eff17..1861cc1 100644 --- a/DDUserManager/DDUserManager/ClassDragDrop.vb +++ b/DDUserManager/DDUserManager/ClassDragDrop.vb @@ -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 diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj b/DDUserManager/DDUserManager/DDUserManager.vbproj index 4a9199a..a5785b2 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj @@ -210,5 +210,8 @@ + + + \ No newline at end of file diff --git a/DDUserManager/DDUserManager/My Project/Resources.Designer.vb b/DDUserManager/DDUserManager/My Project/Resources.Designer.vb index 33848cc..6a57924 100644 --- a/DDUserManager/DDUserManager/My Project/Resources.Designer.vb +++ b/DDUserManager/DDUserManager/My Project/Resources.Designer.vb @@ -70,6 +70,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/DDUserManager/DDUserManager/My Project/Resources.resx b/DDUserManager/DDUserManager/My Project/Resources.resx index 75254aa..1b1e87d 100644 --- a/DDUserManager/DDUserManager/My Project/Resources.resx +++ b/DDUserManager/DDUserManager/My Project/Resources.resx @@ -118,14 +118,23 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\user_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\plugin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\book.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_left_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\group_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -133,25 +142,19 @@ ..\Resources\user_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\group.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\book.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_left_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\plugin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/DDUserManager/DDUserManager/Resources/arrow_refresh.png b/DDUserManager/DDUserManager/Resources/arrow_refresh.png new file mode 100644 index 0000000..0de2656 Binary files /dev/null and b/DDUserManager/DDUserManager/Resources/arrow_refresh.png differ diff --git a/DDUserManager/DDUserManager/UserDataSet.Designer.vb b/DDUserManager/DDUserManager/UserDataSet.Designer.vb index 45c85b8..f93eb8e 100644 --- a/DDUserManager/DDUserManager/UserDataSet.Designer.vb +++ b/DDUserManager/DDUserManager/UserDataSet.Designer.vb @@ -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 _ - 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 - - _ - 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 ''' diff --git a/DDUserManager/DDUserManager/UserDataSet.xsd b/DDUserManager/DDUserManager/UserDataSet.xsd index cb2d66f..38ef0c5 100644 --- a/DDUserManager/DDUserManager/UserDataSet.xsd +++ b/DDUserManager/DDUserManager/UserDataSet.xsd @@ -554,20 +554,16 @@ SELECT GUID, USER_ID, MODULE_ID, IS_ADMIN, COMMENT, ADDED_WHO, ADDED_WHEN FROM T - - 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); + + 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()) - - - - - - - - - - + + + + @@ -579,37 +575,18 @@ FROM TBDD_CLIENT - - 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))); + + 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) - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -1405,21 +1382,21 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + - + - + diff --git a/DDUserManager/DDUserManager/UserDataSet.xss b/DDUserManager/DDUserManager/UserDataSet.xss index 5b0eb46..8ee7b56 100644 --- a/DDUserManager/DDUserManager/UserDataSet.xss +++ b/DDUserManager/DDUserManager/UserDataSet.xss @@ -4,162 +4,166 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - + + + + + + + + + + + - 889 - 282 + 1113 + 0 - 1327 - 282 + 1429 + 0 - 1327 - 441 + 1429 + 391 - 706 - 441 + 1104 + 391 - 1463 - 317 + 1446 + 163 - 1463 - 361 - - - 1103 - 361 + 1420 + 163 - 205 - 723 + 495 + -113 - 205 - 665 + 495 + 59 + + + 340 + 59 - 328 - 433 + 761 + 383 - 412 - 433 + 810 + 383 - 328 - 391 + 761 + 117 - 825 - 391 + 1142 + 117 - 48 - 435 + 461 + 137 - 48 - 491 - - - 56 - 491 + 340 + 137 - + - 835 - 358 + 1096 + -19 - 835 - 608 + 1096 + -74 + + + 1142 + -74 - + - 1471 - 317 + 1446 + -9 - 1471 - 633 + 1421 + -9 - 1079 - 633 + 1421 + -57 - + - 302 - 723 + 702 + -207 - 302 - 353 - - - 1573 - 353 + 783 + -207 - + - 889 - 358 + 1104 + -19 - 1573 - 358 + 1104 + -310 + + + 1054 + -310 + + + 1054 + -302 diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index 0d2471a..bbb87cc 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -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 diff --git a/DDUserManager/DDUserManager/frmMain.resx b/DDUserManager/DDUserManager/frmMain.resx index 7d1a810..26598c8 100644 --- a/DDUserManager/DDUserManager/frmMain.resx +++ b/DDUserManager/DDUserManager/frmMain.resx @@ -225,6 +225,9 @@ 136, 17 + + 17, 17 + 1295, 56 @@ -234,12 +237,6 @@ 439, 56 - - 136, 17 - - - 17, 17 - 693, 17 @@ -315,44 +312,6 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - - 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= - - - - 843, 56 - - - 1073, 56 - - - 17, 95 - - - 17, 17 - - - 1295, 56 - - - 17, 56 - - - 439, 56 - 843, 56 @@ -606,7 +565,7 @@ 1406, 95 - 106 + 198 diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 0620604..85ebfdf 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -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 \ No newline at end of file diff --git a/DDUserManager/SetupWix/Config.wxi b/DDUserManager/SetupWix/Config.wxi new file mode 100644 index 0000000..1c3bed2 --- /dev/null +++ b/DDUserManager/SetupWix/Config.wxi @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DDUserManager/SetupWix/DatabaseDlg.wxs b/DDUserManager/SetupWix/DatabaseDlg.wxs new file mode 100644 index 0000000..7e5a768 --- /dev/null +++ b/DDUserManager/SetupWix/DatabaseDlg.wxs @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + 1 + + + + Click Connect to finalise product installation + + + + {\WixUI_Font_Title}Provide Database Credentials for Digital Data Modules + + + + + + + + + + + NOT Installed + + + + \ No newline at end of file diff --git a/DDUserManager/SetupWix/Product.wxs b/DDUserManager/SetupWix/Product.wxs new file mode 100644 index 0000000..0a17468 --- /dev/null +++ b/DDUserManager/SetupWix/Product.wxs @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DISABLE_DESKTOP_ICON + + + + + DISABLE_STARTMENU_ICON + + + + + + + + + + + + + 1 + 1 + 1 + 1 + 1 + + + diff --git a/DDUserManager/SetupWix/SetupWix.wixproj b/DDUserManager/SetupWix/SetupWix.wixproj new file mode 100644 index 0000000..df17ed4 --- /dev/null +++ b/DDUserManager/SetupWix/SetupWix.wixproj @@ -0,0 +1,69 @@ + + + Debug + x86 + 3.10 + bce990d1-e422-4096-a4be-6e940fb25127 + 2.0 + SetupWix + Package + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + de-DE;en-US + + -b "$(SolutionDir)DDUserManager\bin\$(Configuration)" + + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + + $(WixExtDir)\WixUtilExtension.dll + WixUtilExtension + + + $(WixExtDir)\WixUIExtension.dll + WixUIExtension + + + $(WixExtDir)\WixUIExtension.dll + WixUIExtension + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file