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

Add back comment form to route

Browse Source 
Add some dummy comment data
This commit is contained in:
Andrew Croce 2018-09-21 14:22:48 -04:00
parent c0cf433b5e
commit 0ab8cc86c2
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
atst/routes/requests/approval.py
View File

@ -12,7 +12,9 @@ from . import requests_bp
from atst.domain.requests import Requests from atst.domain.requests import Requests
from atst.domain.exceptions import NotFoundError from atst.domain.exceptions import NotFoundError
from atst.forms.ccpo_review import CCPOReviewForm from atst.forms.ccpo_review import CCPOReviewForm
from atst.forms.internal_comment import InternalCommentForm
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}
@ -27,6 +29,19 @@ def render_approval(request, form=None):
mo_data = map_ccpo_authorizing(g.current_user) mo_data = map_ccpo_authorizing(g.current_user)
form = CCPOReviewForm(data=mo_data) form = CCPOReviewForm(data=mo_data)
internal_comment_form = InternalCommentForm(text=request.internal_comments_text)
# # Dummy internal comments
# comments = [{
# "time_created": date(2018, 9, 18),
# "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. "
# }]
return render_template( return render_template(
"requests/approval.html", "requests/approval.html",
data=data, data=data,
@ -34,6 +49,8 @@ def render_approval(request, form=None):
request=request, request=request,
current_status=request.status.value, current_status=request.status.value,
f=form or CCPOReviewForm(), f=form or CCPOReviewForm(),
internal_comment_form=internal_comment_form,
comments=[], # <-- put comments here
) )
@ -76,3 +93,13 @@ 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"])
def create_internal_comment(request_id):
form = InternalCommentForm(http_request.form)
# if form.validate():
# request = Requests.get(g.current_user, request_id)
# Requests.update_internal_comments(g.current_user, request, form.data["text"])
return redirect(
url_for("requests.approval", request_id=request_id, _anchor="ccpo-notes")
)