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

Update funding section

Browse Source
This commit is contained in:
leigh-mil 2019-01-14 14:12:38 -05:00
parent 5ef246fe2f
commit cc4d9670a1
7 changed files with 104 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
atst/forms/data.py
View File

@ -210,28 +210,28 @@ TEAM_EXPERIENCE = [
]
PERIOD_OF_PERFORMANCE_LENGTH = [
("1", "1 Month"),
("2", "2 Months"),
("3", "3 Months"),
("4", "4 Months"),
("5", "5 Months"),
("6", "6 Months"),
("7", "7 Months"),
("8", "8 Months"),
("9", "9 Months"),
("10", "10 Months"),
("11", "11 Months"),
("12", "1 Year"),
("13", "1 Year, 1 Month"),
("14", "1 Year, 2 Months"),
("15", "1 Year, 3 Months"),
("16", "1 Year, 4 Months"),
("17", "1 Year, 5 Months"),
("18", "1 Year, 6 Months"),
("19", "1 Year, 7 Months"),
("20", "1 Year, 8 Months"),
("21", "1 Year, 9 Months"),
("22", "1 Year, 10 Months"),
("23", "1 Year, 11 Months"),
("24", "2 Years"),
("1", translate("forms.task_order.performance_length.1")),
("2", translate("forms.task_order.performance_length.2")),
("3", translate("forms.task_order.performance_length.3")),
("4", translate("forms.task_order.performance_length.4")),
("5", translate("forms.task_order.performance_length.5")),
("6", translate("forms.task_order.performance_length.6")),
("7", translate("forms.task_order.performance_length.7")),
("8", translate("forms.task_order.performance_length.8")),
("9", translate("forms.task_order.performance_length.9")),
("10", translate("forms.task_order.performance_length.10")),
("11", translate("forms.task_order.performance_length.11")),
("12", translate("forms.task_order.performance_length.12")),
("13", translate("forms.task_order.performance_length.13")),
("14", translate("forms.task_order.performance_length.14")),
("15", translate("forms.task_order.performance_length.15")),
("16", translate("forms.task_order.performance_length.16")),
("17", translate("forms.task_order.performance_length.17")),
("18", translate("forms.task_order.performance_length.18")),
("19", translate("forms.task_order.performance_length.19")),
("20", translate("forms.task_order.performance_length.20")),
("21", translate("forms.task_order.performance_length.21")),
("22", translate("forms.task_order.performance_length.22")),
("23", translate("forms.task_order.performance_length.23")),
("24", translate("forms.task_order.performance_length.24")),
]

2
atst/forms/task_order.py
View File

@ -77,7 +77,7 @@ class AppInfoForm(CacheableForm):
class FundingForm(CacheableForm):
performance_length = SelectField(
translate("forms.task_order.performance_length_label"),
translate("forms.task_order.performance_length.label"),
choices=PERIOD_OF_PERFORMANCE_LENGTH,
)
start_date = DateField(

9
atst/models/task_order.py
View File

@ -135,6 +135,15 @@ class TaskOrder(Base, mixins.TimestampsMixin):
else:
return None
@property
def performance_length_description(self):
if self.performance_length:
return translate(
"forms.task_order.performance_length.{}".format(self.performance_length)
)
else:
return None
def to_dictionary(self):
return {

4
styles/elements/_panels.scss
View File

@ -65,6 +65,10 @@
&.subheading {
color: $color-gray;
}
&.inactive {
color: $color-gray-light;
}
}
}

8
styles/elements/_tables.scss
View File

@ -76,6 +76,14 @@
&:last-child {
margin-bottom: 0;
}
&.funding-summary {
tr td {
margin: 0;
padding: 0;
border-bottom: 0;
}
}
}
}

88
templates/task_orders/new/review.html
View File

@ -88,64 +88,40 @@
<hr>
<section>
<h2>Invite Signatories/Collaborators</h2>
<h3 class="subheading">Funding {{ TOEditLink(screen=2) }}</h3>
<div class="form-row">
<div class="form-col">
<div class="usa-input">
<fieldset class="usa-input__choices">
<legend>Financial Oversight</legend>
<p>
{% if task_order.ko_first_name %}
{{ task_order.ko_first_name }}
{{ task_order.ko_last_name }}
{% else %}
{{ RequiredLabel() }}
{% endif %}
(Contracting Officer)
</p>
<p>
{% if task_order.ko_first_name %}
{{ task_order.cor_first_name }}
{{ task_order.cor_last_name }}
{% else %}
{{ RequiredLabel() }}
{% endif %}
(Contracting Officer Representative)
</p>
</fieldset>
</div>
</div>
<div class="form-col">
<div class="usa-input">
<fieldset class="usa-input__choices">
<legend>Invite?</legend>
</fieldset>
</div>
</div>
<div class="row">
<div class="col col--grow">
<h4>Period of Performance length</h4>
{{ task_order.performance_length_description or RequiredLabel() }}
<p><a href="#" class='icon-link' download>{{ Icon('download') }} View Usasge Estimate</a></p>
</div>
<div class="form-row">
<div class="form-col">
<div class="usa-input">
<fieldset class="usa-input__choices">
<legend>Security Officer</legend>
<p>
{% if task_order.so_first_name %}
{{ task_order.so_first_name }}
{{ task_order.so_last_name }}
{% else %}
{{ RequiredLabel() }}
{% endif %}
(Security Officer)
</p>
</fieldset>
</div>
</div>
<div class="form-col">
<div class="usa-input">
</div>
</div>
<div class="col col--grow">
<table class="funding-summary">
<tbody>
<tr>
<td><h4>Task Order Value</h4></td>
<td class="table-cell--align-right">{{ '${:,.2f}'.format(task_order.budget) }}</td>
</tr>
<tr>
<td><h4>CLIN #1 Unclassified Cloud</h4></td>
<td class="table-cell--align-right">{{ '${:,.2f}'.format(task_order.clin_01) }}</td>
</tr>
<tr>
<td><h4 class="inactive">CLIN #2 Classified Cloud<div>(Available soon)</div></h4></td>
<td class="table-cell--align-right"></td>
</tr>
<tr>
<td><h4>CLIN #3 Unclassified Cloud</h4></td>
<td class="table-cell--align-right">{{ '${:,.2f}'.format(task_order.clin_03) }}</td>
</tr>
<tr>
<td><h4 class="inactive">CLIN #4 Classified Cloud<div>(Available soon)</div></h4></td>
<td class="table-cell--align-right"></td>
<tr>
</tbody>
</table>
</div>
</section>

27
translations.yaml
View File

@ -201,7 +201,32 @@ forms:
built_1: Built or Migrated 1-2 applications
built_3: Built or Migrated 3-5 applications
built_many: Built or migrated many applications, or consulted on several such projects
performance_length:
label: Period of Performance length
'1': 1 Month
'2': 2 Months
'3': 3 Months
'4': 4 Months
'5': 5 Months
'6': 6 Months
'7': 7 Months
'8': 8 Months
'9': 9 Months
'10': 10 Months
'11': 11 Months
'12': 1 Year
'13': 1 Year, 1 Month
'14': 1 Year, 2 Months
'15': 1 Year, 3 Months
'16': 1 Year, 4 Months
'17': 1 Year, 5 Months
'18': 1 Year, 6 Months
'19': 1 Year, 7 Months
'20': 1 Year, 8 Months
'21': 1 Year, 9 Months
'22': 1 Year, 10 Months
'23': 1 Year, 11 Months
'24': 2 Years
start_date_label: Start Date
end_date_label: End Date
pdf_label: Upload a copy of your CSP Cost Estimate Research