From 6d6f8e15ac8ab62cb9aea3fe0a2db9294cadeed3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Oct 2021 14:24:21 +0200 Subject: [PATCH] reactivate control placeholders for grid column sql --- app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 50 ++++++++++++--------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index a31dcc9..83bca33 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -58,9 +58,8 @@ Public Class frmSQL_DESIGNER End If - If CURRENT_DESIGN_TYPE <> "SQL_SOURCE_TABLE_COLUMN" Then - 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") + 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 cmbControls.DisplayMember = oDatatable.Columns(0).ColumnName cmbControls.Visible = True @@ -68,32 +67,29 @@ Public Class frmSQL_DESIGNER btnAddControl.Visible = True cmbIndexe.Items.Clear() - If IDB_ACTIVE = False Then - If MyIndicies IsNot Nothing Then - For Each index As String In MyIndicies - cmbIndexe.Items.Add(index) - Next - cmbIndexe.SelectedIndex = -1 - End If - 'cmbIndexe.Enabled = True - 'lbIndexe.Enabled = True - 'btnAddIndex.Enabled = True - Else - Dim oAttributes = IDBData.GetIndicesByBE(CURRENT_OBJECTTYPE) - If oAttributes IsNot Nothing Then - For Each oAttribute As String In oAttributes - cmbIndexe.Items.Add(oAttribute) - Next - cmbIndexe.SelectedIndex = -1 - End If - - 'cmbIndexe.Enabled = False - 'lbIndexe.Enabled = False - 'btnAddIndex.Enabled = False + If IDB_ACTIVE = False Then + If MyIndicies IsNot Nothing Then + For Each index As String In MyIndicies + cmbIndexe.Items.Add(index) + Next + cmbIndexe.SelectedIndex = -1 + End If + 'cmbIndexe.Enabled = True + 'lbIndexe.Enabled = True + 'btnAddIndex.Enabled = True + Else + Dim oAttributes = IDBData.GetIndicesByBE(CURRENT_OBJECTTYPE) + If oAttributes IsNot Nothing Then + For Each oAttribute As String In oAttributes + cmbIndexe.Items.Add(oAttribute) + Next + cmbIndexe.SelectedIndex = -1 End If - End If - + 'cmbIndexe.Enabled = False + 'lbIndexe.Enabled = False + 'btnAddIndex.Enabled = False + End If Else cmbControls.Visible = False lblControls.Visible = False