This commit is contained in:
SchreiberM 2022-06-09 14:25:36 +02:00
parent 0eda292efa
commit 8af73bd7d7
3 changed files with 24 additions and 21 deletions

View File

@ -22,7 +22,6 @@ Partial Class frmTreeViewNavi
'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmTreeViewNavi)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmTreeViewNavi))
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
@ -123,7 +122,7 @@ Partial Class frmTreeViewNavi
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2)
Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
Me.RibbonPageGroup3.Text = "Relation" Me.RibbonPageGroup3.Text = "Relationen anpassen"
' '
'RibbonStatusBar1 'RibbonStatusBar1
' '
@ -240,7 +239,7 @@ Partial Class frmTreeViewNavi
'XtraTabPage2 'XtraTabPage2
' '
Me.XtraTabPage2.Name = "XtraTabPage2" Me.XtraTabPage2.Name = "XtraTabPage2"
Me.XtraTabPage2.Size = New System.Drawing.Size(209, 717) Me.XtraTabPage2.Size = New System.Drawing.Size(209, 409)
Me.XtraTabPage2.Text = "Freie Gruppen" Me.XtraTabPage2.Text = "Freie Gruppen"
' '
'ImageCollection1 'ImageCollection1

View File

@ -232,19 +232,18 @@
a2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAAChEZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0 a2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAAChEZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0
cmVhbWVyAgAAAAlJbWFnZVNpemUERGF0YQQHE1N5c3RlbS5EcmF3aW5nLlNpemUDAAAAAgIAAAAF/P// cmVhbWVyAgAAAAlJbWFnZVNpemUERGF0YQQHE1N5c3RlbS5EcmF3aW5nLlNpemUDAAAAAgIAAAAF/P//
/xNTeXN0ZW0uRHJhd2luZy5TaXplAgAAAAV3aWR0aAZoZWlnaHQAAAgIAwAAABAAAAAQAAAACQUAAAAP /xNTeXN0ZW0uRHJhd2luZy5TaXplAgAAAAV3aWR0aAZoZWlnaHQAAAgIAwAAABAAAAAQAAAACQUAAAAP
BQAAAMgCAAACogEAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAAFzUkdCAK7OHOkA BQAAAK4CAAAClQEAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAARnQU1BAACxjwv8
AAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAABN0lEQVQ4T8VRsUoEMRBNYamF/oZY YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPxVGxSgQxEE1hqYX+hlgoiKVoIcIlKyKC1vob
KIilaCHCJSsigtb6G7I3uYPDjxAUG+0sziRbHeg/iIWljXYWgscV+mZvspd1TyvBB28z8+bNJMyqP0VG sje5g8OPEBQb7SzOJFsd6D+IhaWNdhaCxxX6Zm+yl3VPK8EHbzPz5s0kzKo/RUZhQ1v/Yii8mk6xKXIJ
YUNb/2IovJpOsSlyCWO9A0eGfCFSE8aGz5QiK03hMtWRX0upjtSEmy5EVlt5WMDLzpMBT1KaQFNhkgHv Y70DR4Z8IVITxobPlCIrTeEy1ZFfS6mO1ISbLkRWW3lYwMvOkwFPUppAU2GSAe947kmS88AuzreYS1sd
eO5JkvPALs63mEtbHbGobejHOGWlt92RtNRhOmGbDRkVa2ljpCa3iiFDsTexY2+XJGwslCkltZ4PZiQc saht6Mc4ZaW33ZG01GE6YZsNGRVraWOkJreKIUOxN7Fjb5ckbCyUKSW1ng9mJBxDkz+LJizrGEvaQ3wX
Q5M/iyYs6xhL2kN8F7WSFO6xl0Wcz2PNj1q9/jz/36uaUciDf8srHZ9qs5F4wWNm3QE3Zac3c3wyWP/u tZIU7rGXRZzPY82PWr3+PP/fq5pRyIN/yysdn2qzkXjBY2bdATdlpzdzfDJY/+6V0gT7+WAWv+yBiy1y
ldIE+/lgFr/sgYstcrusmbY/LBugc700TgNuXU6n/0Sd+xVpqQML+pjW0CB80vLvUOoLDptCNie9mP0A u6yZtj8sG6BzvTROA25dTqf/RJ37FWmpAwv6mNbQIHzS8u9Q6gsOm0I2J72Y/QAAAABJRU5ErkJgghEB
AAAASUVORK5CYIIeAQAAiVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c AACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMA
6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACzSURBVDhPY6AZ8GncPs23acd/ AA7DAAAOwwHHb6hkAAAAs0lEQVQ4T2OgGfBp3D7Nt2nHf2QMlSIOoGsGYZ+mHRug0oQBVgMat3+ASuMH
ZAyVIg6gawZhn6YdG6DShAFWAxq3f4BK4we+zTudsBkAwlAl+AHQpg5smkEYqoQwwKbZp3FHBVSaMAAq vs07nbAZAMJQJfgB0KYObJpBGKqEMMCm2adxRwVUmjAAKt6NbgBUinjg07T9PUyzT+NOT6gwcSB01Spm
3o1uAFSKeODTtP09TLNP405PqDBxIHTVKmYokzTgX79dARjfV0G2hvSu5IQKA8Nk+xmoa5qhQpgAGPr3 KJM04F+/XQEY31dBtob0ruSECgPDZPsZqGuaoUKYABj692BOhmFgWPxBFwNhr6ZdmlBtEAC0oRubQnwY
YE6GYWBY/EEXA2Gvpl2aUG0QALShG5tCfBiqFQKwKSCEoVoHFDAwAACFQt+QLzhmJAAAAABJRU5ErkJg qhUCsCkghKFaBxQwMAAAhULfkC84ZiQAAAAASUVORK5CYIIL
ggs=
</value> </value>
</data> </data>
</root> </root>

View File

@ -6,7 +6,7 @@ Imports DigitalData.GUIs.ZooFlow.ClassConstants
Public Class frmTreeViewNavi Public Class frmTreeViewNavi
Dim RightAddActive As Boolean = False Dim RightAddActive As Boolean = False
Dim FormShown As Boolean = False Dim FormShown As Boolean = False
Dim oSelectedNodeID As Integer = 0 Dim SelectedNodeID As Integer = 0
Private Sub frmTreeViewNavi_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmTreeViewNavi_Load(sender As Object, e As EventArgs) Handles Me.Load
Try Try
Dim oSQL = "select SN_ID ChildID,SN_PARENT_ID ParentID,TERM_VALUE as CAPTION from VWIDB_STRUCTURE_NODES_STRUCTURE" Dim oSQL = "select SN_ID ChildID,SN_PARENT_ID ParentID,TERM_VALUE as CAPTION from VWIDB_STRUCTURE_NODES_STRUCTURE"
@ -42,7 +42,7 @@ Public Class frmTreeViewNavi
KeyValue = TreeList2.FocusedNode(TreeList2.KeyFieldName) KeyValue = TreeList2.FocusedNode(TreeList2.KeyFieldName)
Console.WriteLine($"keyfield: {KeyValue.ToString}") Console.WriteLine($"keyfield: {KeyValue.ToString}")
If IsNumeric(KeyValue) And RightAddActive Then If IsNumeric(KeyValue) And RightAddActive Then
oSelectedNodeID = KeyValue SelectedNodeID = KeyValue
Refresh_Relations() Refresh_Relations()
If XtraTabControlRelationScope.SelectedTabPageIndex = 0 Then If XtraTabControlRelationScope.SelectedTabPageIndex = 0 Then
Refresh_FreeUsers() Refresh_FreeUsers()
@ -65,7 +65,7 @@ Public Class frmTreeViewNavi
Private Sub Refresh_FreeUsers() Private Sub Refresh_FreeUsers()
Try Try
Dim oSQL = $"SELECT GUID as USR_ID, EMAIL FROM DD_ECM.dbo.TBDD_USER USR WHERE GUID NOT IN ( Dim oSQL = $"SELECT GUID as USR_ID, EMAIL FROM DD_ECM.dbo.TBDD_USER USR WHERE GUID NOT IN (
SELECT ScopeID FROM VWIDB_SN_RELATIONS WHERE SN_ID = {oSelectedNodeID}) AND USR.ACTIVE = 1 AND LEN(EMAIL) > 0" SELECT ScopeID FROM VWIDB_SN_RELATIONS WHERE SN_ID = {SelectedNodeID}) AND USR.ACTIVE = 1 AND LEN(EMAIL) > 0"
Dim oDT As DataTable = My.DatabaseIDB.GetDatatable(oSQL) Dim oDT As DataTable = My.DatabaseIDB.GetDatatable(oSQL)
If Not IsNothing(oDT) Then If Not IsNothing(oDT) Then
GridViewFreeUser.Columns.Clear() GridViewFreeUser.Columns.Clear()
@ -78,7 +78,7 @@ Public Class frmTreeViewNavi
End Sub End Sub
Private Sub Refresh_Relations() Private Sub Refresh_Relations()
Try Try
Dim oSQL = $"SELECT * FROM VWIDB_SN_RELATIONS WHERE SN_ID = {oSelectedNodeID}" Dim oSQL = $"SELECT * FROM VWIDB_SN_RELATIONS WHERE SN_ID = {SelectedNodeID}"
Dim oDT As DataTable = My.DatabaseIDB.GetDatatable(oSQL) Dim oDT As DataTable = My.DatabaseIDB.GetDatatable(oSQL)
If Not IsNothing(oDT) Then If Not IsNothing(oDT) Then
GridViewRelations.Columns.Clear() GridViewRelations.Columns.Clear()
@ -135,7 +135,12 @@ Public Class frmTreeViewNavi
Dim oInsert = $"INSERT INTO [dbo].[TBIDB_STRUCTURE_NODES_RELATIONS] Dim oInsert = $"INSERT INTO [dbo].[TBIDB_STRUCTURE_NODES_RELATIONS]
([SN_ID] ([SN_ID]
,[USR_ID] ,[USR_ID]
,[ADDED_WHO]) VALUES ({BarButtonItem2.Tag},,,{My.Application.User.UserName})" ,[ADDED_WHO]) VALUES ({SelectedNodeID}, {BarButtonItem2.Tag},'{My.Application.User.UserName}')"
If My.DatabaseIDB.ExecuteNonQuery(oInsert) = True Then
Refresh_Relations()
Refresh_FreeUsers()
End If
End If End If
End Sub End Sub