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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD_PM_WINDREAM/ClassFinalizeDoc.vb
View File

@ -50,7 +50,7 @@ Public Class ClassFinalizeDoc
sql_Statement = clsPatterns.ReplaceInternalValues(sql_Statement) sql_Statement = clsPatterns.ReplaceInternalValues(sql_Statement)
sql_Statement = clsPatterns.ReplaceWindreamIndicies(sql_Statement, WMObject, True) sql_Statement = clsPatterns.ReplaceWindreamIndicies(sql_Statement, WMObject, True)
LOGGER.Debug("sql after ReplaceAllValues: " & sql_Statement) LOGGER.Debug("sql after ReplaceAllValues: " & sql_Statement)
Dim oDynamic_value = Database_ECM.GetScalarValue(sql_Statement) ', CONNECTION_STRING_ECM, "Write_Final_Metadata/dynamic_value") Dim oDynamic_value = Database.GetScalarValueECM(sql_Statement) ', CONNECTION_STRING_ECM, "Write_Final_Metadata/dynamic_value")
If Not IsNothing(oDynamic_value) Then If Not IsNothing(oDynamic_value) Then
value = oDynamic_value value = oDynamic_value
Else Else

4
app/DD_PM_WINDREAM/ClassWindream_allgemein.vb
View File

@ -136,7 +136,7 @@ LOGGER.Error(ex)
Try Try
' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist ' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist
Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID
Dim userExistsInServerUserGroup = Database_ECM.GetScalarValue(sql) ', CONNECTION_STRING_ECM, "StartWMCC-userExistsInServerUserGroup") Dim userExistsInServerUserGroup = Database.GetScalarValueECM(sql) ', CONNECTION_STRING_ECM, "StartWMCC-userExistsInServerUserGroup")
If WMSESSION_STARTSTOP_STARTUP = True Then If WMSESSION_STARTSTOP_STARTUP = True Then
'And userExistsInServerUserGroup Is Nothing 'And userExistsInServerUserGroup Is Nothing
@ -159,7 +159,7 @@ LOGGER.Error(ex)
Try Try
' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist ' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist
Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID
Dim userExistsInServerUserGroup = Database_ECM.GetScalarValue(sql) ', CONNECTION_STRING_ECM, "StopWMCC-userExistsInServerUserGroup") Dim userExistsInServerUserGroup = Database.GetScalarValueECM(sql) ', CONNECTION_STRING_ECM, "StopWMCC-userExistsInServerUserGroup")
If WMSESSION_STARTSTOP_STARTUP = True Then 'And userExistsInServerUserGroup Is Nothing If WMSESSION_STARTSTOP_STARTUP = True Then 'And userExistsInServerUserGroup Is Nothing
Dim owindreamControlCenter = CreateObject("Wmcc.ControlCenter") Dim owindreamControlCenter = CreateObject("Wmcc.ControlCenter")

20
app/DD_PM_WINDREAM/frmMassValidator.vb
View File

@ -61,7 +61,7 @@ Public Class frmMassValidator
Size = My.Settings.frmMassValidatorSize Size = My.Settings.frmMassValidatorSize
End If End If
Try Try
DTCONTROLS = Database_ECM.GetDatatable($"SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,{USER_LANGUAGE},CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG,* FROM TBPM_PROFILE_CONTROLS WHERE SQL_UEBERPRUEFUNG NOT LIKE '%WMI%' AND PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC") ', "MV_Load1") DTCONTROLS = Database.GetDatatableECM($"SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,{USER_LANGUAGE},CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG,* FROM TBPM_PROFILE_CONTROLS WHERE SQL_UEBERPRUEFUNG NOT LIKE '%WMI%' AND PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC") ', "MV_Load1")
LOGGER.Debug("Profile Data geladen") LOGGER.Debug("Profile Data geladen")
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
@ -370,7 +370,7 @@ Public Class frmMassValidator
Case "TABLE" Case "TABLE"
LOGGER.Debug("Versuch Tabelle zu laden") LOGGER.Debug("Versuch Tabelle zu laden")
Dim oDTMyColumns As DataTable = Database_ECM.GetDatatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1") Dim oDTMyColumns As DataTable = Database.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1")
oControl = ClassControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False) oControl = ClassControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False)
End Select End Select
@ -420,7 +420,7 @@ Public Class frmMassValidator
oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, True) oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, True)
LOGGER.Debug(">>> sql after ReplaceAllValues: " & oSqlCommand) LOGGER.Debug(">>> sql after ReplaceAllValues: " & oSqlCommand)
_dependingControl_in_action = True _dependingControl_in_action = True
Dim oDTDEPENDING_RESULT As DataTable = Database_ECM.GetDatatable(oSqlCommand) ', "MV_OnLookUp1") Dim oDTDEPENDING_RESULT As DataTable = Database.GetDatatableECM(oSqlCommand) ', "MV_OnLookUp1")
Try Try
Dim oDependingLookup As LookupControl3 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault() Dim oDependingLookup As LookupControl3 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault()
For Each oControl As Control In pnldesigner.Controls For Each oControl As Control In pnldesigner.Controls
@ -557,7 +557,7 @@ Public Class frmMassValidator
Select Case Typ Select Case Typ
'Tabellendarstellung 'Tabellendarstellung
Case "TABLE" Case "TABLE"
Dim dt As DataTable = Database_ECM.GetDatatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {CONTROL_ID} ORDER BY SEQUENCE") ', "MV_FillIndexValues") Dim dt As DataTable = Database.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {CONTROL_ID} ORDER BY SEQUENCE") ', "MV_FillIndexValues")
Dim SpaltenWerte As String() Dim SpaltenWerte As String()
If dt.Rows.Count > 1 Then If dt.Rows.Count > 1 Then
For Each Zeile As Object In wertWD For Each Zeile As Object In wertWD
@ -1068,7 +1068,7 @@ Public Class frmMassValidator
If TypeOf control Is Label Then Exit Sub If TypeOf control Is Label Then Exit Sub
Dim sql As String = $"SELECT NAME, CONNECTION_ID, SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE GUID = {controlId} AND PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(ISNULL(SQL_UEBERPRUEFUNG,'')) > 0 AND SQL_UEBERPRUEFUNG NOT LIKE '%#WMI#%' AND SQL_UEBERPRUEFUNG NOT LIKE '%#CTRL#%'" Dim sql As String = $"SELECT NAME, CONNECTION_ID, SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE GUID = {controlId} AND PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(ISNULL(SQL_UEBERPRUEFUNG,'')) > 0 AND SQL_UEBERPRUEFUNG NOT LIKE '%#WMI#%' AND SQL_UEBERPRUEFUNG NOT LIKE '%#CTRL#%'"
Dim dt As DataTable = Database_ECM.GetDatatable(sql) ', "MV_LoadSimpleData") Dim dt As DataTable = Database.GetDatatableECM(sql) ', "MV_LoadSimpleData")
If IsNothing(dt) Then Exit Sub If IsNothing(dt) Then Exit Sub
If dt.Rows.Count = 0 Then Exit Sub If dt.Rows.Count = 0 Then Exit Sub
@ -1090,7 +1090,7 @@ Public Class frmMassValidator
sql = clsPatterns.ReplaceInternalValues(sql) sql = clsPatterns.ReplaceInternalValues(sql)
LOGGER.Debug(">>> sql after ReplaceInternalValues: " & sql) LOGGER.Debug(">>> sql after ReplaceInternalValues: " & sql)
'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement)
dt = Database_ECM.GetDatatable(sql) ', "MV_LoadSimpleData1") dt = Database.GetDatatableECM(sql) ', "MV_LoadSimpleData1")
If IsNothing(dt) Then If IsNothing(dt) Then
MsgBox($"SQL-Query for control {control.Name} is invalid.") MsgBox($"SQL-Query for control {control.Name} is invalid.")
@ -1286,7 +1286,7 @@ Public Class frmMassValidator
If Not IsNothing(WORK_HISTORY_ENTRY) Then If Not IsNothing(WORK_HISTORY_ENTRY) Then
If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
Dim Sql = 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 Sql = 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(Sql) ', "MV_Finish1") Dim DT_ENTRY As DataTable = Database.GetDatatableECM(Sql) ', "MV_Finish1")
If Not IsNothing(DT_ENTRY) Then If Not IsNothing(DT_ENTRY) Then
If DT_ENTRY.Rows.Count = 1 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") Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
@ -1297,7 +1297,7 @@ Public Class frmMassValidator
Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES") Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
If CBool(value) = True Then If CBool(value) = True Then
Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID) Dim Sql = 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(Sql) ', "MV_Finish2") Dim DT_ENTRIES As DataTable = Database.GetDatatableECM(Sql) ', "MV_Finish2")
If Not IsNothing(DT_ENTRIES) Then If Not IsNothing(DT_ENTRIES) Then
If DT_ENTRIES.Rows.Count > 0 Then If DT_ENTRIES.Rows.Count > 0 Then
Dim AnnotationString As String = "" Dim AnnotationString As String = ""
@ -1360,12 +1360,12 @@ Public Class frmMassValidator
Private Function GetWMDocPathWindows(_CheckStandard As Integer) Private Function GetWMDocPathWindows(_CheckStandard As Integer)
Dim oResult As String Dim oResult As String
Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})" Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})"
oResult = Database_ECM.GetScalarValue(oSQL) oResult = Database.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 0 GDP [{oResult}] exists?...") LOGGER.Debug($"Checking file 0 GDP [{oResult}] exists?...")
If File.Exists(oResult) = False Then If File.Exists(oResult) = False Then
LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)" oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
oResult = Database_ECM.GetScalarValue(oSQL) oResult = Database.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...") LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
If File.Exists(oResult) = False Then If File.Exists(oResult) = False Then
Return False Return False

50
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -441,7 +441,7 @@ Public Class frmValidator
Try Try
Dim oDel = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID}" Dim oDel = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID}"
Database_ECM.ExecuteNonQuery(oDel) Database.ExecuteNonQueryECM(oDel)
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
MsgBox("Error in delete jumped files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in delete jumped files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@ -1206,7 +1206,7 @@ Public Class frmValidator
End If End If
oSQL = clsPatterns.ReplaceAllValues(oSQL, PanelValidatorControl, True) oSQL = clsPatterns.ReplaceAllValues(oSQL, PanelValidatorControl, True)
Override_SQLCommand = clsPatterns.ReplaceAllValues(Override_SQLCommand, 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 If IsNothing(oDT_ACTIONS) Then
MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
Exit Sub Exit Sub
@ -1287,7 +1287,7 @@ Public Class frmValidator
If oResult1 = True Then If oResult1 = True Then
Dim oREsult As Boolean = True Dim oREsult As Boolean = True
If Override_SQLCommand <> "" Then If Override_SQLCommand <> "" Then
oREsult = Database_ECM.ExecuteNonQuery(Override_SQLCommand) oREsult = Database.ExecuteNonQueryECM(Override_SQLCommand)
End If End If
If oREsult = True Then If oREsult = True Then
Reload_Controls(oControlName) Reload_Controls(oControlName)
@ -1302,7 +1302,7 @@ Public Class frmValidator
If result = MsgBoxResult.Yes Then If result = MsgBoxResult.Yes Then
Dim oREsult As Boolean = True Dim oREsult As Boolean = True
If Override_SQLCommand <> "" Then If Override_SQLCommand <> "" Then
oREsult = Database_ECM.ExecuteNonQuery(Override_SQLCommand) oREsult = Database.ExecuteNonQueryECM(Override_SQLCommand)
End If End If
If oREsult = True Then If oREsult = True Then
SetStatusLabel("Refreshed single control", "Yellow") SetStatusLabel("Refreshed single control", "Yellow")
@ -1336,7 +1336,6 @@ Public Class frmValidator
Try Try
Dim CONTROL_ID = DirectCast(dgv.Tag, ClassControlCreator.ControlMetadata).Guid 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 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 { 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) .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 Try
Dim CONTROL_ID = DirectCast(oCombobox.Tag, ClassControlCreator.ControlMetadata).Guid 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 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 { 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) .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 Return True
End If End If
If check.ToString.Length > 0 And dr.Item("INDEX_NAME") <> "DD PM-ONLY FOR DISPLAY" Then 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")) 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 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 = $"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 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 If oDT.Rows.Count > 0 Then
oNewGUID = oDT.Rows(0).Item(0) oNewGUID = oDT.Rows(0).Item(0)
CURRENT_DOC_ID = oDT.Rows(0).Item(1) CURRENT_DOC_ID = oDT.Rows(0).Item(1)
@ -2362,14 +2359,17 @@ Public Class frmValidator
Dim oResult As String Dim oResult As String
Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})" 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?...") LOGGER.Debug($"Checking file 0 [{oResult}] exists?...")
WMDocPathWindows = String.Empty WMDocPathWindows = String.Empty
If File.Exists(oResult) = False Then If File.Exists(oResult) = False Then
DocPathWindows = oResult DocPathWindows = oResult
LOGGER.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...") LOGGER.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...")
oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" 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?...") LOGGER.Debug($"Checking file 1[{oResult}] exists?...")
If File.Exists(oResult) = False Then If File.Exists(oResult) = False Then
LOGGER.Info($"GetWMDocPathWindows FileExists2 also returned false [{oResult}]!") 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_GUID", CURRENT_DOC_GUID)
oSQl = oSQl.Replace("@DOC_ID", CURRENT_DOC_ID) oSQl = oSQl.Replace("@DOC_ID", CURRENT_DOC_ID)
oSQl = oSQl.Replace("@DocID", 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 Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
End Try End Try
@ -2469,7 +2469,7 @@ Public Class frmValidator
'If WMDocPathWindows <> String.Empty Then 'If WMDocPathWindows <> String.Empty Then
' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ########################### ' >> >> >> >> >> >>##### 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}" 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 ################# ' ############ Infos eintragen #################
' txtDateipfad.Text = Document_Path ' txtDateipfad.Text = Document_Path
@ -3721,7 +3721,7 @@ Public Class frmValidator
Dim oSQL = PROFIL_FINISH_SQL Dim oSQL = PROFIL_FINISH_SQL
oSQL = clsPatterns.ReplaceAllValues(oSQL, PanelValidatorControl, True) 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 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) MsgBox("Something went wrong in btnFinish_continue - Please check Your log and inform the workflow-team!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
Return False Return False
@ -3963,7 +3963,7 @@ Public Class frmValidator
Try Try
''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde ''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde
If Override = True And Override_SQLCommand <> "" Then If Override = True And Override_SQLCommand <> "" Then
Database_ECM.ExecuteNonQuery(Override_SQLCommand) Database.ExecuteNonQueryECM(Override_SQLCommand)
End If End If
If oErrorOcurred = False Then If oErrorOcurred = False Then
@ -4067,14 +4067,14 @@ Public Class frmValidator
End If End If
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) 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 Dim oFIsql As String
'Close_document_viewer() 'Close_document_viewer()
If WMDocPathWindows.ToLower.EndsWith(".pdf") Then If WMDocPathWindows.ToLower.EndsWith(".pdf") Then
If Not IsNothing(WORK_HISTORY_ENTRY) Then If Not IsNothing(WORK_HISTORY_ENTRY) Then
If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True 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) 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 Not IsNothing(DT_ENTRY) Then
If DT_ENTRY.Rows.Count = 1 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") 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") Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
If CBool(oAnnotateAllWHEs) = True Then 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) 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 Not IsNothing(DT_ENTRIES) Then
If DT_ENTRIES.Rows.Count > 0 Then If DT_ENTRIES.Rows.Count > 0 Then
Dim AnnotationString As String = "" Dim AnnotationString As String = ""
@ -4139,7 +4139,7 @@ Public Class frmValidator
Else Else
LOGGER.Info($"Overriding all in action for DocID: {CURRENT_DOC_ID} - ProfileID: {CURRENT_ProfilGUID}") LOGGER.Info($"Overriding all in action for DocID: {CURRENT_DOC_ID} - ProfileID: {CURRENT_ProfilGUID}")
If Override_SQLCommand <> "" Then If Override_SQLCommand <> "" Then
If Database_ECM.ExecuteNonQuery(Override_SQLCommand) = False Then If Database.ExecuteNonQueryECM(Override_SQLCommand) = False Then
oErrorOcurred = True oErrorOcurred = True
End If End If
End If End If
@ -4150,7 +4150,7 @@ Public Class frmValidator
Else Else
LOGGER.Debug("Validation of document ended successfully!") LOGGER.Debug("Validation of document ended successfully!")
Dim oPROCSQL = $"EXEC PRPM_CHECK_NEXT_WF {CURRENT_DOC_GUID}" Dim oPROCSQL = $"EXEC PRPM_CHECK_NEXT_WF {CURRENT_DOC_GUID}"
Database_ECM.ExecuteNonQuery(oPROCSQL) Database.ExecuteNonQueryECM(oPROCSQL)
End If End If
If CURRENT_JUMP_DOC_GUID <> 0 Then If CURRENT_JUMP_DOC_GUID <> 0 Then
@ -5220,7 +5220,7 @@ Public Class frmValidator
Free_File() Free_File()
Dim oSQL = $"EXECUTE PRPM_FILES_NOT_INDEXED '{USER_USERNAME}',{CURRENT_ProfilGUID},'{WMDocPathWindows}',{CURRENT_DOC_GUID}" 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}") LOGGER.Debug($"Skipped DocGUID {CURRENT_DOC_GUID}")
Load_Next_Document(False) Load_Next_Document(False)
@ -5232,7 +5232,7 @@ Public Class frmValidator
Private Function Free_File() Private Function Free_File()
Try 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}" 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 Catch ex As Exception
allgFunk.Insert_LogEntry($"ERROR Free_File >> {ex.Message}") allgFunk.Insert_LogEntry($"ERROR Free_File >> {ex.Message}")
LOGGER.Error(ex) LOGGER.Error(ex)
@ -5255,7 +5255,7 @@ Public Class frmValidator
FreeFile() FreeFile()
'Aus der Tabelle löschen 'Aus der Tabelle löschen
Dim oDelete = $"DELETE FROM TBPM_PROFILE_FILES WHERE GUID = {CURRENT_DOC_GUID}" 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 Dim oDeleteResult As Boolean = False
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
oDeleteResult = Delete_WMFile() oDeleteResult = Delete_WMFile()
@ -5513,7 +5513,7 @@ Public Class frmValidator
SetStatusLabel($"Data saved", "LimeGreen") SetStatusLabel($"Data saved", "LimeGreen")
LOGGER.Info("Workflowdata saved manually!") 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") 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 Else
SetStatusLabel($"Error while saving data!", "Red") SetStatusLabel($"Error while saving data!", "Red")
End If End If
@ -5671,7 +5671,7 @@ Public Class frmValidator
oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbNewLine & oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbNewLine &
$"EXEC dbo.PRPM_GETFILENAME_EXPORT {CURRENT_DOC_ID}, 1, @Outputfilename = @Filename OUTPUT;" & vbNewLine & $"EXEC dbo.PRPM_GETFILENAME_EXPORT {CURRENT_DOC_ID}, 1, @Outputfilename = @Filename OUTPUT;" & vbNewLine &
"SELECT @Filename" "SELECT @Filename"
Dim oExportFilename = Database_ECM.GetScalarValue(oSQLGetFilename) Dim oExportFilename = Database.GetScalarValueECM(oSQLGetFilename)
oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oExportFilename & oExtension oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oExportFilename & oExtension
File.Copy(WMDocPathWindows, oTargetPath) File.Copy(WMDocPathWindows, oTargetPath)
@ -5686,7 +5686,7 @@ Public Class frmValidator
oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbNewLine & oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbNewLine &
$"EXEC dbo.PRPM_GETFILENAME_EXPORT {oDocID}, {oFileCount}, @Outputfilename = @Filename OUTPUT;" & vbNewLine & $"EXEC dbo.PRPM_GETFILENAME_EXPORT {oDocID}, {oFileCount}, @Outputfilename = @Filename OUTPUT;" & vbNewLine &
"SELECT @Filename" "SELECT @Filename"
oExportFilename = Database_ECM.GetScalarValue(oSQLGetFilename) oExportFilename = Database.GetScalarValueECM(oSQLGetFilename)
oExtension = Path.GetExtension(oFromFilename) oExtension = Path.GetExtension(oFromFilename)
'oFilenameOnly = Path.GetFileName(oFromFilename) 'oFilenameOnly = Path.GetFileName(oFromFilename)