Rename

src/registrar/config/urls.py

@@ -171,7 +171,7 @@ urlpatterns = [
     ),
     path(
         "domain-request/viewonly/<int:pk>",
-        views.DomainRequestStatusViewOnly.as_view(),
+        views.PortfolioDomainRequestStatusViewOnly.as_view(),
         name="domain-request-status-viewonly",
     ),
     path(

src/registrar/templates/domain_request_review.html

@@ -19,12 +19,5 @@
 {% endblock %}
 
 {% block form_fields %}
-  {% include "includes/domain_request_review_steps.html" with is_editable=True %}
+  {% include "includes/request_review_steps.html" with is_editable=True %}
-  {% comment %} 
-  TODO - uncomment
-  {% if not portfolio %}
-    {% include "includes/domain_request_review_steps.html" with is_editable=True %}
-  {% else %}
-    {% include "includes/portfolio_domain_request_review_steps.html" with is_editable=True %}
-  {% endif %} {% endcomment %}
 {% endblock %}

src/registrar/templates/domain_request_status.html

@@ -6,5 +6,5 @@
 
 
 {% block content %}
-  {% include "includes/domain_request_status_manage.html" %}
+  {% include "includes/request_status_manage.html" %}
 {% endblock %}

src/registrar/templates/includes/portfolio_request_review_steps.html

@@ -7,7 +7,6 @@
         {% namespaced_url 'domain-request' step as domain_request_url %}
     {% endif %}
 
-    {% comment %} TODO: what is this? {% endcomment %}
     {% if step == Step.REQUESTING_ENTITY %}
         {% with title=form_titles|get_item:step value=domain_request.portfolio|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe%}
             {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}

src/registrar/templates/includes/portfolio_request_status_view.html

@@ -1,19 +1,18 @@
-{% extends 'includes/domain_request_status_manage.html' %}
+{% extends 'includes/request_status_manage.html' %}
 {% load custom_filters %}
 {% load static url_helpers %}
 
 {% comment %} Do not show the withdrawal text in viewonly mode {% endcomment %}
 {% block status_blurb %}
-{% if DomainRequest.is_awaiting_review %}
+    {% if DomainRequest.is_awaiting_review %}
-    <p>{% include "includes/domain_request_awaiting_review.html" with show_withdraw_text=False %}</p>
+        <p>{% include "includes/domain_request_awaiting_review.html" with show_withdraw_text=False %}</p>
-{% endif %}
+    {% endif %}
 {% endblock status_blurb %}
 
 {% comment %} Do not show action buttons in viewonly mode {% endcomment %}
 {% block modify_request %}
 {% endblock modify_request %}
 
-
 {% block request_summary %}
-    {% include "includes/portfolio_domain_request_review_steps.html" with domain_request=DomainRequest is_editable=False %}
+    {% include "includes/portfolio_request_review_steps.html" with domain_request=DomainRequest is_editable=False %}
 {% endblock request_summary %}

src/registrar/templates/includes/request_review_steps.html

@@ -165,4 +165,4 @@
         {% endwith %}
     {% endif %}
 </section>
-{% endfor %}
+{% endfor %}

src/registrar/templates/includes/request_status_manage.html

@@ -0,0 +1,236 @@
+{% load custom_filters %}
+{% load static url_helpers %}
+<main id="main-content" class="grid-container">
+    <div class="grid-col desktop:grid-offset-2 desktop:grid-col-8">
+        {% block breadcrumb %}
+        {% if portfolio %}
+            {% url 'domain-requests' as url %}
+        {% else %}
+            {% url 'home' as url %}
+        {% endif %}
+        <nav class="usa-breadcrumb padding-top-0" aria-label="Domain request breadcrumb">
+        <ol class="usa-breadcrumb__list">
+            <li class="usa-breadcrumb__list-item">
+            {% if portfolio %}
+                <a href="{{ url }}" class="usa-breadcrumb__link"><span>Domain requests</span></a>
+            {% else %}
+                <a href="{{ url }}" class="usa-breadcrumb__link"><span>Manage your domains</span></a>
+            {% endif %}
+            </li>
+            <li class="usa-breadcrumb__list-item usa-current" aria-current="page">
+            {% if not DomainRequest.requested_domain and DomainRequest.status == DomainRequest.DomainRequestStatus.STARTED %}
+                <span>New domain request</span>
+            {% else %}
+                <span>{{ DomainRequest.requested_domain.name }}</span>
+            {% endif %}
+            </li>
+        </ol>
+        </nav>
+        {% endblock breadcrumb %}
+
+        {% block header %}
+            {% if not DomainRequest.requested_domain and DomainRequest.status == DomainRequest.DomainRequestStatus.STARTED %}
+                <h1>New domain request</h1>
+            {% else %}
+                <h1>Domain request for {{ DomainRequest.requested_domain.name }}</h1>
+            {% endif %}
+        {% endblock header %}
+
+        {% block status_summary %}
+        <div
+            class="usa-summary-box dotgov-status-box margin-top-3 padding-left-2" 
+            role="region"
+            aria-labelledby="summary-box-key-information"
+        >
+        <div class="usa-summary-box__body">
+            <p class="usa-summary-box__heading font-sans-md margin-bottom-0" 
+                id="summary-box-key-information"
+            > 
+            <span class="text-bold text-primary-darker">
+                Status:
+            </span>
+            {{ DomainRequest.get_status_display|default:"ERROR Please contact technical support/dev" }}
+            </p>
+        </div>
+        </div>
+        <br>
+        {% endblock status_summary %}
+        
+        {% block status_metadata %}
+
+        {% if portfolio %}
+            {% if DomainRequest.creator %}
+            <p class="margin-top-1 margin-bottom-1">
+                <b class="review__step__name">Created by:</b> {{DomainRequest.creator.email|default:DomainRequest.creator.get_formatted_name }}
+            </p>
+            {% else %}
+            <p class="margin-top-1 margin-bottom-1">
+                <b class="review__step__name">No creator found:</b> this is an error, please email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
+            </p>
+            {% endif %}
+        {% endif %}
+
+        {% with statuses=DomainRequest.DomainRequestStatus last_submitted=DomainRequest.last_submitted_date|date:"F j, Y" first_submitted=DomainRequest.first_submitted_date|date:"F j, Y" last_status_update=DomainRequest.last_status_update|date:"F j, Y" %}
+        {% comment %} 
+        These are intentionally seperated this way. 
+        There is some code repetition, but it gives us more flexibility rather than a dense reduction. 
+        Leave it this way until we've solidified our requirements.
+        {% endcomment %}
+        {% if DomainRequest.status == statuses.STARTED %}
+        {% with first_started_date=DomainRequest.get_first_status_started_date|date:"F j, Y" %}
+        <p class="margin-top-1">
+            {% comment %} 
+            A newly created domain request will not have a value for last_status update.
+            This is because the status never really updated. 
+            However, if this somehow goes back to started we can default to displaying that new date.
+            {% endcomment %}
+            <b class="review__step__name">Started on:</b> {{last_status_update|default:first_started_date}}
+        </p>
+        {% endwith %}
+        {% elif DomainRequest.status == statuses.SUBMITTED %}
+        <p class="margin-top-1 margin-bottom-1">
+            <b class="review__step__name">Submitted on:</b> {{last_submitted|default:first_submitted }}
+        </p>
+        <p class="margin-top-1">
+            <b class="review__step__name">Last updated on:</b> {{DomainRequest.updated_at|date:"F j, Y"}}
+        </p>
+        {% elif DomainRequest.status == statuses.ACTION_NEEDED %}
+        <p class="margin-top-1 margin-bottom-1">
+            <b class="review__step__name">Submitted on:</b> {{last_submitted|default:first_submitted }}
+        </p>
+        <p class="margin-top-1">
+            <b class="review__step__name">Last updated on:</b> {{DomainRequest.updated_at|date:"F j, Y"}}
+        </p>
+        {% elif DomainRequest.status == statuses.REJECTED %}
+        <p class="margin-top-1 margin-bottom-1">
+            <b class="review__step__name">Submitted on:</b> {{last_submitted|default:first_submitted }}
+        </p>
+        <p class="margin-top-1">
+            <b class="review__step__name">Rejected on:</b> {{last_status_update}}
+        </p>
+        {% elif DomainRequest.status == statuses.WITHDRAWN %}
+        <p class="margin-top-1 margin-bottom-1">
+            <b class="review__step__name">Submitted on:</b> {{last_submitted|default:first_submitted }}
+        </p>
+        <p class="margin-top-1">
+            <b class="review__step__name">Withdrawn on:</b> {{last_status_update}}
+        </p>
+        {% else %}
+        {% comment %} Shown for in_review, approved, ineligible {% endcomment %}
+        <p class="margin-top-1">
+            <b class="review__step__name">Last updated on:</b> {{DomainRequest.updated_at|date:"F j, Y"}}
+        </p>
+        {% endif %}
+        {% endwith %}
+        {% endblock status_metadata %}
+
+        {% block status_blurb %}
+        {% if DomainRequest.is_awaiting_review %}
+            <p>{% include "includes/domain_request_awaiting_review.html" with show_withdraw_text=DomainRequest.is_withdrawable %}</p>
+        {% endif %}
+        {% endblock status_blurb %}
+
+        {% block modify_request %}
+        {% if DomainRequest.is_withdrawable %}
+            <p><a href="{% url 'domain-request-withdraw-confirmation' pk=DomainRequest.id %}" class="usa-button usa-button--outline withdraw_outline">
+                Withdraw request</a>
+            </p>
+        {% endif %}
+        {% endblock modify_request %}
+    </div>
+
+    <div class="grid-col desktop:grid-offset-2 maxw-tablet">
+        {% block request_summary_header %}
+        <h2 class="text-primary-darker"> Summary of your domain request </h2> 
+        {% endblock request_summary_header%}
+
+        {% block request_summary %}
+        {% with heading_level='h3' %}
+        {% with org_type=DomainRequest.get_generic_org_type_display %}
+        {% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
+        {% endwith %}
+
+        {% if DomainRequest.tribe_name %}
+            {% include "includes/summary_item.html" with title='Tribal government' value=DomainRequest.tribe_name heading_level=heading_level %}
+
+            {% if DomainRequest.federally_recognized_tribe %}
+                <p>Federally-recognized tribe</p>
+            {% endif %}
+
+            {% if DomainRequest.state_recognized_tribe %}
+                <p>State-recognized tribe</p>
+            {% endif %}
+
+        {% endif %}
+
+        {% if DomainRequest.get_federal_type_display %}
+            {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type_display heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.is_election_board %}
+            {% with value=DomainRequest.is_election_board|yesno:"Yes,No,Incomplete" %}
+                {% include "includes/summary_item.html" with title='Election office' value=value heading_level=heading_level %}
+            {% endwith %}
+        {% endif %}
+
+        {% if DomainRequest.organization_name %}
+            {% include "includes/summary_item.html" with title='Organization' value=DomainRequest  address='true' heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.about_your_organization %}
+            {% include "includes/summary_item.html" with title='About your organization' value=DomainRequest.about_your_organization heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.senior_official %}
+            {% include "includes/summary_item.html" with title='Senior official' value=DomainRequest.senior_official contact='true' heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.current_websites.all %}
+            {% include "includes/summary_item.html" with title='Current websites' value=DomainRequest.current_websites.all list='true' heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.requested_domain %}
+            {% include "includes/summary_item.html" with title='.gov domain' value=DomainRequest.requested_domain heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.alternative_domains.all %}
+            {% include "includes/summary_item.html" with title='Alternative domains' value=DomainRequest.alternative_domains.all list='true' heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.purpose %}
+            {% include "includes/summary_item.html" with title='Purpose of your domain' value=DomainRequest.purpose heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.creator %}
+            {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
+        {% endif %}
+
+        {% if DomainRequest.other_contacts.all %}
+            {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.other_contacts.all contact='true' list='true' heading_level=heading_level %}
+        {% else %}
+            {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.no_other_contacts_rationale heading_level=heading_level %}
+        {% endif %}
+
+        {# We always show this field even if None #}
+        {% if DomainRequest %}
+            <h3 class="register-form-review-header">CISA Regional Representative</h3>
+            <ul class="usa-list usa-list--unstyled margin-top-0">
+                {% if DomainRequest.cisa_representative_first_name %}
+                {{ DomainRequest.get_formatted_cisa_rep_name }}
+                {% else %}
+                No
+                {% endif %}
+            </ul>
+            <h3 class="register-form-review-header">Anything else</h3>
+            <ul class="usa-list usa-list--unstyled margin-top-0">
+                {% if DomainRequest.anything_else %}
+                {{DomainRequest.anything_else}}
+                {% else %}
+                No
+                {% endif %}
+            </ul>
+        {% endif %}
+    {% endwith %}
+    {% endblock request_summary%}
+    </div>
+</main>

src/registrar/templates/portfolio_domain_request_status_viewonly.html

@@ -5,5 +5,5 @@
 {% block title %}Domain request status | {{ DomainRequest.requested_domain.name }} | {% endblock %}
 
 {% block content %}
-  {% include "includes/domain_request_status_view.html" %}
+  {% include "includes/portfolio_domain_request_status_view.html" %}
 {% endblock %}

src/registrar/utility/enums.py

@@ -72,8 +72,6 @@ class PortfolioDomainRequestStep(StrEnum):
     appear in the order they are defined. (Order matters.)
     """
     # Portfolio
-    # TODO - this does not exist yet.
-    # Fill this in for the portfolio domain request experience.
     REQUESTING_ENTITY = "portfolio"
     CURRENT_SITES = "current_sites"
     DOTGOV_DOMAIN = "dotgov_domain"

src/registrar/views/domain_request.py

@@ -756,20 +756,6 @@ class DomainRequestStatus(DomainRequestPermissionView):
         return True
 
 
-class DomainRequestStatusViewOnly(DomainRequestPortfolioViewonlyView):
-    template_name = "domain_request_status_viewonly.html"
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        # Create a temp wizard object to grab the step list
-        wizard = PortfolioDomainRequestWizard()
-        wizard.request = self.request
-        context["Step"] = wizard.StepEnum.__members__
-        context["steps"] = request_step_list(wizard)
-        context["form_titles"] = wizard.TITLES
-        return context
-
-
 class DomainRequestWithdrawConfirmation(DomainRequestPermissionWithdrawView):
     """This page will ask user to confirm if they want to withdraw
 
@@ -902,3 +888,19 @@ class DomainRequestDeleteView(DomainRequestPermissionDeleteView):
 
         duplicates = [item for item, count in object_dict.items() if count > 1]
         return duplicates
+
+
+# region Portfolio views
+class PortfolioDomainRequestStatusViewOnly(DomainRequestPortfolioViewonlyView):
+    template_name = "portfolio_domain_request_status_viewonly.html"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        # Create a temp wizard object to grab the step list
+        wizard = PortfolioDomainRequestWizard()
+        wizard.request = self.request
+        context["Step"] = wizard.StepEnum.__members__
+        context["steps"] = request_step_list(wizard)
+        context["form_titles"] = wizard.TITLES
+        return context
+# endregion