jj für MS 25.01.17

This commit is contained in:
SchreiberM
2017-01-25 10:41:50 +01:00
parent 9d485d82f0
commit 64ef01a393
13 changed files with 1299 additions and 986 deletions

View File

@@ -132,7 +132,7 @@ Public Class ClassWindreamDocGrid
Public Shared Sub FillColumns(gridView As GridView,
DT_RESULT As DataTable, DT_WINDREAM_RESULTLIST As DataTable, DT_DOCRESULT_DROPDOWN_ITEMS As DataTable,
DropdownValueChangedHandler As EventHandler, DatepickerValueChangedHandler As EventHandler, TextValueChangedHandler As EventHandler, CheckValueChangedHandler As EventHandler,
SearchType As String)
SearchType As String, RECORD_ID As Integer)
' Handler speichern
_dropdownValueChangedHandler = DropdownValueChangedHandler
_datepickerValueChangedHandler = DatepickerValueChangedHandler
@@ -155,8 +155,10 @@ Public Class ClassWindreamDocGrid
' Neues Dataset für Master- und Detail-Tabelle erstellen
Dim ds As New DataSet()
'"FROM TBPMO_DOC_VALUES T INNER JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND T1.LANGUAGE = '{1}' AND T.RECORD_ID = {2} ORDER BY T.DocID, T1.SEQUENCE", CURRENT_ENTITY_ID, USER_LANGUAGE, RECORD_ID)
Dim DT_DETAILS_SQL = String.Format("SELECT T.[GUID],T.[DocID],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}' AND T1.CONFIG_COLUMNS = 1", CURRENT_ENTITY_ID, USER_LANGUAGE)
Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL, True)
' Tabellen zum DataSet hinzufügen
ds.Tables.Add(DT_RESULT)
@@ -299,8 +301,9 @@ Public Class ClassWindreamDocGrid
End Sub
Public Shared Sub gridView_MasterRowExpanded(sender As GridView, e As DevExpress.XtraGrid.Views.Grid.CustomMasterRowEventArgs)
Dim detailView As GridView = sender.GetDetailView(e.RowHandle, e.RelationIndex)
Dim GW As GridView = sender
Dim detailView As GridView = sender.GetDetailView(e.RowHandle, e.RelationIndex)
With detailView.Columns
'Spalten ausblenden
.Item("GUID").Visible = False
@@ -329,7 +332,13 @@ Public Class ClassWindreamDocGrid
.Item("CHANGED_WHO").Caption = "changed Who"
End If
End With
If Not IsNothing(GW.GridControl.ContextMenuStrip.Name) Then
If GW.GridControl.ContextMenuStrip.Name = "cmsResultFilesBasic" Then
detailView.OptionsBehavior.Editable = False
Else
detailView.OptionsBehavior.Editable = True
End If
End If
AddHandler detailView.CustomRowCellEdit, AddressOf detailView_CustomRowCellEdit
End Sub