From 4bd4b4d48877ab40205735de8208fbc4e39b1672 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Thu, 7 Feb 2019 15:39:36 -0500 Subject: [PATCH 1/6] Add description text to officer edit forms and update styling --- styles/sections/_task_order.scss | 26 +++++++++ .../portfolios/task_orders/invitations.html | 56 +++++++++---------- translations.yaml | 4 ++ 3 files changed, 58 insertions(+), 28 deletions(-) diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index c9bb769b..a40f5c1d 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -361,6 +361,32 @@ } .officer__form { + padding: 1.5rem; + background-color: $color-aqua-lightest; + border-left-color: $color-blue; + border-left-style: solid; + border-left-width: $gap / 2; + + .edit-officer { + h4 { + color: $color-gray; + margin-bottom: 0.5rem; + } + + p { + font-size: 1.5rem; + } + } + + .usa-input__title { + font-weight: normal; + } + + .form-row { + margin-bottom: 0rem; + margin-top: 0rem; + } + .officer__form--actions { display: flex; flex-direction: row; diff --git a/templates/portfolios/task_orders/invitations.html b/templates/portfolios/task_orders/invitations.html index 14a3d389..b41261ea 100644 --- a/templates/portfolios/task_orders/invitations.html +++ b/templates/portfolios/task_orders/invitations.html @@ -14,43 +14,43 @@ {% endmacro %} {% macro EditOfficerInfo(form, officer_type) -%} -
-
{% endmacro %} {% macro OfficerInfo(task_order, officer_type, form) %} diff --git a/translations.yaml b/translations.yaml index 983db1b9..6e52024a 100644 --- a/translations.yaml +++ b/translations.yaml @@ -461,21 +461,25 @@ task_orders: pending_to: Pending TO Completion invitations: dod_id_label: DoD ID + edit_text: A new invitation e-mail will be sent when new information is saved. contracting_officer: title: Contracting Officer (KO) Information description: You'll need a signature from your KO. You might want to work with your program Financial Manager to get your TO documents moving in the right direction. add_button_text: Add / Invite KO invite_button_text: Invite KO + edit_title: Edit KO contracting_officer_representative: title: Contracting Officer Representative (COR) Information description: Your COR may assist in submitting the Task Order documents within their official system of record. add_button_text: Add / Invite COR invite_button_text: Invite COR + edit_title: Edit COR security_officer: title: IA Security Officer Information description: Your Security Officer will need to answer some security configuration questions in order to generate a DD-254 document, then digitally sign. add_button_text: Add / Invite Security Officer invite_button_text: Invite Security Officer + edit_title: Edit SO ko_review: alert_title: Verify Your Info title: Task Order Builder From 10cfa17894eba0905ff4e247c0c7e51a61585d7c Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sat, 9 Feb 2019 12:51:08 -0500 Subject: [PATCH 2/6] Add/Invite button toggles edit form and disappears when form is open --- templates/portfolios/task_orders/invitations.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/portfolios/task_orders/invitations.html b/templates/portfolios/task_orders/invitations.html index b41261ea..7816bf4f 100644 --- a/templates/portfolios/task_orders/invitations.html +++ b/templates/portfolios/task_orders/invitations.html @@ -101,7 +101,7 @@
{{ Link("Update", "edit", onClick="edit") }} {{ Link("Remove", "trash", classes="remove") }} -
@@ -113,7 +113,7 @@
-
From 4f3e7f2d66ab96d9d8d5b1b6d2275365e2163372 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sat, 9 Feb 2019 13:42:48 -0500 Subject: [PATCH 3/6] Input for DoD ID appears all the time, but is only editable if an ID hasn't already been given, and invite checkbox appears if officer hasn't been invited --- atst/forms/officers.py | 3 +- styles/sections/_task_order.scss | 14 +++++++++ .../portfolios/task_orders/invitations.html | 30 +++++++++++++++---- translations.yaml | 4 +++ 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/atst/forms/officers.py b/atst/forms/officers.py index 1bbb14e3..b0b0e61d 100644 --- a/atst/forms/officers.py +++ b/atst/forms/officers.py @@ -1,5 +1,5 @@ from flask_wtf import FlaskForm -from wtforms.fields import StringField +from wtforms.fields import StringField, BooleanField from wtforms.fields.html5 import TelField from wtforms.validators import Email, Length, Optional @@ -15,6 +15,7 @@ class OfficerForm(FlaskForm): email = StringField("Email", validators=[Optional(), Email()]) phone_number = TelField("Phone Number", validators=[PhoneNumber()]) dod_id = StringField("DoD ID", validators=[Optional(), Length(min=10), IsNumber()]) + invite = BooleanField("Invite to Task Order Builder") class EditTaskOrderOfficersForm(CacheableForm): diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index a40f5c1d..e4d58c4e 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -366,11 +366,13 @@ border-left-color: $color-blue; border-left-style: solid; border-left-width: $gap / 2; + margin-top: 1.5rem; .edit-officer { h4 { color: $color-gray; margin-bottom: 0.5rem; + margin-top: 0; } p { @@ -385,6 +387,18 @@ .form-row { margin-bottom: 0rem; margin-top: 0rem; + + .usa-input { + margin-bottom: 1.5rem; + } + + &.officer__form--dodId { + margin-top: 1.5rem; + + .usa-input { + margin-bottom: 0rem; + } + } } .officer__form--actions { diff --git a/templates/portfolios/task_orders/invitations.html b/templates/portfolios/task_orders/invitations.html index 7816bf4f..5b6ae798 100644 --- a/templates/portfolios/task_orders/invitations.html +++ b/templates/portfolios/task_orders/invitations.html @@ -13,7 +13,7 @@ {% endmacro %} -{% macro EditOfficerInfo(form, officer_type) -%} +{% macro EditOfficerInfo(form, officer_type, invited) -%}