From 40ccf0ae1dea6b6f7a60a047a076c78726c65404 Mon Sep 17 00:00:00 2001
From: MontrealSergiy <sergeboroday@gmail.com>
Date: Thu, 23 Jan 2025 16:50:40 -0500
Subject: [PATCH] Replace problem users column with a access summary  in the
 tool access reports #1461

---
 .../app/views/tool_configs/_by_resource.erb   | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/BrainPortal/app/views/tool_configs/_by_resource.erb b/BrainPortal/app/views/tool_configs/_by_resource.erb
index 2f6e3851a..b75f7984d 100644
--- a/BrainPortal/app/views/tool_configs/_by_resource.erb
+++ b/BrainPortal/app/views/tool_configs/_by_resource.erb
@@ -97,7 +97,7 @@
         <th><%= for_tool ? "Execution Servers" : "Tools" %> </th>
         <th>Versions Configured</th>
         <th>Projects In Effect</th>
-        <th class="left_align">Users with access problem(s) out of <%= users.count %></th>
+        <th class="left_align">Users Access Summary </th>
       </tr>
     <% end %>
 
@@ -149,20 +149,25 @@
               users_with_access_pb = users.select do |user|
                 !user_can_access_resource[user] || !user_can_access_versus[user] || !tc.can_be_accessed_by?(user)
               end
-
-
-
+              users_with_access = users - users_with_access_pb
             %>
-
+            <% tool_pb, exec_pb = user_can_access_versus, user_can_access_resource %>
+            <% exec_pb, tool_pb = tool_pb, exec_pb if for_tool %>
               <!-- Add information on the tooltip -->
-              <%= html_tool_tip(users_with_access_pb.count.to_s + " users") do %>
-                <% tool_pb, exec_pb = user_can_access_versus, user_can_access_resource %>
-                <% exec_pb, tool_pb = tool_pb, exec_pb if for_tool %>
-
-
+            <span style="color:green">
+              <%= html_tool_tip((users_with_access).count, options={:style => {:color => :green}}) do %>
+                <% admins = users_with_access.select {|u| u.has_role? :admin_user } %>
+                <%= "of which #{admins.count} are admins".html_safe %>
+              <% end %>
+            </span>
+            user(s) have access,
+            <span class="warning">
+              <%= html_tool_tip(users_with_access_pb.count ) do %>
                 <%= "#{exec_pb.values.count false} - due Execution Server's project<br/>".html_safe unless exec_pb.values.all?  %>
                 <%= "#{tool_pb.values.count false} - due Tool's project<br/>".html_safe unless tool_pb.values.all?  %>
               <% end %>
+            </span>
+            users have no access
           </td>
         </tr>
       <% end %>
@@ -170,6 +175,5 @@
 
   </table>
 
-
 </fieldset>