This commit is contained in:
SchreiberM
2017-02-15 09:07:26 +01:00
parent a815c8ab5d
commit 81c3ebe35e
25 changed files with 7215 additions and 7503 deletions

View File

@@ -2354,8 +2354,6 @@ Public Class frmConstructor_Main
If WD_ShowEnitityDocs = True Then
Clear_Windream_ResultList()
GridControlDocSearch.Visible = True
'RUN_WD_SEARCH("", "ENTITY")
' RUN_WDSEARCH_GRID("ENTITY")
End If
End If
End If
@@ -2493,9 +2491,6 @@ Public Class frmConstructor_Main
'ToolStripDokumente.Dock = DockStyle.None
pnlDocToolStrip.Controls.Add(ToolStripDokumente)
pnlDocFill.Controls.Add(GridControlDocSearch)
'ToolStripDokumente.Dock = DockStyle.Top
'GridControlDocSearch.Dock = DockStyle.None
'GridControlDocSearch.Dock = DockStyle.Top
TabWindream.PageVisible = False
@@ -2506,9 +2501,7 @@ Public Class frmConstructor_Main
'ToolStripDokumente.Dock = DockStyle.None
TabWindream.Controls.Add(ToolStripDokumente)
'ToolStripDokumente.Dock = DockStyle.Top
'GridControlDocSearch.Dock = DockStyle.None
TabWindream.Controls.Add(GridControlDocSearch)
'GridControlDocSearch.Dock = DockStyle.Top
TabWindream.PageVisible = True
End If
If RIGHT_READ_ONLY_DOC = False Then
@@ -3718,7 +3711,7 @@ Public Class frmConstructor_Main
Dim CheckBox As CheckEdit = sender
Dim value As Boolean = CheckBox.EditValue
' Config id über mainView -> detailView herausfinden
'Config id über mainView -> detailView herausfinden
Dim mainView As GridView = GridControlDocSearch.MainView
Dim detailView As GridView = mainView.GetDetailView(mainView.FocusedRowHandle, mainView.GetRelationIndex(mainView.FocusedRowHandle, "docIdDetails"))
Dim detailRow As DataRowView = detailView.GetRow(detailView.FocusedRowHandle)
@@ -6554,35 +6547,6 @@ Public Class frmConstructor_Main
End Try
End Sub
'Private Sub GridViewDoc_Search_MasterRowExpanded(sender As Object, e As CustomMasterRowEventArgs) Handles GridViewDoc_Search.MasterRowExpanded
' Dim focusedRow = GridViewDoc_Search.GetDataRow(e.RowHandle)
' Dim docID As Integer = focusedRow(3)
' Dim DT_DETAILS_SQL = String.Format("SELECT T.[GUID],{2},T.[CONFIG_ID],T1.HEADER_CAPTION,T.[VALUE],T1.[LANGUAGE], T1.COLUMN_VIEW,T1.EDITABLE,T1.TYPE_ID,T1.VISIBLE,T.CHANGED_WHEN,T.CHANGED_WHO " &
' "FROM TBPMO_DOC_VALUES T RIGHT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND LANGUAGE = '{1}'", CURRENT_ENTITY_ID, USER_LANGUAGE, docID)
' Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL, True)
'End Sub
'Private Sub GridViewDoc_Search_MasterRowGetChildList(sender As Object, e As MasterRowGetChildListEventArgs) Handles GridViewDoc_Search.MasterRowGetChildList
' Try
' Dim focusedRow = GridViewDoc_Search.GetDataRow(e.RowHandle)
' Dim docID As Integer = focusedRow(3)
' Dim DT_DETAILS_SQL = String.Format("SELECT T.[GUID],{2},T.[CONFIG_ID],T1.HEADER_CAPTION,T.[VALUE],T1.[LANGUAGE], T1.COLUMN_VIEW,T1.EDITABLE,T1.TYPE_ID,T1.VISIBLE,T.CHANGED_WHEN,T.CHANGED_WHO " &
' "FROM TBPMO_DOC_VALUES T RIGHT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND LANGUAGE = '{1}'", CURRENT_ENTITY_ID, USER_LANGUAGE, docID)
' Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL, True)
' e.ChildList = DT_DETAILS
' Catch ex As Exception
' ClassHelper.MSGBOX_Handler("ERROR", "", ex.Message, ex.StackTrace)
' End Try
'End Sub
Private Sub TimerClearResultfiles_Tick(sender As Object, e As EventArgs) Handles TimerClearResultfiles.Tick
Try
For Each row As DataRow In CURRENT_TBPMO_FILES_USER.Rows
@@ -6600,6 +6564,7 @@ Public Class frmConstructor_Main
End If
Next
CURRENT_TBPMO_FILES_USER.AcceptChanges()
ClassFolderWatcher.Check_Scan_Files()
Catch ex As Exception
ClassHelper.MSGBOX_Handler("ERROR", "", "Unexpected Error in clearing User-Files: " & ex.Message, ex.StackTrace)
Finally