From 507c33a4db03413739d0cc91c809dbac2ffbeaf0 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 16 Oct 2025 17:42:42 -0700
Subject: [PATCH]  Add services overview table to organization dashboard

---
 app/main/views/organizations.py               |  1 +
 .../organizations/organization/index.html     | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/app/main/views/organizations.py b/app/main/views/organizations.py
index 01cdf498f..dc41474d0 100644
--- a/app/main/views/organizations.py
+++ b/app/main/views/organizations.py
@@ -115,6 +115,7 @@ def organization_dashboard(org_id):
     return render_template(
         "views/organizations/organization/index.html",
         selected_year=year,
+        services=current_organization.services,
         **message_allowance,
         **service_counts,
     )
diff --git a/app/templates/views/organizations/organization/index.html b/app/templates/views/organizations/organization/index.html
index 88a2d2433..080e12d0b 100644
--- a/app/templates/views/organizations/organization/index.html
+++ b/app/templates/views/organizations/organization/index.html
@@ -73,4 +73,47 @@
     </ol>
   </div>
 
+
+  <div class="margin-bottom-5">
+    <h2 class="font-heading-lg margin-bottom-2">Services Overview</h2>
+    <table class="usa-table">
+      <thead>
+        <tr>
+          <th scope="col" role="columnheader">Name</th>
+          <th scope="col" role="columnheader">Status</th>
+          <th scope="col" role="columnheader">Usage</th>
+          <th scope="col" role="columnheader">Primary Contact</th>
+          <th scope="col" role="columnheader">Recent Template Used</th>
+          <th scope="col" role="columnheader">Created</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% if services %}
+          {% for service in services %}
+          <tr>
+            <td><a href="{{ url_for('main.service_dashboard', service_id=service.id) }}" class="usa-link">{{ service.name }}</a></td>
+            <td>
+              {% if not service.active %}
+                Suspended
+              {% elif service.restricted %}
+                Trial
+              {% else %}
+                Live
+              {% endif %}
+            </td>
+            <td>{{ service.usage|default('N/A') }}</td>
+            <td>{{ service.primary_contact|default('N/A') }}</td>
+            <td>{{ service.recent_template|default('N/A') }}</td>
+            <td>{{ service.created_at.strftime('%b %d, %Y') if service.created_at else 'N/A' }}</td>
+          </tr>
+          {% endfor %}
+        {% else %}
+          <tr>
+            <td colspan="6" class="table-empty-message">No services found within this organization</td>
+          </tr>
+        {% endif %}
+      </tbody>
+    </table>
+  </div>
+
 {% endblock %}