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

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager

Browse Source
This commit is contained in:
Jonathan Jenne 2022-01-19 15:38:50 +01:00
commit a496227fd9
5 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/DD_PM_WINDREAM/ClassControlCreator.vb
View File

@ -527,12 +527,15 @@ Public Class ClassControlCreator
Try
Dim oComboboxDataTable As DataTable = Nothing
Dim oColumnName As String = oRow.Item("SPALTENNAME")
Logger.Debug("Working on SQL for Column[{0}]...", oColumnName)
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 {
.ConnectionId = oConnectionId
})
Else
Logger.Debug("...has complex patterns!!")
End If
Dim oRepositoryItem = GridTables_GetRepositoryItemForColumn(oColumnName, oComboboxDataTable, oRow.Item("ADVANCED_LOOKUP"))

15
app/DD_PM_WINDREAM/ClassInit.vb
View File

@ -191,19 +191,6 @@ Public Class ClassInit
' If there is no client, it will fall back to the db by itself
Database = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB)
'If CONNECTION_STRING_APP_SERVER <> String.Empty Then
' Database_APPSERVER = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_APP_SERVER)
' If Database_APPSERVER.DBInitialized = False Then
' MsgBox("ApplicationServer can not be reached! Check Your configuration.", MsgBoxStyle.Information)
' If dbResult = True Then
' CONNECTION_STRING_READ = CONNECTION_STRING_ECM
' End If
' End If
'End If
If dbResult = False Then
ERROR_STATE = "FAILED DBCONNECTION"
MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical)
@ -331,6 +318,8 @@ Public Class ClassInit
USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
FINALINDICES = New ClassFinalIndex()
FINALINDICES.init()
If IDB_ACTIVE = True Then

1
app/DD_PM_WINDREAM/ClassParamRefresh.vb
View File

@ -63,6 +63,7 @@ Public Class ClassParamRefresh
If Database_IDB.DBInitialized = True Then
IDB_ACTIVE = True
LOGGER.Info($"IDB is active - IDB-Connection [{CON_ID}]!")
Database.InitializeIDB(Database_IDB)
Else
IDB_ACTIVE = False
End If

2
app/DD_PM_WINDREAM/frmFormDesigner.vb
View File

@ -36,7 +36,7 @@ Public Class frmFormDesigner
Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load
Try
ClassControlCreator.Logger = LOGCONFIG.GetLoggerFor("ControlCreator")
BarButtonItem3.Caption = "Designer locked"
BarButtonItem3.ItemAppearance.Normal.BackColor = Color.Red
Designer_Locked = True

16
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -563,11 +563,11 @@ Public Class frmValidator
LOGGER.Error(ex)
End Try
Else
LOGGER.Info("Not loading AdditionalSearches 1...!")
LOGGER.Debug("Not loading AdditionalSearches 1...!")
bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
Else
LOGGER.Info("Not loading AdditionalSearches 2...!")
LOGGER.Debug("Not loading AdditionalSearches 2...!")
bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
Catch ex As Exception
@ -601,7 +601,7 @@ Public Class frmValidator
'End If
If oReadOnly = True Then
LOGGER.Info("Control for Index [{0}] is read-only. Continuing.")
LOGGER.Debug("Control for Index [{0}] is read-only. Continuing.")
Continue For
End If
@ -750,13 +750,12 @@ Public Class frmValidator
})
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 = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_CONTROLS_LANGUAGE", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE")
DT_COLUMNS_GRID = Database.GetDatatable("TBPM_PROFILE_CONTROLS_LANGUAGE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
DT_COLUMNS_GRID = Database.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 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"
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 {
.FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}",
@ -4276,10 +4275,9 @@ Public Class frmValidator
Dim oIsRequired As Boolean = CBool(oControlRow.Item("VALIDATION"))
Dim oSQLCheckCommand As String = IIf(IsDBNull(oControlRow.Item("SQL_UEBERPRUEFUNG")), "", oControlRow.Item("SQL_UEBERPRUEFUNG"))
Dim oIsReadOnly As Boolean = CBool(oControlRow.Item("READ_ONLY"))
If oDBControlName = "txtString00" And oControl.Name = "txtString00" Then
MsgBox("txtString00")
End If
If oIsReadOnly = True Then
Continue For
End If
Dim oControlType As String = oControlRow.Item("CTRL_TYPE")