This commit is contained in:
2022-07-07 13:20:13 +02:00
parent 331611c9e8
commit 28254c99f7
125 changed files with 1796 additions and 1144 deletions

View File

@@ -372,6 +372,7 @@ Public Class frmConstructor_Main
SQL = String.Format("select T.* from VWPMO_STRUCTURE_NODES T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T1.CONSTRUCT_ID = {0}", CONSTRUCTORID)
Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
If DT.Rows.Count > 1 Then
LOGGER.Info($"There are [{DT.Rows.Count}] NODES.....")
TreeView_perControl = True
DT_TREEVIEW_NODES_ALL = DT
DT_TREEVIEW_NODES_DEVEXPRESS = DT_TREEVIEW_NODES_ALL.Copy()
@@ -406,7 +407,7 @@ Public Class frmConstructor_Main
DT_TREEVIEW_NODES_FIRST = ClassHelper.FILTER_DATATABLE(DT, "EXPAND_NODE = 1", "")
SQL = String.Format("select T.* from TBPMO_STRUCTURE_NODES_CONFIGURATION T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T1.CONSTRUCT_ID = {0}", CONSTRUCTORID)
DT_TREEVIEW_CONFIGURATION = ClassDatabase.Return_Datatable(SQL)
LOGGER.Debug($"DT_TREEVIEW_CONFIGURATION-Count: {DT_TREEVIEW_CONFIGURATION.Rows.Count}")
Try
TREEVIEW_IMAGELIST = New ImageList
For Each row As DataRow In DT_TREEVIEW_CONFIGURATION.Rows
@@ -445,6 +446,7 @@ Public Class frmConstructor_Main
Else
LOGGER.Info($"There are now rows for VWPMO_STRUCTURE_NODE [{SQL}]")
tsmiNodeNew.Visible = False
tsmiNodeRename.Visible = False
@@ -1412,6 +1414,7 @@ Public Class frmConstructor_Main
' newTreeview = ClassNodeNavigation.CreateTreeViewNodes(DT_TREEVIEW_NODES, TREEVIEW_IMAGELIST)
'Else
Try
LOGGER.Debug($"NODES: DT_TREEVIEW_NODES_ALL-Count: {DT_TREEVIEW_NODES_ALL.Rows.Count}")
Dim async As New ClassAsyncNodeBuild(DT_TREEVIEW_NODES_ALL, TREEVIEW_IMAGELIST)
async.bw.RunWorkerAsync()
While async.bw.IsBusy
@@ -1422,6 +1425,7 @@ Public Class frmConstructor_Main
End While
BarEditItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
bsitmLoadEntity.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
LOGGER.Debug($"NODES: StructureNodes-Count (asyn.newTreeviewc): {async.newTreeview.Nodes.Count}")
MyTreeview = async.newTreeview
Catch ex As Exception
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Async NodeBuild", ex.Message & vbNewLine & "ADDI will try an alternative method!", ex.StackTrace)
@@ -1440,9 +1444,6 @@ Public Class frmConstructor_Main
MyTreeview.EndUpdate()
End If
' Start the asynchronous operation.
'backgroundWorkerTreeView.RunWorkerAsync()
sw.Done()
Catch ex As Exception
@@ -1475,21 +1476,21 @@ Public Class frmConstructor_Main
Next
Dim sw As New SW("Devexpress TreeView")
TreeList1.DataSource = DT_TREEVIEW_NODES_DEVEXPRESS
TreeList1.KeyFieldName = "GUID"
TreeList1.ParentFieldName = "PARENT_GUID"
TreeListDevexpress.DataSource = DT_TREEVIEW_NODES_DEVEXPRESS
TreeListDevexpress.KeyFieldName = "GUID"
TreeListDevexpress.ParentFieldName = "PARENT_GUID"
Try
TreeList1.Columns.ColumnByName("colRECORD_ID").Visible = False
TreeListDevexpress.Columns.ColumnByName("colRECORD_ID").Visible = False
Catch ex As Exception
End Try
Try
TreeList1.Columns.ColumnByName("colNODE_CONFIG_ID").Visible = False
TreeListDevexpress.Columns.ColumnByName("colNODE_CONFIG_ID").Visible = False
Catch ex As Exception
End Try
Try
TreeList1.Columns.ColumnByName("colBACK_COLOR").Visible = False
TreeListDevexpress.Columns.ColumnByName("colBACK_COLOR").Visible = False
Catch ex As Exception
End Try
@@ -6224,13 +6225,24 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
If Not IsNothing(row.Item("DOC_ID")) Then
Dim Count As Integer = ClassDatabase.Execute_Scalar("SELECT COUNT(GUID) FROM TBPMO_DOC_RECORD_LINK WHERE DOC_ID = " & row.Item("DOC_ID"), True)
If Count > 1 And CURRENT_SEARCH_TYPE = "RECORD" Then
msg = "Diese Datei ist noch mit anderen Datensätzen verknüpft! Lediglich die Verknüpfung zum aktuellen Datensatz wird gelöscht!"
msg = "Diese Datei ist noch mit anderen Datensätzen verknüpft! Wollen Sie diese Verknüpfungen ebenfalls löschen?"
If USER_LANGUAGE <> "de-DE" Then
msg = "This file is also linked to other records! Only the link for this Record will be deleted!"
msg = "This file is also linked to other records! Would You like to delete these links also?"
End If
MsgBox(msg, MsgBoxStyle.Information)
If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, 0) = True Then
ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE LINK DELETED BY USER")
Dim result2 As MsgBoxResult
result2 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
Dim oDElWMFile As Boolean = False
If result2 = MsgBoxResult.Yes Then
oDElWMFile = True
End If
If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, oDElWMFile) = True Then
If oDElWMFile = True Then
ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE DELETED BY USER")
Else
ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE LINK DELETED BY USER")
End If
End If
Else
If CURRENT_SEARCH_TYPE = "FULLTEXT" Or CURRENT_SEARCH_TYPE = "ENTITY" Then
@@ -6642,8 +6654,14 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
ClassDatabase.Execute_non_Query(oEXEC, True)
End If
End If
Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle
Cursor = Cursors.Default
RUN_WDSEARCH_GRID(True)
If Not IsNothing(oRowHandle) Then
GridViewDoc_Search.FocusedRowHandle = oRowHandle
End If
ContextMenuStripResultFiles.Close()
End If
Catch ex As Exception
@@ -6667,7 +6685,13 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
If CMDoc_TextBoxRenameDisplay.Text <> "" Then
If ClassFileResult.Set_Displayname(CMDoc_TextBoxRenameDisplay.Text) Then
Cursor = Cursors.WaitCursor
Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle
Cursor = Cursors.Default
RUN_WDSEARCH_GRID(True)
If Not IsNothing(oRowHandle) Then
GridViewDoc_Search.FocusedRowHandle = oRowHandle
End If
ContextMenuStripResultFiles.Close()
End If
End If
@@ -7083,15 +7107,15 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
End Sub
Private Sub TreeList1_GetStateImage(sender As Object, e As DevExpress.XtraTreeList.GetStateImageEventArgs) Handles TreeList1.GetStateImage
Dim Column_Config_ID As DevExpress.XtraTreeList.Columns.TreeListColumn = TreeList1.Columns("NODE_CONFIG_ID")
Private Sub TreeList1_GetStateImage(sender As Object, e As DevExpress.XtraTreeList.GetStateImageEventArgs) Handles TreeListDevexpress.GetStateImage
Dim Column_Config_ID As DevExpress.XtraTreeList.Columns.TreeListColumn = TreeListDevexpress.Columns("NODE_CONFIG_ID")
Dim configid = e.Node.GetDisplayText(Column_Config_ID)
e.Node.StateImageIndex = ImageCollection1.Images.Keys.IndexOf(configid)
End Sub
Private Sub TreeList1_ColumnFilterChanged(sender As Object, e As EventArgs) Handles TreeList1.ColumnFilterChanged
Private Sub TreeList1_ColumnFilterChanged(sender As Object, e As EventArgs) Handles TreeListDevexpress.ColumnFilterChanged
Dim tree As TreeList = TryCast(sender, TreeList)
Dim filteredColumns As List(Of TreeListColumn) = tree.Columns.Cast(Of TreeListColumn)().Where(Function(c) c.FilterInfo.AutoFilterRowValue IsNot Nothing).ToList()
If filteredColumns.Count = 0 Then