From 2c35ae7582e9f4a46ed61f5fcea149b739e02f95 Mon Sep 17 00:00:00 2001 From: Oliwia Zaremba Date: Wed, 6 Sep 2023 21:11:55 +0100 Subject: [PATCH] Rename ProviderRequest status open -> more info required --- ...0061_providerrequest_rename_open_status.py | 38 +++++++++++++++++++ apps/accounts/models/provider_request.py | 2 +- .../provider_portal/request_detail.html | 8 +++- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 apps/accounts/migrations/0061_providerrequest_rename_open_status.py diff --git a/apps/accounts/migrations/0061_providerrequest_rename_open_status.py b/apps/accounts/migrations/0061_providerrequest_rename_open_status.py new file mode 100644 index 00000000..51bf46fb --- /dev/null +++ b/apps/accounts/migrations/0061_providerrequest_rename_open_status.py @@ -0,0 +1,38 @@ +# Generated by Django 3.2.20 on 2023-09-06 19:10 + +from django.db import migrations, models + + +def rename_status(apps, schema_editor): + """ + Rename status OPEN to MORE INFO REQUIRED for existing ProviderRequest objects + """ + db_alias = schema_editor.connection.alias + ProviderRequest = apps.get_model("accounts", "ProviderRequest") + ProviderRequest.objects.using(db_alias).filter(status="Open").update( + status="More info required" + ) + + +class Migration(migrations.Migration): + dependencies = [ + ("accounts", "0060_provider_request_consent"), + ] + + operations = [ + migrations.AlterField( + model_name="providerrequest", + name="status", + field=models.CharField( + choices=[ + ("Pending review", "Pending Review"), + ("Approved", "Approved"), + ("Rejected", "Rejected"), + ("More info required", "Open"), + ("Removed", "Removed"), + ], + max_length=255, + ), + ), + migrations.RunPython(code=rename_status, reverse_code=lambda *args: ...), + ] diff --git a/apps/accounts/models/provider_request.py b/apps/accounts/models/provider_request.py index dab94f6d..44eee626 100644 --- a/apps/accounts/models/provider_request.py +++ b/apps/accounts/models/provider_request.py @@ -40,7 +40,7 @@ class ProviderRequestStatus(models.TextChoices): PENDING_REVIEW = "Pending review" APPROVED = "Approved" REJECTED = "Rejected" - OPEN = "Open" + OPEN = "More info required" REMOVED = "Removed" diff --git a/apps/accounts/templates/provider_portal/request_detail.html b/apps/accounts/templates/provider_portal/request_detail.html index 72e33350..10b8844d 100644 --- a/apps/accounts/templates/provider_portal/request_detail.html +++ b/apps/accounts/templates/provider_portal/request_detail.html @@ -14,12 +14,16 @@

Summary of request

Submitted on: {{ object.created }}

Status: {{ object.status }}

- {% if object.approved_at %} + {% if object.approved_at and object.status|lower == "approved" %}

Approved on: {{ object.approved_at }}

{% endif %} {% if object.status|lower == "pending review" %} - If you want to update the information relating to this provider, please get in touch using our support form. + We are currently reviewing this request. If you want to update the information relating to this provider, please get in touch using our support form. + {% endif %} + + {% if object.status|lower == "more info required" %} +

Update this request

{% endif %}