fix mctr choices and summary page

uktrade · Feb 19, 2025 · 3b93ee8 · 3b93ee8
1 parent 71ff167
commit 3b93ee8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 29 deletions.
diff --git a/exporter/f680/application_sections/approval_details/forms.py b/exporter/f680/application_sections/approval_details/forms.py
@@ -117,6 +117,7 @@ class Layout:
     product_description = forms.CharField(
         label=Layout.TITLE,
         help_text="Where possible include the make, model and type of the item",
+        widget=forms.Textarea(attrs={"rows": 5}),
     )
 
     def get_layout_fields(self):
@@ -280,10 +281,10 @@ class Layout:
 
     is_item_rated_under_mctr = forms.ChoiceField(
         choices=(
-            Choice("yes_mtcr_1", "Yes, the product is MTCR Category 1"),
-            Choice("yes_mtcr_2", "Yes, the product is MTCR Category 2"),
-            Choice("no_but_supports_mtcr_1", "No, but the item supports a MTCR Category 1 item"),
-            Choice("no_but_supports_mtcr_2", "No, but the item supports a MTCR Category 2 item"),
+            Choice("mtcr_1", "Yes, the product is MTCR Category 1"),
+            Choice("mtcr_2", "Yes, the product is MTCR Category 2"),
+            Choice("supports_mtcr_1", "No, but the item supports a MTCR Category 1 item"),
+            Choice("supports_mtcr_2", "No, but the item supports a MTCR Category 2 item"),
             Choice("no", "No", divider="Or"),
             Choice("dont_know", "Don't know"),
         ),

diff --git a/exporter/templates/f680/summary.html b/exporter/templates/f680/summary.html
@@ -62,18 +62,10 @@ <h2 class="lite-task-list__section">
                             {% endif %}
                         </div>
                     </li>
-                </ul>
-            </li>
-            <li>
-                <h2 class="lite-task-list__section">
-                    <span class="lite-task-list__section-number">3. </span>
-                    Tell us who is involved
-                </h2>
-                <ul class="lite-task-list__items">
                     <li class="lite-task-list__item">
                         <div class="lite-task-list__item-header">
-                            <a class="govuk-link govuk-link--no-visited-state" href="{% url "f680:user_information:summary" pk=application.id %}">User information</a>
-                            {% if application.application.sections.user_information %}
+                            <a class="govuk-link govuk-link--no-visited-state" href="{% url "f680:approval_details:product_wizard" pk=application.id %}">Product information</a>
+                            {% if application.application.sections.product_information %}
                             <div class="lite-tag lite-tag--blue">
                                 Completed
                             </div>
@@ -83,21 +75,8 @@ <h2 class="lite-task-list__section">
                             </div>
                             {% endif %}
                         </div>
-                        <li class="lite-task-list__item">
-                            <div class="lite-task-list__item-header">
-                                <a class="govuk-link govuk-link--no-visited-state" href="{% url "f680:approval_details:product_wizard" pk=application.id %}">Product information</a>
-                                {% if application.application.sections.product_information %}
-                                <div class="lite-tag lite-tag--blue">
-                                    Completed
-                                </div>
-                                {% else %}
-                                <div class="lite-tag lite-tag--grey">
-                                    Not Started
-                                </div>
-                                {% endif %}
-                            </div>
-                        </li>
                     </li>
+                </li>
                 </ul>
             </li>
             <li>
@@ -119,7 +98,6 @@ <h2 class="lite-task-list__section">
                             </div>
                             {% endif %}
                         </div>
-                    </li>
                 </ul>
             </li>
             <li>