format
This commit is contained in:
@@ -16,6 +16,7 @@ from atst.forms.internal_comment import InternalCommentForm
|
|||||||
|
|
||||||
from datetime import date
|
from datetime import date
|
||||||
|
|
||||||
|
|
||||||
def map_ccpo_authorizing(user):
|
def map_ccpo_authorizing(user):
|
||||||
return {"fname_ccpo": user.first_name, "lname_ccpo": user.last_name}
|
return {"fname_ccpo": user.first_name, "lname_ccpo": user.last_name}
|
||||||
|
|
||||||
@@ -32,15 +33,18 @@ def render_approval(request, form=None):
|
|||||||
internal_comment_form = InternalCommentForm(text=request.internal_comments_text)
|
internal_comment_form = InternalCommentForm(text=request.internal_comments_text)
|
||||||
|
|
||||||
# Dummy internal comments
|
# Dummy internal comments
|
||||||
comments = [{
|
comments = [
|
||||||
"time_created": date(2018, 9, 18),
|
{
|
||||||
"full_name_commenter": "Darth Vader",
|
"time_created": date(2018, 9, 18),
|
||||||
"message": "We'll have no more of this Obi-Wan Kenobi jibberish...and don't talk to me about your mission, either. You're fortunate he doesn't blast you into a million pieces right here. "
|
"full_name_commenter": "Darth Vader",
|
||||||
}, {
|
"message": "We'll have no more of this Obi-Wan Kenobi jibberish...and don't talk to me about your mission, either. You're fortunate he doesn't blast you into a million pieces right here. ",
|
||||||
"time_created": date(2018, 9, 20),
|
},
|
||||||
"full_name_commenter": "Grand Moff Tarkin",
|
{
|
||||||
"message": "We'll have no more of this Obi-Wan Kenobi jibberish...and don't talk to me about your mission, either. You're fortunate he doesn't blast you into a million pieces right here. "
|
"time_created": date(2018, 9, 20),
|
||||||
}]
|
"full_name_commenter": "Grand Moff Tarkin",
|
||||||
|
"message": "We'll have no more of this Obi-Wan Kenobi jibberish...and don't talk to me about your mission, either. You're fortunate he doesn't blast you into a million pieces right here. ",
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
return render_template(
|
return render_template(
|
||||||
"requests/approval.html",
|
"requests/approval.html",
|
||||||
@@ -50,7 +54,7 @@ def render_approval(request, form=None):
|
|||||||
current_status=request.status.value,
|
current_status=request.status.value,
|
||||||
f=form or CCPOReviewForm(),
|
f=form or CCPOReviewForm(),
|
||||||
internal_comment_form=internal_comment_form,
|
internal_comment_form=internal_comment_form,
|
||||||
comments=comments
|
comments=comments,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -94,6 +98,7 @@ def task_order_pdf_download(request_id):
|
|||||||
else:
|
else:
|
||||||
raise NotFoundError("task_order pdf")
|
raise NotFoundError("task_order pdf")
|
||||||
|
|
||||||
|
|
||||||
@requests_bp.route("/requests/internal_comments/<string:request_id>", methods=["POST"])
|
@requests_bp.route("/requests/internal_comments/<string:request_id>", methods=["POST"])
|
||||||
def create_internal_comment(request_id):
|
def create_internal_comment(request_id):
|
||||||
form = InternalCommentForm(http_request.form)
|
form = InternalCommentForm(http_request.form)
|
||||||
|
Reference in New Issue
Block a user