diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index b1ed930c..dd0ead1c 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -240,15 +240,16 @@ def update_financial_verification(request_id): @requests_bp.route("/requests/verify//draft", methods=["POST"]) def save_financial_verification_draft(request_id): - request = Requests.get(g.current_user, request_id) + user = g.current_user + request = Requests.get(user, request_id) fv_data = {**http_request.form, **http_request.files} is_extended = fv_extended(http_request) try: - SaveFinancialVerificationDraft( + updated_request = SaveFinancialVerificationDraft( PENumberValidator(), TaskOrderNumberValidator(), - g.current_user, + user, request, fv_data, is_extended=is_extended, @@ -261,4 +262,14 @@ def save_financial_verification_draft(request_id): extended=is_extended, ) - return redirect(url_for("requests.requests_index")) + form = GetFinancialVerificationForm( + user, updated_request, is_extended=is_extended + ).execute() + return render_template( + "requests/financial_verification.html", + f=form, + jedi_request=request, + review_comment=request.review_comment, + extended=is_extended, + saved_draft=True, + ) diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html index 827ff9f5..32234099 100644 --- a/templates/requests/financial_verification.html +++ b/templates/requests/financial_verification.html @@ -42,6 +42,11 @@ {% endcall %} {% endif %} + {% if saved_draft %} + {% call Alert('Draft saved', level='info') %} + {% endcall %} + {% endif %} +
{{ f.csrf_token }} diff --git a/tests/routes/test_financial_verification.py b/tests/routes/test_financial_verification.py index 94274551..18afa0de 100644 --- a/tests/routes/test_financial_verification.py +++ b/tests/routes/test_financial_verification.py @@ -17,7 +17,6 @@ from atst.domain.requests.financial_verification import ( PENumberValidator, TaskOrderNumberValidator, ) -from atst.utils import pick from atst.models.request_status_event import RequestStatus from atst.domain.requests.query import RequestsQuery @@ -199,11 +198,16 @@ def test_save_draft_allows_invalid_data(): data = { "task_order-number": MANUAL_TO_NUMBER, "request-pe_id": "123", - "request-ba_code": "a" + "request-ba_code": "a", } assert SaveFinancialVerificationDraft( - PENumberValidator(), TaskOrderNumberValidator(), user, request, data, is_extended=True + PENumberValidator(), + TaskOrderNumberValidator(), + user, + request, + data, + is_extended=True, ).execute() @@ -267,17 +271,6 @@ def test_update_ignores_empty_values(fv_data, e_fv_data): ).execute() -def test_simple_form_does_not_generate_task_order(fv_data): - request = RequestFactory.create() - user = UserFactory.create() - data = pick(["uii_ids"], fv_data) - updated_request = SaveFinancialVerificationDraft( - TrueValidator, TrueValidator, user, request, data, is_extended=False - ).execute() - - assert updated_request.task_order is None - - def test_can_save_draft_with_funding_type(fv_data, e_fv_data): request = RequestFactory.create() user = UserFactory.create()