diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 41391f724..5b8d67983 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -470,6 +470,8 @@ def analytics(request): submitted_requests_sliced_at_start_date=submitted_requests_sliced_at_start_date, requests_sliced_at_end_date=requests_sliced_at_end_date, submitted_requests_sliced_at_end_date=submitted_requests_sliced_at_end_date, + start_date=start_date, + end_date=end_date, ), ) return render(request, "admin/analytics.html", context) diff --git a/src/registrar/assets/js/get-gov-reports.js b/src/registrar/assets/js/get-gov-reports.js index e900fabe8..d10cf2dc6 100644 --- a/src/registrar/assets/js/get-gov-reports.js +++ b/src/registrar/assets/js/get-gov-reports.js @@ -55,8 +55,8 @@ })(); document.addEventListener("DOMContentLoaded", function () { - createComparativeColumnChart("myChart", "Unmanaged domains", "Start Date", "End Date"); - createComparativeColumnChart("myChart2", "Managed domains", "Start Date", "End Date"); + createComparativeColumnChart("myChart1", "Managed domains", "Start Date", "End Date"); + createComparativeColumnChart("myChart2", "Unmanaged domains", "Start Date", "End Date"); createComparativeColumnChart("myChart3", "Deleted domains", "Start Date", "End Date"); createComparativeColumnChart("myChart4", "Ready domains", "Start Date", "End Date"); createComparativeColumnChart("myChart5", "Submitted requests", "Start Date", "End Date"); diff --git a/src/registrar/templates/admin/analytics.html b/src/registrar/templates/admin/analytics.html index 72aa244cf..da7f25c66 100644 --- a/src/registrar/templates/admin/analytics.html +++ b/src/registrar/templates/admin/analytics.html @@ -115,46 +115,76 @@
{{ data.managed_domains_sliced_at_end_date.0 }} managed domains for {{ data.end_date }}
+{{ data.unmanaged_domains_sliced_at_end_date.0 }} unmanaged domains for {{ data.end_date }}
+{{ data.deleted_domains_sliced_at_end_date.0 }} deleted domains for {{ data.end_date }}
+{{ data.ready_domains_sliced_at_end_date.0 }} ready domains for {{ data.end_date }}
+{{ data.submitted_requests_sliced_at_end_date.0 }} submitted requests for {{ data.end_date }}
+{{ data.requests_sliced_at_end_date.0 }} requests for {{ data.end_date }}
+