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

Pass signer_dod_id and signed_at directly to the update method

Browse Source
This commit is contained in:
George Drummond 2019-02-11 10:11:22 -05:00
parent 58ff83ace7
commit 04fea25394
No known key found for this signature in database
GPG Key ID: 296DD6077123BF17
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/forms/task_order.py
View File

@ -225,10 +225,6 @@ class ReviewForm(CacheableForm):
class SignatureForm(CacheableForm): class SignatureForm(CacheableForm):
signer_dod_id = StringField("signer_dod_id")
signed_at = StringField("signed_at")
level_of_warrant = DecimalField( level_of_warrant = DecimalField(
translate("task_orders.sign.level_of_warrant_label"), translate("task_orders.sign.level_of_warrant_label"),
description=translate("task_orders.sign.level_of_warrant_description"), description=translate("task_orders.sign.level_of_warrant_description"),

10
atst/routes/task_orders/signing.py
View File

@ -37,8 +37,6 @@ def record_signature(task_order_id):
task_order = find_unsigned_ko_to(task_order_id) task_order = find_unsigned_ko_to(task_order_id)
form_data = {**http_request.form} form_data = {**http_request.form}
form_data["signer_dod_id"] = g.current_user.dod_id
form_data["signed_at"] = datetime.datetime.now()
if "unlimited_level_of_warrant" in form_data and form_data[ if "unlimited_level_of_warrant" in form_data and form_data[
"unlimited_level_of_warrant" "unlimited_level_of_warrant"
@ -48,7 +46,13 @@ def record_signature(task_order_id):
form = SignatureForm(form_data) form = SignatureForm(form_data)
if form.validate(): if form.validate():
TaskOrders.update(user=g.current_user, task_order=task_order, **form.data) TaskOrders.update(
user=g.current_user,
task_order=task_order,
signer_dod_id=g.current_user.dod_id,
signed_at=datetime.datetime.now(),
**form.data,
)
return render_template("task_orders/signing/success.html"), 201 return render_template("task_orders/signing/success.html"), 201
else: else:
return ( return (