From 21306531d97471ba17145145da959feded09a31f Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 18 Jul 2024 13:03:46 -0700 Subject: [PATCH 1/9] Biz logic for hiding urbanization --- src/registrar/assets/js/get-gov.js | 31 +++++++++++++++++++ .../templates/domain_request_org_contact.html | 9 ++++-- src/registrar/views/domain_request.py | 1 - 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index 83e575dc53..9dc5eca222 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -657,6 +657,37 @@ function hideDeletedForms() { }); } +// Checks for if we want to display Urbanization or not +document.addEventListener('DOMContentLoaded', function() { + var stateTerritoryField = document.querySelector('select[name="organization_contact-state_territory"]'); + + if (!stateTerritoryField) { + // console.log("State territory field not found, skipping urbanization setup."); + return; // Exit if the field is not found + } + + setupUrbanizationToggle(stateTerritoryField); +}); + +function setupUrbanizationToggle(stateTerritoryField) { + var urbanizationField = document.getElementById('urbanization-field'); + + function toggleUrbanizationField() { + // console.log("Selected value:", stateTerritoryField.value); + if (stateTerritoryField.value === 'PR') { // For Puerto Rico + urbanizationField.style.display = 'block'; + } else { + urbanizationField.style.display = 'none'; + } + } + + // Initial check + toggleUrbanizationField(); + + // Add event listener for changes + stateTerritoryField.addEventListener('change', toggleUrbanizationField); +} + /** * An IIFE that attaches a click handler for our dynamic formsets * diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html index 21cf19306b..f145ee3bfe 100644 --- a/src/registrar/templates/domain_request_org_contact.html +++ b/src/registrar/templates/domain_request_org_contact.html @@ -1,5 +1,5 @@ {% extends 'domain_request_form.html' %} -{% load field_helpers url_helpers %} +{% load field_helpers url_helpers static %} {% block form_instructions %}

If your domain request is approved, the name of your organization and your city/state will be listed in .gov’s public data.

@@ -37,7 +37,12 @@

What is the name and mailing address of the organization you represent?

{% input_with_errors forms.0.zipcode %} {% endwith %} - {% input_with_errors forms.0.urbanization %} + {% endblock %} + + + diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index a7d6aa6ae8..741e541cc2 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -534,7 +534,6 @@ class OrganizationContact(DomainRequestWizard): template_name = "domain_request_org_contact.html" forms = [forms.OrganizationContactForm] - class AboutYourOrganization(DomainRequestWizard): template_name = "domain_request_about_your_organization.html" forms = [forms.AboutYourOrganizationForm] From fd5b9df2fb9642ce1325e9534bdf6b07292d2e59 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 18 Jul 2024 13:56:26 -0700 Subject: [PATCH 2/9] Fix linting --- src/registrar/views/domain_request.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index 741e541cc2..a7d6aa6ae8 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -534,6 +534,7 @@ class OrganizationContact(DomainRequestWizard): template_name = "domain_request_org_contact.html" forms = [forms.OrganizationContactForm] + class AboutYourOrganization(DomainRequestWizard): template_name = "domain_request_about_your_organization.html" forms = [forms.AboutYourOrganizationForm] From 5f89cddd930ae07c13fc7ce887c4944ef891fe89 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 18 Jul 2024 14:05:02 -0700 Subject: [PATCH 3/9] Deployment fix --- src/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 39282ff96d..5d83cd40df 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -113,4 +113,4 @@ services: volumes: - .:/zap/wrk/ links: ["app"] - profiles: ["owasp-scan"] + profiles: ["owasp-scan"] \ No newline at end of file From 05b9be3145b9725efd06644f7d81e872b30dc628 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 18 Jul 2024 14:23:17 -0700 Subject: [PATCH 4/9] Remove some comments to check for deployment --- src/registrar/assets/js/get-gov.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index 9dc5eca222..10e576d163 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -657,7 +657,7 @@ function hideDeletedForms() { }); } -// Checks for if we want to display Urbanization or not +// Checks for if we want to display Urbanization or not document.addEventListener('DOMContentLoaded', function() { var stateTerritoryField = document.querySelector('select[name="organization_contact-state_territory"]'); @@ -681,10 +681,8 @@ function setupUrbanizationToggle(stateTerritoryField) { } } - // Initial check toggleUrbanizationField(); - // Add event listener for changes stateTerritoryField.addEventListener('change', toggleUrbanizationField); } From 6f869803f6fdd7d4f871d5e9ab2d36f34bb11d82 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 18 Jul 2024 14:24:28 -0700 Subject: [PATCH 5/9] Remove versioning --- src/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 5d83cd40df..4a9993b08f 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.0" services: app: build: . From 124a030477e3f959eb6cef46e19f85e156fb3cbc Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Mon, 22 Jul 2024 13:12:40 -0700 Subject: [PATCH 6/9] Remove comments and fix spacing --- src/registrar/assets/js/get-gov.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index 10e576d163..47c18ff590 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -662,8 +662,7 @@ document.addEventListener('DOMContentLoaded', function() { var stateTerritoryField = document.querySelector('select[name="organization_contact-state_territory"]'); if (!stateTerritoryField) { - // console.log("State territory field not found, skipping urbanization setup."); - return; // Exit if the field is not found + return; // Exit if the field not found } setupUrbanizationToggle(stateTerritoryField); @@ -673,8 +672,8 @@ function setupUrbanizationToggle(stateTerritoryField) { var urbanizationField = document.getElementById('urbanization-field'); function toggleUrbanizationField() { - // console.log("Selected value:", stateTerritoryField.value); - if (stateTerritoryField.value === 'PR') { // For Puerto Rico + // Checking specifically for Puerto Rico only + if (stateTerritoryField.value === 'PR') { urbanizationField.style.display = 'block'; } else { urbanizationField.style.display = 'none'; From 21f0cddce938cfe941de3aed4c069da31ec344f1 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Mon, 22 Jul 2024 13:44:39 -0700 Subject: [PATCH 7/9] Fix added changes on yml file --- src/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 4a9993b08f..9b22bcdc37 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -112,4 +112,5 @@ services: volumes: - .:/zap/wrk/ links: ["app"] - profiles: ["owasp-scan"] \ No newline at end of file + profiles: ["owasp-scan"] + \ No newline at end of file From 517d318507da00bae0885489217731fcf73c7670 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Mon, 22 Jul 2024 13:45:13 -0700 Subject: [PATCH 8/9] Remove newline --- src/docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 9b22bcdc37..4a9993b08f 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -112,5 +112,4 @@ services: volumes: - .:/zap/wrk/ links: ["app"] - profiles: ["owasp-scan"] - \ No newline at end of file + profiles: ["owasp-scan"] \ No newline at end of file From a88e0892d1b1ea327cadede2c17a20bad5c6c439 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Mon, 22 Jul 2024 13:49:49 -0700 Subject: [PATCH 9/9] Remove changes I did on yml --- src/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 4a9993b08f..d64ba80d55 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -112,4 +112,4 @@ services: volumes: - .:/zap/wrk/ links: ["app"] - profiles: ["owasp-scan"] \ No newline at end of file + profiles: ["owasp-scan"]