diff --git a/web/domains/workbasket/row.py b/web/domains/workbasket/row.py index d869d47a3..1d397493d 100644 --- a/web/domains/workbasket/row.py +++ b/web/domains/workbasket/row.py @@ -79,7 +79,7 @@ def _get_case_wb_row(app: ImpOrExp, user: User, is_ilb_admin: bool) -> Workbaske r.reference = app.get_reference() - r.timestamp = app.created + r.timestamp = app.submit_datetime or app.created r.status = app.get_status_display() @@ -121,7 +121,7 @@ def _get_access_wb_row( r.status = app.get_status_display() - r.timestamp = app.created + r.timestamp = app.submit_datetime or app.created info_rows = ["Access Request"] @@ -213,7 +213,7 @@ def _get_approval_wb_row( r.status = app.get_status_display() - r.timestamp = app.created + r.timestamp = app.request_date or app.created information = "Approval Request" diff --git a/web/tests/domains/workbasket/test_row.py b/web/tests/domains/workbasket/test_row.py index b510bc44f..192f196bb 100644 --- a/web/tests/domains/workbasket/test_row.py +++ b/web/tests/domains/workbasket/test_row.py @@ -1,3 +1,5 @@ +import datetime as dt + import pytest from django.test import override_settings @@ -29,6 +31,8 @@ def app_in_progress(db, importer, importer_one_contact): @pytest.fixture def app_submitted(db, importer, importer_one_contact): app = _create_wood_app(importer, importer_one_contact, ImpExpStatus.SUBMITTED) + app.submit_datetime = dt.datetime.now() + app.save() return _get_wood_app_with_annotations(app) @@ -64,6 +68,8 @@ def test_actions_in_progress(app_in_progress, importer_one_contact): get_row = get_workbasket_row_func(app_in_progress.process_type) user_row = get_row(app_in_progress, importer_one_contact, False) + assert user_row.timestamp == app_in_progress.created + _check_actions(user_row.sections, expected_actions={"Resume", "Cancel"}) @@ -72,6 +78,8 @@ def test_actions_submitted(app_submitted, importer_one_contact): user_row = get_row(app_submitted, importer_one_contact, False) + assert user_row.timestamp == app_submitted.submit_datetime + _check_actions(user_row.sections, expected_actions={"Withdraw", "View Application"})