Merge pull request #1275 from cisagov/dk/996-sort-update

Issue 996 - Basic domain reports - follow up to change the sort order

src/registrar/assets/sass/_theme/_admin.scss

@@ -187,7 +187,7 @@ h1, h2, h3 {
 .object-tools li a,
 .object-tools p a {
     font-family: "Source Sans Pro Web", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
-    text-transform: capitalize!important;
+    text-transform: none!important;
     font-size: 14px!important;
 }
 

src/registrar/templates/django/admin/domain_change_list.html

@@ -15,7 +15,7 @@
     {% if has_add_permission %}
     <li>
         <a href="{% url 'admin:registrar_domain_add' %}" class="addlink">
-            Add Domain
+            Add domain
         </a>
     </li>
     {% endif %}

src/registrar/utility/csv_export.py

@@ -2,6 +2,8 @@ import csv
 from registrar.models.domain import Domain
 from registrar.models.domain_information import DomainInformation
 from registrar.models.public_contact import PublicContact
+from django.db.models import Value
+from django.db.models.functions import Coalesce
 
 
 def export_domains_to_writer(writer, columns, sort_fields, filter_condition):
@@ -61,7 +63,13 @@ def export_data_type_to_csv(csv_file):
         "Status",
         "Expiration Date",
     ]
-    sort_fields = ["domain__name"]
+    # Coalesce is used to replace federal_type of None with ZZZZZ
+    sort_fields = [
+        "organization_type",
+        Coalesce("federal_type", Value("ZZZZZ")),
+        "federal_agency",
+        "domain__name",
+    ]
     filter_condition = {
         "domain__state__in": [
             Domain.State.READY,
@@ -84,7 +92,13 @@ def export_data_full_to_csv(csv_file):
         "State",
         "Security Contact Email",
     ]
-    sort_fields = ["domain__name", "federal_agency", "organization_type"]
+    # Coalesce is used to replace federal_type of None with ZZZZZ
+    sort_fields = [
+        "organization_type",
+        Coalesce("federal_type", Value("ZZZZZ")),
+        "federal_agency",
+        "domain__name",
+    ]
     filter_condition = {
         "domain__state__in": [
             Domain.State.READY,
@@ -107,7 +121,13 @@ def export_data_federal_to_csv(csv_file):
         "State",
         "Security Contact Email",
     ]
-    sort_fields = ["domain__name", "federal_agency", "organization_type"]
+    # Coalesce is used to replace federal_type of None with ZZZZZ
+    sort_fields = [
+        "organization_type",
+        Coalesce("federal_type", Value("ZZZZZ")),
+        "federal_agency",
+        "domain__name",
+    ]
     filter_condition = {
         "organization_type__icontains": "federal",
         "domain__state__in": [