diff --git a/js/components/clin_fields.js b/js/components/clin_fields.js index 6b948922..0284a433 100644 --- a/js/components/clin_fields.js +++ b/js/components/clin_fields.js @@ -8,6 +8,7 @@ const OBLIGATED_AMOUNT = 'obligated_amount' const START_DATE = 'start_date' const END_DATE = 'end_date' const POP = 'period_of_performance' +const NUMBER = 'number' export default { name: 'clin-fields', @@ -33,6 +34,10 @@ export default { type: String, default: null, }, + initialClinNumber: { + type: String, + default: null, + }, }, data: function() { @@ -44,6 +49,9 @@ export default { : undefined const popValidation = !this.initialStartDate ? false : start < end const showPopValidation = !this.initialStartDate ? false : !popValidation + const clinNumber = !!this.initialClinNumber + ? this.initialClinNumber + : undefined return { clinIndex: this.initialClinIndex, @@ -53,6 +61,7 @@ export default { endDate: end, popValid: popValidation, showPopError: showPopValidation, + clinNumber: clinNumber, } }, @@ -113,8 +122,20 @@ export default { } else if (event.name.includes(END_DATE)) { if (!!event.value) this.endDate = new Date(event.value) this.validatePop() + } else if (event.name.includes(NUMBER)) { + if (!!event.value) this.clinNumber = event.value } } }, }, + + computed: { + clinTitle: function() { + if (!!this.clinNumber) { + return `CLIN ${this.clinNumber}` + } else { + return `CLIN` + } + }, + }, } diff --git a/js/test_templates/upload_input_error_template.html b/js/test_templates/upload_input_error_template.html index ff3676ab..1420fe17 100644 --- a/js/test_templates/upload_input_error_template.html +++ b/js/test_templates/upload_input_error_template.html @@ -11,7 +11,7 @@
- + Remove diff --git a/js/test_templates/upload_input_template.html b/js/test_templates/upload_input_template.html index 07fbb194..1eeaa1c7 100644 --- a/js/test_templates/upload_input_template.html +++ b/js/test_templates/upload_input_template.html @@ -12,7 +12,7 @@
- + Remove diff --git a/static/icons/check-circle-solid.svg b/static/icons/check-circle-solid.svg deleted file mode 100644 index 6aaa9742..00000000 --- a/static/icons/check-circle-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/icons/ok.svg b/static/icons/ok.svg index d4f61f78..6aaa9742 100644 --- a/static/icons/ok.svg +++ b/static/icons/ok.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index a1d1c395..c554fe1d 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -84,7 +84,7 @@ } .card { - padding: ($gap * 5); + padding: ($gap * 4) ($gap * 5); .usa-input { margin: 0 $gap 0 0; @@ -100,7 +100,7 @@ } .form-row { - margin-top: 0; + margin: 0; } select { @@ -246,4 +246,9 @@ .clin-card { width: 65rem; + + &__title.h4 { + margin-top: 0; + padding-bottom: $gap * 2.5; + } } diff --git a/templates/components/upload_input.html b/templates/components/upload_input.html index 5d2bf737..8f5cec3c 100644 --- a/templates/components/upload_input.html +++ b/templates/components/upload_input.html @@ -16,7 +16,7 @@ >
- {{ Icon("check-circle-solid") }} + {{ Icon("ok") }} Remove
diff --git a/templates/fragments/task_order_review.html b/templates/fragments/task_order_review.html index 9b938106..9e926783 100644 --- a/templates/fragments/task_order_review.html +++ b/templates/fragments/task_order_review.html @@ -14,7 +14,7 @@ {{ 'task_orders.review.pdf_title' | translate }}
- {{ Icon('check-circle-solid') }} + {{ Icon('ok') }} {{ task_order.pdf.filename }} diff --git a/templates/task_orders/step_3.html b/templates/task_orders/step_3.html index 59adf536..a1dc2c44 100644 --- a/templates/task_orders/step_3.html +++ b/templates/task_orders/step_3.html @@ -19,21 +19,18 @@ v-bind:initial-amount='{{ fields.obligated_amount.data or 0 }}' v-bind:initial-start-date="'{{ fields.start_date.data | string }}'" v-bind:initial-end-date="'{{ fields.end_date.data | string }}'" + v-bind:initial-clin-number="'{{ fields.number.data | string }}'" {% else %} v-bind:initial-clin-index='clinIndex' v-bind:initial-clin-type="'JEDI_CLIN_1'" {% endif %} inline-template>
-
- {{ 'task_orders.form.base_clin_title' | translate }} -
+
-
-
- CLIN Details -
+
+ CLIN Details
@@ -41,8 +38,9 @@ {% if fields %} {{ TextInput(fields.number, watch=True) }} {% else %} - -
+ +