jj: fix TBDD_GROUPS
This commit is contained in:
Jonathan Jenne
parent
a52fa63476
commit
767ce88170
@ -70,7 +70,7 @@ Public Class ClassDragDrop
|
||||
Private Sub grid_DragOver(sender As Object, e As DragEventArgs)
|
||||
Dim multipleDropped As Boolean = e.Data.GetDataPresent(GetType(GridView))
|
||||
Dim singleUserDropped As Boolean = e.Data.GetDataPresent(GetType(TBDD_USERRow))
|
||||
Dim singleGroupDropped As Boolean = e.Data.GetDataPresent(GetType(TBDD_GROUPSRow))
|
||||
Dim singleGroupDropped As Boolean = e.Data.GetDataPresent(GetType(DS_ChangeS.TBDD_GROUPSRow))
|
||||
|
||||
If multipleDropped Or singleUserDropped Or singleGroupDropped Then
|
||||
e.Effect = DragDropEffects.Move
|
||||
|
||||
34
DDUserManager/DDUserManager/frmMain.Designer.vb
generated
34
DDUserManager/DDUserManager/frmMain.Designer.vb
generated
@ -192,6 +192,8 @@ Partial Class frmMain
|
||||
Me.tabPageGroups = New DevExpress.XtraTab.XtraTabPage()
|
||||
Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
|
||||
Me.gridGroups = New DevExpress.XtraGrid.GridControl()
|
||||
Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.DS_ChangeS = New DDUserManager.DS_ChangeS()
|
||||
Me.viewGroups = New DevExpress.XtraGrid.Views.Grid.GridView()
|
||||
Me.colNAME5 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
Me.colCOMMENT1 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
@ -205,8 +207,6 @@ Partial Class frmMain
|
||||
Me.ACTIVECheckBox = New System.Windows.Forms.CheckBox()
|
||||
Me.AD_SYNCCheckBox = New System.Windows.Forms.CheckBox()
|
||||
Me.GUIDTextBox1 = New System.Windows.Forms.TextBox()
|
||||
Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.DS_ChangeS = New DDUserManager.DS_ChangeS()
|
||||
Me.NAMETextBox1 = New System.Windows.Forms.TextBox()
|
||||
Me.COMMENTTextBox1 = New System.Windows.Forms.TextBox()
|
||||
Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl()
|
||||
@ -443,11 +443,11 @@ Partial Class frmMain
|
||||
Me.SplitContainer3.Panel2.SuspendLayout()
|
||||
Me.SplitContainer3.SuspendLayout()
|
||||
CType(Me.gridGroups, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.TBDD_GROUPSBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.viewGroups, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.GroupBox4.SuspendLayout()
|
||||
Me.GroupBox2.SuspendLayout()
|
||||
CType(Me.TBDD_GROUPSBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.XtraTabControl3.SuspendLayout()
|
||||
Me.XtraTabPage1.SuspendLayout()
|
||||
@ -1377,7 +1377,7 @@ Partial Class frmMain
|
||||
'
|
||||
'gridGroups_AllGroups
|
||||
'
|
||||
Me.gridGroups_AllGroups.DataSource = Me.TBDD_GROUPSBindingSource
|
||||
Me.gridGroups_AllGroups.DataSource = Me.TBDD_GROUPSBindingSource1
|
||||
Me.gridGroups_AllGroups.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.gridGroups_AllGroups.Location = New System.Drawing.Point(0, 30)
|
||||
Me.gridGroups_AllGroups.MainView = Me.viewGroups_AllGroups
|
||||
@ -2160,6 +2160,16 @@ Partial Class frmMain
|
||||
Me.gridGroups.TabIndex = 17
|
||||
Me.gridGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups})
|
||||
'
|
||||
'TBDD_GROUPSBindingSource1
|
||||
'
|
||||
Me.TBDD_GROUPSBindingSource1.DataMember = "TBDD_GROUPS"
|
||||
Me.TBDD_GROUPSBindingSource1.DataSource = Me.DS_ChangeS
|
||||
'
|
||||
'DS_ChangeS
|
||||
'
|
||||
Me.DS_ChangeS.DataSetName = "DS_ChangeS"
|
||||
Me.DS_ChangeS.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
|
||||
'
|
||||
'viewGroups
|
||||
'
|
||||
Me.viewGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME5, Me.colCOMMENT1})
|
||||
@ -2295,16 +2305,6 @@ Partial Class frmMain
|
||||
Me.GUIDTextBox1.Size = New System.Drawing.Size(200, 21)
|
||||
Me.GUIDTextBox1.TabIndex = 2
|
||||
'
|
||||
'TBDD_GROUPSBindingSource1
|
||||
'
|
||||
Me.TBDD_GROUPSBindingSource1.DataMember = "TBDD_GROUPS"
|
||||
Me.TBDD_GROUPSBindingSource1.DataSource = Me.DS_ChangeS
|
||||
'
|
||||
'DS_ChangeS
|
||||
'
|
||||
Me.DS_ChangeS.DataSetName = "DS_ChangeS"
|
||||
Me.DS_ChangeS.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
|
||||
'
|
||||
'NAMETextBox1
|
||||
'
|
||||
Me.NAMETextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_GROUPSBindingSource1, "NAME", True))
|
||||
@ -3595,13 +3595,13 @@ Partial Class frmMain
|
||||
CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.SplitContainer3.ResumeLayout(False)
|
||||
CType(Me.gridGroups, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.TBDD_GROUPSBindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.viewGroups, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.GroupBox4.ResumeLayout(False)
|
||||
Me.GroupBox4.PerformLayout()
|
||||
Me.GroupBox2.ResumeLayout(False)
|
||||
Me.GroupBox2.PerformLayout()
|
||||
CType(Me.TBDD_GROUPSBindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.XtraTabControl3.ResumeLayout(False)
|
||||
Me.XtraTabPage1.ResumeLayout(False)
|
||||
|
||||
@ -228,6 +228,12 @@
|
||||
<metadata name="TBDD_CLIENTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>911, 56</value>
|
||||
</metadata>
|
||||
<metadata name="TBDD_GROUPSBindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1026, 134</value>
|
||||
</metadata>
|
||||
<metadata name="DS_ChangeS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>906, 134</value>
|
||||
</metadata>
|
||||
<metadata name="TBDD_USERBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>693, 17</value>
|
||||
</metadata>
|
||||
@ -303,12 +309,6 @@
|
||||
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="TBDD_GROUPSBindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1026, 134</value>
|
||||
</metadata>
|
||||
<metadata name="DS_ChangeS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>906, 134</value>
|
||||
</metadata>
|
||||
<metadata name="TBDD_GROUPSBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 95</value>
|
||||
</metadata>
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
Imports DevExpress.XtraGrid
|
||||
Imports DevExpress.XtraGrid.Views.Grid
|
||||
Imports DDUserManager.UserDataSet
|
||||
Imports DDUserManager.DS_ChangeS
|
||||
Imports DD_LIB_Standards
|
||||
|
||||
''' <summary>
|
||||
@ -117,7 +118,7 @@ Public Class frmMain
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim group As TBDD_GROUPSRow = GetSelectedGroup()
|
||||
Dim group As DS_ChangeS.TBDD_GROUPSRow = GetSelectedGroup()
|
||||
|
||||
labelGroups_AssignedUsers.Text = String.Format("Benutzer in Gruppe {0}:", group.NAME)
|
||||
|
||||
@ -219,10 +220,10 @@ Public Class frmMain
|
||||
End Try
|
||||
End Function
|
||||
|
||||
Private Function GetGroupsForUser(username As String) As TBDD_GROUPSDataTable
|
||||
Private Function GetGroupsForUser(username As String) As DS_ChangeS.TBDD_GROUPSDataTable
|
||||
Try
|
||||
Dim dt As New TBDD_GROUPSDataTable()
|
||||
'TBDD_GROUPSTableAdapter.FillByUsername(dt, username)
|
||||
Dim dt As New DS_ChangeS.TBDD_GROUPSDataTable()
|
||||
TBDD_GROUPSTableAdapter.FillByUsername(dt, username)
|
||||
|
||||
Return dt
|
||||
Catch ex As Exception
|
||||
@ -480,7 +481,7 @@ Public Class frmMain
|
||||
[Module] = 4
|
||||
End Enum
|
||||
|
||||
Private Function GetSelectedGroup(Optional type As ItemType = ItemType.User) As TBDD_GROUPSRow
|
||||
Private Function GetSelectedGroup(Optional type As ItemType = ItemType.User) As DS_ChangeS.TBDD_GROUPSRow
|
||||
Dim grid As GridView
|
||||
|
||||
Select Case type
|
||||
@ -492,7 +493,7 @@ Public Class frmMain
|
||||
|
||||
Dim groupRowIndex = grid.GetSelectedRows().First()
|
||||
Dim selectedGroupView As DataRowView = grid.GetRow(groupRowIndex)
|
||||
Dim selectedGroup As TBDD_GROUPSRow = selectedGroupView.Row
|
||||
Dim selectedGroup As DS_ChangeS.TBDD_GROUPSRow = selectedGroupView.Row
|
||||
|
||||
Return selectedGroup
|
||||
End Function
|
||||
@ -564,8 +565,8 @@ Public Class frmMain
|
||||
modifiedRows.Add(row)
|
||||
End If
|
||||
|
||||
ElseIf data.GetDataPresent(GetType(TBDD_GROUPSRow)) Then
|
||||
Dim row As TBDD_GROUPSRow = data.GetData(GetType(TBDD_GROUPSRow))
|
||||
ElseIf data.GetDataPresent(GetType(DS_ChangeS.TBDD_GROUPSRow)) Then
|
||||
Dim row As DS_ChangeS.TBDD_GROUPSRow = data.GetData(GetType(DS_ChangeS.TBDD_GROUPSRow))
|
||||
|
||||
If Not table.Rows.Contains(row.GUID) Then
|
||||
modifiedRows.Add(row)
|
||||
@ -580,7 +581,7 @@ Public Class frmMain
|
||||
Try
|
||||
Dim grid As GridControl = sender
|
||||
Dim userRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
|
||||
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
|
||||
Dim selectedGroup As DS_ChangeS.TBDD_GROUPSRow = GetSelectedGroup()
|
||||
|
||||
' Zeilen in Oberfläche und in Datenbank einfügen
|
||||
For Each userRow As TBDD_USERRow In userRowsToBeDeleted
|
||||
@ -600,7 +601,7 @@ Public Class frmMain
|
||||
Try
|
||||
Dim grid As GridControl = sender
|
||||
Dim userRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
|
||||
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
|
||||
Dim selectedGroup As DS_ChangeS.TBDD_GROUPSRow = GetSelectedGroup()
|
||||
|
||||
' Zeilen in Oberfläche und in Datenbank einfügen
|
||||
For Each userRow As TBDD_USERRow In userRowsToBeInserted
|
||||
@ -620,7 +621,7 @@ Public Class frmMain
|
||||
Private Sub btnGroups_AddUsers_Click(sender As Object, e As EventArgs) Handles btnGroups_AddUsers.Click
|
||||
Try
|
||||
Dim selectedUserHandles = viewGroups_AvailableUsers.GetSelectedRows().ToList()
|
||||
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
|
||||
Dim selectedGroup As DS_ChangeS.TBDD_GROUPSRow = GetSelectedGroup()
|
||||
|
||||
For Each handle As Integer In selectedUserHandles
|
||||
Dim rowView As DataRowView = viewGroups_AvailableUsers.GetRow(handle)
|
||||
@ -640,7 +641,7 @@ Public Class frmMain
|
||||
Private Sub btnGroups_RemoveUsers_Click(sender As Object, e As EventArgs) Handles btnGroups_RemoveUsers.Click
|
||||
Try
|
||||
Dim selectedUserHandles = viewGroups_AssignedUsers.GetSelectedRows().ToList()
|
||||
Dim selectedGroup As TBDD_GROUPSRow = GetSelectedGroup()
|
||||
Dim selectedGroup As DS_ChangeS.TBDD_GROUPSRow = GetSelectedGroup()
|
||||
|
||||
For Each handle As Integer In selectedUserHandles
|
||||
Dim rowView As DataRowView = viewGroups_AssignedUsers.GetRow(handle)
|
||||
@ -744,7 +745,7 @@ Public Class frmMain
|
||||
|
||||
For Each handle As Integer In selectedGroupHandles
|
||||
Dim rowView As DataRowView = viewClientsGroups_AvailableGroups.GetRow(handle)
|
||||
Dim groupRow As TBDD_GROUPSRow = rowView.Row
|
||||
Dim groupRow As DS_ChangeS.TBDD_GROUPSRow = rowView.Row
|
||||
TBDD_GROUPS_CLIENTTableAdapter.Insert(selectedClient.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
|
||||
Next
|
||||
|
||||
@ -762,7 +763,7 @@ Public Class frmMain
|
||||
|
||||
For Each handle As Integer In selectedGroupHandles
|
||||
Dim rowView As DataRowView = viewClientsGroups_AssignedGroups.GetRow(handle)
|
||||
Dim groupRow As TBDD_GROUPSRow = rowView.Row
|
||||
Dim groupRow As DS_ChangeS.TBDD_GROUPSRow = rowView.Row
|
||||
|
||||
TBDD_GROUPS_CLIENTTableAdapter.Delete(selectedClient.GUID, groupRow.GUID)
|
||||
Next
|
||||
@ -872,7 +873,7 @@ Public Class frmMain
|
||||
Dim groupRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
|
||||
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
|
||||
|
||||
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeInserted
|
||||
For Each groupRow As DS_ChangeS.TBDD_GROUPSRow In groupRowsToBeInserted
|
||||
TBDD_GROUPS_CLIENTTableAdapter.Insert(selectedClient.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Client {selectedClient.CLIENT_NAME}", Environment.UserName)
|
||||
Next
|
||||
|
||||
@ -889,7 +890,7 @@ Public Class frmMain
|
||||
Dim groupRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
|
||||
Dim selectedClient As TBDD_CLIENTRow = GetSelectedClient()
|
||||
|
||||
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeDeleted
|
||||
For Each groupRow As DS_ChangeS.TBDD_GROUPSRow In groupRowsToBeDeleted
|
||||
TBDD_GROUPS_CLIENTTableAdapter.Delete(selectedClient.GUID, groupRow.GUID)
|
||||
Next
|
||||
|
||||
@ -906,7 +907,7 @@ Public Class frmMain
|
||||
Dim groupRowsToBeDeleted = GetModifiedRowsFromDragDropData(grid, e.Data)
|
||||
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
|
||||
|
||||
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeDeleted
|
||||
For Each groupRow As DS_ChangeS.TBDD_GROUPSRow In groupRowsToBeDeleted
|
||||
TBDD_GROUPS_MODULESTableAdapter.Delete(selectedModule.GUID, groupRow.GUID)
|
||||
Next
|
||||
|
||||
@ -923,7 +924,7 @@ Public Class frmMain
|
||||
Dim groupRowsToBeInserted = GetModifiedRowsFromDragDropData(grid, e.Data)
|
||||
Dim selectedModule As TBDD_MODULESRow = GetSelectedModule(ItemType.Group)
|
||||
|
||||
For Each groupRow As TBDD_GROUPSRow In groupRowsToBeInserted
|
||||
For Each groupRow As DS_ChangeS.TBDD_GROUPSRow In groupRowsToBeInserted
|
||||
TBDD_GROUPS_MODULESTableAdapter.Insert(selectedModule.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Module {selectedModule.NAME}", Environment.UserName)
|
||||
Next
|
||||
|
||||
@ -941,7 +942,7 @@ Public Class frmMain
|
||||
|
||||
For Each handle As Integer In selectedGroupHandles
|
||||
Dim rowView As DataRowView = viewModulesGroups_AvailableGroups.GetRow(handle)
|
||||
Dim groupRow As TBDD_GROUPSRow = rowView.Row
|
||||
Dim groupRow As DS_ChangeS.TBDD_GROUPSRow = rowView.Row
|
||||
TBDD_GROUPS_MODULESTableAdapter.Insert(selectedModule.GUID, groupRow.GUID, $"Assign Group {groupRow.NAME} to Module {selectedModule.NAME}", Environment.UserName)
|
||||
Next
|
||||
|
||||
@ -959,7 +960,7 @@ Public Class frmMain
|
||||
|
||||
For Each handle As Integer In selectedGroupHandles
|
||||
Dim rowView As DataRowView = viewModulesGroups_AssignedGroups.GetRow(handle)
|
||||
Dim groupRow As TBDD_GROUPSRow = rowView.Row
|
||||
Dim groupRow As DS_ChangeS.TBDD_GROUPSRow = rowView.Row
|
||||
TBDD_GROUPS_MODULESTableAdapter.Delete(selectedModule.GUID, groupRow.GUID)
|
||||
Next
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user