Merge pull request #1198 from NHSDigital/DTOSS-12378-image-order

Make image view order consistent

Author: swebberuk

manage_breast_screening/mammograms/forms/images/image_details_form.py

@@ -34,33 +34,33 @@ class RecallChoices(TextChoices):
             "No, record as 'partial mammography'",
         )
 
-    rmlo_count = IntegerField(
-        label="RMLO",
+    rcc_count = IntegerField(
+        label="RCC",
         classes="nhsuk-input--width-4",
         required=True,
         min_value=0,
         max_value=20,
         initial=1,
         error_messages={
-            "min_value": "Number of RMLO images must be at least 0",
-            "max_value": "Number of RMLO images must be at most 20",
-            "invalid": "Enter a valid number of RMLO images",
-            "required": "Enter the number of RMLO images",
+            "min_value": "Number of RCC images must be at least 0",
+            "max_value": "Number of RCC images must be at most 20",
+            "invalid": "Enter a valid number of RCC images",
+            "required": "Enter the number of RCC images",
         },
         widget=StepperInput,
     )
-    rcc_count = IntegerField(
-        label="RCC",
+    rmlo_count = IntegerField(
+        label="RMLO",
         classes="nhsuk-input--width-4",
         required=True,
         min_value=0,
         max_value=20,
         initial=1,
         error_messages={
-            "min_value": "Number of RCC images must be at least 0",
-            "max_value": "Number of RCC images must be at most 20",
-            "invalid": "Enter a valid number of RCC images",
-            "required": "Enter the number of RCC images",
+            "min_value": "Number of RMLO images must be at least 0",
+            "max_value": "Number of RMLO images must be at most 20",
+            "invalid": "Enter a valid number of RMLO images",
+            "required": "Enter the number of RMLO images",
         },
         widget=StepperInput,
     )
@@ -80,33 +80,33 @@ class RecallChoices(TextChoices):
         },
         widget=StepperInput,
     )
-    lmlo_count = IntegerField(
-        label="LMLO",
+    lcc_count = IntegerField(
+        label="LCC",
         classes="nhsuk-input--width-4",
         required=True,
         min_value=0,
         max_value=20,
         initial=1,
         error_messages={
-            "min_value": "Number of LMLO images must be at least 0",
-            "max_value": "Number of LMLO images must be at most 20",
-            "invalid": "Enter a valid number of LMLO images",
-            "required": "Enter the number of LMLO images",
+            "min_value": "Number of LCC images must be at least 0",
+            "max_value": "Number of LCC images must be at most 20",
+            "invalid": "Enter a valid number of LCC images",
+            "required": "Enter the number of LCC images",
         },
         widget=StepperInput,
     )
-    lcc_count = IntegerField(
-        label="LCC",
+    lmlo_count = IntegerField(
+        label="LMLO",
         classes="nhsuk-input--width-4",
         required=True,
         min_value=0,
         max_value=20,
         initial=1,
         error_messages={
-            "min_value": "Number of LCC images must be at least 0",
-            "max_value": "Number of LCC images must be at most 20",
-            "invalid": "Enter a valid number of LCC images",
-            "required": "Enter the number of LCC images",
+            "min_value": "Number of LMLO images must be at least 0",
+            "max_value": "Number of LMLO images must be at most 20",
+            "invalid": "Enter a valid number of LMLO images",
+            "required": "Enter the number of LMLO images",
         },
         widget=StepperInput,
     )

manage_breast_screening/mammograms/jinja2/mammograms/image_details.jinja

@@ -14,8 +14,8 @@
           "classes": "nhsuk-fieldset__legend--s"
         }
       }) %}
-          {{ form.rmlo_count.as_field_group() }}
           {{ form.rcc_count.as_field_group() }}
+          {{ form.rmlo_count.as_field_group() }}
           {{ form.right_eklund_count.as_field_group() }}
       {% endcall %}
     </div>
@@ -26,8 +26,8 @@
           "classes": "nhsuk-fieldset__legend--s"
         }
       }) %}
-          {{ form.lmlo_count.as_field_group() }}
           {{ form.lcc_count.as_field_group() }}
+          {{ form.lmlo_count.as_field_group() }}
           {{ form.left_eklund_count.as_field_group() }}
       {% endcall %}
     </div>

manage_breast_screening/mammograms/tests/views/test_add_image_details_views.py

@@ -167,11 +167,11 @@ def test_invalid_post_renders_response_with_errors(self, clinical_user_client):
         assertInHTML(
             """
             <ul class="nhsuk-list nhsuk-error-summary__list">
-                <li><a href="#id_rmlo_count">Number of RMLO images must be at least 0</a></li>
                 <li><a href="#id_rcc_count">Enter a valid number of RCC images</a></li>
+                <li><a href="#id_rmlo_count">Number of RMLO images must be at least 0</a></li>
                 <li><a href="#id_right_eklund_count">Enter a valid number of Right Eklund images</a></li>
-                <li><a href="#id_lmlo_count">Number of LMLO images must be at most 20</a></li>
                 <li><a href="#id_lcc_count">Number of LCC images must be at most 20</a></li>
+                <li><a href="#id_lmlo_count">Number of LMLO images must be at most 20</a></li>
                 <li><a href="#id_left_eklund_count">Enter the number of Left Eklund images</a></li>
             </ul>
             """,