From 8b411139fa98d71ec3690526841a5abe2b83fe25 Mon Sep 17 00:00:00 2001 From: Matthew McKenzie Date: Wed, 13 Nov 2024 09:07:58 +0000 Subject: [PATCH] TP2000-1570 content changes --- quotas/forms/wizards.py | 2 +- .../sub-quota-definitions-selected.jinja | 8 ++++++-- .../sub-quota-duplicate-definitions-start.jinja | 3 ++- quotas/views/wizards.py | 8 ++++---- workbaskets/jinja2/workbaskets/edit-workbasket.jinja | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/quotas/forms/wizards.py b/quotas/forms/wizards.py index e6d587342..e4c17a640 100644 --- a/quotas/forms/wizards.py +++ b/quotas/forms/wizards.py @@ -48,7 +48,7 @@ def init_layout(self, request): self.helper.layout = Layout( Div( HTML( - '

Enter main and sub-quota order numbers

', + '

Enter main and sub-quota order numbers to link together

', ), ), Div( diff --git a/quotas/jinja2/quota-definitions/sub-quota-definitions-selected.jinja b/quotas/jinja2/quota-definitions/sub-quota-definitions-selected.jinja index eab834e68..9b1f5d4f4 100644 --- a/quotas/jinja2/quota-definitions/sub-quota-definitions-selected.jinja +++ b/quotas/jinja2/quota-definitions/sub-quota-definitions-selected.jinja @@ -45,7 +45,7 @@

You must enter a co-efficient value and specify the relationship type for each definition period.

{{ govukTable({ "head": [ - {"text": "Sid"}, + {"text": "SID"}, {"text": "Start date"}, {"text": "End date"}, {"text": "Volume"}, @@ -57,7 +57,11 @@ ], "rows": table_rows, }) }} -

Selecting 'Submit' will create the new definitions and create a quota association. Further edits to the definitions can be made via the Quota view

+
+
+

Selecting 'Submit' will create the new definitions and create a quota association. Further edits to the definition periods can be made on the quota order number page.

+
+
{{ govukButton({ "text": "Submit", diff --git a/quotas/jinja2/quota-definitions/sub-quota-duplicate-definitions-start.jinja b/quotas/jinja2/quota-definitions/sub-quota-duplicate-definitions-start.jinja index fde772a87..1d786a713 100644 --- a/quotas/jinja2/quota-definitions/sub-quota-duplicate-definitions-start.jinja +++ b/quotas/jinja2/quota-definitions/sub-quota-duplicate-definitions-start.jinja @@ -9,8 +9,9 @@
  • the sub-quota order number
  • which definitions should be duplicated from main to sub-quota
  • any updates to be made to the duplicated definitions
  • -
  • (additional updates can be made after duplication, via the edit definition page)
  • + Additional updates can be made after duplication, via the edit definition page. +

    {{ govukButton({"text": "Start now", "isStartButton": True}) }} diff --git a/quotas/views/wizards.py b/quotas/views/wizards.py index cc942ee72..0472cc341 100644 --- a/quotas/views/wizards.py +++ b/quotas/views/wizards.py @@ -59,19 +59,19 @@ class DuplicateDefinitionsWizard( step_metadata = { START: { - "title": "Duplicate quota definitions", + "title": "Create quota associations", "link_text": "Start", }, QUOTA_ORDER_NUMBERS: { - "title": "Create associations", + "title": "Choose quotas to be linked", "link_text": "Order numbers", }, SELECT_DEFINITION_PERIODS: { - "title": "Select definition periods", + "title": "Select definition periods to duplicate", "link_text": "Definition periods", }, SELECTED_DEFINITIONS: { - "title": "Provide updates and details for duplicated definitions", + "title": "Edit duplicated definition periods", "link_text": "Selected definitions", }, COMPLETE: {"title": "Finished", "link_text": "Success"}, diff --git a/workbaskets/jinja2/workbaskets/edit-workbasket.jinja b/workbaskets/jinja2/workbaskets/edit-workbasket.jinja index a6776cd48..b11760b13 100644 --- a/workbaskets/jinja2/workbaskets/edit-workbasket.jinja +++ b/workbaskets/jinja2/workbaskets/edit-workbasket.jinja @@ -78,7 +78,7 @@ {{ workbasket_column("Quotas", [ {"text": "Create a new quota", "url": url('quota-ui-create')}, {"text": "Find and edit quotas", "url": url('quota-ui-list')}, - {"text": "Create quota association", "url": url('sub_quota_definitions-ui-create')}, + {"text": "Create quota associations", "url": url('sub_quota_definitions-ui-create')}, ]) }} {{ workbasket_column("Regulations", [