This commit is contained in:
Digital Data - Marlon Schreiber
2018-07-04 10:33:11 +02:00
parent 00c7d956c1
commit 0876b7b4e4
25 changed files with 7682 additions and 5917 deletions

View File

@@ -142,7 +142,7 @@ Public Class frmConstructor_Main
' Private gridGUID = 2
Private DT_WINDREAM_RESULTLIST_DEF As DataTable
Private DT_WINDREAM_RESULTLIST As DataTable
Private DT_WINDREAM_COLUMNS_GRID As DataTable
Private DT_DOCRESULT_DROPDOWN_ITEMS As DataTable
Private DT_RESULTLIST_OPTIONS As DataTable
Private DT_RESULTLIST_VARIABLE_VALUE As DataTable
@@ -2358,14 +2358,14 @@ Public Class frmConstructor_Main
ClassLogger.Add("ADDING RECORDS IS PROHIBITED FOR ENTITY: " & ENTITY_ID, False)
End If
sql = 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, True)
sql = 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 = 3 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE)
sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
DT_WINDREAM_COLUMNS_GRID = ClassDatabase.Return_Datatable(sql, True)
sql = 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 = 3 AND LANGUAGE = '{1}') ORDER BY T.SEQUENCE ", ENTITY_ID, USER_LANGUAGE)
DT_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True)
sql = 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, True)
sql = 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)
sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE)
DT_RESULTLIST_VARIABLE_VALUE = ClassDatabase.Return_Datatable(sql, True)
Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable()
Select form
@@ -2433,7 +2433,7 @@ Public Class frmConstructor_Main
ENTITY_RECORD_COUNT = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = " & ENTITY_ID, True)
If CBool(LOAD_ENTITY_SEARCH_AT_STARTUP) = True Then
ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, True, True)
ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_COLUMNS_GRID, ENTITY_ID, RECORD_ID, True, True)
End If
Select Case ACT_EBENE
Case 1
@@ -3629,7 +3629,7 @@ Public Class frmConstructor_Main
Me.Cursor = Cursors.Default
End If
Dim DT_RESULT As DataTable
DT_RESULT = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, CBool(LOAD_ENTITY_SEARCH_AT_STARTUP))
DT_RESULT = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_COLUMNS_GRID, ENTITY_ID, RECORD_ID, CBool(LOAD_ENTITY_SEARCH_AT_STARTUP))
If IsNothing(DT_RESULT) Then
Dim msg = "wrong DocSearch-Configuration oer unexpected Error in Get_DOC_RESULTTABLE - Check logfile and contact Digital Data"
@@ -3701,7 +3701,7 @@ Public Class frmConstructor_Main
ClassWindreamDocGrid.FillColumns(
GridViewDoc_Search,
DT_RESULT,
DT_WINDREAM_RESULTLIST,
DT_WINDREAM_COLUMNS_GRID,
DT_DOCRESULT_DROPDOWN_ITEMS,
AddressOf OnCBSelectedValueChanged,
AddressOf OnDateSelectedValueChanged,
@@ -5819,6 +5819,7 @@ Public Class frmConstructor_Main
File.Delete(XMLPath)
GridControlDocSearch.DataSource = Nothing
GridViewDoc_Search.Columns.Clear()
RUN_WDSEARCH_GRID()
Else
@@ -6463,7 +6464,7 @@ Public Class frmConstructor_Main
' Rename file.
My.Computer.FileSystem.RenameFile(OldName, NewName)
Cursor = Cursors.WaitCursor
Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}",
Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}",
OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID)
If DD_LIB_Standards.clsDatabase.Execute_non_Query(upd) Then
If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then