zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-12 20:49:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Issue 996 - Basic domain reports - follow up to change the sort order
This commit is contained in:
dave-kennedy-ecs 2023-11-07 10:03:43 -05:00 • committed by GitHub
commit 3eef418ff8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/assets/sass/_theme/_admin.scss
View file

@ -187,7 +187,7 @@ h1, h2, h3 {
.object-tools li a, .object-tools li a,
.object-tools p a { .object-tools p a {
font-family: "Source Sans Pro Web", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; 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; font-size: 14px!important;
} }

2
src/registrar/templates/django/admin/domain_change_list.html
View file

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

26
src/registrar/utility/csv_export.py
View file

@ -2,6 +2,8 @@ import csv
from registrar.models.domain import Domain from registrar.models.domain import Domain
from registrar.models.domain_information import DomainInformation from registrar.models.domain_information import DomainInformation
from registrar.models.public_contact import PublicContact 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): def export_domains_to_writer(writer, columns, sort_fields, filter_condition):
@ -61,7 +63,13 @@ def export_data_type_to_csv(csv_file):
"Status", "Status",
"Expiration Date", "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 = { filter_condition = {
"domain__state__in": [ "domain__state__in": [
Domain.State.READY, Domain.State.READY,
@ -84,7 +92,13 @@ def export_data_full_to_csv(csv_file):
"State", "State",
"Security Contact Email", "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 = { filter_condition = {
"domain__state__in": [ "domain__state__in": [
Domain.State.READY, Domain.State.READY,
@ -107,7 +121,13 @@ def export_data_federal_to_csv(csv_file):
"State", "State",
"Security Contact Email", "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 = { filter_condition = {
"organization_type__icontains": "federal", "organization_type__icontains": "federal",
"domain__state__in": [ "domain__state__in": [