zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-25 20:18:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix fed agency and org type displays

Browse source
This commit is contained in:
Rachid Mrad 2024-06-26 17:41:33 -04:00
parent 56a8f83e18
commit 4b40b95bac
No known key found for this signature in database
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,6 +187,7 @@ class DomainExport:
"domain__created_at",
"domain__deleted",
"authorizing_official__email",
"federal_agency__agency",
]
# Convert the domain request queryset to a dictionary (including annotated fields)
@ -234,6 +235,7 @@ class DomainExport:
annotations = {}
additional_values = [
"domain__name",
"federal_agency__agency",
]
# Convert the domain request queryset to a dictionary (including annotated fields)
@ -282,6 +284,7 @@ class DomainExport:
annotations = {}
additional_values = [
"domain__name",
"federal_agency__agency",
]
# Convert the domain request queryset to a dictionary (including annotated fields)
@ -359,6 +362,7 @@ class DomainExport:
"domain__expiration_date",
"domain__created_at",
"domain__deleted",
"federal_agency__agency",
]
# Convert the domain request queryset to a dictionary (including annotated fields)
@ -658,13 +662,17 @@ class DomainExport:
human_readable_domain_federal_type = BranchChoices.get_branch_label(domain_federal_type)
domain_type = human_readable_domain_org_type
if domain_federal_type and domain_org_type == DomainRequest.OrgChoicesElectionOffice.FEDERAL:
domain_type = f"{human_readable_domain_federal_type} - {human_readable_domain_org_type}"
domain_type = f"{human_readable_domain_org_type} - {human_readable_domain_federal_type}"
if domain.get("domain__name") == "18f.gov":
print(f'domain_type {domain_type}')
print(f'federal_agency {domain.get("federal_agency")}')
print(f'city {domain.get("city")}')
print(f'agency {domain.get("agency")}')
print(f'federal_agency__agency {domain.get("federal_agency__agency")}')
# create a dictionary of fields which can be included in output.
# "extra_fields" are precomputed fields (generated in the DB or parsed).
FIELDS = {
@ -674,7 +682,7 @@ class DomainExport:
"First ready on": first_ready_on,
"Expiration date": expiration_date,
"Domain type": domain_type,
"Agency": domain.get("federal_agency"),
"Agency": domain.get("federal_agency__agency"),
"Organization name": domain.get("organization_name"),
"City": domain.get("city"),
"State": domain.get("state_territory"),