From 52f299d06e304cca79026037facee6794d5f1bb7 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 7 Mar 2024 12:35:10 -0500
Subject: [PATCH] initial form changes - wip

---
 src/registrar/admin.py                     | 58 +++++++---------------
 src/registrar/models/domain_application.py |  4 +-
 src/registrar/models/domain_information.py |  2 +-
 3 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 92e477667..0ea791181 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -777,18 +777,21 @@ class DomainInformationAdmin(ListHeaderAdmin):
     search_help_text = "Search by domain."
 
     fieldsets = [
-        (None, {"fields": ["creator", "domain_application", "notes"]}),
+        (None, {"fields": ["creator", "submitter", "domain_application", "notes"]}),
+        (".gov domain", {"fields": ["domain"]}),
+        ("Contacts", {"fields": ["authorizing_official", "other_contacts", "no_other_contacts_rationale"]}),
+        ("Background info", {"fields": ["anything_else"]}),
         (
             "Type of organization",
             {
                 "fields": [
                     "organization_type",
+                    "is_election_board",
+                    "federal_type",
+                    "federal_agency",
+                    "tribe_name",
                     "federally_recognized_tribe",
                     "state_recognized_tribe",
-                    "tribe_name",
-                    "federal_agency",
-                    "federal_type",
-                    "is_election_board",
                     "about_your_organization",
                 ]
             },
@@ -798,28 +801,15 @@ class DomainInformationAdmin(ListHeaderAdmin):
             {
                 "fields": [
                     "organization_name",
+                    "state_territory",
                     "address_line1",
                     "address_line2",
                     "city",
-                    "state_territory",
                     "zipcode",
                     "urbanization",
                 ]
             },
         ),
-        ("Authorizing official", {"fields": ["authorizing_official"]}),
-        (".gov domain", {"fields": ["domain"]}),
-        ("Your contact information", {"fields": ["submitter"]}),
-        ("Other employees from your organization?", {"fields": ["other_contacts"]}),
-        (
-            "No other employees from your organization?",
-            {"fields": ["no_other_contacts_rationale"]},
-        ),
-        ("Anything else?", {"fields": ["anything_else"]}),
-        (
-            "Requirements for operating a .gov domain",
-            {"fields": ["is_policy_acknowledged"]},
-        ),
     ]
 
     # Read only that we'll leverage for CISA Analysts
@@ -979,18 +969,21 @@ class DomainApplicationAdmin(ListHeaderAdmin):
     search_help_text = "Search by domain or submitter."
 
     fieldsets = [
-        (None, {"fields": ["status", "rejection_reason", "investigator", "creator", "approved_domain", "notes"]}),
+        (None, {"fields": ["status", "rejection_reason", "investigator", "creator", "submitter", "approved_domain", "notes"]}),
+        (".gov domain", {"fields": ["requested_domain", "alternative_domains"]}),
+        ("Contacts", {"fields": ["authorizing_official", "other_contacts", "no_other_contacts_rationale"]}),
+        ("Background info", {"fields": ["purpose", "anything_else", "current_websites"]}),
         (
             "Type of organization",
             {
                 "fields": [
                     "organization_type",
+                    "is_election_board",
+                    "federal_type",
+                    "federal_agency",
+                    "tribe_name",
                     "federally_recognized_tribe",
                     "state_recognized_tribe",
-                    "tribe_name",
-                    "federal_agency",
-                    "federal_type",
-                    "is_election_board",
                     "about_your_organization",
                 ]
             },
@@ -1000,30 +993,15 @@ class DomainApplicationAdmin(ListHeaderAdmin):
             {
                 "fields": [
                     "organization_name",
+                    "state_territory",
                     "address_line1",
                     "address_line2",
                     "city",
-                    "state_territory",
                     "zipcode",
                     "urbanization",
                 ]
             },
         ),
-        ("Authorizing official", {"fields": ["authorizing_official"]}),
-        ("Current websites", {"fields": ["current_websites"]}),
-        (".gov domain", {"fields": ["requested_domain", "alternative_domains"]}),
-        ("Purpose of your domain", {"fields": ["purpose"]}),
-        ("Your contact information", {"fields": ["submitter"]}),
-        ("Other employees from your organization?", {"fields": ["other_contacts"]}),
-        (
-            "No other employees from your organization?",
-            {"fields": ["no_other_contacts_rationale"]},
-        ),
-        ("Anything else?", {"fields": ["anything_else"]}),
-        (
-            "Requirements for operating a .gov domain",
-            {"fields": ["is_policy_acknowledged"]},
-        ),
     ]
 
     # Read only that we'll leverage for CISA Analysts
diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 8c417b51a..90627a63b 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -504,7 +504,7 @@ class DomainApplication(TimeStampedModel):
         "registrar.Website",
         blank=True,
         related_name="current+",
-        verbose_name="websites",
+        verbose_name="Current websites",
     )
 
     approved_domain = models.OneToOneField(
@@ -550,7 +550,7 @@ class DomainApplication(TimeStampedModel):
         "registrar.Contact",
         blank=True,
         related_name="contact_applications",
-        verbose_name="contacts",
+        verbose_name="Other employees",
     )
 
     no_other_contacts_rationale = models.TextField(
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 861171c5c..5e17cfd2c 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -183,7 +183,7 @@ class DomainInformation(TimeStampedModel):
         "registrar.Contact",
         blank=True,
         related_name="contact_applications_information",
-        verbose_name="contacts",
+        verbose_name="Other employees",
     )
 
     no_other_contacts_rationale = models.TextField(