From 3ea6171c4f03ceffa770a5910a8058f49138066c Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 16 Mar 2022 15:48:18 +0100 Subject: [PATCH] MS 2.3.0.4 --- app/DD_PM_WINDREAM/ApplicationEvents.vb | 2 +- .../ClassAllgemeineFunktionen.vb | 4 +- app/DD_PM_WINDREAM/ClassControlCreator.vb | 4 +- app/DD_PM_WINDREAM/ClassFinalizeDoc.vb | 6 +- app/DD_PM_WINDREAM/ClassIDBData.vb | 14 +- app/DD_PM_WINDREAM/ClassInit.vb | 86 +++-- app/DD_PM_WINDREAM/ClassParamRefresh.vb | 34 +- app/DD_PM_WINDREAM/ClassWindream_allgemein.vb | 4 +- app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 8 +- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 4 +- app/DD_PM_WINDREAM/frmAdmin2.vb | 14 +- app/DD_PM_WINDREAM/frmAdministration.vb | 34 +- app/DD_PM_WINDREAM/frmColumn_Detail.vb | 4 +- app/DD_PM_WINDREAM/frmDesignerLayout.vb | 4 +- app/DD_PM_WINDREAM/frmFormDesigner.vb | 16 +- app/DD_PM_WINDREAM/frmGhostMode.vb | 8 +- app/DD_PM_WINDREAM/frmInvDashboard.vb | 4 +- app/DD_PM_WINDREAM/frmKonfig.vb | 3 +- app/DD_PM_WINDREAM/frmMain.Designer.vb | 11 +- app/DD_PM_WINDREAM/frmMain.resx | 329 ++++++++++-------- app/DD_PM_WINDREAM/frmMain.vb | 35 +- app/DD_PM_WINDREAM/frmMassValidator.vb | 28 +- app/DD_PM_WINDREAM/frmMonitor.vb | 10 +- app/DD_PM_WINDREAM/frmSQL_Admin.vb | 2 +- app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 12 +- app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb | 10 +- app/DD_PM_WINDREAM/frmValidator.vb | 113 +++--- app/DD_PM_WINDREAM/frmValidatorSearch.vb | 4 +- 28 files changed, 443 insertions(+), 364 deletions(-) diff --git a/app/DD_PM_WINDREAM/ApplicationEvents.vb b/app/DD_PM_WINDREAM/ApplicationEvents.vb index 27e4f35..a334afa 100644 --- a/app/DD_PM_WINDREAM/ApplicationEvents.vb +++ b/app/DD_PM_WINDREAM/ApplicationEvents.vb @@ -22,7 +22,7 @@ Namespace My Dim oDBMessage = PrepareLogMessage(oLogMessage) & $" [Machinename: {Environment.MachineName}]" Dim oSQL = $"INSERT INTO [dbo].[TBPM_LOG_DEBUG] ([USERID], [LOGMSG], [ADDED_WHEN], DATE_STR) VALUES({USER_ID},'{oDBMessage}',GETDATE(),'{Now}')" - Database_ECM.ExecuteNonQuery(oSQL) + DatabaseFallback.ExecuteNonQueryECM(oSQL) End If Catch ex As Exception LOGGER.Error(ex) diff --git a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb index d7bd2cb..5f3266c 100644 --- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb +++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb @@ -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.ExecuteNonQueryECM(oSql) = True Then + If DatabaseFallback.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.ExecuteNonQueryECM(oSql) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oSql) = True Then LOGGER.Debug($"{LoginorOut} of User successfully!") Return True Else diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb index 4b96996..6b03b75 100644 --- a/app/DD_PM_WINDREAM/ClassControlCreator.vb +++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb @@ -532,7 +532,7 @@ Public Class ClassControlCreator If Not clsPatterns.HasComplexPatterns(oSqlCommand) Then Logger.Debug("SQL has no complex patterns!") 'oComboboxDataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId) - oComboboxDataTable = Database.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { + oComboboxDataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { .ConnectionId = oConnectionId }) Else @@ -888,7 +888,7 @@ Public Class ClassControlCreator Public Shared Sub GridTables_CacheDatatableForColumn(pControlId As Object, pColumnName As Object, pSqlStatement As Object, pConnectionId As Integer, pAdvancedLookup As Boolean) Try 'Dim oTable As DataTable = ClassDatabase.Return_Datatable_ConId(pSqlStatement, pConnectionId) - Dim oTable As DataTable = Database.GetDatatable(New GetDatatableOptions(pSqlStatement, DatabaseType.ECM) With { + Dim oTable As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(pSqlStatement, DatabaseType.ECM) With { .ConnectionId = pConnectionId }) diff --git a/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb b/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb index baf29f6..e3d2979 100644 --- a/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb +++ b/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb @@ -7,8 +7,8 @@ Public Class ClassFinalizeDoc Dim _error As Boolean = False If CURRENT_DT_FINAL_INDEXING Is Nothing Then Dim oSQL = String.Format("select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = {0}", CURRENT_ProfilGUID) - 'CURRENT_DT_FINAL_INDEXING = Database_ECM.GetDatatable(oSQL) ', "Write_Final_Metadata") - CURRENT_DT_FINAL_INDEXING = Database.GetDatatable("TBPM_PROFILE_FINAL_INDEXING", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + 'CURRENT_DT_FINAL_INDEXING = DatabaseFallback.GetDatatableECM(oSQL) ', "Write_Final_Metadata") + CURRENT_DT_FINAL_INDEXING = DatabaseFallback.GetDatatable("TBPM_PROFILE_FINAL_INDEXING", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}" }) @@ -50,7 +50,7 @@ Public Class ClassFinalizeDoc sql_Statement = clsPatterns.ReplaceInternalValues(sql_Statement) sql_Statement = clsPatterns.ReplaceWindreamIndicies(sql_Statement, WMObject, True) LOGGER.Debug("sql after ReplaceAllValues: " & sql_Statement) - Dim oDynamic_value = Database.GetScalarValueECM(sql_Statement) ', CONNECTION_STRING_ECM, "Write_Final_Metadata/dynamic_value") + Dim oDynamic_value = DatabaseFallback.GetScalarValueECM(sql_Statement) ', CONNECTION_STRING_ECM, "Write_Final_Metadata/dynamic_value") If Not IsNothing(oDynamic_value) Then value = oDynamic_value Else diff --git a/app/DD_PM_WINDREAM/ClassIDBData.vb b/app/DD_PM_WINDREAM/ClassIDBData.vb index fb2ce37..4146033 100644 --- a/app/DD_PM_WINDREAM/ClassIDBData.vb +++ b/app/DD_PM_WINDREAM/ClassIDBData.vb @@ -9,10 +9,10 @@ ''' Public Function Init() Dim oSQL = $"SELECT DISTINCT ATTR_TITLE, TYP_ID, TYP_ID as [TYPE_ID] FROM VWIDB_BE_ATTRIBUTE WHERE SYS_ATTRIBUTE = 0 ORDER BY ATTR_TITLE" - DTVWIDB_BE_ATTRIBUTE = Database.GetDatatableIDB(oSQL) + DTVWIDB_BE_ATTRIBUTE = DatabaseFallback.GetDatatableIDB(oSQL) If IsNothing(DTVWIDB_BE_ATTRIBUTE) Then oSQL = $"SELECT DISTINCT ATTR_TITLE, TYP_ID, TYP_ID as [TYPE_ID] FROM VWIDB_BE_ATTRIBUTE ORDER BY ATTR_TITLE " - DTVWIDB_BE_ATTRIBUTE = Database.GetDatatableIDB(oSQL) + DTVWIDB_BE_ATTRIBUTE = DatabaseFallback.GetDatatableIDB(oSQL) End If End Function Public IDBSystemIndices As List(Of String) @@ -117,7 +117,7 @@ LOGGER.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ") End If Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({CURRENT_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))" - oAttributeValue = Database.GetDatatableIDB(oFNSQL) + oAttributeValue = DatabaseFallback.GetDatatableIDB(oFNSQL) Dim odt As DataTable = oAttributeValue If odt.Rows.Count = 1 Then oAttributeValue = odt.Rows(0).Item(0) @@ -138,7 +138,7 @@ oID_IS_FOREIGN = 1 End If Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}" - Database.ExecuteNonQueryIDB(oDELSQL) + DatabaseFallback.ExecuteNonQueryIDB(oDELSQL) Catch ex As Exception LOGGER.Error(ex) @@ -149,7 +149,7 @@ Public Function Delete_AttributeData(pIDB_OBJID As Int64, pAttributeName As String) As Object Try Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{USER_USERNAME}'" - Database.ExecuteNonQueryIDB(oDELSQL) + DatabaseFallback.ExecuteNonQueryIDB(oDELSQL) Catch ex As Exception LOGGER.Error(ex) @@ -231,7 +231,7 @@ For Each oNewValueRow As DataRow In oDTMyNewValues.Rows Dim oSuccess As Boolean = False Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" - oSuccess = Database.ExecuteNonQueryIDB(oFNSQL) + oSuccess = DatabaseFallback.ExecuteNonQueryIDB(oFNSQL) If oSuccess = False Then Return False End If @@ -239,7 +239,7 @@ Return True Else Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" - Return Database.ExecuteNonQueryIDB(oFNSQL) + Return DatabaseFallback.ExecuteNonQueryIDB(oFNSQL) End If Catch ex As Exception diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index ded0117..f4d12d6 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -94,8 +94,6 @@ Public Class ClassInit 'End If If CONFIG.Config.EDMIAppServer <> String.Empty Then - - Try 'Dim oSplit() = CONFIG.Config.EDMIAppServer.ToString.Split(";") 'Dim oAppServer = oSplit(0) @@ -162,8 +160,9 @@ Public Class ClassInit Public Function InitDatabase() - Dim dbResult As Boolean + Dim Database_ECM As MSSQLServer = Nothing + Dim Database_IDB As MSSQLServer = Nothing If CONNECTION_STRING_ECM = String.Empty Then MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information) ERROR_STATE = "NO DB-CONNECTION" @@ -173,14 +172,20 @@ Public Class ClassInit Database_ECM = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_ECM) If Database_ECM.DBInitialized = True Then 'ClassDatabase.Init(CONNECTION_STRING_ECM) - dbResult = True + dbECMInitialized = True Else - dbResult = False + dbECMInitialized = False + End If + If dbECMInitialized = False Then + ERROR_STATE = "FAILED DBCONNECTION" + MsgBox("Error in InitDatabase. (Connection DD_ECM failed) More information in the logfile.", MsgBoxStyle.Critical) + Return False End If If CONNECTION_STRING_IDB <> String.Empty Then Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB) If Database_IDB.DBInitialized = True Then + dbIDBInitialized = True IDB_ACTIVE = True LOGGER.Info("IDB is active via Config") @@ -189,15 +194,19 @@ Public Class ClassInit ' We initialize the Class in anycase. ' If there is no client, it will fall back to the db by itself - Database = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB) - - If dbResult = False Then - ERROR_STATE = "FAILED DBCONNECTION" - MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical) - Return False - Else + DatabaseFallback = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB) + If dbECMInitialized = True And CONNECTION_STRING_IDB = String.Empty Then Return True + ElseIf dbECMInitialized = True And CONNECTION_STRING_IDB <> String.Empty Then + If dbIDBInitialized = True Then + Return True + Else + MsgBox("Error in InitDatabase. (Connection IDB failed) More information in the logfile.", MsgBoxStyle.Critical) + Return False + End If + End If + End Function @@ -246,7 +255,7 @@ Public Class ClassInit Dim oSQLSW As New RefreshHelper.SW("VWDD_USER_CLIENT") oSQL = $"SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{USER_USERNAME}')" - DT_CLIENT_USER = Database.GetDatatable("VWDD_USER_CLIENT", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + DT_CLIENT_USER = DatabaseFallback.GetDatatable("VWDD_USER_CLIENT", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"USERNAME like '{USER_USERNAME}'" }) 'DT_CLIENT_USER = DataASorDB.GetDatatable("DD_ECM", oSQL, "VWDD_USER_CLIENT", $"USERNAME like '{USER_USERNAME}'") @@ -275,7 +284,7 @@ Public Class ClassInit '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 { + DT_CHECKUSER_MODULE = DatabaseFallback.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'" }) @@ -314,7 +323,31 @@ Public Class ClassInit USER_RIGHT_FILE_DELETE = False End Try USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") - USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + + 'If Not IsNothing(BASEDATA_DT_TBDD_SQL_COMMANDS) Then + ' If BASEDATA_DT_TBDD_SQL_COMMANDS.Rows.Count > 0 Then + ' For Each oRow As DataRow In BASEDATA_DT_TBDD_SQL_COMMANDS.Rows + ' If oRow.Item("TITLE") = "LICENSE_COUNT_PM" Then + ' oSQL = oRow.Item("SQL_COMMAND") + ' Dim oResult = _Client.GetScalarValueFromECM(oSQL) + ' If oResult.OK Then + ' USERCOUNT_LOGGED_IN = oResult.Scalar + ' Else + ' USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + ' End If + ' End If + ' Next + ' Else + ' LOGGER.Warn("BASEDATA_DT_TBDD_SQL_COMMANDS.Rows = 0!") + ' USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + ' End If + 'Else + ' LOGGER.Warn("BASEDATA_DT_TBDD_SQL_COMMANDS is nothing!") + ' USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + 'End If + + + ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE) @@ -388,7 +421,7 @@ Public Class ClassInit Dim oSql = String.Format("select * from TBPM_KONFIGURATION WHERE GUID = 1") oStep = "TBPM_KONFIGURATION" 'BASEDATA_DT_CONFIG = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_KONFIGURATION", $"GUID = 1") - BASEDATA_DT_CONFIG = Database.GetDatatable("TBPM_KONFIGURATION", New GetDatatableOptions(oSql, DatabaseType.ECM) With { + BASEDATA_DT_CONFIG = DatabaseFallback.GetDatatable("TBPM_KONFIGURATION", New GetDatatableOptions(oSql, DatabaseType.ECM) With { .FilterExpression = $"GUID = 1" }) @@ -397,13 +430,13 @@ Public Class ClassInit oStep = "TBDD_CONNECTION" oSql = "select * from TBDD_CONNECTION WHERE AKTIV = 1" 'BASEDATA_DT_TBDD_CONNECTION = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_CONNECTION", "") - BASEDATA_DT_TBDD_CONNECTION = Database.GetDatatable("TBDD_CONNECTION", New GetDatatableOptions(oSql, DatabaseType.ECM)) + BASEDATA_DT_TBDD_CONNECTION = DatabaseFallback.GetDatatable("TBDD_CONNECTION", New GetDatatableOptions(oSql, DatabaseType.ECM)) oStep = "TBDD_3RD_PARTY_MODULES" oSql = "Select * FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1" Dim oTBDD_3RD_PARTY_MODULES As DataTable 'oTBDD_3RD_PARTY_MODULES = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_3RD_PARTY_MODULES", "") - oTBDD_3RD_PARTY_MODULES = Database.GetDatatable("TBDD_3RD_PARTY_MODULES", New GetDatatableOptions(oSql, DatabaseType.ECM)) + oTBDD_3RD_PARTY_MODULES = DatabaseFallback.GetDatatable("TBDD_3RD_PARTY_MODULES", New GetDatatableOptions(oSql, DatabaseType.ECM)) For Each oROW As DataRow In oTBDD_3RD_PARTY_MODULES.Rows If oROW.Item("NAME") = "GDPICTURE" Then @@ -411,15 +444,20 @@ Public Class ClassInit End If Next + oStep = "TBDD_SQL_COMMANDS" + oSql = "Select * FROM TBDD_SQL_COMMANDS" + + BASEDATA_DT_TBDD_SQL_COMMANDS = DatabaseFallback.GetDatatable("TBDD_SQL_COMMANDS", New GetDatatableOptions(oSql, DatabaseType.ECM)) + oStep = "TBDD_GUI_LANGUAGE_PHRASE" oSql = "SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE IN ('PM','All Modules')" 'BASEDATA_DT_GUI_LANGUAGE_PHRASES = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_GUI_LANGUAGE_PHRASE", "") - BASEDATA_DT_GUI_LANGUAGE_PHRASES = Database.GetDatatable("TBDD_GUI_LANGUAGE_PHRASE", New GetDatatableOptions(oSql, DatabaseType.ECM)) + BASEDATA_DT_GUI_LANGUAGE_PHRASES = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE_PHRASE", New GetDatatableOptions(oSql, DatabaseType.ECM)) oStep = "TBPM_PROFILE_SEARCH" oSql = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX" 'BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX") - BASEDATA_DT_PROFILES_SEARCHES_DOC = Database.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSql, DatabaseType.ECM) With { + BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSql, DatabaseType.ECM) With { .FilterExpression = "TYPE = 'DOC'", .SortByColumn = "PROFILE_ID,TAB_INDEX" }) @@ -428,13 +466,13 @@ Public Class ClassInit oStep = "TBPM_MAIN_VIEW_GROUPS" oSql = "SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1" 'BASEDATA_DTGRID_GROUPS = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_MAIN_VIEW_GROUPS", "") - BASEDATA_DTGRID_GROUPS = Database.GetDatatable("TBPM_MAIN_VIEW_GROUPS", New GetDatatableOptions(oSql, DatabaseType.ECM)) + BASEDATA_DTGRID_GROUPS = DatabaseFallback.GetDatatable("TBPM_MAIN_VIEW_GROUPS", New GetDatatableOptions(oSql, DatabaseType.ECM)) oStep = "TBPM_CHART" oSql = "SELECT * FROM TBPM_CHART" 'BASEDATA_DT_CHARTS = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_CHART", "") - BASEDATA_DT_CHARTS = Database.GetDatatable("TBPM_CHART", New GetDatatableOptions(oSql, DatabaseType.ECM)) + BASEDATA_DT_CHARTS = DatabaseFallback.GetDatatable("TBPM_CHART", New GetDatatableOptions(oSql, DatabaseType.ECM)) oStopWatch.Done() Catch ex As Exception @@ -449,7 +487,7 @@ Public Class ClassInit Dim oStopWatch As New RefreshHelper.SW("InitBasics2") Dim oSql = String.Format("SELECT * FROM VWPM_PROFILE_USER WHERE USER_ID = {0}", USER_ID) 'BASEDATA_DT_VW_PROFILE_USER = DataASorDB.GetDatatable("DD_ECM", oSql, "VWPM_PROFILE_USER", $"USER_ID = {USER_ID}") - BASEDATA_DT_VW_PROFILE_USER = Database.GetDatatable("VWPM_PROFILE_USER", New GetDatatableOptions(oSql, DatabaseType.ECM) With { + BASEDATA_DT_VW_PROFILE_USER = DatabaseFallback.GetDatatable("VWPM_PROFILE_USER", New GetDatatableOptions(oSql, DatabaseType.ECM) With { .FilterExpression = $"USER_ID = {USER_ID}" }) @@ -470,7 +508,7 @@ Public Class ClassInit Dim oSql As String = "select * from tbdd_Modules where SHORT_NAME = 'PM'" Dim oDTtbdd_Modules As DataTable 'oDTtbdd_Modules = DataASorDB.GetDatatable("DD_ECM", oSql, "tbdd_Modules", $" SHORT_NAME = 'PM'") - oDTtbdd_Modules = Database.GetDatatable("TBDD_MODULES", New GetDatatableOptions(oSql, DatabaseType.ECM) With { + oDTtbdd_Modules = DatabaseFallback.GetDatatable("TBDD_MODULES", New GetDatatableOptions(oSql, DatabaseType.ECM) With { .FilterExpression = $" SHORT_NAME = 'PM'" }) diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index 4ec0c7b..75c63b4 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -5,11 +5,28 @@ Public Class ClassParamRefresh Dim oStopwatch As New RefreshHelper.SW("Refresh_Params") FORCE_LAYOUT_OVERVIEW = False SHOW_CHARTS = True + Dim oLicenseoverSQL As Boolean = False + + If Not IsNothing(BASEDATA_DT_TBDD_SQL_COMMANDS) Then + If BASEDATA_DT_TBDD_SQL_COMMANDS.Rows.Count > 0 Then + For Each oRow As DataRow In BASEDATA_DT_TBDD_SQL_COMMANDS.Rows + If oRow.Item("TITLE") = "LICENSE_COUNT_PM" Then + Dim oSQL = oRow.Item("SQL_COMMAND") + USERCOUNT_LOGGED_IN = DatabaseFallback.GetScalarValueECM(oSQL) + oLicenseoverSQL = True + End If + Next + End If + End If + If DT_CHECKUSER.Rows.Count = 1 Then - USERCOUNT_LOGGED_IN = DT_CHECKUSER.Rows(0).Item("USERCOUNT_LOGGED_IN") + If oLicenseoverSQL = False Then + USERCOUNT_LOGGED_IN = DT_CHECKUSER.Rows(0).Item("USERCOUNT_LOGGED_IN") + End If + Try WORKING_MODE = DT_CHECKUSER.Rows(0).Item("WORKING_MODE") Catch ex As Exception @@ -48,22 +65,21 @@ Public Class ClassParamRefresh BASIC_CONF_VISIBLE = False LOGGER.Debug($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]") ElseIf oMode.StartsWith("PM.IDB_CONID!") Then - If CONNECTION_STRING_IDB <> "" And Not IsNothing(Database_IDB) Then - If Database_IDB.DBInitialized = True Then - IDB_ACTIVE = True - Continue For - End If + If CONNECTION_STRING_IDB <> "" And dbIDBInitialized = True Then + IDB_ACTIVE = True + Continue For Else + Dim Database_IDB As MSSQLServer = Nothing Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "") - 'Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID) - Dim oConString = Database_ECM.Get_ConnectionStringforID(CON_ID) + + Dim oConString = DatabaseFallback.GetConnectionString(CON_ID) CONNECTION_STRING_IDB = oConString Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB) If Database_IDB.DBInitialized = True Then IDB_ACTIVE = True LOGGER.Info($"IDB is active - IDB-Connection [{CON_ID}]!") - Database.InitializeIDB(Database_IDB) + DatabaseFallback.InitializeIDB(Database_IDB) Else IDB_ACTIVE = False End If diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb index 8328618..f7bc3a2 100644 --- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb +++ b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb @@ -136,7 +136,7 @@ LOGGER.Error(ex) Try ' 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 userExistsInServerUserGroup = Database.GetScalarValueECM(sql) ', CONNECTION_STRING_ECM, "StartWMCC-userExistsInServerUserGroup") + Dim userExistsInServerUserGroup = DatabaseFallback.GetScalarValueECM(sql) ', CONNECTION_STRING_ECM, "StartWMCC-userExistsInServerUserGroup") If WMSESSION_STARTSTOP_STARTUP = True Then 'And userExistsInServerUserGroup Is Nothing @@ -159,7 +159,7 @@ LOGGER.Error(ex) Try ' 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 userExistsInServerUserGroup = Database.GetScalarValueECM(sql) ', CONNECTION_STRING_ECM, "StopWMCC-userExistsInServerUserGroup") + Dim userExistsInServerUserGroup = DatabaseFallback.GetScalarValueECM(sql) ', CONNECTION_STRING_ECM, "StopWMCC-userExistsInServerUserGroup") If WMSESSION_STARTSTOP_STARTUP = True Then 'And userExistsInServerUserGroup Is Nothing Dim owindreamControlCenter = CreateObject("Wmcc.ControlCenter") diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 52c9686..325e08f 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -8,6 +8,7 @@ Module ModuleRuntimeVariables ' Diese Werte müssen später zur Laufzeit geladen werden Public Property BASEDATA_DT_TBDD_CONNECTION As DataTable + Public Property BASEDATA_DT_TBDD_SQL_COMMANDS As DataTable Public Property BASEDATA_DT_CONFIG As DataTable Public Property BASEDATA_DTGRID_GROUPS As DataTable Public Property BASEDATA_DT_CHARTS As DataTable @@ -152,10 +153,11 @@ Module ModuleRuntimeVariables Public Property _Client As Client - Public Property Database_ECM As MSSQLServer - Public Property Database_IDB As MSSQLServer - Public Property Database As DatabaseWithFallback + + Public Property DatabaseFallback As DatabaseWithFallback + Public Property dbECMInitialized As Boolean = False + Public Property dbIDBInitialized As Boolean = False Public Property Timer5Mins_running As Boolean = False Public Property TimerRefresh_running As Boolean = False diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 8e876bd..b65092b 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmAdmin2.vb b/app/DD_PM_WINDREAM/frmAdmin2.vb index e107bc9..f45e9aa 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.vb +++ b/app/DD_PM_WINDREAM/frmAdmin2.vb @@ -101,7 +101,7 @@ Public Class frmAdmin2 'wenn Speichern ja If result = MsgBoxResult.Yes Then Dim oSQL = $"Delete from TBDD_EMAIL_TEMPLATE where guid = {GUIDTextEdit.Text}" - If Database_ECM.ExecuteNonQuery(oSQL) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oSQL) = True Then Load_Email_template() Status_Changed("Vorlage gelöscht!") End If @@ -140,12 +140,12 @@ Public Class frmAdmin2 Me.Cursor = Cursors.WaitCursor Try Dim oSQL = "SELECT * FROM TBPM_FURTHER_KONFIG_VIEW" - DT_FURTHER_KONFIG_VIEW = Database_ECM.GetDatatable(oSQL) ', "Monitor-Load_Grid_Data1") + DT_FURTHER_KONFIG_VIEW = DatabaseFallback.GetDatatableECM(oSQL) ', "Monitor-Load_Grid_Data1") If Not IsNothing(DT_FURTHER_KONFIG_VIEW) Then If DT_FURTHER_KONFIG_VIEW.Rows.Count >= 1 Then oSQL = DT_FURTHER_KONFIG_VIEW.Rows(0).Item("GRID_SQL") GridViewWK1.Columns.Clear() - Dim oDTGRID1 As DataTable = Database_ECM.GetDatatable(oSQL) ', "FurtherConfig-Load_Grid_Data1") + Dim oDTGRID1 As DataTable = DatabaseFallback.GetDatatableECM(oSQL) ', "FurtherConfig-Load_Grid_Data1") GridControlWK1.DataSource = oDTGRID1 GRID1_TITLE = DT_FURTHER_KONFIG_VIEW.Rows(0).Item("GRID_TITLE") GridViewWK1.Tag = GRID1_TITLE @@ -167,7 +167,7 @@ Public Class frmAdmin2 GridViewWK2.Tag = GRID2_TITLE GridViewWK2.Columns.Clear() - Dim oDTGRID2 As DataTable = Database_ECM.GetDatatable(GRID2_SQL) ', "FurtherConfig-Load_Grid_Data2") + Dim oDTGRID2 As DataTable = DatabaseFallback.GetDatatableECM(GRID2_SQL) ', "FurtherConfig-Load_Grid_Data2") GridControlWK2.DataSource = oDTGRID2 SET_GRID_DESCRIPTION(GridViewWK2, oDTGRID2) Select Case DT_FURTHER_KONFIG_VIEW.Rows.Count @@ -178,7 +178,7 @@ Public Class frmAdmin2 GridViewWK3.Tag = GRID3_TITLE GridViewWK3.Columns.Clear() - Dim oDTGRID3 As DataTable = Database_ECM.GetDatatable(GRID3_SQL) ', "FurtherConfig-Load_Grid_Data3") + Dim oDTGRID3 As DataTable = DatabaseFallback.GetDatatableECM(GRID3_SQL) ', "FurtherConfig-Load_Grid_Data3") GridControlWK3.DataSource = oDTGRID3 SET_GRID_DESCRIPTION(GridViewWK3, oDTGRID3) Case 4 @@ -186,14 +186,14 @@ Public Class frmAdmin2 GRID3_SQL = DT_FURTHER_KONFIG_VIEW.Rows(2).Item("GRID_SQL") GridViewWK3.Tag = GRID3_TITLE GridViewWK3.Columns.Clear() - Dim oDTGRID3 As DataTable = Database_ECM.GetDatatable(GRID3_SQL) ', "FurtherConfig-Load_Grid_Data3") + Dim oDTGRID3 As DataTable = DatabaseFallback.GetDatatableECM(GRID3_SQL) ', "FurtherConfig-Load_Grid_Data3") GridControlWK3.DataSource = oDTGRID3 SET_GRID_DESCRIPTION(GridViewWK3, oDTGRID3) GRID4_TITLE = DT_FURTHER_KONFIG_VIEW.Rows(3).Item("GRID_TITLE") GRID4_SQL = DT_FURTHER_KONFIG_VIEW.Rows(3).Item("GRID_SQL") GridViewWK4.Tag = GRID4_TITLE GridViewWK4.Columns.Clear() - Dim oDTGRID4 As DataTable = Database_ECM.GetDatatable(GRID4_SQL) ', "FurtherConfig-Load_Grid_Data4") + Dim oDTGRID4 As DataTable = DatabaseFallback.GetDatatableECM(GRID4_SQL) ', "FurtherConfig-Load_Grid_Data4") GridControlWK4.DataSource = oDTGRID4 SET_GRID_DESCRIPTION(GridViewWK4, oDTGRID4) End Select diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index aa7bf06..0d9c9a6 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -216,7 +216,7 @@ Public Class frmAdministration End Try Else Dim oSQL = "SELECT GUID, TITLE FROM TBIDB_BUSINESS_ENTITY" - Dim oDT As DataTable = Database_IDB.GetDatatable(oSQL) + Dim oDT As DataTable = DatabaseFallback.GetDatatableIDB(oSQL) For Each oROW As DataRow In oDT.Rows Me.cmbObjekttypen.Items.Add(oROW.Item(1)) Next @@ -488,7 +488,7 @@ Public Class frmAdministration Series4Sequence.Value = 1 Dim oSQLChart As String = "SELECT * FROM TBPM_CHART ORDER BY GROUP_ID" - DT_CHART_CONFIG = Database_ECM.GetDatatable(oSQLChart) ', "Adm_Chart") + DT_CHART_CONFIG = DatabaseFallback.GetDatatableECM(oSQLChart) ', "Adm_Chart") For Each oROW As DataRow In DT_CHART_CONFIG.Rows If oROW.Item("GROUP_ID") = 1 Then Series1GUID.Text = oROW.Item("GUID") @@ -1086,7 +1086,7 @@ Public Class frmAdministration If result = MsgBoxResult.Yes Then Try Dim oEXECSQL As String = $"EXEC PRPM_COPY_PROFILE {PROFILGUIDTextBox.Text},'{USER_USERNAME}'" - If Database_ECM.ExecuteNonQuery(oEXECSQL) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oEXECSQL) = True Then MsgBox("Das Profil " & NAMETextBox.Text & " wurde erfolgreich kopiert!", MsgBoxStyle.Information, "Erfolgsmeldung") Refresh_Profildaten() Else @@ -1110,7 +1110,7 @@ Public Class frmAdministration Try Dim profileID = PROFILGUIDTextBox.Text Dim del As String = $"EXEC PRPM_DELETE_PROFILE {profileID}" - If Database_ECM.ExecuteNonQuery(del) = True Then + If DatabaseFallback.ExecuteNonQueryECM(del) = True Then MsgBox("Das Profil " & NAMETextBox.Text & " wurde erfolgreich gelöscht!", MsgBoxStyle.Information, "Erfolgsmeldung") Refresh_Profildaten() End If @@ -1127,7 +1127,7 @@ Public Class frmAdministration Dim result As MsgBoxResult = MsgBox("Wollen Sie die Dateien für dieses Profil wirklich entfernen?" & vbNewLine & "Wenn ja müssen Sie auf die Aktualisierung des Jobs warten bis wieder Dateien zur Bearbeitung frei sind.", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") 'wenn Speichern ja If result = MsgBoxResult.Yes Then - If Database_ECM.ExecuteNonQuery("DELETE FROM TBPM_PROFILE_FILES WHERE PROFIL_ID = " & PROFILGUIDTextBox.Text) = True Then + If DatabaseFallback.ExecuteNonQueryECM("DELETE FROM TBPM_PROFILE_FILES WHERE PROFIL_ID = " & PROFILGUIDTextBox.Text) = True Then MsgBox("Die Dateien zum Profil wurden erfolgreich gelöscht!", MsgBoxStyle.Information) End If End If @@ -1184,7 +1184,7 @@ Public Class frmAdministration Dim result As MsgBoxResult = MsgBox("Do You really want to delete all workflow-Jobs?" & vbNewLine & "If yes You have to wait for the next Sync-Job for the jobs.", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") 'wenn Speichern ja If result = MsgBoxResult.Yes Then - If Database_ECM.ExecuteNonQuery("DELETE FROM TBPM_PROFILE_FILES") = True Then + If DatabaseFallback.ExecuteNonQueryECM("DELETE FROM TBPM_PROFILE_FILES") = True Then MsgBox("All workflow-jobs have been erased!", MsgBoxStyle.Information) End If End If @@ -1205,7 +1205,7 @@ Public Class frmAdministration Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then - Database_ECM.ExecuteNonQuery(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) + DatabaseFallback.ExecuteNonQueryECM(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand End If Catch ex As Exception @@ -1299,7 +1299,7 @@ Public Class frmAdministration Dim sql As String = $"INSERT INTO TBPM_PROFILE_FINAL_INDEXING (PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, ADDED_WHO,IF_VEKTOR_BEHAVIOUR,DESCRIPTION,SEQUENCE,CONTINUE_INDETERMINED) VALUES ({oProfileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})" - If Database_ECM.ExecuteNonQuery(sql) Then + If DatabaseFallback.ExecuteNonQueryECM(sql) Then tsbStaticInfo.Caption = $"Final index added - {Now.ToLongTimeString}" INSERT_ACTIVE = False End If @@ -1309,7 +1309,7 @@ Public Class frmAdministration VALUE = '{value}', ACTIVE = {active}, ALLOW_NEW_VALUES = {AllowAddNewValues}, PREVENT_DUPLICATES = {preventDuplicates},IF_VEKTOR_BEHAVIOUR = '{IF_VEKTOR_BEHAVIOUR}', [SEQUENCE] = {oSequence}, CONTINUE_INDETERMINED = {oContinueOIdS} WHERE GUID = {guid}" - If Database_ECM.ExecuteNonQuery(sql) Then + If DatabaseFallback.ExecuteNonQueryECM(sql) Then tsbStaticInfo.Caption = $"Final index saved - {Now.ToLongTimeString} - RESTART NECESSARY" End If End If @@ -1348,7 +1348,7 @@ Public Class frmAdministration Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then - Database_ECM.ExecuteNonQuery(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) + DatabaseFallback.ExecuteNonQueryECM(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand End If Catch ex As Exception @@ -1363,14 +1363,14 @@ Public Class frmAdministration CURRENT_ProfilGUID = PROFILGUIDTextBox.Text CURRENT_DESIGN_TYPE = "SQL_PROFILE" Dim oSQL = $"SELECT [SQL_VIEW] FROM TBPM_PROFILE WHERE GUID = {CURRENT_ProfilGUID}" - Dim oldSQL = Database_ECM.GetScalarValue(oSQL) + Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then If oldSQL <> oForm.SQLCommand Then Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_VIEW = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" - If Database_ECM.ExecuteNonQuery(oUpdate) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then tsbStaticInfo.Caption = $"Profile SQL saved - {Now.ToLongTimeString}" CHANGES_FORM_DESIGN = True End If @@ -1388,14 +1388,14 @@ Public Class frmAdministration CURRENT_ProfilGUID = PROFILGUIDTextBox.Text CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {CURRENT_ProfilGUID}" - Dim oldSQL = Database_ECM.GetScalarValue(oSQL) ', CONNECTION_STRING_ECM, "bbtnItemFinishSQL_ItemClick-get SQL_BTN_FINISH") + Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) ', CONNECTION_STRING_ECM, "bbtnItemFinishSQL_ItemClick-get SQL_BTN_FINISH") Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then If oldSQL <> oForm.SQLCommand Then Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" - If Database_ECM.ExecuteNonQuery(oUpdate) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then tsbStaticInfo.Caption = $"Profile SQLFinish saved - {Now.ToLongTimeString}" CHANGES_FORM_DESIGN = True End If @@ -1532,7 +1532,7 @@ Public Class frmAdministration ,[CHANGED_WHO] = '{USER_USERNAME}' ,[GROUP_ID] = '{pSequence}' WHERE GUID = {pGUID}" - Return Database_ECM.ExecuteNonQuery(oUpdate) + Return DatabaseFallback.ExecuteNonQueryECM(oUpdate) End Function Private Function Insert_ChartRow(pTitle As String, pArgument As String, pColumn As String, pType As String, pSQL As String, pSequence As String) pSQL = pSQL.Replace("'", "''") @@ -1552,7 +1552,7 @@ Public Class frmAdministration ,'{pTitle}' ,'{USER_USERNAME}' ,'{pSequence}')" - Return Database_ECM.ExecuteNonQuery(oInsert) + Return DatabaseFallback.ExecuteNonQueryECM(oInsert) End Function Private Sub BarButtonItem22_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem22.ItemClick @@ -1671,7 +1671,7 @@ Public Class frmAdministration End Sub Private Function DELETE_ChartRow(pGUID As String) Dim oDelete = $"DELETE FROM [dbo].[TBPM_CHART] WHERE GUID = {pGUID}" - Return Database_ECM.ExecuteNonQuery(oDelete) + Return DatabaseFallback.ExecuteNonQueryECM(oDelete) End Function Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click diff --git a/app/DD_PM_WINDREAM/frmColumn_Detail.vb b/app/DD_PM_WINDREAM/frmColumn_Detail.vb index 1bbae64..f8ae4fa 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.vb +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.vb @@ -118,7 +118,7 @@ Public Class frmColumn_Detail If oldSQL <> oForm.SQLCommand Then Dim oUpdate As String = $"Update TBPM_CONTROL_TABLE SET CHANGED_WHO = '{USER_USERNAME}', SQL_COMMAND = '{oForm.SQLCommand.Replace("'", "''")}' , CONNECTION_ID = {oForm.ConnectionID} WHERE GUID = {GUIDTextBox.Text}" - If Database_ECM.ExecuteNonQuery(oUpdate) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always tslblAenderungen.Caption = "Changes saved - " & Now End If @@ -166,7 +166,7 @@ Public Class frmColumn_Detail If oldSQL <> oForm.SQLCommand Then Dim oUpdate As String = $"Update TBPM_CONTROL_TABLE SET CHANGED_WHO = '{USER_USERNAME}', SQL_COMMAND = '{oForm.SQLCommand.Replace("'", "''")}' , CONNECTION_ID = {oForm.ConnectionID} WHERE GUID = {GUIDTextBox.Text}" - If Database_ECM.ExecuteNonQuery(oUpdate) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always tslblAenderungen.Caption = "Changes saved - " & Now End If diff --git a/app/DD_PM_WINDREAM/frmDesignerLayout.vb b/app/DD_PM_WINDREAM/frmDesignerLayout.vb index f775942..0dc52c8 100644 --- a/app/DD_PM_WINDREAM/frmDesignerLayout.vb +++ b/app/DD_PM_WINDREAM/frmDesignerLayout.vb @@ -105,7 +105,7 @@ Public Class frmDesignerLayout _LayoutSerializer = New LayoutControlSerializer(LOGCONFIG) Dim oSQL = "Select * from TBIDB_LAYOUT_CONFIG" - FormsDatatable = Database_IDB.GetDatatable(oSQL) + FormsDatatable = DatabaseFallback.GetDatatableIDB(oSQL) If Not IsNothing(FormsDatatable) Then For Each oRow As DataRow In FormsDatatable.Rows Dim oItem As New BarButtonItem(RibbonControl1.Manager, oRow.Item("TITLE")) @@ -149,7 +149,7 @@ Public Class frmDesignerLayout Dim oSql As String = $"UPDATE TBIDB_LAYOUT_CONFIG SET XML_CONTENT = '{oControls}', XML_LAYOUT = '{oLayout}', CHANGED_WHO = '{Environment.UserName}' WHERE GUID = {SelectedLayoutId}" - Database_IDB.ExecuteNonQuery(oSql) + DatabaseFallback.ExecuteNonQueryIDB(oSql) End Using End Using End Sub diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 332ad93..e76a384 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -117,7 +117,7 @@ Public Class frmFormDesigner Private Sub frmFormDesigner_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing If ProfileId > 0 Then Dim sql As String = $"SELECT NAME, INDEX_NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {ProfileId} AND CTRL_TYPE NOT IN ('BUTTON','LBL','LINE')" - Dim dt As DataTable = Database_ECM.GetDatatable(sql) ', "frmFormDesigner_FormClosing") + Dim dt As DataTable = DatabaseFallback.GetDatatableECM(sql) ', "frmFormDesigner_FormClosing") Dim missingIndexControls As New List(Of String) @@ -265,7 +265,7 @@ Public Class frmFormDesigner SetMovementHandlers(dgv) Case "TABLE" - Dim oDTColumnsPerDevExGrid As DataTable = Database_ECM.GetDatatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {guid} ORDER BY [SEQUENCE]") ', "FDesignLaodControls") + Dim oDTColumnsPerDevExGrid As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {guid} ORDER BY [SEQUENCE]") ', "FDesignLaodControls") Dim table = ClassControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True) @@ -515,7 +515,7 @@ Public Class frmFormDesigner Private Function GetLastID() Dim sql = String.Format("SELECT MAX(GUID) FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0}", ProfileId) - Return Database_ECM.GetScalarValue(sql) + Return DatabaseFallback.GetScalarValueECM(sql) End Function Sub SetActiveControlColor() @@ -1100,12 +1100,12 @@ Public Class frmFormDesigner End If Try - If Database_ECM.ExecuteNonQuery($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue}, CHANGED_WHO = '{USER_USERNAME}' WHERE GUID = {guid}") = True Then + If DatabaseFallback.ExecuteNonQueryECM($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue}, CHANGED_WHO = '{USER_USERNAME}' WHERE GUID = {guid}") = True Then tslblAenderungen.Visible = True tslblAenderungen.Text = "Änderungen gespeichert - " & Now If columnName.ToUpper = "CTRL_TEXT" Then Dim oSQL = $"EXEC PRPM_CHANGE_CONTROL_CAPTION {guid},{escapedValue},'{USER_USERNAME}','{USER_LANGUAGE}'" - Database_ECM.ExecuteNonQuery(oSQL) + DatabaseFallback.ExecuteNonQueryECM(oSQL) End If CHANGES_FORM_DESIGN = True Return True @@ -1127,7 +1127,7 @@ Public Class frmFormDesigner Dim oGuid = clsTools.ShortGuid() Dim oColumnName As String = "colNew" & oGuid Dim oColumnCaption As String = "New Column " & oGuid - If Database_ECM.ExecuteNonQuery($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)") = True Then + If DatabaseFallback.ExecuteNonQueryECM($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)") = True Then tslblAenderungen.Visible = True tslblAenderungen.Text = "Änderungen gespeichert - " & Now @@ -1144,14 +1144,14 @@ Public Class frmFormDesigner Try CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}" - Dim oldSQL = Database_ECM.GetScalarValue(oSQL) + Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then If oldSQL <> oForm.SQLCommand Then Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" - If Database_ECM.ExecuteNonQuery(oUpdate) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then tslblAenderungen.Text = $"Profile SQLFinish saved - {Now.ToLongTimeString}" tslblAenderungen.Visible = True CHANGES_FORM_DESIGN = True diff --git a/app/DD_PM_WINDREAM/frmGhostMode.vb b/app/DD_PM_WINDREAM/frmGhostMode.vb index 4ec1808..662f97e 100644 --- a/app/DD_PM_WINDREAM/frmGhostMode.vb +++ b/app/DD_PM_WINDREAM/frmGhostMode.vb @@ -1,13 +1,13 @@ Public Class frmGhostMode Private Sub frmGhostMode_Load(sender As Object, e As EventArgs) Handles Me.Load Dim oSQL = "SELECT CONFIG_VALUE FROM TBIDB_BASE WHERE CONFIG_NAME = 'GHOST_SELECT'" - oSQL = Database_IDB.GetScalarValue(oSQL) ',CONNECTION_STRING_IDB, "frmGhostMode_Load") - Dim DT_USER = Database_ECM.GetDatatable(oSQL) ', "frmGhostMode_LoadDT") + oSQL = DatabaseFallback.GetScalarValueIDB(oSQL) ',CONNECTION_STRING_IDB, "frmGhostMode_Load") + Dim DT_USER = DatabaseFallback.GetDatatableECM(oSQL) ', "frmGhostMode_LoadDT") If IsNothing(DT_USER) Then oSQL = "SELECT [SQL_COMMAND] FROM TBDD_SQL_COMMANDS where TITLE = 'GHOST_SELECT'" If Not IsNothing(oSQL) Then - oSQL = Database_IDB.GetScalarValue(oSQL) ', CONNECTION_STRING_ECM) - DT_USER = Database_ECM.GetDatatable(oSQL) '(oSQL, "frmGhostMode_LoadDT2") + oSQL = DatabaseFallback.GetScalarValueECM(oSQL) ', CONNECTION_STRING_ECM) + DT_USER = DatabaseFallback.GetDatatableECM(oSQL) '(oSQL, "frmGhostMode_LoadDT2") Else MsgBox("No SQL for Ghostmode via DD_ECM. Check Your configuration.", MsgBoxStyle.Exclamation) Exit Sub diff --git a/app/DD_PM_WINDREAM/frmInvDashboard.vb b/app/DD_PM_WINDREAM/frmInvDashboard.vb index f06326f..9def94f 100644 --- a/app/DD_PM_WINDREAM/frmInvDashboard.vb +++ b/app/DD_PM_WINDREAM/frmInvDashboard.vb @@ -70,7 +70,7 @@ Public Class frmInvDashboard Dim oChartArgument = cRow.Item("ARGUMENT") Dim oSqlchart = cRow.Item("SQL_COMMAND") oSqlchart = oSqlchart.Replace("@USER", USER_USERNAME) - Dim DATA_DT As DataTable = Database_ECM.GetDatatable(oSqlchart) ', "layputDashboard1") + Dim DATA_DT As DataTable = DatabaseFallback.GetDatatableECM(oSqlchart) ', "layputDashboard1") Dim series As Series = Create_Series(oChartTitle, oChartType.ToString.ToUpper) @@ -118,7 +118,7 @@ Public Class frmInvDashboard oSqlchart = oSqlchart.ToString.ToUpper.Replace("@USER_ID", USER_ID) oSqlchart = oSqlchart.ToString.ToUpper.Replace("@USER", USER_USERNAME) - Dim DATA_DT As DataTable = Database_ECM.GetDatatable(oSqlchart) ', "layputDashboard2") + Dim DATA_DT As DataTable = DatabaseFallback.GetDatatableECM(oSqlchart) ', "layputDashboard2") ' Create Series based on type Dim series As Series = Create_Series(oChartTitle, oChartType) diff --git a/app/DD_PM_WINDREAM/frmKonfig.vb b/app/DD_PM_WINDREAM/frmKonfig.vb index 37dfd98..8bf8fb9 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.vb @@ -88,8 +88,7 @@ Public Class frmKonfig If result = MsgBoxResult.Yes Then 'ConnectionString in Anwendung speichern CONNECTION_STRING_ECM = oPlainConnectionString - 'ClassDatabase.Init() - Database_ECM = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_ECM) + 'Das Passwort verschlüsseln If chkbxUserAut.Checked = False Then Dim wrapper As New ClassEncryption("!35452didalog=") diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index da81ad5..e6195b4 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -174,6 +174,7 @@ Partial Class frmMain Me.bwBasicData = New System.ComponentModel.BackgroundWorker() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components) + Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit() @@ -192,6 +193,7 @@ Partial Class frmMain CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ImageListProfile @@ -565,7 +567,6 @@ Partial Class frmMain Me.bsiUserLoggedIn.Id = 10 Me.bsiUserLoggedIn.ImageOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.group_key Me.bsiUserLoggedIn.Name = "bsiUserLoggedIn" - Me.bsiUserLoggedIn.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' 'bsiVersion ' @@ -1380,11 +1381,17 @@ Partial Class frmMain 'TimerInactivity ' ' + 'PanelControl1 + ' + resources.ApplyResources(Me.PanelControl1, "PanelControl1") + Me.PanelControl1.Name = "PanelControl1" + ' 'frmMain ' Me.Appearance.Options.UseFont = True resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.PanelControl1) Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) @@ -1417,6 +1424,7 @@ Partial Class frmMain CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1571,4 +1579,5 @@ Partial Class frmMain Friend WithEvents BarStaticItemAppServer As DevExpress.XtraBars.BarStaticItem Friend WithEvents bbtniCW As DevExpress.XtraBars.BarButtonItem Friend WithEvents bsiInactivityCheck As DevExpress.XtraBars.BarStaticItem + Friend WithEvents PanelControl1 As DevExpress.XtraEditors.PanelControl End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index dec0639..1110773 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAdQBBwHUAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAdwBBwHcAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -176,6 +176,108 @@ 863, 17 + + 269, 26 + + + Validierung für Gruppe/Profil starten + + + 269, 26 + + + Validierung für Datei starten + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y + 7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb + mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N + CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO + RK5CYII= + + + + 269, 26 + + + Metadaten Datei anzeigen + + + + False + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA + qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg + 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY + AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC + + + + 269, 26 + + + Massenabschluss markierte Dateien + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAP9JREFUOE9jAIHv3787fHz5/P/DQ3v+f/v2jSQMNuDr168NZ/qa/i9U4/1/sCQF + RcGRPbvAYk/v3fkfGRn538nJCY7hBgBdkPDs/Kn/y4xlwIYcaywGS17YueX/Gget/6fnTv6fkpKCohnF + ABAAcV7fufl/o68l3BCQgddWzIe7BhuGaocYAMKgsIC5ZFuUO4YGdAzVjukCkNNBNC7no3gBGIj7b29d + C7cZFpAg54PEbh/Zjz8MQM4GaUTWDMOgwAW5CkQji8Mw2AAg4z1IIygq0RUQwmADvnz5YgDi4PIrLgw3 + AARAHGyK8GEMA8jBUO1UMgCbM/Fh6htAOv72HwANMrXhfARkwAAAAABJRU5ErkJggg== + + + + 269, 26 + + + Lösche alle Filter + + + 269, 26 + + + Layout zurücksetzen + + + 269, 26 + + + Layout speichern + + + 266, 6 + + + 200, 22 + + + Datei als Link versenden + + + 269, 26 + + + Aktionen Datei + + + 269, 26 + + + Exportieren + 270, 256 @@ -216,7 +318,6 @@ 1114, 330 - 8 @@ -338,6 +439,12 @@ 1012, 17 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -516,121 +623,35 @@ $this - 3 - - - 269, 26 - - - Validierung für Gruppe/Profil starten - - - 269, 26 - - - Validierung für Datei starten - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y - 7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb - mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N - CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO - RK5CYII= - - - - 269, 26 - - - Metadaten Datei anzeigen - - - False - - - 266, 6 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA - qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg - 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY - AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC - - - - 269, 26 - - - Massenabschluss markierte Dateien - - - 266, 6 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAP9JREFUOE9jAIHv3787fHz5/P/DQ3v+f/v2jSQMNuDr168NZ/qa/i9U4/1/sCQF - RcGRPbvAYk/v3fkfGRn538nJCY7hBgBdkPDs/Kn/y4xlwIYcaywGS17YueX/Gget/6fnTv6fkpKCohnF - ABAAcV7fufl/o68l3BCQgddWzIe7BhuGaocYAMKgsIC5ZFuUO4YGdAzVjukCkNNBNC7no3gBGIj7b29d - C7cZFpAg54PEbh/Zjz8MQM4GaUTWDMOgwAW5CkQji8Mw2AAg4z1IIygq0RUQwmADvnz5YgDi4PIrLgw3 - AARAHGyK8GEMA8jBUO1UMgCbM/Fh6htAOv72HwANMrXhfARkwAAAAABJRU5ErkJggg== - - - - 269, 26 - - - Lösche alle Filter - - - 269, 26 - - - Layout zurücksetzen - - - 269, 26 - - - Layout speichern - - - 266, 6 - - - 269, 26 + 4 - - Aktionen Datei + + 490, 17 + + + 404, 56 + + + 234, 22 - - 200, 22 + + Popup Erinnerung inaktivieren - - Datei als Link versenden + + 231, 6 - - 269, 26 + + 234, 22 - - Exportieren + + Bring to Front - - 219, 26 + + 234, 22 - - Starte Validierung für Profil + + Out of Range - PM fixieren - - 490, 17 - - - 404, 56 - 235, 76 @@ -812,27 +833,6 @@ True - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 231, 6 - - - 234, 22 - - - Bring to Front - - - 234, 22 - - - Out of Range - PM fixieren - 605, 17 @@ -1425,6 +1425,21 @@ 0, 0 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Funktionen/App Start + Start @@ -1447,7 +1462,7 @@ $this - 4 + 5 RibbonControl1 @@ -1459,22 +1474,7 @@ $this - 5 - - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Funktionen/App Start + 6 Top @@ -1504,7 +1504,7 @@ $this - 8 + 9 Left @@ -1525,7 +1525,7 @@ $this - 6 + 7 Right @@ -1546,7 +1546,7 @@ $this - 7 + 8 True @@ -1560,6 +1560,27 @@ 1347, 527 + + 275, 527 + + + 200, 100 + + + 11 + + + PanelControl1 + + + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + Tahoma, 12pt @@ -2771,9 +2792,6 @@ &Ansicht - - &Hintergrund - &Seiten Layout @@ -2786,6 +2804,9 @@ Bars + + &Hintergrund + PDF Dokument @@ -2913,7 +2934,7 @@ $this - 9 + 10 RibbonPage2 diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 2287ac0..718cbe2 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -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.ExecuteNonQueryECM(sql) + Return DatabaseFallback.ExecuteNonQueryECM(sql) Catch ex As Exception allgFunk.Insert_LogEntry($"ERROR Free_File >> {ex.Message}") LOGGER.Error(ex) @@ -339,7 +339,7 @@ Public Class frmMain If SOURCE_INIT = True Then Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'" 'Dim DTIDB_DOC_DATA_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBDD_SQL_COMMANDS", "TITLE = 'PM_IDB_DOC_DATA'") - Dim DTIDB_DOC_DATA_SQL = Database.GetDatatable("TBDD_SQL_COMMANDS", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + Dim DTIDB_DOC_DATA_SQL = DatabaseFallback.GetDatatable("TBDD_SQL_COMMANDS", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = "TITLE = 'PM_IDB_DOC_DATA'" }) @@ -614,7 +614,6 @@ Public Class frmMain End Sub Sub LoadNavBar() - Dim oStopWatch As New RefreshHelper.SW("LoadNavBar") Dim profileGroupOpen As Boolean = False If Not IsNothing(CurrNavBarGroup) Then Try @@ -684,14 +683,12 @@ Public Class frmMain NavBarControl1.Visible = False End If - - Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Load_Profile_items - Error: " & ex.Message) 'MsgBox("Unexpected Error in Load_Profile_items - Error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - oStopWatch.Done() + End Sub Private Async Sub navBar_LinkClicked(ByVal sender As Object, ByVal e As NavBarLinkEventArgs) If GRID_LOAD_TYPE = "OVERVIEW" Then @@ -802,7 +799,7 @@ Public Class frmMain oSQL = oSQL.Replace("@DATE", Now.ToShortDateString) oSQL = oSQL.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) - CURR_DT_OVERVIEW = Await Database.GetDatatableECMAsync(oSQL) + CURR_DT_OVERVIEW = Await DatabaseFallback.GetDatatableECMAsync(oSQL) If ForceReload = True Then LOGGER.Info("ForceReload is true!") End If @@ -1525,7 +1522,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.GetScalarValueECM(oSQL) + Dim oResult = DatabaseFallback.GetScalarValueECM(oSQL) Try If CBool(oResult) = True Then Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID) @@ -1629,7 +1626,7 @@ Public Class frmMain Dim oSQL = $"select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY [SEQUENCE]" 'CURRENT_DT_FINAL_INDEXING = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE") - CURRENT_DT_FINAL_INDEXING = Database.GetDatatable("TBPM_PROFILE_FINAL_INDEXING", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + CURRENT_DT_FINAL_INDEXING = DatabaseFallback.GetDatatable("TBPM_PROFILE_FINAL_INDEXING", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .SortByColumn = "SEQUENCE" }) @@ -1731,7 +1728,7 @@ Public Class frmMain oSQLOverview = oSQLOverview.Replace("@DATE", Now.ToShortDateString) oSQLOverview = oSQLOverview.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) - CURR_DT_OVERVIEW = Await Database.GetDatatableECMAsync(oSQLOverview) + CURR_DT_OVERVIEW = Await DatabaseFallback.GetDatatableECMAsync(oSQLOverview) oStopWatch2.Done() If Not IsNothing(CURR_DT_OVERVIEW) Then @@ -2178,13 +2175,13 @@ Public Class frmMain Sub LoadCURRENT_DT_PROFILES() Dim oSQL = "select * from TBPM_PROFILE where ACTIVE = 1" 'CURRENT_DT_PROFILES = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE", "") - CURRENT_DT_PROFILES = Database.GetDatatable("TBPM_PROFILE", New GetDatatableOptions(oSQL, DatabaseType.ECM)) + CURRENT_DT_PROFILES = DatabaseFallback.GetDatatable("TBPM_PROFILE", New GetDatatableOptions(oSQL, DatabaseType.ECM)) End Sub Sub LoadVWPM_CONTROL_INDEX() Dim oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX ORDER BY PROFIL_ID,Y_LOC, X_LOC" 'DTVWCONTROLS_INDEX = DataASorDB.GetDatatable("DD_ECM", oSQL, "VWPM_CONTROL_INDEX", "") - DTVWCONTROLS_INDEX = Database.GetDatatable("VWPM_CONTROL_INDEX", New GetDatatableOptions(oSQL, DatabaseType.ECM)) + DTVWCONTROLS_INDEX = DatabaseFallback.GetDatatable("VWPM_CONTROL_INDEX", New GetDatatableOptions(oSQL, DatabaseType.ECM)) End Sub Sub GetBaseData(pMode As String) Dim oStopWatch As New RefreshHelper.SW("GetBaseData") @@ -2192,7 +2189,7 @@ Public Class frmMain Dim 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 = 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 { + DT_CHECKUSER_MODULE = DatabaseFallback.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'" }) @@ -2203,7 +2200,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.GetDatatableECM(oSQL) + CURR_DT_VWPM_PROFILE_ACTIVE = DatabaseFallback.GetDatatableECM(oSQL) If pMode = "bwBasicData" Then bwBasicData.ReportProgress(30) LoadCURRENT_DT_PROFILES() @@ -2213,7 +2210,7 @@ Public Class frmMain If pMode = "bwBasicData" Then bwBasicData.ReportProgress(40) oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX" 'BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX") - BASEDATA_DT_PROFILES_SEARCHES_DOC = Database.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = "TYPE = 'DOC'", .SortByColumn = "PROFILE_ID,TAB_INDEX" }) @@ -2223,7 +2220,7 @@ Public Class frmMain If pMode = "bwBasicData" Then bwBasicData.ReportProgress(50) oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX" 'BASEDATA_DT_PROFILES_SEARCHES_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_SEARCH", "TYPE = 'SQL'", "PROFILE_ID,TAB_INDEX") - BASEDATA_DT_PROFILES_SEARCHES_SQL = Database.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + BASEDATA_DT_PROFILES_SEARCHES_SQL = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = "TYPE = 'SQL'", .SortByColumn = "PROFILE_ID,TAB_INDEX" }) @@ -2238,7 +2235,7 @@ Public Class frmMain End If oSQL = $"SELECT * FROM TBPM_PROFILE_CONTROLS WHERE LEN(ISNULL(SQL_UEBERPRUEFUNG,'')) > 0 AND CTRL_TYPE <> 'BUTTON'" 'DTCONTROLS_WITH_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "DTCONTROLS_WITH_SQL", "", "") - DTCONTROLS_WITH_SQL = Database.GetDatatable("DTCONTROLS_WITH_SQL", New GetDatatableOptions(oSQL, DatabaseType.ECM)) + DTCONTROLS_WITH_SQL = DatabaseFallback.GetDatatable("DTCONTROLS_WITH_SQL", New GetDatatableOptions(oSQL, DatabaseType.ECM)) If pMode = "bwBasicData" Then bwBasicData.ReportProgress(85) If pMode = "bwBasicData" Then bwBasicData.ReportProgress(100) @@ -2294,7 +2291,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.ExecuteNonQueryECM(oSQL) + DatabaseFallback.ExecuteNonQueryECM(oSQL) Next LOGCONFIG.ClearLogs() Catch ex As Exception @@ -2568,7 +2565,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.GetScalarValueECM(oSQL) + Dim oFilePath = DatabaseFallback.GetScalarValueECM(oSQL) Dim oLink = "

Link zur Datei

" Dim oLink2 = "Link zur Datei" diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index 4b88a5c..6a5b7d2 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -61,7 +61,7 @@ Public Class frmMassValidator Size = My.Settings.frmMassValidatorSize End If Try - 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") + DTCONTROLS = DatabaseFallback.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") Catch ex As Exception LOGGER.Error(ex) @@ -370,7 +370,7 @@ Public Class frmMassValidator Case "TABLE" LOGGER.Debug("Versuch Tabelle zu laden") - Dim oDTMyColumns As DataTable = Database.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1") + Dim oDTMyColumns As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1") oControl = ClassControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False) End Select @@ -420,7 +420,7 @@ Public Class frmMassValidator oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, True) LOGGER.Debug(">>> sql after ReplaceAllValues: " & oSqlCommand) _dependingControl_in_action = True - Dim oDTDEPENDING_RESULT As DataTable = Database.GetDatatableECM(oSqlCommand) ', "MV_OnLookUp1") + Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatableECM(oSqlCommand) ', "MV_OnLookUp1") Try Dim oDependingLookup As LookupControl3 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault() For Each oControl As Control In pnldesigner.Controls @@ -557,7 +557,7 @@ Public Class frmMassValidator Select Case Typ 'Tabellendarstellung Case "TABLE" - Dim dt As DataTable = Database.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {CONTROL_ID} ORDER BY SEQUENCE") ', "MV_FillIndexValues") + Dim dt As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {CONTROL_ID} ORDER BY SEQUENCE") ', "MV_FillIndexValues") Dim SpaltenWerte As String() If dt.Rows.Count > 1 Then For Each Zeile As Object In wertWD @@ -894,7 +894,7 @@ Public Class frmMassValidator LOGGER.Debug("Setting Values for Control [{0}]", displayboxname) 'Dim oResultTable As DataTable = ClassDatabase.Return_Datatable_ConId(sqlCommand, sqlConnection) - Dim oResultTable As DataTable = Database.GetDatatable(New GetDatatableOptions(sqlCommand, DatabaseType.ECM) With { + Dim oResultTable As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sqlCommand, DatabaseType.ECM) With { .ConnectionId = sqlConnection }) @@ -1024,7 +1024,7 @@ Public Class frmMassValidator sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue) Dim oConnectionId = ROW.Item(1) 'Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1)) - Dim resultDT As DataTable = Database.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With { + Dim resultDT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With { .ConnectionId = oConnectionId }) @@ -1068,7 +1068,7 @@ Public Class frmMassValidator 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 dt As DataTable = Database.GetDatatableECM(sql) ', "MV_LoadSimpleData") + Dim dt As DataTable = DatabaseFallback.GetDatatableECM(sql) ', "MV_LoadSimpleData") If IsNothing(dt) Then Exit Sub If dt.Rows.Count = 0 Then Exit Sub @@ -1090,7 +1090,7 @@ Public Class frmMassValidator sql = clsPatterns.ReplaceInternalValues(sql) LOGGER.Debug(">>> sql after ReplaceInternalValues: " & sql) 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) - dt = Database.GetDatatableECM(sql) ', "MV_LoadSimpleData1") + dt = DatabaseFallback.GetDatatableECM(sql) ', "MV_LoadSimpleData1") If IsNothing(dt) Then MsgBox($"SQL-Query for control {control.Name} is invalid.") @@ -1186,7 +1186,7 @@ Public Class frmMassValidator If CreateWMObject() = True Then If ClassFinalizeDoc.Write_Final_Metadata(CURRENT_WMFILE) = True Then Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", USER_USERNAME, CURRENT_DOC_GUID) - If Database.ExecuteNonQueryECM(sql) = True Then + If DatabaseFallback.ExecuteNonQueryECM(sql) = True Then workedFiles += 1 End If End If @@ -1279,14 +1279,14 @@ Public Class frmMassValidator WORK_HISTORY_ENTRY = "" 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.ExecuteNonQueryECM(ins) + DatabaseFallback.ExecuteNonQueryECM(ins) '####### ANNOTIEREN WENN KONFIGURIERT ####### If docrow.Item("FULL_PATH").ToString.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 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.GetDatatableECM(Sql) ', "MV_Finish1") + Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(Sql) ', "MV_Finish1") 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") @@ -1297,7 +1297,7 @@ Public Class frmMassValidator Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES") 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 DT_ENTRIES As DataTable = Database.GetDatatableECM(Sql) ', "MV_Finish2") + Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(Sql) ', "MV_Finish2") If Not IsNothing(DT_ENTRIES) Then If DT_ENTRIES.Rows.Count > 0 Then Dim AnnotationString As String = "" @@ -1360,12 +1360,12 @@ Public Class frmMassValidator Private Function GetWMDocPathWindows(_CheckStandard As Integer) Dim oResult As String Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})" - oResult = Database.GetScalarValueECM(oSQL) + oResult = DatabaseFallback.GetScalarValueECM(oSQL) LOGGER.Debug($"Checking file 0 GDP [{oResult}] exists?...") If File.Exists(oResult) = False Then LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)" - oResult = Database.GetScalarValueECM(oSQL) + oResult = DatabaseFallback.GetScalarValueECM(oSQL) LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...") If File.Exists(oResult) = False Then Return False diff --git a/app/DD_PM_WINDREAM/frmMonitor.vb b/app/DD_PM_WINDREAM/frmMonitor.vb index b0957e7..b2ae81c 100644 --- a/app/DD_PM_WINDREAM/frmMonitor.vb +++ b/app/DD_PM_WINDREAM/frmMonitor.vb @@ -59,7 +59,7 @@ Public Class frmMonitor oDetailSQL = oDetailSQL.Replace("@IDBOBJID", oDocID) oDetailSQL = oDetailSQL.Replace("@UserID", USER_ID) oDetailSQL = oDetailSQL.Replace("@UserName", USER_USERNAME) - Dim oDT2 As DataTable = Database_ECM.GetDatatable(oDetailSQL) ', "Monitor_Detail1") + Dim oDT2 As DataTable = DatabaseFallback.GetDatatableECM(oDetailSQL) ', "Monitor_Detail1") If Not IsNothing(oDT2) Then LOGGER.Debug($"Found {oDT2.Rows.Count} rows for GridView2") GridView2.Columns.Clear() @@ -80,7 +80,7 @@ Public Class frmMonitor oDetailSQL = oDetailSQL.Replace("@IDBOBJID", oDocID) oDetailSQL = oDetailSQL.Replace("@UserID", USER_ID) oDetailSQL = oDetailSQL.Replace("@UserName", USER_USERNAME) - Dim oDT3 As DataTable = Database_ECM.GetDatatable(oDetailSQL) ', "Monitor_Detail2") + Dim oDT3 As DataTable = DatabaseFallback.GetDatatableECM(oDetailSQL) ', "Monitor_Detail2") LOGGER.Debug($"oDetailSQL for Grid 3: {oDetailSQL}") If Not IsNothing(oDT3) Then LOGGER.Debug($"Found {oDT3.Rows.Count} rows for GridView3") @@ -95,7 +95,7 @@ Public Class frmMonitor oDetailSQL = oDetailSQL.Replace("@UserID", USER_ID) oDetailSQL = oDetailSQL.Replace("@UserName", USER_USERNAME) LOGGER.Debug($"oDetailSQL for Grid 4: {oDetailSQL}") - Dim oDT4 As DataTable = Database_ECM.GetDatatable(oDetailSQL) ', "Monitor_Detail3") + Dim oDT4 As DataTable = DatabaseFallback.GetDatatableECM(oDetailSQL) ', "Monitor_Detail3") If Not IsNothing(oDT4) Then LOGGER.Debug($"Found {oDT4.Rows.Count} rows for GridView4") GridView4.Columns.Clear() @@ -200,12 +200,12 @@ Public Class frmMonitor Try FormShown = False Dim oSQL = "SELECT * FROM TBPM_MONITOR_KONFIG" - DT_MONITOR_KONFIG = Database_ECM.GetDatatable(oSQL) ', "Monitor-Load_Grid_Data1") + DT_MONITOR_KONFIG = DatabaseFallback.GetDatatableECM(oSQL) ', "Monitor-Load_Grid_Data1") If Not IsNothing(DT_MONITOR_KONFIG) Then If DT_MONITOR_KONFIG.Rows.Count >= 1 Then oSQL = DT_MONITOR_KONFIG.Rows(0).Item("GRID_SQL") GridView1.Columns.Clear() - Dim oDTGRID1 As DataTable = Await Database_ECM.GetDatatableAsync(oSQL) ', "Monitor-Load_Grid_Data2") + Dim oDTGRID1 As DataTable = Await DatabaseFallback.GetDatatableECMAsync(oSQL) ', "Monitor-Load_Grid_Data2") GridControl1.DataSource = oDTGRID1 GRID1_TITLE = DT_MONITOR_KONFIG.Rows(0).Item("GRID_TITLE") diff --git a/app/DD_PM_WINDREAM/frmSQL_Admin.vb b/app/DD_PM_WINDREAM/frmSQL_Admin.vb index a7633e6..19a8f6e 100644 --- a/app/DD_PM_WINDREAM/frmSQL_Admin.vb +++ b/app/DD_PM_WINDREAM/frmSQL_Admin.vb @@ -7,7 +7,7 @@ Public Class frmSQL_Admin Private Sub btnrunSQL_Click(sender As Object, e As EventArgs) Handles btnrunSQL.Click If txtSQL.Text <> "" Then If txtSQL.Text.ToLower.StartsWith("select") Then - Dim dt As DataTable = Database_ECM.GetDatatable(txtSQL.Text) ', "btnrunSQL_Click") + Dim dt As DataTable = DatabaseFallback.GetDatatableECM(txtSQL.Text) ', "btnrunSQL_Click") If Not dt Is Nothing Then XtraTabControl1.SelectedTabPageIndex = 1 BindingSource1.DataSource = dt diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index ac89a96..fe3121a 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -35,11 +35,11 @@ Public Class frmSQL_DESIGNER TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then - CURRENT_DT_SQL_CONFIG_TABLE = Database_ECM.GetDatatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID)) ', "frmSQL_FINAL_INDICES_Load1") + CURRENT_DT_SQL_CONFIG_TABLE = DatabaseFallback.GetDatatableECM(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID)) ', "frmSQL_FINAL_INDICES_Load1") ElseIf CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then - CURRENT_DT_SQL_CONFIG_TABLE = Database_ECM.GetDatatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0} ORDER BY T.SEQUENCE", CURRENT_INDEX_ID)) ', "frmSQL_FINAL_INDICES_Load2") + CURRENT_DT_SQL_CONFIG_TABLE = DatabaseFallback.GetDatatableECM(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0} ORDER BY T.SEQUENCE", CURRENT_INDEX_ID)) ', "frmSQL_FINAL_INDICES_Load2") ElseIf CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then - CURRENT_DT_SQL_CONFIG_TABLE = Database_ECM.GetDatatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_CONTROL_TABLE T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID)) ', "frmSQL_FINAL_INDICES_Load2") + CURRENT_DT_SQL_CONFIG_TABLE = DatabaseFallback.GetDatatableECM(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_CONTROL_TABLE T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID)) ', "frmSQL_FINAL_INDICES_Load2") End If If CURRENT_DESIGN_TYPE = "SQL_OVERVIEW" Then cmbConnection.Enabled = False @@ -59,8 +59,8 @@ Public Class frmSQL_DESIGNER End If Dim oSQL = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID) - Dim oDatatable As DataTable = Database_ECM.GetDatatable(oSQL) ', "frmSQL_FINAL_INDICES_Load3") - cmbControls.DataSource = oDatatable + Dim oDatatable As DataTable = DatabaseFallback.GetDatatableECM(oSQL) ', "frmSQL_FINAL_INDICES_Load3") + cmbControls.DataSource = oDatatable cmbControls.DisplayMember = oDatatable.Columns(0).ColumnName cmbControls.Visible = True lblControls.Visible = True @@ -167,7 +167,7 @@ Public Class frmSQL_DESIGNER Dim connectionString As String 'connectionString = ClassDatabase.Get_ConnectionString(connectionId) - connectionString = Database_ECM.Get_ConnectionStringforID(connectionId) + connectionString = DatabaseFallback.GetConnectionString(connectionId) If connectionString <> "" Then diff --git a/app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb b/app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb index 9d0d4e8..54e39d6 100644 --- a/app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb +++ b/app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb @@ -171,19 +171,19 @@ Public Class frmUserKonfig_AddUsers Dim SQL If Not UserExists(USERNAME) Then SQL = "INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO) VALUES('" & PRENAME & "', '" & NAME & "', '" & USERNAME & "','" & email & "','" & USER_USERNAME & "')" - If Database_ECM.ExecuteNonQuery(SQL) = True Then - Dim ID = Database_ECM.GetScalarValue("SELECT MAX(GUID) FROM TBDD_USER") + If DatabaseFallback.ExecuteNonQueryECM(SQL) = True Then + Dim ID = DatabaseFallback.GetScalarValueECM("SELECT MAX(GUID) FROM TBDD_USER") Dim msg = String.Format(">> USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, USERNAME) LOGGER.Info(msg) SQL = String.Format("INSERT INTO TBDD_USER_MODULES (USER_ID,MODULE_ID) VALUES ({0},(SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'PM'))", ID) - If Database_ECM.ExecuteNonQuery(SQL) = False Then + If DatabaseFallback.ExecuteNonQueryECM(SQL) = False Then MsgBox("Attention: could not add user to module! - Please check the log.", MsgBoxStyle.Exclamation) End If usersAdded = usersAdded + 1 End If Else SQL = String.Format("UPDATE TBDD_USER SET PRENAME = '{0}', NAME = '{1}', EMAIL = '{2}' WHERE UPPER(USERNAME) = UPPER('{3}')", PRENAME, NAME, email, USERNAME) - If Database_ECM.ExecuteNonQuery(SQL) = True Then + If DatabaseFallback.ExecuteNonQueryECM(SQL) = True Then usersAdded = usersAdded + 1 End If End If @@ -207,7 +207,7 @@ Public Class frmUserKonfig_AddUsers Private Function UserExists(username As String) As Boolean Try Dim SQL = "SELECT GUID FROM TBDD_USER WHERE UPPER(USERNAME) = UPPER('" & username & "')" - If Database_ECM.GetScalarValue(SQL) = Nothing Then + If DatabaseFallback.GetScalarValueECM(SQL) = Nothing Then Return False Else Return True diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index d1e66db..750dc99 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -286,7 +286,7 @@ Public Class frmValidator RibbonPageConversations.Visible = False If IDB_ACTIVE Then Dim oSQL = $"SELECT * FROM [dbo].[FNIDB_OBJECT_DYNAMIC_CONFIG] ({CURRENT_DOC_ID},{USER_ID})" - DTDYNAMIC_RIGHTS = Database.GetDatatableIDB(oSQL) ', CONNECTION_STRING_IDB, "FNIDB_OBJECT_DYNAMIC_CONFIG") + DTDYNAMIC_RIGHTS = DatabaseFallback.GetDatatableIDB(oSQL) ', CONNECTION_STRING_IDB, "FNIDB_OBJECT_DYNAMIC_CONFIG") RibbonPageGroupConv1.Enabled = False Dim oView As DataView = New DataView(DTDYNAMIC_RIGHTS) oView.RowFilter = "CONF_TITLE like '%CONVERSATION_RIGHT%'" @@ -441,7 +441,7 @@ Public Class frmValidator Try Dim oDel = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID}" - Database.ExecuteNonQueryECM(oDel) + DatabaseFallback.ExecuteNonQueryECM(oDel) Catch ex As Exception LOGGER.Error(ex) MsgBox("Error in delete jumped files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -484,7 +484,7 @@ Public Class frmValidator oDataResultCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") oDataResultCommand = clsPatterns.ReplaceAllValues(oDataResultCommand, PanelValidatorControl, True) 'oDatatableDataResult = ClassDatabase.Return_Datatable_ConId(oDataResultCommand, oConID, "Load_Additional_Searches1") - oDatatableDataResult = Database.GetDatatable(New GetDatatableOptions(oDataResultCommand, DatabaseType.ECM) With { + oDatatableDataResult = DatabaseFallback.GetDatatable(New GetDatatableOptions(oDataResultCommand, DatabaseType.ECM) With { .ConnectionId = oConID }) End If @@ -494,7 +494,7 @@ Public Class frmValidator oDocResultCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, PanelValidatorControl, True) 'oDatatableDocResult = ClassDatabase.Return_Datatable_ConId(oDocResultCommand, oConID, "Load_Additional_Searches2") - oDatatableDocResult = Database.GetDatatable(New GetDatatableOptions(oDocResultCommand, DatabaseType.ECM) With { + oDatatableDocResult = DatabaseFallback.GetDatatable(New GetDatatableOptions(oDocResultCommand, DatabaseType.ECM) With { .ConnectionId = oConID }) End If @@ -637,7 +637,7 @@ Public Class frmValidator End If 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) 'Dim oDTContent As DataTable = ClassDatabase.Return_Datatable_ConId(oSQLStatement, oConnectionId, $"LoadSQLData - pControlId: {pControlId}") - Dim oDTContent As DataTable = Database.GetDatatable(New GetDatatableOptions(oSQLStatement, DatabaseType.ECM) With { + Dim oDTContent As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSQLStatement, DatabaseType.ECM) With { .ConnectionId = oConnectionId }) @@ -744,20 +744,20 @@ Public Class frmValidator PanelValidatorControl.Controls.Clear() Dim oSQL = $"SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,'{USER_LANGUAGE}',CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG, * FROM TBPM_PROFILE_CONTROLS WHERE CONTROL_ACTIVE = 1 AND PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC" 'DT_CONTROLS = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_CONTROLS_LANGUAGE", $"LANGUAGE = '{USER_LANGUAGE}' AND PROFIL_ID = {CURRENT_ProfilGUID}", "Y_LOC, X_LOC") - DT_CONTROLS = Database.GetDatatable("TBPM_PROFILE_CONTROLS_LANGUAGE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + DT_CONTROLS = DatabaseFallback.GetDatatable("TBPM_PROFILE_CONTROLS_LANGUAGE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"LANGUAGE = '{USER_LANGUAGE}' AND PROFIL_ID = {CURRENT_ProfilGUID}", .SortByColumn = "Y_LOC, X_LOC" }) oSQL = $"SELECT T.* from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE" - DT_COLUMNS_GRID = Database.GetDatatable("TBPM_CONTROL_TABLE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + DT_COLUMNS_GRID = DatabaseFallback.GetDatatable("TBPM_CONTROL_TABLE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .SortByColumn = "SEQUENCE" }) oSQL = "SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.CONNECTION_ID, T.SQL_COMMAND, T.SPALTENNAME,T.FORMATTYPE,T.FORMATSTRING, T.ADVANCED_LOOKUP from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = " & CURRENT_ProfilGUID & " AND LEN(T.SQL_COMMAND) > 0 ORDER BY T.SEQUENCE" 'DT_COLUMNS_GRID_WITH_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "DTGRID_SQL_DEFINITION", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE") - DT_COLUMNS_GRID_WITH_SQL = Database.GetDatatable("DTGRID_SQL_DEFINITION", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + DT_COLUMNS_GRID_WITH_SQL = DatabaseFallback.GetDatatable("DTGRID_SQL_DEFINITION", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .SortByColumn = "SEQUENCE" }) @@ -784,7 +784,7 @@ Public Class frmValidator ORDER BY T.SEQUENCE" 'DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER = DataASorDB.GetDatatable("DD_ECM", oSQL, "DTGRID_SQL_DEFINITION", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE") - DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER = Database.GetDatatable("DTGRID_SQL_DEFINITION", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER = DatabaseFallback.GetDatatable("DTGRID_SQL_DEFINITION", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .SortByColumn = "SEQUENCE" }) @@ -865,7 +865,7 @@ Public Class frmValidator oSQL = clsPatterns.ReplaceInternalValues(oSQL) oSQL = clsPatterns.ReplaceControlValues(oSQL, PanelValidatorControl, True) 'Dim oDT As DataTable = ClassDatabase.Return_Datatable_ConId(oSQL, oCONID, $"CreateControls - oControlID: {oControlID}") - Dim oDT As DataTable = Database.GetDatatable(New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + Dim oDT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .ConnectionId = oCONID }) @@ -1148,7 +1148,7 @@ Public Class frmValidator Dim oSql = 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, oTextBox.Name) Dim DTCONTROLS_UEBP As DataTable 'DTCONTROLS_UEBP = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_PROFILE_CONTROLS_SQL_UEP", $"PROFIL_ID = {CURRENT_ProfilGUID} AND SQL_UEBERPRUEFUNG LIKE '%{oTextBox.Name}%'") - DTCONTROLS_UEBP = Database.GetDatatable("TBPM_PROFILE_CONTROLS_SQL_UEP", New GetDatatableOptions(oSql, DatabaseType.ECM) With { + DTCONTROLS_UEBP = DatabaseFallback.GetDatatable("TBPM_PROFILE_CONTROLS_SQL_UEP", New GetDatatableOptions(oSql, DatabaseType.ECM) With { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID} AND SQL_UEBERPRUEFUNG LIKE '%{oTextBox.Name}%'" }) @@ -1208,7 +1208,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.GetDatatableECM(oSQL) ', "onCustomButtonClick") + Dim oDT_ACTIONS As DataTable = DatabaseFallback.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 @@ -1289,7 +1289,7 @@ Public Class frmValidator If oResult1 = True Then Dim oREsult As Boolean = True If Override_SQLCommand <> "" Then - oREsult = Database.ExecuteNonQueryECM(Override_SQLCommand) + oREsult = DatabaseFallback.ExecuteNonQueryECM(Override_SQLCommand) End If If oREsult = True Then Reload_Controls(oControlName) @@ -1304,7 +1304,7 @@ Public Class frmValidator If result = MsgBoxResult.Yes Then Dim oREsult As Boolean = True If Override_SQLCommand <> "" Then - oREsult = Database.ExecuteNonQueryECM(Override_SQLCommand) + oREsult = DatabaseFallback.ExecuteNonQueryECM(Override_SQLCommand) End If If oREsult = True Then SetStatusLabel("Refreshed single control", "Yellow") @@ -1338,7 +1338,7 @@ 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.GetDatatable("TBPM_PROFILE_CONTROLS", New GetDatatableOptions(sql, DatabaseType.ECM) With { + Dim DT As DataTable = DatabaseFallback.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) }) @@ -1351,7 +1351,7 @@ Public Class frmValidator Dim cellvalue = dgv.Rows(dgv.Rows.Count - 2).Cells(0).Value.ToString() sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue) 'Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1), $"oControlID[{CONTROL_ID}]") - Dim resultDT As DataTable = Database.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With { + Dim resultDT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With { .ConnectionId = ROW.Item("CONNECTION_ID") }) @@ -1493,7 +1493,7 @@ Public Class frmValidator oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True) 'Dim oControlDataResult As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId, $"SetControlValues - CTRLID {oControlID}") - Dim oControlDataResult As DataTable = Database.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { + Dim oControlDataResult As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { .ConnectionId = oConnectionId }) @@ -1644,7 +1644,7 @@ Public Class frmValidator oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True) _dependingControl_in_action = True 'Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oRowDependingControl.Item("CONNECTION_ID"), $"LookupControl_DependingControls - oControlID: {oControlID}") - Dim oDTDEPENDING_RESULT As DataTable = Database.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { + Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { .ConnectionId = oRowDependingControl.Item("CONNECTION_ID") }) Try @@ -1768,7 +1768,7 @@ Public Class frmValidator oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True) _dependingControl_in_action = True 'Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oRowDependingControl.Item("CONNECTION_ID"), $"CheckBox_DependingControls - oControlID: {oControlID}") - Dim oDTDEPENDING_RESULT As DataTable = Database.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { + Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { .ConnectionId = oRowDependingControl.Item("CONNECTION_ID") }) @@ -1890,7 +1890,7 @@ Public Class frmValidator _dependingColumn_in_action = True Try 'Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID, $"LookupControl_DependingColumn - oDEPENDING_CONTROL_ID: {oDEPENDING_CONTROL_ID}") - Dim oDTDEPENDING_RESULT As DataTable = Database.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { + Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { .ConnectionId = oCONNID }) @@ -1935,7 +1935,7 @@ Public Class frmValidator _dependingColumn_in_action = True Try 'Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID, $"CheckBox_DependingColumn - oDEPENDING_CONTROL_ID: {oDEPENDING_CONTROL_ID}") - Dim oDTDEPENDING_RESULT As DataTable = Database.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { + Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { .ConnectionId = oCONNID }) @@ -1968,7 +1968,7 @@ 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.GetDatatable("TBPM_PROFILE_CONTROLS", New GetDatatableOptions(sql, DatabaseType.ECM) With { + Dim DT As DataTable = DatabaseFallback.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) }) If Not IsNothing(DT) And DT.Rows.Count > 0 Then @@ -2043,13 +2043,10 @@ Public Class frmValidator _dependingControl_in_action = True Dim oConnectionId As Integer = oRowEnablingControl.Item("CONNECTION_ID") - Dim oResult = _Client.get(oSqlCommand, oConnectionId) + Dim oENABLERESULT As Boolean = False + oENABLERESULT = DatabaseFallback.GetScalarValueWithConnection(oSqlCommand, oConnectionId) - If oResult.OK Then - oENABLERESULT = oResult.Scalar - End If - 'Dim oENABLERESULT As Boolean = ClassDatabase.Execute_Scalar_ConID(oSqlCommand, oRowEnablingControl.Item("CONNECTION_ID"), $"Controls2beEnabled - oENABLE_CTRLID: {oENABLE_GUID}") Try Dim oFound As Boolean = False @@ -2125,13 +2122,13 @@ Public Class frmValidator oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True) Dim oConnectionId As Integer = oRowEnablingControl.Item("CONNECTION_ID") - Dim oResult = _Client.GetScalarValueFromIDB(oSqlCommand, oConnectionId) Dim oENABLERESULT As Boolean = False - If oResult.OK Then - oENABLERESULT = oResult.Scalar - End If - 'Dim oENABLERESULT As Boolean = ClassDatabase.Execute_Scalar_ConID(oSqlCommand, oRowEnablingControl.Item("SQL_ENABLE_ON_LOAD_CONID"), $"Controls2B_EnDisabled_on_Load - oENABLE_CTRLID: {oENABLE_GUID}") + oENABLERESULT = DatabaseFallback.GetScalarValueWithConnection(oSqlCommand, oConnectionId) + + + + Try LOGGER.Debug($"oENABLERESULT [{oENABLERESULT}]...") @@ -2157,7 +2154,7 @@ Public Class frmValidator LOGGER.Debug("Setting Values for Control [{0}]", displayboxname) 'Dim oResultTable As DataTable = ClassDatabase.Return_Datatable_ConId(sqlCommand, sqlConnection) - Dim oResultTable As DataTable = Database.GetDatatable(New GetDatatableOptions(sqlCommand, DatabaseType.ECM) With { + Dim oResultTable As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sqlCommand, DatabaseType.ECM) With { .ConnectionId = sqlConnection }) @@ -2242,7 +2239,7 @@ 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 = Database_ECM.Get_ConnectionStringforID(dr.Item("CONNECTION_ID")) + Dim cs As String = DatabaseFallback.GetConnectionString(dr.Item("CONNECTION_ID")) If allgFunk.CheckValue_Exists(dr.Item("SQL_UEBERPRUEFUNG"), "@Eingabe", control.Text, dr.Item("TYP"), cs, CURRENT_ProfilGUID) = True Then Return True @@ -2288,7 +2285,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.GetDatatableECM(oSQL) + Dim oDT As DataTable = DatabaseFallback.GetDatatableECM(oSQL) If oDT.Rows.Count > 0 Then oNewGUID = oDT.Rows(0).Item(0) CURRENT_DOC_ID = oDT.Rows(0).Item(1) @@ -2361,7 +2358,7 @@ Public Class frmValidator Dim oResult As String Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})" - oResult = Database.GetScalarValueECM(oSQL) + oResult = DatabaseFallback.GetScalarValueECM(oSQL) LOGGER.Debug($"Checking file 0 [{oResult}] exists?...") WMDocPathWindows = String.Empty @@ -2370,7 +2367,7 @@ Public Class frmValidator LOGGER.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...") oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" - oResult = Database.GetScalarValueECM(oSQL) + oResult = DatabaseFallback.GetScalarValueECM(oSQL) LOGGER.Debug($"Checking file 1[{oResult}] exists?...") If File.Exists(oResult) = False Then @@ -2403,7 +2400,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.GetDatatableECM(oSQl) + IDB_DT_DOC_DATA = DatabaseFallback.GetDatatableECM(oSQl) Catch ex As Exception LOGGER.Error(ex) End Try @@ -2471,7 +2468,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.ExecuteNonQueryECM(sql) + DatabaseFallback.ExecuteNonQueryECM(sql) ' ############ Infos eintragen ################# ' txtDateipfad.Text = Document_Path @@ -3497,7 +3494,7 @@ Public Class frmValidator Try 'Dim oDTRESULT_FOR_COLUMN As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID, $"oDEPENDING_CTRL_ID: {oDEPENDING_CTRL_ID}") - Dim oDTRESULT_FOR_COLUMN As DataTable = Database.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { + Dim oDTRESULT_FOR_COLUMN As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { .ConnectionId = oCONNID }) @@ -3527,7 +3524,7 @@ Public Class frmValidator If IDB_ACTIVE = True Then Try Dim oSQL = $"select Attribut, TERM_VALUE from VWIDB_VALUE_TEXT WHERE LANG_CODE = '{USER_LANGUAGE}' AND IDB_OBJ_ID = {CURRENT_DOC_ID} AND Attribut in ('PM_Info1','PM_Info2') ORDER BY Attribut" - Dim oDTINFO As DataTable = Database.GetDatatableIDB(oSQL) + Dim oDTINFO As DataTable = DatabaseFallback.GetDatatableIDB(oSQL) If Not IsNothing(oDTINFO) Then Dim oColor As System.Drawing.Color If oDTINFO.Rows.Count > 0 Then @@ -3728,7 +3725,7 @@ Public Class frmValidator Dim oSQL = PROFIL_FINISH_SQL oSQL = clsPatterns.ReplaceAllValues(oSQL, PanelValidatorControl, True) - Dim oDT_ACTIONS As DataTable = Database.GetDatatableECM(oSQL) + Dim oDT_ACTIONS As DataTable = DatabaseFallback.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 @@ -3815,7 +3812,7 @@ Public Class frmValidator Dim oSQL = $"SELECT * FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {CURRENT_ProfilGUID} AND ACTIVE = 1 ORDER BY SEQUENCE" Dim oDTFinalIndexing As DataTable 'oDTFinalIndexing = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE") - oDTFinalIndexing = Database.GetDatatable("TBPM_PROFILE_FINAL_INDEXING", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { + oDTFinalIndexing = DatabaseFallback.GetDatatable("TBPM_PROFILE_FINAL_INDEXING", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .SortByColumn = "PROFILE_ID,TAB_INDEX" }) @@ -3845,7 +3842,7 @@ Public Class frmValidator ItemWorked = False End If If Not IsNothing(oSQLCommand) Then - Dim oDBResult = _Client.GetScalarValueFromIDB(oSQLCommand, oConnectionID) + Dim oDBResult = _Client.GetScalarValueFromConnection(oSQLCommand, oConnectionID) Dim oResultfromSQL As Object = "" If oDBResult.OK Then @@ -3970,7 +3967,7 @@ Public Class frmValidator Try ''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde If Override = True And Override_SQLCommand <> "" Then - Database.ExecuteNonQueryECM(Override_SQLCommand) + DatabaseFallback.ExecuteNonQueryECM(Override_SQLCommand) End If If oErrorOcurred = False Then @@ -4074,14 +4071,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.ExecuteNonQueryECM(ins) + DatabaseFallback.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.GetDatatableECM(oFIsql) ', "Finish_WFStep2") + Dim DT_ENTRY As DataTable = DatabaseFallback.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") @@ -4092,7 +4089,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.GetDatatableECM(oFIsql) ', "Finish_WFStep3") + Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep3") If Not IsNothing(DT_ENTRIES) Then If DT_ENTRIES.Rows.Count > 0 Then Dim AnnotationString As String = "" @@ -4146,7 +4143,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.ExecuteNonQueryECM(Override_SQLCommand) = False Then + If DatabaseFallback.ExecuteNonQueryECM(Override_SQLCommand) = False Then oErrorOcurred = True End If End If @@ -4157,7 +4154,7 @@ Public Class frmValidator Else LOGGER.Debug("Validation of document ended successfully!") Dim oPROCSQL = $"EXEC PRPM_CHECK_NEXT_WF {CURRENT_DOC_GUID}" - Database.ExecuteNonQueryECM(oPROCSQL) + DatabaseFallback.ExecuteNonQueryECM(oPROCSQL) End If If CURRENT_JUMP_DOC_GUID <> 0 Then @@ -5226,7 +5223,7 @@ Public Class frmValidator Free_File() Dim oSQL = $"EXECUTE PRPM_FILES_NOT_INDEXED '{USER_USERNAME}',{CURRENT_ProfilGUID},'{WMDocPathWindows}',{CURRENT_DOC_GUID}" - Database.ExecuteNonQueryECM(oSQL) + DatabaseFallback.ExecuteNonQueryECM(oSQL) LOGGER.Debug($"Skipped DocGUID {CURRENT_DOC_GUID}") Load_Next_Document(False) @@ -5238,7 +5235,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.ExecuteNonQueryECM(sql) + Return DatabaseFallback.ExecuteNonQueryECM(sql) Catch ex As Exception allgFunk.Insert_LogEntry($"ERROR Free_File >> {ex.Message}") LOGGER.Error(ex) @@ -5261,7 +5258,7 @@ Public Class frmValidator FreeFile() 'Aus der Tabelle löschen Dim oDelete = $"DELETE FROM TBPM_PROFILE_FILES WHERE GUID = {CURRENT_DOC_GUID}" - If Database.ExecuteNonQueryECM(oDelete) = True Then + If DatabaseFallback.ExecuteNonQueryECM(oDelete) = True Then Dim oDeleteResult As Boolean = False If IDB_ACTIVE = False Then oDeleteResult = Delete_WMFile() @@ -5519,7 +5516,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.ExecuteNonQueryECM(ins) + DatabaseFallback.ExecuteNonQueryECM(ins) Else SetStatusLabel($"Error while saving data!", "Red") End If @@ -5573,7 +5570,7 @@ Public Class frmValidator For Each oRow As DataRow In DTDYNAMIC_RIGHTS.Rows If oRow.Item("CONF_TITLE") = "NEW_CONVERSATION_USER_SELECT" Then Dim oSQL = oRow.Item("CONF_VALUE") - oDTUSER = Database.GetDatatableIDB(oSQL) + oDTUSER = DatabaseFallback.GetDatatableIDB(oSQL) End If Next If Not IsNothing(oDTUSER) Then @@ -5603,7 +5600,7 @@ Public Class frmValidator result = MessageBox.Show(oQuestion.Rows(0).Item("STRING1").ToString, oQuestion.Rows(0).Item("STRING2").ToString, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) If result = MsgBoxResult.Yes Then Dim oSQL = $"EXEC PRIDB_END_CONVERSATION {ChatControl1.CurrentConversationID}, '{USER_USERNAME}', '{USER_LANGUAGE}'" - If Database.ExecuteNonQueryIDB(oSQL) = True Then + If DatabaseFallback.ExecuteNonQueryIDB(oSQL) = True Then btnitemConversationEnd.Enabled = False SplitContainer2_DV_Chat.Collapsed = True btnitemConversationEnd.Enabled = True @@ -5677,7 +5674,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.GetScalarValueECM(oSQLGetFilename) + Dim oExportFilename = DatabaseFallback.GetScalarValueECM(oSQLGetFilename) oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oExportFilename & oExtension File.Copy(WMDocPathWindows, oTargetPath) @@ -5692,7 +5689,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.GetScalarValueECM(oSQLGetFilename) + oExportFilename = DatabaseFallback.GetScalarValueECM(oSQLGetFilename) oExtension = Path.GetExtension(oFromFilename) 'oFilenameOnly = Path.GetFileName(oFromFilename) diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.vb index 58e181e..440a608 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.vb +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.vb @@ -139,7 +139,7 @@ Public Class frmValidatorSearch End Select myGridControl.ContextMenuStrip = ContextMenuStripSQL 'Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_ConId(SQLCommand, ConID) - Dim oDatatable As DataTable = Database.GetDatatable(New GetDatatableOptions(SQLCommand, DatabaseType.ECM) With { + Dim oDatatable As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(SQLCommand, DatabaseType.ECM) With { .ConnectionId = ConID }) @@ -202,7 +202,7 @@ Public Class frmValidatorSearch End Select myGridControl.ContextMenuStrip = ContextMenuStripWMFile 'Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_ConId(SQLCommand, ConID) - Dim oDatatable As DataTable = Database.GetDatatable(New GetDatatableOptions(SQLCommand, DatabaseType.ECM) With { + Dim oDatatable As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(SQLCommand, DatabaseType.ECM) With { .ConnectionId = ConID })