zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-06-11 15:04:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

Address PR feedback

Browse source
This commit is contained in:
Seamus Johnston 2022-12-13 16:01:57 -06:00
parent 4237e353a5
commit e6852274ed
No known key found for this signature in database
GPG key ID: 2F21225985069105
4 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/registrar/forms/application_wizard.py
View file

@ -91,7 +91,10 @@ class OrganizationContactForm(RegistrarForm):
choices=[("", "--Select--")] + DomainApplication.StateTerritoryChoices.choices,
)
zipcode = forms.CharField(label="ZIP code")
urbanization = forms.CharField(label="Urbanization (Puerto Rico only)")
urbanization = forms.CharField(
required=False,
label="Urbanization (Puerto Rico only)",
)
class AuthorizingOfficialForm(RegistrarForm):

9
src/registrar/migrations/0005_domainapplication_city_and_more.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.1.3 on 2022-12-09 19:27
# Generated by Django 4.1.3 on 2022-12-12 21:00
from django.db import migrations, models
@ -20,4 +20,11 @@ class Migration(migrations.Migration):
name="urbanization",
field=models.TextField(blank=True, help_text="Urbanization", null=True),
),
migrations.AlterField(
model_name="domainapplication",
name="federal_agency",
field=models.TextField(
blank=True, help_text="Top level federal agency", null=True
),
),
]

20
src/registrar/migrations/0006_alter_domainapplication_federal_agency.py
View file

@ -1,20 +0,0 @@
# Generated by Django 4.1.3 on 2022-12-12 14:48
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("registrar", "0005_domainapplication_city_and_more"),
]
operations = [
migrations.AlterField(
model_name="domainapplication",
name="federal_agency",
field=models.TextField(
blank=True, help_text="Top level federal agency", null=True
),
),
]

36
src/registrar/templates/application_review.html
View file

@ -9,25 +9,34 @@
{% csrf_token %}
{% for step in wizard.steps.all|slice:":-1" %}
<div class="review__step margin-top-2">
<section class="review__step margin-top-205">
<hr />
<div class="review__step__title display-flex flex-justify">
<div class="review__step__value">
<div class="review__step__name">{{ form_titles|get_item:step }}</div>
<div>
{% if step == step_cls.ORGANIZATION_TYPE %}
{{ application.get_organization_type_display }}
{{ application.get_organization_type_display|default:"Incomplete" }}
{% endif %}
{% if step == step_cls.ORGANIZATION_FEDERAL %}
{{ application.get_federal_type_display }}
{{ application.get_federal_type_display|default:"Incomplete" }}
{% endif %}
{% if step == step_cls.ORGANIZATION_ELECTION %}
{{ application.is_election_board|yesno:"Yes,No,Maybe" }}
{{ application.is_election_board|yesno:"Yes,No,Incomplete" }}
{% endif %}
{% if step == step_cls.ORGANIZATION_CONTACT %}
{% if organization.organization_name %}
{% include "includes/organization_address.html" with organization=application %}
{% else %}
Incomplete
{% endif %}
{% endif %}
{% if step == step_cls.AUTHORIZING_OFFICIAL %}
{% if application.authorizing_official %}
{% include "includes/contact.html" with contact=application.authorizing_official %}
{% else %}
Incomplete
{% endif %}
{% endif %}
{% if step == step_cls.CURRENT_SITES %}
<ul class="add-list-reset">
@ -40,17 +49,21 @@
{% endif %}
{% if step == step_cls.DOTGOV_DOMAIN %}
<ul class="add-list-reset">
<li>{{ application.requested_domain.name }}</li>
<li>{{ application.requested_domain.name|default:"Incomplete" }}</li>
{% for site in application.alternative_domains.all %}
<li>{{ site.website }}</li>
{% endfor %}
</ul>
{% endif %}
{% if step == step_cls.PURPOSE %}
{{ application.purpose }}
{{ application.purpose|default:"Incomplete" }}
{% endif %}
{% if step == step_cls.YOUR_CONTACT %}
{% include "includes/contact.html" with contact=application.submitter %}
{% if application.submitter %}
{% include "includes/contact.html" with contact=application.submitter %}
{% else %}
Incomplete
{% endif %}
{% endif %}
{% if step == step_cls.OTHER_CONTACTS %}
{% for other in application.other_contacts.all %}
@ -60,10 +73,13 @@
{% endfor %}
{% endif %}
{% if step == step_cls.SECURITY_EMAIL %}
{{ application.security_email }}
{{ application.security_email|default:"None" }}
{% endif %}
{% if step == step_cls.ANYTHING_ELSE %}
{{ application.anything_else }}
{{ application.anything_else|default:"No" }}
{% endif %}
{% if step == step_cls.REQUIREMENTS %}
{{ application.is_policy_acknowledged|yesno:"Agree,Do not agree,Do not agree" }}
{% endif %}
</div>
</div>
@ -72,7 +88,7 @@
href="{% url wizard.url_name step=step %}"
>Edit<span class="sr-only"> {{ form_titles|get_item:step }}</span></a>
</div>
</div>
</section>
{% endfor %}
{{ block.super }}