AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://SchreiberM@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
SchreiberM
2017-03-29 12:44:43 +02:00
parent a78ce0597e d88684e685
commit bb154d1241
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD-Record-Organizer/ClassDOC_SEARCH.vb
View File

@@ -376,7 +376,7 @@ Public Class ClassDOC_SEARCH
NewRow.Item(1) = fullpath NewRow.Item(1) = fullpath
NewRow.Item(2) = objecttype NewRow.Item(2) = objecttype
NewRow.Item(3) = DocID NewRow.Item(3) = DocID
Dim i = 4 'Fängt bei 2 an, um die definierten Spalten zu überspringen Dim i = 4 'Fängt bei 4 an, um die definierten Spalten zu überspringen
For Each Colname As String In ColArrayDEFINITION For Each Colname As String In ColArrayDEFINITION
Dim rowvalue Dim rowvalue
Try Try

39
app/DD-Record-Organizer/ClassWindreamDocGrid.vb
View File

@@ -147,6 +147,16 @@ Public Class ClassWindreamDocGrid
RESULT_CONFIG_IDS = New Hashtable() RESULT_CONFIG_IDS = New Hashtable()
For Each row As DataRow In DT_WINDREAM_RESULTLIST.Rows
Dim isConfig As Boolean = row.Item("CONFIG_COLUMNS")
Dim guid As Integer = row.Item("GUID")
Dim columnTitle As String = row.Item("HEADER_CAPTION")
If isConfig Then
RESULT_CONFIG_IDS.Add(columnTitle, guid)
End If
Next
' Tabelle zurückspielen und zuweisen ' Tabelle zurückspielen und zuweisen
Try Try
clonedTable.Load(DT_RESULT.CreateDataReader()) clonedTable.Load(DT_RESULT.CreateDataReader())
@@ -158,8 +168,35 @@ Public Class ClassWindreamDocGrid
'"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) '"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 " & 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) "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) Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL, True)
' ' '
For Each row As DataRow In DT_RESULT.Rows
For Each col As DataColumn In DT_RESULT.Columns
Dim colName As String = col.ColumnName
Dim docId As Integer = row.Item("DocID")
Dim configId As Integer = RESULT_CONFIG_IDS.Item(col.ColumnName)
If Not IsNothing(configId) Then
Dim value As String
Try
value = ClassDatabase.Execute_Scalar(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1}", configId, docId))
Catch ex As Exception
ClassLogger.Add(String.Format(">> Attention: Could not get Value from TBPMO_DOC_VALUES for ConfigId[{0}], DocId[{1}]: ", configId, docId) & ex.Message, False)
End Try
' Überprüfung, ob die Spalte zu CONFIG_COLUMNS gehört..
If Not IsNothing(value) Then
row.Item(colName) = value
End If
End If
Next
Next
' ' '
' Tabellen zum DataSet hinzufügen ' Tabellen zum DataSet hinzufügen
ds.Tables.Add(DT_RESULT) ds.Tables.Add(DT_RESULT)
ds.Tables.Add(DT_DETAILS) ds.Tables.Add(DT_DETAILS)