pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put app strings into a YAML file for easy editing by product owner

Browse Source
This commit is contained in:
George Drummond
2018-12-13 15:02:52 -05:00
parent 8eecb62034
commit f806425d91
35 changed files with 845 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/requests/_new.html
View File

@@ -20,7 +20,7 @@
<div class="panel__heading">
<h1>{% block heading %}{% endblock %}</h1>
<div class="subtitle h2">New Request</div>
<div class="subtitle h2">{{ "requests._new.new_request" | translate }}</div>
</div>
<div class="panel__content">
@@ -37,7 +37,7 @@
{% block next %}
<div class='action-group'>
<input type='submit' class='usa-button usa-button-primary' value='Save & Continue' />
<input type='submit' class='usa-button usa-button-primary' value='{{ "requests._new.save_and_continue" | translate }}' />
</div>
{% endblock %}

70
templates/requests/approval.html
View File

@@ -12,7 +12,8 @@
<section class='panel'>
<header class='panel__heading panel__heading--divider request-approval__heading'>
<h1 class='h2'>Request: {{ jedi_request.displayname }}
<h1 class='h2'>
{{ "requests.approval.request_title" | translate({ "displayname": jedi_request.displayname }) }}
</h1>
<span class='label label--info'>{{ current_status }}</span>
</header>
@@ -31,7 +32,7 @@
<form method="POST" action="{{ url_for('requests.create_internal_comment', request_id=jedi_request.id) }}">
<div class='panel'>
<div class='panel__heading panel__heading--divider'>
<h2>CCPO Internal Comments</h2>
<h2>{{ "requests.approval.ccpo_internal_comments" | translate }}</h2>
</div>
<div class='comment-log'>
@@ -54,14 +55,18 @@
</ol>
{% else %}
<div class='panel__content'>
<p class='h4'>No CCPO comments have been recorded yet.</p>
<p class='h4'>
{{ "requests.approval.no_ccpo_comments" | translate }}
</p>
</div>
{% endif %}
</div>
<div class='panel__heading internal-notes__add-comment__heading'>
<h3 class='h3'>Add a comment</h2>
<h3 class='h3'>
{{ "requests.approval.add_comment" | translate }}
</h3>
</div>
<div class='panel__content'>
@@ -70,7 +75,9 @@
</div>
</div>
<div class='action-group action-group--tight'>
<button class='usa-button' type="submit">Save Notes</button>
<button class='usa-button' type="submit">
{{ "requests.approval.save_notes" | translate }}
</button>
</div>
</form>
</section>
@@ -86,7 +93,9 @@
<div class='panel'>
<header class='panel__heading panel__heading--divider'>
<h2 class='request-approval__columns__heading'>CCPO Review Activity</h2>
<h2 class='request-approval__columns__heading'>
{{ "requests.approval.ccpo_review_activity" | translate }}
</h2>
</header>
<div class='approval-log'>
@@ -104,7 +113,9 @@
<div class='approval-log__behalfs'>
{% if review.lname_mao %}
<div class='approval-log__behalf'>
<h3 class='approval-log__log-item__header'>Mission Owner approval on behalf of:</h3>
<h3 class='approval-log__log-item__header'>
{{ "requests.approval.mission_owner_approval_on_behalf_of" | translate }}
</h3>
<span>{{ review.full_name_mao }}</span>
<span>{{ review.email_mao }}</span>
<span>
@@ -118,7 +129,9 @@
{% if review.lname_ccpo %}
<div class='approval-log__behalf'>
<h3 class='approval-log__log-item__header'>CCPO approval on behalf of:</h3>
<h3 class='approval-log__log-item__header'>
{{ "requests.approval.ccpo_approval_on_behalf_of" | translate }}
</h3>
<span>{{ review.full_name_ccpo }}</span>
</div>
{% endif %}
@@ -134,14 +147,18 @@
</ol>
{% else %}
<div class='panel__content'>
<p class='h4'>No CCPO approvals or request changes have been recorded yet.</p>
<p class='h4'>
{{ "requests.approval.no_ccpo_approval_request_changes" | translate }}
</p>
</div>
{% endif %}
</div>
{% if jedi_request.is_pending_ccpo_action %}
<div class='panel__heading request-approval__review__heading'>
<h3 class='h3'>Review this Request</h2>
<h3 class='h3'>
{{ "requests.approval.review_request" | translate }}
</h3>
</div>
<div class='panel__content'>
@@ -149,10 +166,14 @@
<div class='usa-input'>
<fieldset class='usa-input__choices usa-input__choices--inline'>
<input v-on:change='setReview' type='radio' name='review' id='review-approving' value='approving' {{ 'checked' if initialState == 'approving' }}/>
<label for='review-approving'>Ready for approval</label>
<label for='review-approving'>
{{ "requests.approval.ready_for_approval" | translate }}
</label>
<input v-on:change='setReview' type='radio' name='review' id='review-denying' value='denying'/>
<label for='review-denying'>Request revisions</label>
<label for='review-denying'>
{{ "requests.approval.request_revisions" | translate }}
</label>
</fieldset>
</div>
@@ -161,8 +182,8 @@
<div v-if='approving' key='approving' v-cloak>
{{ TextInput(
review_form.comment,
label='Approval comments or notes',
description='Provide any comments or notes regarding the approval of this request. <strong>This message will be shared with the person making the JEDI request.</strong>',
label=("requests.approval.approve_comments_or_notes_label" | translate),
description=("requests.approval.approve_comments_or_notes_description" | translate),
paragraph=True,
noMaxWidth=True
) }}
@@ -171,7 +192,7 @@
<div v-else key='denying' v-cloak>
{{ TextInput(
review_form.comment,
label='Revision instructions or notes',
label=("requests.approval.revision_instructions_or_notes_label" | translate),
paragraph=True,
noMaxWidth=True
) }}
@@ -180,12 +201,20 @@
<div v-if='approving' class='form__sub-fields' v-cloak>
<h3>Authorizing Officials <span class='subtitle'>(optional)</span></h3>
<p>Provide the name of the key officials for both parties that have authorized this request to move forward. <strong>This section is not visible to the person making the request. It is only viewable by CCPO staff.</strong></p>
<h3>
{{ "requests.approval.authorizing_officials_title" | translate }}
<span class='subtitle'>(optional)</span>
</h3>
<p>
{{ "requests.approval.authorizing_officials_paragraph" | translate }}
</p>
<hr />
<h4>Mission Authorizing Official</h4>
<h4>
{{ "requests.approval.mission_authorizing_official_title" | translate }}
</h4>
<div class='form-row'>
<div class='form-col form-col--half'>
@@ -202,7 +231,9 @@
<hr />
<h4>CCPO Authorizing Official</h4>
<h4>
{{ "requests.approval.ccpo_authorizing_official_title" | translate }}
</h4>
<div class='form-row'>
<div class='form-col form-col--half'>
@@ -238,4 +269,3 @@
</article>
{% endblock %}

54
templates/requests/financial_verification.html
View File

@@ -12,25 +12,25 @@
{% include "fragments/flash.html" %}
{% if saved_draft %}
{% call Alert('Draft saved', level='success') %}
{% 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('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
{{ Alert(("requests.financial_verification.pending_financial_verification" | translate), fragment="fragments/pending_financial_verification.html") }}
{% endif %}
<financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'>
<div class="col">
{% if extended %}
{{ Alert('Manually enter Task Order information',
message="Additional fields are displayed below, where you can manually enter financial information as documented in your Task Order.",
{{ 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': 'Learn more about the JEDI Cloud Task Order and the Financial Verification process.',
'label': ("requests.financial_verification.manually_enter_task_information_help_label" | translate),
'icon': 'help'
}
]
@@ -39,9 +39,12 @@
{% if f.is_missing_task_order_number %}
{% set extended_url = url_for('requests.financial_verification', request_id=jedi_request.id, extended=True) %}
{% call Alert('Task Order not found in EDA', level='warning') %}
We could not find your Task Order in our system of record, EDA. Please confirm that you have entered it correctly.<br>
<a class="usa-button" href="{{ extended_url }}">Enter Task Order information manually</a>
{% call Alert(("requests.financial_verification.task_order_not_found_eda_label"), level='warning') %}
{{ "requsts.financial_verification.task_order_not_found_eda_description" | translate }}
<br>
<a class="usa-button" href="{{ extended_url }}">
{{ "requests.financial_verification.enter_task_order_manually_link_text" | translate }}
</a>
{% endcall %}
{% endif %}
@@ -52,7 +55,7 @@
{% autoescape false %}
{% if f.errors and not f.is_only_missing_task_order_number %}
{{ Alert('There were some errors',
{{ Alert(("requests.financial_verification.some_errors_label" | translate),
message="<p>Please see below.</p>",
level='error'
) }}
@@ -61,13 +64,19 @@
<div class="panel">
<div class="panel__heading">
<h1>Financial Verification</h1>
<div class="subtitle" id="financial-verification"><h2>Request: {{ jedi_request.displayname }}</h2></div>
<h1>{{ "requests.financial_verification.financial_verification_title" | translate }}</h1>
<div class="subtitle" id="financial-verification">
<h2>
{{ "requests.financial_verification.request_title" | translate({ "displayname" : jedi_request.displayname }) }}
</h2>
</div>
</div>
<div class="panel__content">
<p>In order to get you access to the JEDI Cloud, we will need you to enter the details below that will help us verify and account for your Task Order.</p>
<p>
{{ "requests.financial_verification.permissions_paragraph" | translate }}
</p>
{% if extended %}
<fieldset class="form__sub-fields form__sub-fields--warning">
@@ -77,7 +86,14 @@
{{ TextInput(f.legacy_task_order.funding_type_other) }}
</template>
{{ DateInput(f.legacy_task_order.expiration_date, placeholder='MM / DD / YYYY', validation='date', tooltip='Please enter the expiration date for the task order only and do not include options that you may choose to exercise in the future.') }}
{{
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,
@@ -130,14 +146,14 @@
{{ TextInput(
f.legacy_task_order.number,
placeholder="e.g.: 1234567899C0001",
tooltip="A Contracting Officer will likely be the best source for this number.",
tooltip=("requests.financial_verification.number_placeholder" | translate),
validation="requiredField"
) }}
{{ TextInput(f.request.uii_ids,
paragraph=True,
placeholder="examples: \nDI 0CVA5786950 \nUN1945326361234786950",
tooltip="A Unique Item Identifer is a unique code that helps the Department of Defense track and report on where and how digital assets are stored. <br>Not all applications have an existing UII number assigned."
tooltip=("requests.financial_verification.uui_ids_placeholder" | translate)
) }}
{{ TextInput(f.request.pe_id,
@@ -151,7 +167,9 @@
<hr />
<h3>Contracting Officer (KO) Information</h3>
<h3>
{{ "requests.financial_verification.contracting_officer_information_title" | translate }}
</h3>
<div class='form-row'>
<div class='form-col form-col--half '>{{ TextInput(f.request.fname_co, validation="requiredField") }}</div>
@@ -165,7 +183,9 @@
<hr />
<h3>Contracting Officer Representative (COR) Information</h3>
<h3>
{{ "requests.financial_verification.contracting_officer_representative_information_title" | translate }}
</h3>
<div class='form-row'>
<div class='form-col form-col--half '>{{ TextInput(f.request.fname_cor, validation="requiredField") }}</div>
<div class='form-col form-col--half '>{{ TextInput(f.request.lname_cor, validation="requiredField") }}</div>

43
templates/requests/index.html
View File

@@ -7,7 +7,7 @@
{% block content %}
{% call Modal(name='pendingFinancialVerification', dismissable=True) %}
<h1>Request submitted!</h1>
<h1>{{ "requests.index.request_submitted_title" | translate }}</h1>
{% include 'fragments/pending_financial_verification.html' %}
@@ -17,7 +17,7 @@
{% endcall %}
{% call Modal(name='pendingCCPOApproval', dismissable=True) %}
<h1>Financial Verification submitted!</h1>
<h1>{{ "requests.index.financial_verification_submitted_title" | translate }}</h1>
{% include 'fragments/pending_ccpo_approval_modal.html' %}
@@ -27,7 +27,7 @@
{% endcall %}
{% call Modal(name='pendingCCPOAcceptance', dismissable=True) %}
<h1>Request submitted!</h1>
<h1>{{ "requests.index.request_submitted_title" | translate }}</h1>
{% include 'fragments/pending_ccpo_acceptance_alert.html' %}
@@ -50,9 +50,9 @@
{% if not requests %}
{{ EmptyState(
'You currently have no JEDI Cloud workspaces.',
sub_message='A JEDI Cloud Workspace is where you manage your projects and control user access to those projects.',
action_label='Create a new JEDI Cloud Request',
("requests.index.no_workspaces_label" | translate),
sub_message=("requests.index.no_workspaces_sub_message" | translate),
action_label=("requests.index.no_workspaces_action_label" | translate),
action_href=url_for('requests.requests_form_new', screen=1),
icon='document'
) }}
@@ -62,15 +62,15 @@
<div class="row kpi">
<div class="kpi__item col col--grow">
<div class="kpi__item__value">{{ kpi_inprogress }}</div>
<div class="kpi__item__description">Requests in progress</div>
<div class="kpi__item__description">{{ "requests.index.requests_in_progress" | translate }}</div>
</div>
<div class="kpi__item col col--grow">
<div class="kpi__item__value">{{ kpi_pending }}</div>
<div class="kpi__item__description">Pending CCPO Action</div>
<div class="kpi__item__description">{{ "requests.index.pending_ccpo_action" | translate }}</div>
</div>
<div class="kpi__item col col--grow">
<div class="kpi__item__value">{{ kpi_completed }}</div>
<div class="kpi__item__description">Approved Requests</div>
<div class="kpi__item__description">{{ "requests.index.approved_requests" | translate }}</div>
</div>
</div>
{% endif %}
@@ -80,28 +80,28 @@
{% if extended_view %}
<form @submit.prevent class='search-bar'>
<div class='usa-input search-input'>
<label for='requests-search'>Search requests by name</label>
<label for='requests-search'>{{ "requests.index.search_by_name" | translate }}</label>
<input v-model='searchValue' type='search' id='requests-search' name='requests-search' placeholder="Search by name"/>
<button>
<span class="hide">Search</span>
<span class="hide">{{ "requests.index.search_button_text" | translate }}</span>
</button>
</div>
<div class="search-bar__filters">
<div class='usa-input'>
<label for='filter-status'>Filter requests by status</label>
<label for='filter-status'>{{ "requests.index.filter_requests_by_status_label" | translate }}</label>
<select v-model="statusValue" id="filter-status" name="filter-status">
<option value="" selected disabled>Filter by status</option>
<option value="">All</option>
<option value="" selected disabled>{{ "requests.index.filter_by_status" | translate }}</option>
<option value="">{{ "requests.index.all_filter" | translate }}</option>
<option v-for="status in statuses" :value="status">!{ status }</option>
</select>
</div>
<div class='usa-input'>
<label for='filter-dod-component'>Filter requests by DOD component</label>
<label for='filter-dod-component'>{{ "requests.index.filter_requests_by_dod_component" | translate }}</label>
<select v-model="dodComponentValue" id="filter-dod-component" name="filter-dod-component">
<option value="" selected disabled>Filter by DOD Component</option>
<option value="">All</option>
<option value="" selected disabled>{{ "requests.index.filter_by_dod_component" | translate }}</option>
<option value="">{{ "requests.index.all_filter" | translate }}</option>
<option v-for="dodComponent in dodComponents" :value="dodComponent">!{ dodComponent }</option>
</select>
</div>
@@ -128,7 +128,9 @@
<tr>
<th scope="row">
<a class='icon-link icon-link--large' :href="r.edit_link">!{ r.name }</a>
<span v-if="r.action_required" class="label label--info">Action Required</span>
<span v-if="r.action_required" class="label label--info">
{{ "requests.index.action_required" | translate }}
</span>
</th>
<td>
<local-datetime
@@ -159,10 +161,10 @@
</table>
<div v-else>
{{ EmptyState(
'No requests found.',
("requests.index.no_requests_found" | translate),
action_label=None,
action_href=None,
sub_message='Please try a different search.',
sub_message=("requests.index.try_different_search" | translate),
icon=None
) }}
</div>
@@ -174,4 +176,3 @@
</requests-list>
{% endblock %}

4
templates/requests/review_menu.html
View File

@@ -4,7 +4,7 @@
<ul>
<li class="progress-menu__item progress-menu__item--complete">
<a href="{{ pending_url }}">
Request Information
{{ "requests.review_menu.request_information_link_text" | translate }}
</a>
</li>
{% if g.matchesPath(financial_url) %}
@@ -14,7 +14,7 @@
{% endif %}
<li class="progress-menu__item progress-menu__item--{{ financial_status }}">
<a href="{{ financial_url }}">
Financial Verification Information
{{ "requests.review_menu.financial_verification_information_link_text" | translate }}
</a>
</li>
</ul>

99
templates/requests/screen-1.html
View File

@@ -15,46 +15,86 @@
<details-of-use inline-template v-bind:initial-data='{{ f.data|tojson }}'>
<div>
<p>We’d like to know a little about how you plan to use JEDI Cloud services to process your request. Please answer the following questions to the best of your ability. Note that the CCPO does not directly help with migrating systems to JEDI Cloud. These questions are for learning about your cloud readiness and financial usage of the JEDI Cloud; your estimates will not be used for any department level reporting.</p>
<p><em>All fields are required, unless specified optional.</em></p>
{{ "requests.screen-1.form_instructions" | translate }}
<h2>General</h2>
<h2>{{ "requests.screen-1.general_title_text"| translate }}</h2>
{{ OptionsInput(f.dod_component) }}
{{ TextInput(f.jedi_usage, paragraph=True, placeholder="Briefly describe how you are expecting to use the JEDI Cloud. e.g. We are migrating XYZ application to the cloud so that...") }}
{{
TextInput(
f.jedi_usage,
paragraph=True,
placeholder=("requests.screen-1.jedi_usage_placeholder" | translate)
)
}}
<h2>Cloud Readiness</h2>
{{ TextInput(f.num_software_systems,validation="integer",tooltip="A software system can be any code that you plan to host on cloud infrastructure. For example, it could be a custom-developed web application, or a large ERP system.",placeholder="0") }}
{{ OptionsInput(f.jedi_migration, tooltip="Cloud migration is the process of moving data, applications or other business elements from an organization\\'s onsite computers/data centers to the cloud, or moving them from one cloud environment to another.") }}
<h2>{{ "requests.screen-1.cloud_readiness_title_text" | translate }}</h2>
{{
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)
)
}}
<transition name='slide'>
<template v-if="jediMigrationOptionSelected">
<fieldset class='form__sub-fields' v-if='isJediMigration' v-cloak>
<legend class='usa-sr-only'>Questions related to JEDI Cloud migration</legend>
{{ OptionsInput(f.rationalization_software_systems, tooltip="Rationalization is the DoD process to determine whether the application should move to the cloud.") }}
<legend class='usa-sr-only'>
{{ "requests.screen-1.questions_title_text" | translate }}
</legend>
{{
OptionsInput(
f.rationalization_software_systems,
tooltip=("requests.screen-1.rationalization_software_systems_tooltip" | translate)
)
}}
{{ OptionsInput(f.technical_support_team) }}
<transition name='slide'>
<template v-if="hasTechnicalSupportTeam">
{{ OptionsInput(f.organization_providing_assistance) }}
</template>
</transition>
{{ OptionsInput(f.engineering_assessment, tooltip="An engineering assessment is an evaluation to convert your application architecture from on-premises to using the commercial cloud") }}
{{ OptionsInput(
f.engineering_assessment,
tooltip=("requests.screen-1.engineering_assessment_tooltip" | translate)
)
}}
{{ OptionsInput(f.data_transfers) }}
{{ OptionsInput(f.expected_completion_date) }}
</fieldset>
<template v-if='!isJediMigration' v-cloak>
{{ OptionsInput(f.cloud_native, tooltip="Cloud native is architecting and designing your application to use all the benefits of the commercial cloud. Specifically, designing applications so that they are decoupled from a physical resource.") }}
{{
OptionsInput(
f.cloud_native,
tooltip=("requests.screen-1.cloud_native_tooltip" | translate)
)
}}
</template>
</template>
</transition>
<h2>Financial Usage</h2>
{{ TextInput(f.estimated_monthly_spend, tooltip="Refer to financial verification step help docs", validation="dollars", placeholder="$0") }}
<h2>{{ "requests.screen-1.financial_usage_title" | translate }}</h2>
{{
TextInput(
f.estimated_monthly_spend,
tooltip=("requests.screen-1.estimated_monthly_spend_tooltip" | translate),
validation="dollars",
placeholder="$0"
)
}}
<div class='alert alert-info'>
<div class='alert__content'>
<div class='alert__message'>
<p>So this means you are spending approximately <span class="label label--info">!{ annualSpendStr }</span> annually</p>
{{ "requests.screen-1.approximate_annual_spend_paragraph" | translate }}
</div>
</div>
</div>
@@ -62,15 +102,38 @@
<transition name='slide'>
<template v-if="annualSpend > {{ annual_spend_threshold }}">
<fieldset class='form__sub-fields'>
<h3>Please provide additional details regarding your planned usage.</h3>
<h3>
{{ "requests.screen-1.additional_plan_details_title" | translate }}
</h3>
{{ TextInput(f.number_user_sessions, validation='integer', placeholder="0") }}
{{ TextInput(f.average_daily_traffic, tooltip="Requests are the client-to-server network traffic that is being transferred to your systems",validation="integer", placeholder="0") }}
{{ TextInput(f.average_daily_traffic_gb, tooltip="GB uploaded is the gigabyte amount of data traffic that is being transferred to your systems",validation="gigabytes", placeholder="0GB") }}
{{
TextInput(
f.average_daily_traffic,
tooltip=("requests.screen-1.average_daily_traffic_tooltip" | translate),
validation="integer",
placeholder="0"
)
}}
{{
TextInput(
f.average_daily_traffic_gb,
tooltip=("requests.screen-1.average_daily_traffic_gb_tooltip" | translate),
validation="gigabytes",
placeholder="0GB"
)
}}
</fieldset>
</template>
</transition>
{{ TextInput(f.dollar_value, validation='dollars', placeholder='$0', tooltip='You may specify a different Total Spend amount to cover other JEDI Cloud services that the JEDI Cloud cost calculator was not able to estimate. Examples may include support packages from the cloud service provider.') }}
{{
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='workspaceName') }}