diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb index ac5ec16..4656934 100644 --- a/app/DD_PM_WINDREAM/ClassControlCreator.vb +++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb @@ -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")) diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 1f3c337..332ad93 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -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 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index b7cfccf..4423ddb 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -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")