diff --git a/templates/requests/_new.html b/templates/requests/_new.html deleted file mode 100644 index 59ceeaa8..00000000 --- a/templates/requests/_new.html +++ /dev/null @@ -1,49 +0,0 @@ -{% extends "base.html" %} - -{% block content %} - -
- - {% include 'requests/menu.html' %} - - {% include "fragments/flash.html" %} - - {% block form_action %} - {% if request_id %} -
- {% else %} - - {% endif %} - {% endblock %} - -
- -
-

{% block heading %}{% endblock %}

-
{{ "requests._new.new_request" | translate }}
-
- -
- - {{ f.csrf_token }} - {% block form %} - form goes here - {% endblock %} - -
- -
- - {% block next %} - -
- -
- - {% endblock %} - -
- -
- -{% endblock %} diff --git a/templates/requests/_review.html b/templates/requests/_review.html deleted file mode 100644 index 9ced019f..00000000 --- a/templates/requests/_review.html +++ /dev/null @@ -1,215 +0,0 @@ -{% macro RequiredLabel() -%} - Response Required -{%- endmacro %} - -{% macro DefinitionReviewField(title, section, item_name, filter=None, filter_args=[]) -%} -
-
{{ title | safe }}
-
- {% set value = data.get(section, {}).get(item_name) %} - {% if value is not none %} - {{ value | findFilter(filter, filter_args) }} - {% else %} - {{ RequiredLabel() }} - {% endif %} -
-
-{% endmacro %} - -{% macro EditLink(screen) %} - {% if request_id %} - {{ url_for('requests.requests_form_update', screen=screen, request_id=request_id)}} - {% else %} - {{ url_for('requests.requests_form_update', screen=screen, request_id=None) }} - {% endif %} -{% endmacro %} - -

- Details of Use - {% if editable %} - - {{ Icon('edit') }} - Edit this section - - {% endif %} -

- -
- - {{ DefinitionReviewField("DoD Component", "details_of_use", "dod_component", filter="getOptionLabel", filter_args=[service_branches]) }} - - {{ DefinitionReviewField("JEDI Cloud Usage", "details_of_use", "jedi_usage") }} - - {{ DefinitionReviewField("Number of software systems", "details_of_use", "num_software_systems", filter="readableInteger") }} - - {{ DefinitionReviewField("JEDI Cloud Migration", "details_of_use", "jedi_migration") }} - - {% if data['details_of_use']['jedi_migration'] == 'yes' %} - {{ DefinitionReviewField("Rationalization of Software Systems", "details_of_use", "rationalization_software_systems") }} - - {{ DefinitionReviewField("Technical Support Team", "details_of_use", "technical_support_team") }} - - {% if data['details_of_use']['technical_support_team'] == 'yes' %} - {{ DefinitionReviewField("Organization Providing Assistance", "details_of_use", "organization_providing_assistance", filter="getOptionLabel", filter_args=[assistance_org_types]) }} - {% endif %} - - {{ DefinitionReviewField("Engineering Assessment", "details_of_use", "engineering_assessment") }} - - {{ DefinitionReviewField("Data Transfers", "details_of_use", "data_transfers", filter="getOptionLabel", filter_args=[data_transfer_amounts]) }} - - {{ DefinitionReviewField("Expected Completion Date", "details_of_use", "expected_completion_date", filter="getOptionLabel", filter_args=[completion_date_ranges]) }} - - {% else %} - - {{ DefinitionReviewField("Cloud Native", "details_of_use", "cloud_native") }} - - {% endif %} - - {{ DefinitionReviewField("Estimated Monthly Spend", "details_of_use", "estimated_monthly_spend", filter="dollars") }} - - {% if jedi_request and jedi_request.annual_spend > annual_spend_threshold %} - - {{ DefinitionReviewField("Number of User Sessions", "details_of_use", "number_user_sessions", filter="readableInteger") }} - - {{ DefinitionReviewField("Average Daily Traffic (Number of Requests)", "details_of_use", "average_daily_traffic", filter="readableInteger") }} - - {{ DefinitionReviewField("Average Daily Traffic (GB)", "details_of_use", "average_daily_traffic_gb", filter="readableInteger") }} - - {% endif %} - - {{ DefinitionReviewField("Total Spend", "details_of_use", "dollar_value", filter="dollars") }} - - {{ DefinitionReviewField("Start Date", "details_of_use", "start_date") }} - - {{ DefinitionReviewField("Request Name", "details_of_use", "name") }} -
- -
-

- Information About You - {% if editable %} - - {{ Icon('edit') }} - Edit this section - - {% endif %} -

- -
- {{ DefinitionReviewField("First Name", "information_about_you", "fname_request") }} - - {{ DefinitionReviewField("Last Name", "information_about_you", "lname_request") }} - - {{ DefinitionReviewField("Email Address", "information_about_you", "email_request") }} - -
-
Phone Number
-
- {% if data.information_about_you.phone_number is not none %} - {{ data.information_about_you.phone_number }} - {% else %} - {{ RequiredLabel() }} - {% endif %} - - {% if data.information_about_you.phone_ext %} - ext. {{ data.information_about_you.phone_ext }} - {% endif %} -
-
- - {{ DefinitionReviewField("Service Branch or Agency", "information_about_you", "service_branch", filter="getOptionLabel", filter_args=[service_branches]) }} - - {{ DefinitionReviewField("Citizenship", "information_about_you", "citizenship") }} - - {{ DefinitionReviewField("Designation of Person", "information_about_you", "designation", filter="capitalize") }} - - {{ DefinitionReviewField("Latest Information Assurance (IA) Training completion date", "information_about_you", "date_latest_training") }} -
- -
-

- Portfolio Owner - {% if editable %} - - {{ Icon('edit') }} - Edit this section - - {% endif %} -

- -
- {{ DefinitionReviewField("POC First Name", "primary_poc", "fname_poc") }} - - {{ DefinitionReviewField("POC Last Name", "primary_poc", "lname_poc") }} - - {{ DefinitionReviewField("POC Email Address", "primary_poc", "email_poc") }} - - {{ DefinitionReviewField("DoD ID", "primary_poc", "dodid_poc") }} -
- -{% if jedi_request.has_financial_data %} -
-

- Financial Verification -

- -
- {% if jedi_request.legacy_task_order.pdf %} - - Download the Task Order PDF - - {% else %} -

No Task Order PDF attached.

- {% endif %} -
- -
- {{ DefinitionReviewField("Task Order Information Source", "legacy_task_order", "source", filter="getOptionLabel", filter_args=[task_order_sources]) }} - - {{ DefinitionReviewField("Task Order Number", "legacy_task_order", "number") }} - - {{ DefinitionReviewField("What is the source of funding?", "legacy_task_order", "funding_type", filter="getOptionLabel", filter_args=[funding_types]) }} - - {% if data["legacy_task_order"] and data["legacy_task_order"]["funding_type"].value == "OTHER" %} - {{ DefinitionReviewField("If other, please specify", "legacy_task_order", "funding_type_other") }} - {% endif %} - - {{ DefinitionReviewField("Task Order Expiration Date", "legacy_task_order", "expiration_date") }} - - {{ DefinitionReviewField("
CLIN 0001
-
Unclassified IaaS and PaaS Amount
", "legacy_task_order", "clin_0001", filter="dollars") }} - - {{ DefinitionReviewField("
CLIN 0003
-
Unclassified Cloud Support Package
", "legacy_task_order", "clin_0003", filter="dollars") }} - - {{ DefinitionReviewField("
CLIN 1001
-
Unclassified IaaS and PaaS Amount
OPTION PERIOD 1
", "legacy_task_order", "clin_1001", filter="dollars") }} - - {{ DefinitionReviewField("
CLIN 1003
-
Unclassified Cloud Support Package
OPTION PERIOD 1
", "legacy_task_order", "clin_1003", filter="dollars") }} - - {{ DefinitionReviewField("
CLIN 2001
-
Unclassified IaaS and PaaS Amount
OPTION PERIOD 2
", "legacy_task_order", "clin_2001", filter="dollars") }} - - {{ DefinitionReviewField("
CLIN 2003
-
Unclassified Cloud Support Package
OPTION PERIOD 2
", "legacy_task_order", "clin_2003", filter="dollars") }} - - {{ DefinitionReviewField("Unique Item Identifier (UII)s related to your application(s) if you already have them", "financial_verification", "uii_ids", filter="renderList") }} - - {{ DefinitionReviewField("Program Element (PE) Number related to your request", "financial_verification", "pe_id") }} - - {{ DefinitionReviewField("Program Treasury Code", "financial_verification", "treasury_code") }} - - {{ DefinitionReviewField("Program Budget Activity (BA) Code", "financial_verification", "ba_code") }} - - {{ DefinitionReviewField("Contracting Officer First Name", "financial_verification", "fname_co") }} - - {{ DefinitionReviewField("Contracting Officer Last Name", "financial_verification", "lname_co") }} - - {{ DefinitionReviewField("Contracting Officer Email", "financial_verification", "email_co") }} - - {{ DefinitionReviewField("Contracting Officer Office", "financial_verification", "office_co") }} - - {{ DefinitionReviewField("Contracting Officer Representative (COR) First Name", "financial_verification", "fname_cor") }} - - {{ DefinitionReviewField("Contracting Officer Representative (COR) Last Name", "financial_verification", "lname_cor") }} - - {{ DefinitionReviewField("Contracting Officer Representative (COR) Email", "financial_verification", "email_cor") }} - - {{ DefinitionReviewField("Contracting Officer Representative (COR) Office", "financial_verification", "office_cor") }} -
-{% endif %} diff --git a/templates/requests/approval.html b/templates/requests/approval.html deleted file mode 100644 index bc454e37..00000000 --- a/templates/requests/approval.html +++ /dev/null @@ -1,271 +0,0 @@ -{% extends "base.html" %} - -{% from "components/icon.html" import Icon %} -{% from "components/text_input.html" import TextInput %} -{% from "components/phone_input.html" import PhoneInput %} - -{% block content %} - -
- -{% include "fragments/flash.html" %} - -
-
-

- {{ "requests.approval.request_title" | translate({ "displayname": jedi_request.displayname }) }} -

- {{ current_status }} -
- -
- - {% with data=data, request_id=jedi_request.id %} - {% include "requests/_review.html" %} - {% endwith %} - -
- -
- -
-
-
-
-

{{ "requests.approval.ccpo_internal_comments" | translate }}

-
- -
- {% if comments %} -
    - {% for comment in comments %} -
  1. -
    -
    -

    {{ comment.user.full_name }}

    -

    {{ comment.text }}

    -
    - {% set timestamp=comment.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %} -
    - -
    -
    -
    2. - {% endfor %} -
- {% else %} -
-

- {{ "requests.approval.no_ccpo_comments" | translate }} -

-
- {% endif %} - -
- -
-

- {{ "requests.approval.add_comment" | translate }} -

-
- -
- {{ internal_comment_form.csrf_token }} - {{ TextInput(internal_comment_form.text, paragraph=True, noMaxWidth=True) }} -
-
-
- -
-
-
- - -
-
- {{ review_form.csrf_token }} - - {% set initialState = 'approving' if review_form.errors else '' %} - -
-
- -
-

- {{ "requests.approval.ccpo_review_activity" | translate }} -

-
- -
- {% if reviews %} -
    - {% for review in reviews %} -
  1. -
    -
    -

    {{ review.status.log_name }} by {{ review.full_name_reviewer }}

    - {% if review.comment %} -

    {{ review.comment }}

    - {% endif %} - -
    - {% if review.lname_mao %} -
    -

    - {{ "requests.approval.mission_owner_approval_on_behalf_of" | translate }} -

    - {{ review.full_name_mao }} - {{ review.email_mao }} - - {{ review.phone_mao }} - {% if review.phone_ext_mao %} - ext. {{ review.phone_ext_mao }} - {% endif %} - -
    - {% endif %} - - {% if review.lname_ccpo %} -
    -

    - {{ "requests.approval.ccpo_approval_on_behalf_of" | translate }} -

    - {{ review.full_name_ccpo }} -
    - {% endif %} -
    -
    - {% set timestamp=review.status.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %} -
    - -
    -
    -
    2. - {% endfor %} -
- {% else %} -
-

- {{ "requests.approval.no_ccpo_approval_request_changes" | translate }} -

-
- {% endif %} -
- - {% if jedi_request.is_pending_ccpo_action %} -
-

- {{ "requests.approval.review_request" | translate }} -

-
- -
- -
-
- - - - - -
-
- -
-

Message to Requestor (optional)

-
- {{ TextInput( - review_form.comment, - label=("requests.approval.approve_comments_or_notes_label" | translate), - description=("requests.approval.approve_comments_or_notes_description" | translate), - paragraph=True, - noMaxWidth=True - ) }} -
- -
- {{ TextInput( - review_form.comment, - label=("requests.approval.revision_instructions_or_notes_label" | translate), - paragraph=True, - noMaxWidth=True - ) }} -
-
- -
- -

- {{ "requests.approval.authorizing_officials_title" | translate }} - (optional) -

- -

- {{ "requests.approval.authorizing_officials_paragraph" | translate }} -

- -
- -

- {{ "requests.approval.mission_authorizing_official_title" | translate }} -

- -
-
- {{ TextInput(review_form.fname_mao, placeholder="First name of mission authorizing official") }} -
- -
- {{ TextInput(review_form.lname_mao, placeholder="Last name of mission authorizing official") }} -
-
- - {{ TextInput(review_form.email_mao, placeholder="name@mail.mil", validation='email') }} - {{ PhoneInput(review_form.phone_mao, review_form.phone_ext_mao) }} - -
- -

- {{ "requests.approval.ccpo_authorizing_official_title" | translate }} -

- -
-
- {{ TextInput(review_form.fname_ccpo, placeholder="First name of CCPO authorizing official") }} -
- -
- {{ TextInput(review_form.lname_ccpo, placeholder="Last name of CCPO authorizing official") }} -
-
-
-
- {% endif %} - -
- - {% if jedi_request.is_pending_ccpo_action %} -
- - - - {{ Icon('x') }} - Cancel - -
- {% endif %} - -
- -
-
- -
- -{% endblock %} diff --git a/templates/requests/details.html b/templates/requests/details.html deleted file mode 100644 index 98e65dd0..00000000 --- a/templates/requests/details.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "base.html" %} - -{% from "components/alert.html" import Alert %} - -{% block content %} -
- - {% if jedi_request.is_pending_ccpo_acceptance %} - {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_acceptance_alert.html") }} - {% elif jedi_request.is_pending_ccpo_approval %} - {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_modal.html") }} - {% elif requires_fv_action %} - {% include 'requests/review_menu.html' %} - {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }} - {% endif %} - -
-
-

Request Details

-

Request: {{ jedi_request.displayname }}

{{ jedi_request.status_displayname }}
-
- -
- - {% include "requests/_review.html" %} - -
-
-
-{% endblock %} diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html deleted file mode 100644 index b66ab719..00000000 --- a/templates/requests/financial_verification.html +++ /dev/null @@ -1,220 +0,0 @@ -{% extends "base.html" %} - -{% from "components/alert.html" import Alert %} -{% from "components/text_input.html" import TextInput %} -{% from "components/options_input.html" import OptionsInput %} -{% from "components/date_input.html" import DateInput %} - -{% block content %} - -{% include 'requests/review_menu.html' %} - -{% include "fragments/flash.html" %} - -{% if saved_draft %} - {% call Alert(("requests.financial_verification.draft_saved" | translate), level='success') %} - {% endcall %} -{% endif %} - - -{% if jedi_request.is_pending_financial_verification and not f.errors and not extended %} - {{ Alert(("requests.financial_verification.pending_financial_verification" | translate), fragment="fragments/pending_financial_verification.html") }} -{% endif %} - - -
- {% if extended %} - {{ Alert(("requests.financial_verification.manually_enter_task_information_label" | translate), - message=("requests.financial_verification.manually_enter_task_information_description" | translate), - level='warning', - actions=[ - { - 'href': url_for('atst.helpdocs'), - 'label': ("requests.financial_verification.manually_enter_task_information_help_label" | translate), - 'icon': 'help' - } - ] - ) }} - {% endif %} - - {% if f.is_missing_task_order_number %} - {% set extended_url = url_for('requests.financial_verification', request_id=jedi_request.id, extended=True) %} - {% call Alert(("requests.financial_verification.task_order_not_found_eda_label"), level='warning') %} - {{ "requsts.financial_verification.task_order_not_found_eda_description" | translate }} -
- - {{ "requests.financial_verification.enter_task_order_manually_link_text" | translate }} - - {% endcall %} - {% endif %} - -
- - {{ f.csrf_token }} - {% block form %} - {% autoescape false %} - - {% if f.errors and not f.is_only_missing_task_order_number %} - {{ Alert(("requests.financial_verification.some_errors_label" | translate), - message="

Please see below.

", - level='error' - ) }} - {% endif %} - -
- -
-

{{ "requests.financial_verification.financial_verification_title" | translate }}

-
-

- {{ "requests.financial_verification.request_title" | translate({ "displayname" : jedi_request.displayname }) }} -

-
-
- -
- -

- {{ "requests.financial_verification.permissions_paragraph" | translate }} -

- - {% if extended %} -
- {{ OptionsInput(f.legacy_task_order.funding_type) }} - - - - {{ - DateInput( - f.legacy_task_order.expiration_date, - placeholder='MM / DD / YYYY', - validation='date', - tooltip=("requests.financial_verification.expiration_date_placeholder" | translate) - ) - }} - - {{ TextInput( - f.legacy_task_order.clin_0001, - validation='dollars' - ) }} - - {{ TextInput( - f.legacy_task_order.clin_0003, - validation='dollars' - ) }} - - {{ TextInput( - f.legacy_task_order.clin_1001, - validation='dollars' - ) }} - - {{ TextInput( - f.legacy_task_order.clin_1003, - validation='dollars' - ) }} - - {{ TextInput( - f.legacy_task_order.clin_2001, - validation='dollars' - ) }} - - {{ TextInput( - f.legacy_task_order.clin_2003, - validation='dollars' - ) }} - - - -
- {% endif %} - - {{ TextInput( - f.legacy_task_order.number, - placeholder="e.g.: 1234567899C0001", - tooltip=("requests.financial_verification.number_placeholder" | translate), - validation="requiredField" - ) }} - - {{ TextInput(f.request.uii_ids, - paragraph=True, - placeholder="examples: \nDI 0CVA5786950 \nUN1945326361234786950", - tooltip=("requests.financial_verification.uui_ids_placeholder" | translate) - ) }} - - {{ TextInput(f.request.pe_id, - placeholder="e.g.: 0105688F", - validation="peNumber" - ) }} - - {{ TextInput(f.request.treasury_code,placeholder="e.g.: 00123456",validation="treasuryCode") }} - - {{ TextInput(f.request.ba_code,placeholder="e.g.: 02A",validation="baCode") }} - -
- -

- {{ "requests.financial_verification.contracting_officer_information_title" | translate }} -

- -
-
{{ TextInput(f.request.fname_co, validation="requiredField") }}
-
{{ TextInput(f.request.lname_co, validation="requiredField") }}
-
- -
-
{{ TextInput(f.request.email_co,validation='email', placeholder='e.g. jane@mail.mil') }}
-
{{ TextInput(f.request.office_co, validation="requiredField", placeholder="e.g.: WHS") }}
-
- -
- -

- {{ "requests.financial_verification.contracting_officer_representative_information_title" | translate }} -

-
-
{{ TextInput(f.request.fname_cor, validation="requiredField") }}
-
{{ TextInput(f.request.lname_cor, validation="requiredField") }}
-
- -
-
{{ TextInput(f.request.email_cor,validation='email', placeholder='e.g. jane@mail.mil') }}
-
{{ TextInput(f.request.office_cor, validation="requiredField", placeholder="e.g.: WHS") }}
-
- - - {% endautoescape %} - -
-
- - {% endblock form %} - {% block next %} -
- - - {% if jedi_request.last_finver_draft_saved_at %} - Draft saved at - {% endif %} -
- {% endblock %} -
- -
- - -{% endblock %} diff --git a/templates/requests/financial_verification_submitted.html b/templates/requests/financial_verification_submitted.html deleted file mode 100644 index 01d6ef89..00000000 --- a/templates/requests/financial_verification_submitted.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base.html" %} - -{% block content %} - -
- -
- -
- -
-

Submitted

-
-
-
-
- -{% endblock %} diff --git a/templates/requests/index.html b/templates/requests/index.html deleted file mode 100644 index b0ac66f2..00000000 --- a/templates/requests/index.html +++ /dev/null @@ -1,178 +0,0 @@ -{% extends "base.html" %} - -{% from "components/modal.html" import Modal %} -{% from "components/empty_state.html" import EmptyState %} -{% from "components/icon.html" import Icon %} - -{% block content %} - - {% call Modal(name='pendingFinancialVerification', dismissable=True) %} -

{{ "requests.index.request_submitted_title" | translate }}

- - {% include 'fragments/pending_financial_verification.html' %} - -
- -
- {% endcall %} - - {% call Modal(name='pendingCCPOApproval', dismissable=True) %} -

{{ "requests.index.financial_verification_submitted_title" | translate }}

- - {% include 'fragments/pending_ccpo_approval_modal.html' %} - -
- -
- {% endcall %} - - {% call Modal(name='pendingCCPOAcceptance', dismissable=True) %} -

{{ "requests.index.request_submitted_title" | translate }}

- - {% include 'fragments/pending_ccpo_acceptance_alert.html' %} - -
- -
- {% endcall %} - - -
- -{% include "fragments/flash.html" %} - -{% if not requests %} - - {{ EmptyState( - ("requests.index.no_portfolios_label" | translate), - sub_message=("requests.index.no_portfolios_sub_message" | translate), - action_label=("requests.index.no_portfolios_action_label" | translate), - action_href=url_for('requests.requests_form_new', screen=1), - icon='document' - ) }} - -{% else %} - {% if extended_view %} -
-
-
{{ kpi_inprogress }}
-
{{ "requests.index.requests_in_progress" | translate }}
-
-
-
{{ kpi_pending }}
-
{{ "requests.index.pending_ccpo_action" | translate }}
-
-
-
{{ kpi_completed }}
-
{{ "requests.index.approved_requests" | translate }}
-
-
- {% endif %} - -
- - {% if extended_view %} -
-
- - - -
- -
-
- - -
- -
- - -
-
-
- {% endif %} - -
- - - - - - - - - - - {% if extended_view %} - - - {% endif %} - - - {% if extended_view %} - - {% endif %} - - -
- !{ column.displayName } - - {{ Icon("caret_down") }} - - - {{ Icon("caret_up") }} - -
- !{ r.name } - - {{ "requests.index.action_required" | translate }} - - - - - — - !{ r.full_name }!{ dollars(r.annual_usage) } - - !{ r.status } - - - !{ r.status } - - !{ r.dod_component }
-
- {{ EmptyState( - ("requests.index.no_requests_found" | translate), - action_label=None, - action_href=None, - sub_message=("requests.index.try_different_search" | translate), - icon=None - ) }} -
-
-
-{% endif %} - -
- - -{% endblock %} diff --git a/templates/requests/menu.html b/templates/requests/menu.html deleted file mode 100644 index 40de55d3..00000000 --- a/templates/requests/menu.html +++ /dev/null @@ -1,21 +0,0 @@ -
- -
diff --git a/templates/requests/review_menu.html b/templates/requests/review_menu.html deleted file mode 100644 index 51ae0fdd..00000000 --- a/templates/requests/review_menu.html +++ /dev/null @@ -1,21 +0,0 @@ -{% set pending_url=url_for('requests.view_request_details', request_id=jedi_request.id) %} -{% set financial_url=url_for('requests.financial_verification', request_id=jedi_request.id) %} -
- -
diff --git a/templates/requests/screen-1.html b/templates/requests/screen-1.html deleted file mode 100644 index 0d8b52ef..00000000 --- a/templates/requests/screen-1.html +++ /dev/null @@ -1,143 +0,0 @@ -{% extends 'requests/_new.html' %} - -{% from "components/text_input.html" import TextInput %} -{% from "components/options_input.html" import OptionsInput %} -{% from "components/date_input.html" import DateInput %} - -{% block heading %} - Details of Use -{% endblock %} - -{% block form %} - -{% include "fragments/flash.html" %} - - -
- - {{ "requests.screen-1.form_instructions" | translate }} - -

{{ "requests.screen-1.general_title_text"| translate }}

- {{ OptionsInput(f.dod_component) }} - {{ - TextInput( - f.jedi_usage, - paragraph=True, - placeholder=("requests.screen-1.jedi_usage_placeholder" | translate) - ) - }} - -

{{ "requests.screen-1.cloud_readiness_title_text" | translate }}

- {{ - TextInput( - f.num_software_systems, - validation="integer", - tooltip=("requests.screen-1.num_software_systems_tooltip" | translate), - placeholder="0" - ) - }} - {{ - OptionsInput( - f.jedi_migration, - tooltip=("requests.screen-1.jedi_migration_tooltip" | translate) - ) - }} - - - - - -

{{ "requests.screen-1.financial_usage_title" | translate }}

- {{ - TextInput( - f.estimated_monthly_spend, - tooltip=("requests.screen-1.estimated_monthly_spend_tooltip" | translate), - validation="dollars", - placeholder="$0" - ) - }} - -
-
-
- {{ "requests.screen-1.approximate_annual_spend_paragraph" | translate }} -
-
-
- - - - - - {{ - TextInput( - f.dollar_value, - validation='dollars', - placeholder='$0', - tooltip=("requests.screen-1.dollar_value_tooltip" | translate) - ) - }} - {{ DateInput(f.start_date, placeholder='MM / DD / YYYY', validation='date') }} - {{ TextInput(f.name, placeholder='Request Name', validation='portfolioName') }} - -
- - -{% endblock %} diff --git a/templates/requests/screen-2.html b/templates/requests/screen-2.html deleted file mode 100644 index 03984dd4..00000000 --- a/templates/requests/screen-2.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends 'requests/_new.html' %} - -{% from "components/text_input.html" import TextInput %} -{% from "components/options_input.html" import OptionsInput %} -{% from "components/date_input.html" import DateInput %} -{% from "components/phone_input.html" import PhoneInput %} - -{% block heading %} - Information About You -{% endblock %} - -{% block form %} - -{% include "fragments/flash.html" %} - -

Please tell us more about you.

- -
-
{{ TextInput(f.fname_request) }}
-
{{ TextInput(f.lname_request) }}
-
- -{{ TextInput(f.email_request, placeholder='e.g. jane@mail.mil', validation='email') }} -{{ PhoneInput(f.phone_number, f.phone_ext, placeholder_phone='e.g. (123) 456-7890') }} - -

We want to collect the following information from you for security auditing and determining priviledged user access.

- -{{ OptionsInput(f.service_branch) }} -{{ OptionsInput(f.citizenship) }} -{{ OptionsInput(f.designation) }} -{{ DateInput(f.date_latest_training,tooltip="When was the last time you completed the IA training?
Information Assurance (IA) training is an important step in cyber awareness.",placeholder="MM / DD / YYYY", validation="date") }} -{% endblock %} diff --git a/templates/requests/screen-3.html b/templates/requests/screen-3.html deleted file mode 100644 index 2ac4e223..00000000 --- a/templates/requests/screen-3.html +++ /dev/null @@ -1,48 +0,0 @@ -{% extends 'requests/_new.html' %} - -{% from "components/text_input.html" import TextInput %} -{% from "components/checkbox_input.html" import CheckboxInput %} - -{% block heading %} - Designate a Portfolio Owner -{% endblock %} - -{% block form %} - -{% include "fragments/flash.html" %} - - -
- -

The Portfolio Owner is the primary point of contact and technical administrator of the JEDI Cloud Portfolio and will have the - following responsibilities:

- -

- -

This person must be a DoD employee (not a contractor).

-

The Portfolio Owner may be you. You will be able to add other administrators later. This person will be invited via email - once your request is approved.

- - {{ CheckboxInput(f.am_poc) }} - - - -
- -{% endblock %} diff --git a/templates/requests/screen-4.html b/templates/requests/screen-4.html deleted file mode 100644 index 4c4443c4..00000000 --- a/templates/requests/screen-4.html +++ /dev/null @@ -1,40 +0,0 @@ -{% macro RequiredLabel() -%} - Response Required -{%- endmacro %} - -{% extends 'requests/_new.html' %} - -{% from "components/text_input.html" import TextInput %} -{% from "components/icon.html" import Icon %} - -{% block heading %} - Review & Submit -{% endblock %} - - -{% block form_action %} -
-{% endblock %} - - {% block form %} - -

Before you can submit your request, please take a moment to review the information entered in the form. You may make changes by clicking the edit link on each section. When all information looks right, go ahead and submit.

- - {% include "fragments/flash.html" %} - - {% with editable=True %} - {% include "requests/_review.html" %} - {% endwith %} - - -{% endblock %} - -{% block next %} - -
- -
- -
- -{% endblock %} diff --git a/templates/requests/sidebar.html b/templates/requests/sidebar.html deleted file mode 100644 index f8516917..00000000 --- a/templates/requests/sidebar.html +++ /dev/null @@ -1,33 +0,0 @@ -
- - - -