This commit is contained in:
Digital Data - Marlon Schreiber
2018-02-06 10:28:02 +01:00
parent ef06120f13
commit 17946f1a19
68 changed files with 4065 additions and 3630 deletions

View File

@@ -113,8 +113,9 @@ Public Class ClassDOC_SEARCH
"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine &
"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine &
"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine &
"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine &
"FROM " & vbNewLine &
"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC3.GUID) AS VALUE4," & vbNewLine &
"dwAccessRight AS ACCESS_RIGHT" & vbNewLine &
"FROM " & vbNewLine &
"VWPMO_DOC_SEARCH T " & vbNewLine &
"INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine &
"INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine &
@@ -215,7 +216,19 @@ Public Class ClassDOC_SEARCH
End If
End If
Return ClassDatabase.Return_Datatable(SQL_DOC_SEARCH, True)
Dim DTFILE_RESULT_ASYNC As DataTable
Try
Dim async As New ClassAsyncSQL(SQL_DOC_SEARCH)
async.bw.RunWorkerAsync()
While async.bw.IsBusy
Application.DoEvents()
End While
DTFILE_RESULT_ASYNC = async.dt
Catch ex As Exception
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Async DTFILE_RESULT_ASYNC", ex.Message, ex.StackTrace)
End Try
Return DTFILE_RESULT_ASYNC 'ClassDatabase.Return_Datatable(SQL_DOC_SEARCH, True)
Catch ex As Exception
ClassLogger.Add("Unexpected Error in GET_DOCSEARCH_DATATABLE: " & ex.Message, True)
Return Nothing
@@ -450,9 +463,9 @@ Public Class ClassDOC_SEARCH
If ClassWDRights.Init = True Then
If ClassWDRights.Doc_Renew_Rights(RESULT_DOCID, RESULT_DOC_PATH, True) Then
If ClassWDRights.MSG_RESULT <> "" Then
Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & ClassWDRights.MSG_RESULT.MSG_RESULT
Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & ClassWDRights.MSG_RESULT
If USER_LANGUAGE <> "de-DE" Then
msg = "Attention: some rights could not be set: " & vbNewLine & ClassWDRights.MSG_RESULT.MSG_RESULT
msg = "Attention: some rights could not be set: " & vbNewLine & ClassWDRights.MSG_RESULT
End If
ClassHelper.MSGBOX_Handler("INFO", "Information:", msg)
End If