This commit is contained in:
SchreiberM
2016-10-04 11:41:03 +02:00
parent dd158e8414
commit c831a56a88
8 changed files with 1056 additions and 506 deletions

View File

@@ -140,6 +140,7 @@ Public Class frmConstructor_Main
Private DT_WINDREAM_RESULTLIST As DataTable
Private DT_DOCRESULT_DROPDOWN_ITEMS As DataTable
Private DT_RESULTLIST_OPTIONS As DataTable
Private DT_RESULTLIST_VARIABLE_VALUE As DataTable
Private DT_WORKFLOWS_MANUAL As DataTable
Private _MANUAL_WORKFLOW As Boolean = False
@@ -2219,13 +2220,13 @@ 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)
sql_ResultList = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.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_ITEMS = 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")
sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE)
DT_RESULTLIST_VARIABLE_VALUE = ClassDatabase.Return_Datatable(sql_ResultList, "GETVARIABLE VALUES")
Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable()
Select form
Where form.Item("GUID") = ENTITY_ID).Single()
@@ -3863,7 +3864,7 @@ Public Class frmConstructor_Main
Dim elapsed As Double
' Dim Basesearch As String
Try
Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, "RECORD")
Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, "RECORD")
If IsNothing(DT_RESULT) Then
Exit Sub
Else
@@ -3927,7 +3928,7 @@ Public Class frmConstructor_Main
Dim sw As New Stopwatch
sw.Start()
Dim elapsed As Double
Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, Type)
Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, Type)
If IsNothing(DT_RESULT) Then
Dim msg = "wrong DocSearch-Configuration - Check logfile and contact Digital Data"
tslblWindreamView.Text = msg
@@ -4062,7 +4063,7 @@ Public Class frmConstructor_Main
Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
Dim user As String = Environment.UserName
Dim dateString = value.ToString("yyyy-MM-dd hh:mm:ss.fff")
Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff
Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, dateString, user)
ClassDatabase.Execute_non_Query(Sql)
@@ -4752,7 +4753,7 @@ Public Class frmConstructor_Main
exists = True
End If
Next
tsslblWorkflowstate.BackColor = Color.Black
tsslblWorkflowstate.BackColor = Color.Transparent
If exists = False Then
'Keine Workflows....also auch keinen Zugriff geben
tsButtonShowTaskOverview.Visible = False
@@ -5354,9 +5355,23 @@ Public Class frmConstructor_Main
End If
End Sub
Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged
ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
Refresh_DocID
End Sub
Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged
'Get_Doc_Items()
ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
Refresh_DocID()
End Sub
Sub Refresh_DocID()
If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then
tsstlblDocID.Text = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString
Else
tsstlblDocID.Text = ""
End If
End Sub
Private Sub LöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TsMI_DocRemoveLink.Click
@@ -5816,10 +5831,10 @@ Public Class frmConstructor_Main
Try
Dim DROPDOWN_VALUE
If Not IsNothing(CURRENT_DOC_DROPDOWN) Then
If Not IsNothing(DT_DOCRESULT_DROPDOWN_ITEMS) Then
'Den ColumnTitle aus ConfigTableholen
If CURRENT_DOC_DROPDOWN.Rows.Count > 0 Then
For Each confrow As DataRow In CURRENT_DOC_DROPDOWN.Rows
If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then
For Each confrow As DataRow In DT_DOCRESULT_DROPDOWN_ITEMS.Rows
Dim CAPTION = confrow.Item("HEADER_CAPTION")
DROPDOWN_VALUE = GridViewDoc_Search.GetRowCellValue(e.RowHandle, CAPTION)
If Not IsNothing(DROPDOWN_VALUE) Then
@@ -5852,7 +5867,7 @@ Public Class frmConstructor_Main
End If
End If
End If
Catch ex As Exception
ClassLogger.Add(">> Unexpected Error in RowStyle-Color Dropdown: " & ex.Message, False)