MS_1705

app/DD-Record-Organiser/frmUserKonfig.vb

@@ -419,29 +419,7 @@
     Private Sub TabControl3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl3.SelectedIndexChanged
         Select Case TabControl3.SelectedIndex
             Case 1
-                Try
-                    DD_ECMAdmin.TBWH_Users2.Clear()
-
-                    Dim sql = String.Format("SELECT T.GUID, T.USERNAME,T.EMAIL FROM TBDD_USER T where T.GUID in (SELECT DISTINCT USER_ID FROM TBDD_CLIENT_USER WHERE CLIENT_ID IN ({0})) ORDER BY T.USERNAME", USER_CLIENTS_COMMA_SEPERATED)
-                    Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
-                    For Each userrow As DataRow In DT.Rows
-                        Dim newUserRow As DD_ECMAdmin.TBWH_Users2Row
-                        newUserRow = DD_ECMAdmin.TBWH_Users2.NewTBWH_Users2Row
-
-                        newUserRow.Username = userrow.Item(1)
-                        Try
-                            newUserRow.Email = userrow.Item(2)
-                        Catch ex As Exception
-                            newUserRow.Email = ""
-                        End Try
-
-                        newUserRow.ID = userrow.Item(0)
-                        DD_ECMAdmin.TBWH_Users2.Rows.Add(newUserRow)
-                        ' chklbxUserClient.Items.Add(New MyListBoxItem() With {.Text = userrow.Item(1), .ExtraData = userrow.Item(0)})
-                    Next
-                Catch ex As Exception
-                    MsgBox("Error in LoadUserForClients:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                End Try
+                Load_Users_not_Related_2_Client()
                 Try
                     cmbClientsforUser.SelectedIndex = 1
                 Catch ex As Exception
@@ -449,6 +427,31 @@
                 cmbClientsforUser.SelectedIndex = 0
         End Select
     End Sub
+    Sub Load_Users_not_Related_2_Client()
+        Try
+            DD_ECMAdmin.TBWH_Users2.Clear()
+            Dim sql = String.Format("SELECT T.GUID, T.USERNAME,T.EMAIL FROM TBDD_USER T WHERE T.GUID NOT IN (SELECT USER_ID FROM TBDD_CLIENT_USER WHERE CLIENT_ID = {0}) ORDER BY T.USERNAME", cmbClientsforUser.SelectedValue)
+            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
+            For Each userrow As DataRow In DT.Rows
+                Dim newUserRow As DD_ECMAdmin.TBWH_Users2Row
+                newUserRow = DD_ECMAdmin.TBWH_Users2.NewTBWH_Users2Row
+
+                newUserRow.Username = userrow.Item(1)
+                Try
+                    newUserRow.Email = userrow.Item(2)
+                Catch ex As Exception
+                    newUserRow.Email = ""
+                End Try
+
+                newUserRow.ID = userrow.Item(0)
+                DD_ECMAdmin.TBWH_Users2.Rows.Add(newUserRow)
+                ' chklbxUserClient.Items.Add(New MyListBoxItem() With {.Text = userrow.Item(1), .ExtraData = userrow.Item(0)})
+            Next
+            Label16.Text = "Users not linked to client (" & DT.Rows.Count & ")"
+        Catch ex As Exception
+            MsgBox("Error in Load Users not related 2 Client:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
 
     Private Sub btnsaddUser2Client_Click(sender As Object, e As EventArgs) Handles btnsaddUser2Client.Click
         For Each row As DataRow In DD_ECMAdmin.TBWH_Users2.Rows
@@ -475,32 +478,32 @@
             Exit Sub
         End Try
         If clientid Is Nothing Then Exit Sub
-        If Not cmbClientsforUser.SelectedValue Is Nothing Then
+
+        Load_Users_not_Related_2_Client()
 
 
-            lblUser2Client.Text = "User for Client " & cmbClientsforUser.Text
-            Dim SQL As String = String.Format("SELECT T1.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T, TBDD_CLIENT_USER T1 WHERE T1.USER_ID = T.GUID AND T1.CLIENT_ID = {0} ORDER BY T.USERNAME", cmbClientsforUser.SelectedValue)
-            Try
-                Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
-                DD_ECMAdmin.TBWH_Users1.Clear()
-                For Each row As DataRow In dt.Rows
-                    Dim newUserRow As DD_ECMAdmin.TBWH_Users1Row
-                    newUserRow = DD_ECMAdmin.TBWH_Users1.NewTBWH_Users1Row
-                    newUserRow.Username = row.Item(1)
-                    Try
-                        newUserRow.Email = row.Item(2)
-                    Catch ex As Exception
-                        newUserRow.Email = ""
-                    End Try
+        Dim SQL As String = String.Format("SELECT T1.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T, TBDD_CLIENT_USER T1 WHERE T1.USER_ID = T.GUID AND T1.CLIENT_ID = {0} ORDER BY T.USERNAME", cmbClientsforUser.SelectedValue)
+        Try
+            Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
+            DD_ECMAdmin.TBWH_Users1.Clear()
+            For Each row As DataRow In dt.Rows
+                Dim newUserRow As DD_ECMAdmin.TBWH_Users1Row
+                newUserRow = DD_ECMAdmin.TBWH_Users1.NewTBWH_Users1Row
+                newUserRow.Username = row.Item(1)
+                Try
+                    newUserRow.Email = row.Item(2)
+                Catch ex As Exception
+                    newUserRow.Email = ""
+                End Try
 
-                    newUserRow.ID = row.Item(0)
-                    DD_ECMAdmin.TBWH_Users1.Rows.Add(newUserRow)
-                    ' chklbxUsersforClient.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
-                Next
-            Catch ex As Exception
-                MsgBox("Error in LoadUserForClient:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End Try
-        End If
+                newUserRow.ID = row.Item(0)
+                DD_ECMAdmin.TBWH_Users1.Rows.Add(newUserRow)
+                ' chklbxUsersforClient.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
+            Next
+            lblUser2Client.Text = "Users linked to Client '" & cmbClientsforUser.Text & "' (" & dt.Rows.Count & ")"
+        Catch ex As Exception
+            MsgBox("Error in LoadUserForClient:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
 
     End Sub
 
@@ -562,6 +565,6 @@
             End If
         End If
 
-      
+
     End Sub
 End Class