ms

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -47,7 +47,6 @@ Public Class frmConstructor_Main
     Private DT_CONSTRUCT_VIEW As DataTable
     Private DT_VWPMO_CONSTRUCTOR_FORMS As DataTable
     Private DT_ENTITY_DATA As DataTable
-    Private DT_FORM As DataTable
     Private DT_TREEVIEW_PER_CONTROLS As DataTable
     Private DT_TREEVIEW_CONFIGURATION As DataTable
 
@@ -137,6 +136,7 @@ Public Class frmConstructor_Main
 
     Private DT_WINDREAM_RESULTLIST_DEF As DataTable
     Private DT_WINDREAM_RESULTLIST As DataTable
+    Private DT_DOCRESULT_DROPDOWN_ITMES As DataTable
     Private DT_RESULTLIST_OPTIONS As DataTable
     Private DT_WORKFLOWS_MANUAL As DataTable
 
@@ -2173,11 +2173,9 @@ Public Class frmConstructor_Main
             ' Show_Selected_Record_Data(SELECTED_RECORD_ID)
             Update_Status_Label(True, "Record saved - " & Now, EditState.Update)
             Update_Record_Label(SELECTED_RECORD_ID)
-            DT_FORM = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID)
-
-            Dim FORM_TYPE = DT_FORM.Rows(0).Item("FORM_TYPE_ID") 'ClassDatabase.Execute_Scalar("SELECT FORM_TYPE_ID FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID)
-            Dim IS_SINGLE_RECORD = DT_FORM.Rows(0).Item("SINGLE_RECORD") 'ClassDatabase.Execute_Scalar("SELECT SINGLE_RECORD FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID)
 
+            ' Dim FORM_TYPE = DT_FORM.Rows(0).Item("FORM_TYPE_ID") 'ClassDatabase.Execute_Scalar("SELECT FORM_TYPE_ID FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID)
+            
             CURRENT_DATE_FORMAT = USER_DATE_FORMAT
 
             If IS_SINGLE_RECORD = False Then
@@ -2512,6 +2510,9 @@ Public Class frmConstructor_Main
 
             Dim sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
             DT_WINDREAM_RESULTLIST = ClassDatabase.Return_Datatable(sql_ResultList, "GETRESULTLIST KONFIG")
+            sql_ResultList = String.Format("select * from TBPMO_DOCRESULT_DROPDOWN_ITEMS WHERE CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE)
+            DT_DOCRESULT_DROPDOWN_ITMES = ClassDatabase.Return_Datatable(sql_ResultList, "GETRESULT_DROPDOWN_ITEMS")
+
             sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
             DT_RESULTLIST_OPTIONS = ClassDatabase.Return_Datatable(sql_ResultList, "GETVARIABLE CONTROLS")
 
@@ -2735,17 +2736,17 @@ Public Class frmConstructor_Main
 
                 progressLoadEntity.Visible = True
                 labelLoadEntity.Visible = True
+                SplitContainerMain.Panel2.Enabled = False
                 Dim async As New ClassAsyncSQL(_ENTITYSQL)
                 async.bw.RunWorkerAsync()
                 While async.bw.IsBusy
                     Application.DoEvents()
                 End While
+                SplitContainerMain.Panel2.Enabled = True
                 progressLoadEntity.Visible = False
                 labelLoadEntity.Visible = False
                 Dim DTEntity As DataTable = async.dt
 
-                'Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, "LoadEntityData - Get DTEntity")
-
 
                 DTEntity.TableName = "VWTEMP_PMO_FORM" & ENTITY_ID
                 If IsNothing(DTEntity) Then
@@ -4377,6 +4378,11 @@ Public Class frmConstructor_Main
 
                     Dim listcheck As New List(Of String)
                     Dim listdate As New List(Of String)
+                    Dim DROPDOWN_TABLE As New DataTable
+                    DROPDOWN_TABLE.TableName = "DROPDOWN_TABLE"
+                    ' Create two columns, ID and Name.
+                    DROPDOWN_TABLE.Columns.Add("ID", GetType(Integer))
+                    DROPDOWN_TABLE.Columns.Add("COLUMN_VIEW", GetType(System.String))
                     For Each rw As DataRow In DT_WINDREAM_RESULTLIST.Rows
                         ' Dim Width = rw.Item("WIDTH") 'DT_WINDREAM_RESULTLIST.Rows(0).Item(String.Format("{0}_WIDTH", col.ColumnName))
                         ' If Not IsNothing(Width) And Not IsDBNull(Width) Then
@@ -4393,6 +4399,14 @@ Public Class frmConstructor_Main
                         If rw.Item("TYPE_ID") = 3 And CBool(rw.Item("VISIBLE")) = True Then
                             listdate.Add(rw.Item("HEADER_CAPTION"))
                         End If
+                        If rw.Item("TYPE_ID") = 4 And CBool(rw.Item("VISIBLE")) = True Then
+                            Dim newRow As DataRow = DROPDOWN_TABLE.NewRow()
+                            newRow("ID") = rw.Item("GUID")
+                            newRow("COLUMN_VIEW") = rw.Item("HEADER_CAPTION")
+                            DROPDOWN_TABLE.Rows.Add(newRow)
+                            DROPDOWN_TABLE.AcceptChanges()
+                        End If
+
                     Next
 
                     Dim tbltemp As DataTable = DT_RESULT.Clone()
@@ -4421,6 +4435,27 @@ Public Class frmConstructor_Main
                         colDate.DisplayFormat.FormatType = FormatType.DateTime
                         colDate.DisplayFormat.FormatString = USER_DATE_FORMAT
                     Next
+                    ' Alle Date Spalten durchgehen 
+                    For Each dropdownrow As DataRow In DROPDOWN_TABLE.Rows
+                        Dim RepositoryItemComboBox = New RepositoryItemComboBox()
+                        Dim colstring = dropdownrow.Item(1)
+                        Dim guid = dropdownrow.Item("ID")
+                        Dim expression As String
+                        expression = "CONFIG_ID = " & guid.ToString
+                        Dim foundRows() As DataRow
+                        ' Use the Select method to find all rows matching the filter.
+                        foundRows = DT_DOCRESULT_DROPDOWN_ITMES.Select(expression, "SEQUENCE")
+
+                        ' For each row add an item
+                        For i = 0 To foundRows.GetUpperBound(0)
+                            RepositoryItemComboBox.Items.Add(foundRows(i)("VALUE"))
+                        Next
+                        Dim docresult_dd_Column = GridViewDoc_Search.Columns(colstring)
+                        GridViewDoc_Search.GridControl.RepositoryItems.Add(RepositoryItemComboBox)
+                        If Not IsNothing(GridViewDoc_Search.Columns(colstring)) Then
+                            GridViewDoc_Search.Columns(colstring).ColumnEdit = RepositoryItemComboBox
+                        End If
+                    Next
                     'Jetzt die Spaltenbreiten anpassen
                     For Each rw As DataRow In DT_WINDREAM_RESULTLIST.Rows
                         Dim Width = rw.Item("WIDTH") 'DT_WINDREAM_RESULTLIST.Rows(0).Item(String.Format("{0}_WIDTH", col.ColumnName))
@@ -5139,7 +5174,7 @@ Public Class frmConstructor_Main
             Try
                 CURRENT_FORM_ID = ENTITY_ID
                 Dim sql = "EXEC	PRPMO_CREATE_WF_TASKS " & CURRENT_FORM_ID & ", " & RECORD_ID
-                If ClassDatabase.Execute_non_Query(sql) Then
+                If ClassDatabase.Execute_non_Query(sql) = True Then
                     VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName)
                     Show_act_WFTask()
                     If USER_LANGUAGE = "de-DE" Then
@@ -6117,7 +6152,7 @@ Public Class frmConstructor_Main
 
     Private Sub GridViewDoc_Search_RowStyle(sender As Object, e As Views.Grid.RowStyleEventArgs) Handles GridViewDoc_Search.RowStyle
         If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then
-            e.Appearance.BackColor = Color.Orange
+            e.Appearance.BackColor = Color.Yellow
         Else
             If e.RowHandle = -1 Then
                 Exit Sub