This commit is contained in:
SchreiberM 2022-01-17 15:40:36 +01:00
commit 9ae107d369
3 changed files with 14 additions and 27 deletions

View File

@ -45,14 +45,14 @@ Public Class ClassAllgemeineFunktionen
Else
If INACTIVITYRecognized = True Then
oSql = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected',LOGOUT = GETDATE() WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager') AND LOGOUT IS NULL"
If Database_ECM.ExecuteNonQuery(oSql, "Inactivity insert") = True Then
If Database.ExecuteNonQueryECM(oSql) = True Then
End If
End If
oSql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager')"
End If
If Database_ECM.ExecuteNonQuery(oSql) = True Then
If Database.ExecuteNonQueryECM(oSql) = True Then
LOGGER.Debug($"{LoginorOut} of User successfully!")
Return True
Else

View File

@ -286,10 +286,11 @@ Public Class ClassInit
oSQL = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
Dim DT_CHECKUSER_MODULE As DataTable
DT_CHECKUSER_MODULE = Database.GetDatatableECM(oSQL)
'DT_CHECKUSER_MODULE = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBDD_USER_MODULE", $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'")
DT_CHECKUSER_MODULE = Database.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
.FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'"
})
'DT_CHECKUSER_MODULE = Database.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
' .FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'"
'})
oFnct.Done()

View File

@ -83,7 +83,7 @@ Public Class frmMain
Private Function Free_File()
Try
Dim sql = $"UPDATE TBPM_PROFILE_FILES SET EDIT = 0, IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}"
Return Database_ECM.ExecuteNonQuery(sql)
Return Database.ExecuteNonQueryECM(sql)
Catch ex As Exception
allgFunk.Insert_LogEntry($"ERROR Free_File >> {ex.Message}")
LOGGER.Error(ex)
@ -802,7 +802,7 @@ Public Class frmMain
oSQL = oSQL.Replace("@DATE", Now.ToShortDateString)
oSQL = oSQL.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID)
CURR_DT_OVERVIEW = Await Database_ECM.GetDatatableAsync(oSQL)
CURR_DT_OVERVIEW = Await Database.GetDatatableECMAsync(oSQL)
If ForceReload = True Then
LOGGER.Info("ForceReload is true!")
End If
@ -1111,17 +1111,6 @@ Public Class frmMain
RefreshHelper.SaveViewInfo()
End If
'If Not Application.OpenForms().OfType(Of frmValidator).Any Then
' Dim oUpdate = "Not Defined"
' Try
' oUpdate = $"UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = NULL, IN_WORK_WHEN = NULL where UPPER(WORK_USER) = UPPER('{USER_USERNAME}')"
' Database_ECM.ExecuteNonQuery(oUpdate)
' Catch ex As Exception
' LOGGER.Warn($"Unexpected Error in freefileforUser [{oUpdate}] - {ex.Message}")
' End Try
'End If
If bwSync.IsBusy Then
TimerRefresh_running = False
Exit Sub
@ -1536,7 +1525,7 @@ Public Class frmMain
CURRENT_DOC_GUID = CURRENT_JUMP_DOC_GUID
CURRENT_DOC_PATH = DOC_PATH
Dim oSQL = $"SELECT [dbo].[FNPM_CHECK_DocGUID_Valid] ({CURRENT_DOC_GUID})"
Dim oResult = Database_ECM.GetScalarValue(oSQL)
Dim oResult = Database.GetScalarValueECM(oSQL)
Try
If CBool(oResult) = True Then
Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID)
@ -1742,7 +1731,7 @@ Public Class frmMain
oSQLOverview = oSQLOverview.Replace("@DATE", Now.ToShortDateString)
oSQLOverview = oSQLOverview.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID)
CURR_DT_OVERVIEW = Await Database_ECM.GetDatatableAsync(oSQLOverview)
CURR_DT_OVERVIEW = Await Database.GetDatatableECMAsync(oSQLOverview)
oStopWatch2.Done()
If Not IsNothing(CURR_DT_OVERVIEW) Then
@ -2214,7 +2203,7 @@ Public Class frmMain
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(20)
oSQL = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID)
CURR_DT_VWPM_PROFILE_ACTIVE = Database_ECM.GetDatatable(oSQL)
CURR_DT_VWPM_PROFILE_ACTIVE = Database.GetDatatableECM(oSQL)
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(30)
LoadCURRENT_DT_PROFILES()
@ -2305,7 +2294,7 @@ Public Class frmMain
Dim oMessage = PrepareLogMessage(oSLogstring)
Dim oDateTime As Date = CDate(oLogSplit(0))
oSQL = $"INSERT INTO [dbo].[TBPM_LOG_DEBUG] ([USERID] , [LOGMSG], [ADDED_WHEN],DATE_STR) VALUES({USER_ID},'{oMessage}',GetDate(),'{oDateTime}')"
Database_ECM.ExecuteNonQuery(oSQL)
Database.ExecuteNonQueryECM(oSQL)
Next
LOGCONFIG.ClearLogs()
Catch ex As Exception
@ -2448,12 +2437,9 @@ Public Class frmMain
End If
If DEBUG = True Then
' 'Jetzt de rinsert der Inhalte
' 'Jetzt der insert der Inhalte
If Not IsNothing(LOGCONFIG.Logs) Then
If LOGCONFIG.Logs.Count > 0 Then
' Dim odel = $"delete from TBPM_LOG_DEBUG where userid = {USER_ID}"
' Database_ECM.ExecuteNonQuery(odel)
Dim thread As New Thread(AddressOf DebuglogBackgroundthread)
thread.Start()
@ -2582,7 +2568,7 @@ Public Class frmMain
Dim oReceipiant = ""
Dim oFocusedDocGUID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("GUID"))
Dim oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({oFocusedDocGUID},1)"
Dim oFilePath = Database_ECM.GetScalarValue(oSQL)
Dim oFilePath = Database.GetScalarValueECM(oSQL)
Dim oLink = "<HTML><body><p><a href=" + "file:///" + oFilePath + ">Link zur Datei</a></p></body></HTML>"
Dim oLink2 = "<a href=" + "file:///" + oFilePath + ">Link zur Datei</a>"