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

Add columns relating to Funding and Oversight sections to TaskOrder model

Browse Source
This commit is contained in:
leigh-mil
2019-01-10 14:32:15 -05:00
parent 74ab102891
commit b18e3a9e10
11 changed files with 125 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
atst/forms/data.py
View File

@@ -215,28 +215,28 @@ TEAM_EXPERIENCE = [
]
PERIOD_OF_PERFORMANCE_LENGTH = [
("1_month", "1 Month"),
("2_months", "2 Months"),
("3_months", "3 Months"),
("4_months", "4 Months"),
("5_months", "5 Months"),
("6_months", "6 Months"),
("7_months", "7 Months"),
("8_months", "8 Months"),
("9_months", "9 Months"),
("10_months", "10 Months"),
("11_months", "11 Months"),
("1_year", "1 Year"),
("1_year_1_month", "1 Year, 1 Month"),
("1_year_2_months", "1 Year, 2 Months"),
("1_year_3_months", "1 Year, 3 Months"),
("1_year_4_months", "1 Year, 4 Months"),
("1_year_5_months", "1 Year, 5 Months"),
("1_year_6_months", "1 Year, 6 Months"),
("1_year_7_months", "1 Year, 7 Months"),
("1_hyear_8_months", "1 Year, 8 Months"),
("1_year_9_months", "1 Year, 9 Months"),
("1_year_10_months", "1 Year, 10 Months"),
("1_year_11_months", "1 Year, 11 Months"),
("2_years", "2 Years"),
("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"),
]

6
atst/forms/task_order.py
View File

@@ -112,7 +112,7 @@ class OversightForm(CacheableForm):
)
ko_last_name = StringField(translate("forms.task_order.oversight_last_name_label"))
ko_email = StringField(translate("forms.task_order.oversight_email_label"))
ko_phone = TelField(
ko_phone_number = TelField(
translate("forms.task_order.oversight_phone_label"), validators=[PhoneNumber()]
)
ko_dod_id = StringField(
@@ -125,7 +125,7 @@ class OversightForm(CacheableForm):
)
cor_last_name = StringField(translate("forms.task_order.oversight_last_name_label"))
cor_email = StringField(translate("forms.task_order.oversight_email_label"))
cor_phone = TelField(
cor_phone_number = TelField(
translate("forms.task_order.oversight_phone_label"), validators=[PhoneNumber()]
)
cor_dod_id = StringField(
@@ -138,7 +138,7 @@ class OversightForm(CacheableForm):
)
so_last_name = StringField(translate("forms.task_order.oversight_last_name_label"))
so_email = StringField(translate("forms.task_order.oversight_email_label"))
so_phone = TelField(
so_phone_number = TelField(
translate("forms.task_order.oversight_phone_label"), validators=[PhoneNumber()]
)
so_dod_id = StringField(