From d88684e6854e298551e8e9ef739df03b6c9ff388 Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Tue, 28 Mar 2017 15:59:14 +0200
Subject: [PATCH] jj gridViewDoc

---
 app/DD-Record-Organizer/ClassDOC_SEARCH.vb    |  2 +-
 .../ClassWindreamDocGrid.vb                   | 39 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb
index 4c747cc..359295f 100644
--- a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb
+++ b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb
@@ -376,7 +376,7 @@ Public Class ClassDOC_SEARCH
                 NewRow.Item(1) = fullpath
                 NewRow.Item(2) = objecttype
                 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
                     Dim rowvalue
                     Try
diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
index 0e5bb39..2b64fa4 100644
--- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
+++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
@@ -147,6 +147,16 @@ Public Class ClassWindreamDocGrid
 
         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
         Try
             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)
             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)
+
+            ' ' '
+
+            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
             ds.Tables.Add(DT_RESULT)
             ds.Tables.Add(DT_DETAILS)