MS_

app/DD-Record-Organiser/frmConstructorDesigner.vb

@@ -539,7 +539,7 @@ Public Class frmConstructorDesigner
     End Sub
     Public Sub Load_UserSQL()
         Try
-            Dim sql = String.Format("SELECT DISTINCT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T, TBDD_CLIENT_USER T1 WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID = T1.USER_ID AND T1.CLIENT_ID IN ({0}) ORDER BY T.USERNAME", USER_CLIENTS_COMMA_SEPERATED)
+            Dim sql = String.Format("SELECT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
             DD_ECMAdmin.TBWH_Users1.Clear()
             For Each row As DataRow In DT.Rows
@@ -746,6 +746,9 @@ Public Class frmConstructorDesigner
     Private Sub btnAddUserSQL_Click(sender As Object, e As EventArgs) Handles btnAddUserSQL.Click
         If GUIDTextBox.Text = "" Then
             TBPMO_CONSTRUCTOR_USER_SQLBindingSource.AddNew()
+            SQL_COMMANDTextBox.Enabled = True
+            SQL_COMMANDTextBox.BackColor = Color.PapayaWhip
+            SQL_COMMANDTextBox.Focus()
         End If
     End Sub
 
@@ -767,8 +770,10 @@ Public Class frmConstructorDesigner
     Private Sub SQL_COMMANDTextBox_TextChanged(sender As Object, e As EventArgs) Handles SQL_COMMANDTextBox.TextChanged
         If SQL_COMMANDTextBox.Text.Trim().Count = 0 Then
             dgvPlaceholders.Enabled = False
+            SQL_COMMANDTextBox.BackColor = Color.LightGray
         Else
             dgvPlaceholders.Enabled = True
+            SQL_COMMANDTextBox.BackColor = Color.PapayaWhip
         End If
 
         CheckForPlaceholders()
@@ -859,6 +864,12 @@ Public Class frmConstructorDesigner
                 If Not USERID Is Nothing Then
                     Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Connection.ConnectionString = MyConnectionString
                     Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL, SELECTED_CONSTRUCTOR_DETAIL_ID, USERID)
+                    If SQL_COMMANDTextBox.Text <> "" Then
+                        SQL_COMMANDTextBox.Enabled = True
+                    Else
+                        SQL_COMMANDTextBox.Enabled = False
+                    End If
+
                 End If
 
             Catch ex As System.Exception