AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use DatabaseWithFallback in Userfacing Forms

Browse Source
This commit is contained in:
Jonathan Jenne
2022-01-13 14:49:59 +01:00
parent 86d40492c8
commit 156ffcebbf
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/DD_PM_WINDREAM/frmValidator.vb
View File

@@ -441,7 +441,7 @@ Public Class frmValidator
Try
Dim oDel = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID}"
Database_ECM.ExecuteNonQuery(oDel)
Database.ExecuteNonQueryECM(oDel)
Catch ex As Exception
LOGGER.Error(ex)
MsgBox("Error in delete jumped files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -1206,7 +1206,7 @@ Public Class frmValidator
End If
oSQL = clsPatterns.ReplaceAllValues(oSQL, PanelValidatorControl, True)
Override_SQLCommand = clsPatterns.ReplaceAllValues(Override_SQLCommand, PanelValidatorControl, True)
Dim oDT_ACTIONS As DataTable = Database_ECM.GetDatatable(oSQL) ', "onCustomButtonClick")
Dim oDT_ACTIONS As DataTable = Database.GetDatatableECM(oSQL) ', "onCustomButtonClick")
If IsNothing(oDT_ACTIONS) Then
MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
Exit Sub
@@ -1287,7 +1287,7 @@ Public Class frmValidator
If oResult1 = True Then
Dim oREsult As Boolean = True
If Override_SQLCommand <> "" Then
oREsult = Database_ECM.ExecuteNonQuery(Override_SQLCommand)
oREsult = Database.ExecuteNonQueryECM(Override_SQLCommand)
End If
If oREsult = True Then
Reload_Controls(oControlName)
@@ -1302,7 +1302,7 @@ Public Class frmValidator
If result = MsgBoxResult.Yes Then
Dim oREsult As Boolean = True
If Override_SQLCommand <> "" Then
oREsult = Database_ECM.ExecuteNonQuery(Override_SQLCommand)
oREsult = Database.ExecuteNonQueryECM(Override_SQLCommand)
End If
If oREsult = True Then
SetStatusLabel("Refreshed single control", "Yellow")
@@ -1336,7 +1336,6 @@ Public Class frmValidator
Try
Dim CONTROL_ID = DirectCast(dgv.Tag, ClassControlCreator.ControlMetadata).Guid
Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE CONTROL_ACTIVE = 1 AND PROFIL_ID = {0} And SQL_UEBERPRUEFUNG Like '%{1}%'", CURRENT_ProfilGUID, dgv.Name)
'Dim DT As DataTable = Database_ECM.GetDatatable(sql) ', "onDGVRowValidating")
Dim DT As DataTable = Database.GetDatatable("TBPM_PROFILE_CONTROLS", New GetDatatableOptions(sql, DatabaseType.ECM) With {
.FilterExpression = String.Format("CONTROL_ACTIVE = 1 AND PROFIL_ID = {0} And SQL_UEBERPRUEFUNG Like '%{1}%'", CURRENT_ProfilGUID, dgv.Name)
})
@@ -1967,7 +1966,6 @@ Public Class frmValidator
Try
Dim CONTROL_ID = DirectCast(oCombobox.Tag, ClassControlCreator.ControlMetadata).Guid
Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE CONTROL_ACTIVE = 1 AND PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, oCombobox.Name)
'Dim DT As DataTable = Database_ECM.GetDatatable(sql) ', "OnCmbselectedIndex")
Dim DT As DataTable = Database.GetDatatable("TBPM_PROFILE_CONTROLS", New GetDatatableOptions(sql, DatabaseType.ECM) With {
.FilterExpression = String.Format("CONTROL_ACTIVE = 1 AND PROFIL_ID = {0} And SQL_UEBERPRUEFUNG Like '%{1}%'", CURRENT_ProfilGUID, oCombobox.Name)
})
@@ -2242,7 +2240,6 @@ Public Class frmValidator
Return True
End If
If check.ToString.Length > 0 And dr.Item("INDEX_NAME") <> "DD PM-ONLY FOR DISPLAY" Then
'Dim cs As String = ClassDatabase.Get_ConnectionString(dr.Item("CONNECTION_ID"))
Dim cs As String = Database_ECM.Get_ConnectionStringforID(dr.Item("CONNECTION_ID"))
If allgFunk.CheckValue_Exists(dr.Item("SQL_UEBERPRUEFUNG"), "@Eingabe", control.Text, dr.Item("TYP"), cs, CURRENT_ProfilGUID) = True Then
@@ -2289,7 +2286,7 @@ Public Class frmValidator
Dim oSQL = $"EXEC PRPM_GET_NEXT_DOC_INFO {CURRENT_ProfilGUID},{CURRENT_DOC_ID},{USER_ID}"
'Dim oSQL = $"SELECT * from [dbo].[FNPM_GET_NEXT_DOC_INFO] ({CURRENT_ProfilGUID},{oBIT},{CURRENT_DOC_GUID},'{USER_USERNAME}')"
Dim oDT As DataTable = Database_ECM.GetDatatable(oSQL)
Dim oDT As DataTable = Database.GetDatatableECM(oSQL)
If oDT.Rows.Count > 0 Then
oNewGUID = oDT.Rows(0).Item(0)
CURRENT_DOC_ID = oDT.Rows(0).Item(1)
@@ -2362,14 +2359,17 @@ Public Class frmValidator
Dim oResult As String
Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
oResult = Database_ECM.GetScalarValue(oSQL) ', CONNECTION_STRING_ECM, "GetDocPathWindows1")
oResult = Database.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 0 [{oResult}] exists?...")
WMDocPathWindows = String.Empty
If File.Exists(oResult) = False Then
DocPathWindows = oResult
LOGGER.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...")
oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)"
oResult = Database_ECM.GetScalarValue(oSQL) ', CONNECTION_STRING_ECM, "GetDocPathWindows2")
oResult = Database.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 1[{oResult}] exists?...")
If File.Exists(oResult) = False Then
LOGGER.Info($"GetWMDocPathWindows FileExists2 also returned false [{oResult}]!")
@@ -2401,7 +2401,7 @@ Public Class frmValidator
oSQl = oSQl.Replace("@DOC_GUID", CURRENT_DOC_GUID)
oSQl = oSQl.Replace("@DOC_ID", CURRENT_DOC_ID)
oSQl = oSQl.Replace("@DocID", CURRENT_DOC_ID)
IDB_DT_DOC_DATA = Database_ECM.GetDatatable(oSQl)
IDB_DT_DOC_DATA = Database.GetDatatableECM(oSQl)
Catch ex As Exception
LOGGER.Error(ex)
End Try
@@ -2469,7 +2469,7 @@ Public Class frmValidator
'If WMDocPathWindows <> String.Empty Then
' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ###########################
Dim sql = $"UPDATE TBPM_PROFILE_FILES SET IN_WORK = 1, IN_WORK_WHEN = GETDATE(), WORK_USER = '{USER_USERNAME}' WHERE GUID = {CURRENT_DOC_GUID}"
Database_ECM.ExecuteNonQuery(sql)
Database.ExecuteNonQueryECM(sql)
' ############ Infos eintragen #################
' txtDateipfad.Text = Document_Path
@@ -3721,7 +3721,7 @@ Public Class frmValidator
Dim oSQL = PROFIL_FINISH_SQL
oSQL = clsPatterns.ReplaceAllValues(oSQL, PanelValidatorControl, True)
Dim oDT_ACTIONS As DataTable = Database_ECM.GetDatatable(oSQL)
Dim oDT_ACTIONS As DataTable = Database.GetDatatableECM(oSQL)
If IsNothing(oDT_ACTIONS) Then
MsgBox("Something went wrong in btnFinish_continue - Please check Your log and inform the workflow-team!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
Return False
@@ -3963,7 +3963,7 @@ Public Class frmValidator
Try
''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde
If Override = True And Override_SQLCommand <> "" Then
Database_ECM.ExecuteNonQuery(Override_SQLCommand)
Database.ExecuteNonQueryECM(Override_SQLCommand)
End If
If oErrorOcurred = False Then
@@ -4067,14 +4067,14 @@ Public Class frmValidator
End If
End If
Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, Environment.MachineName, WORK_HISTORY_ENTRY)
Database_ECM.ExecuteNonQuery(ins)
Database.ExecuteNonQueryECM(ins)
Dim oFIsql As String
'Close_document_viewer()
If WMDocPathWindows.ToLower.EndsWith(".pdf") Then
If Not IsNothing(WORK_HISTORY_ENTRY) Then
If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
Dim DT_ENTRY As DataTable = Database_ECM.GetDatatable(oFIsql) ', "Finish_WFStep2")
Dim DT_ENTRY As DataTable = Database.GetDatatableECM(oFIsql) ', "Finish_WFStep2")
If Not IsNothing(DT_ENTRY) Then
If DT_ENTRY.Rows.Count = 1 Then
Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
@@ -4085,7 +4085,7 @@ Public Class frmValidator
Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
If CBool(oAnnotateAllWHEs) = True Then
oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
Dim DT_ENTRIES As DataTable = Database_ECM.GetDatatable(oFIsql) ', "Finish_WFStep3")
Dim DT_ENTRIES As DataTable = Database.GetDatatableECM(oFIsql) ', "Finish_WFStep3")
If Not IsNothing(DT_ENTRIES) Then
If DT_ENTRIES.Rows.Count > 0 Then
Dim AnnotationString As String = ""
@@ -4139,7 +4139,7 @@ Public Class frmValidator
Else
LOGGER.Info($"Overriding all in action for DocID: {CURRENT_DOC_ID} - ProfileID: {CURRENT_ProfilGUID}")
If Override_SQLCommand <> "" Then
If Database_ECM.ExecuteNonQuery(Override_SQLCommand) = False Then
If Database.ExecuteNonQueryECM(Override_SQLCommand) = False Then
oErrorOcurred = True
End If
End If
@@ -4150,7 +4150,7 @@ Public Class frmValidator
Else
LOGGER.Debug("Validation of document ended successfully!")
Dim oPROCSQL = $"EXEC PRPM_CHECK_NEXT_WF {CURRENT_DOC_GUID}"
Database_ECM.ExecuteNonQuery(oPROCSQL)
Database.ExecuteNonQueryECM(oPROCSQL)
End If
If CURRENT_JUMP_DOC_GUID <> 0 Then
@@ -5220,7 +5220,7 @@ Public Class frmValidator
Free_File()
Dim oSQL = $"EXECUTE PRPM_FILES_NOT_INDEXED '{USER_USERNAME}',{CURRENT_ProfilGUID},'{WMDocPathWindows}',{CURRENT_DOC_GUID}"
Database_ECM.ExecuteNonQuery(oSQL)
Database.ExecuteNonQueryECM(oSQL)
LOGGER.Debug($"Skipped DocGUID {CURRENT_DOC_GUID}")
Load_Next_Document(False)
@@ -5232,7 +5232,7 @@ Public Class frmValidator
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)
@@ -5255,7 +5255,7 @@ Public Class frmValidator
FreeFile()
'Aus der Tabelle löschen
Dim oDelete = $"DELETE FROM TBPM_PROFILE_FILES WHERE GUID = {CURRENT_DOC_GUID}"
If Database_ECM.ExecuteNonQuery(oDelete) = True Then
If Database.ExecuteNonQueryECM(oDelete) = True Then
Dim oDeleteResult As Boolean = False
If IDB_ACTIVE = False Then
oDeleteResult = Delete_WMFile()
@@ -5513,7 +5513,7 @@ Public Class frmValidator
SetStatusLabel($"Data saved", "LimeGreen")
LOGGER.Info("Workflowdata saved manually!")
Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, Environment.MachineName, "Manual Save via button")
Database_ECM.ExecuteNonQuery(ins)
Database.ExecuteNonQueryECM(ins)
Else
SetStatusLabel($"Error while saving data!", "Red")
End If
@@ -5671,7 +5671,7 @@ Public Class frmValidator
oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbNewLine &
$"EXEC dbo.PRPM_GETFILENAME_EXPORT {CURRENT_DOC_ID}, 1, @Outputfilename = @Filename OUTPUT;" & vbNewLine &
"SELECT @Filename"
Dim oExportFilename = Database_ECM.GetScalarValue(oSQLGetFilename)
Dim oExportFilename = Database.GetScalarValueECM(oSQLGetFilename)
oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oExportFilename & oExtension
File.Copy(WMDocPathWindows, oTargetPath)
@@ -5686,7 +5686,7 @@ Public Class frmValidator
oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbNewLine &
$"EXEC dbo.PRPM_GETFILENAME_EXPORT {oDocID}, {oFileCount}, @Outputfilename = @Filename OUTPUT;" & vbNewLine &
"SELECT @Filename"
oExportFilename = Database_ECM.GetScalarValue(oSQLGetFilename)
oExportFilename = Database.GetScalarValueECM(oSQLGetFilename)
oExtension = Path.GetExtension(oFromFilename)
'oFilenameOnly = Path.GetFileName(oFromFilename)