diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py index 7a503e48..e933d139 100644 --- a/atst/forms/task_order.py +++ b/atst/forms/task_order.py @@ -67,19 +67,25 @@ class CLINForm(FlaskForm): and self.start_date.data > self.end_date.data ): self.start_date.errors.append( - translate("forms.task_order.start_date_error") + translate("forms.task_order.pop_errors.date_order") ) valid = False if self.start_date.data and self.start_date.data <= CONTRACT_START_DATE: self.start_date.errors.append( - "PoP start date must be on or after {}.".format(CONTRACT_START_DATE) + translate( + "forms.task_order.pop_errors.start", + {"date": CONTRACT_START_DATE.strftime("%b %d, %Y")}, + ) ) valid = False if self.end_date.data and self.end_date.data >= CONTRACT_END_DATE: self.end_date.errors.append( - "PoP end date must be before or on {}.".format(CONTRACT_END_DATE) + translate( + "forms.task_order.pop_errors.end", + {"date": CONTRACT_END_DATE.strftime("%b %d, %Y")}, + ) ) valid = False diff --git a/js/components/clin_fields.js b/js/components/clin_fields.js index 72da4b71..22faeabe 100644 --- a/js/components/clin_fields.js +++ b/js/components/clin_fields.js @@ -1,4 +1,5 @@ import * as R from 'ramda' +import moment from 'moment' import DateSelector from './date_selector' import { emitEvent } from '../lib/emitters' @@ -70,11 +71,15 @@ export default { }, { func: this.popStartsAfterContract, - message: `PoP start date must be on or after ${CONTRACT_START_DATE}.`, + message: `PoP start date must be on or after ${moment( + CONTRACT_START_DATE + ).format('MMM D, YYYY')}.`, }, { func: this.popEndsBeforeContract, - message: `PoP end date must be before or on ${CONTRACT_END_DATE}.`, + message: `PoP end date must be before or on ${moment( + CONTRACT_END_DATE + ).format('MMM D, YYYY')}.`, }, ], } diff --git a/package.json b/package.json index e5c95e60..0604d27e 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "azure-storage": "^2.10.3", "babel-polyfill": "^6.26.0", "date-fns": "^1.29.0", + "moment": "^2.24.0", "ramda": "^0.25.0", "stickybits": "^3.6.6", "svg-innerhtml": "^1.1.0", diff --git a/templates/task_orders/step_3.html b/templates/task_orders/step_3.html index 3b2bfe0b..8c09f26f 100644 --- a/templates/task_orders/step_3.html +++ b/templates/task_orders/step_3.html @@ -314,8 +314,8 @@ {% endif %}
Not sure how to describe your scope? Read some examples to get some inspiration.
' scope_label: Cloud project scope - start_date_error: PoP start date must be before end date. team_experience: built_1: Built, migrated, or consulted on 1-2 applications built_3: Built, migrated, or consulted on 3-5 applications