MS 2.3.0.4

This commit is contained in:
2022-03-16 15:48:18 +01:00
parent 6c4fac05e8
commit 3ea6171c4f
28 changed files with 445 additions and 366 deletions

View File

@@ -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