From 6b5c356464a9912f86e2edc1ec7995f086b483dd Mon Sep 17 00:00:00 2001
From: Abdallah Harun <abdallah.harun@digital.trade.gov.uk>
Date: Wed, 29 Jan 2025 11:56:11 +0000
Subject: [PATCH] DST-901 - Changing content in view a license from H3 to H2
 and moving it below individual details. (#185)

* DST-901 - Changing content in view a license from H3 to H2 and moving it below individual details.

* DST-901 - Changing content in view a license from H3 to H2 and moving it below individual details.
---
 django_app/core/models.py                     |  2 +-
 .../view_a_licence_application.html           | 38 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/django_app/core/models.py b/django_app/core/models.py
index f6f63172..cd780684 100644
--- a/django_app/core/models.py
+++ b/django_app/core/models.py
@@ -14,7 +14,7 @@ class Meta:
 
     @property
     def _history_user(self):
-        # todo - remove when OneLogin is enabled
+        # todo - remove when OneLogin is enabled.
         return None
 
 
diff --git a/django_app/view_a_licence/templates/view_a_licence/view_a_licence_application.html b/django_app/view_a_licence/templates/view_a_licence/view_a_licence_application.html
index 36b35515..13969a3a 100644
--- a/django_app/view_a_licence/templates/view_a_licence/view_a_licence_application.html
+++ b/django_app/view_a_licence/templates/view_a_licence/view_a_licence_application.html
@@ -84,52 +84,52 @@ <h3 class="govuk-heading-s"> Business {{ forloop.counter }}</h3>
         {% endfor %}
     {% endif %}
     {% if licence.who_do_you_want_the_licence_to_cover == "myself" or licence.who_do_you_want_the_licence_to_cover == "individual" %}
-        <h3 class="govuk-heading-s">Their details</h3>
-        {% if licence.who_do_you_want_the_licence_to_cover == "individual" %}
+        {% for individual in licence.individuals.all %}
+            <h3 class="govuk-heading-s"> Individual {{ forloop.counter }}</h3>
             <dl class="govuk-summary-list">
                 <div class="govuk-summary-list__row">
                     <dt class="govuk-summary-list__key govuk-!-font-weight-regular">
-                        Business name
+                        Name
                     </dt>
                     <dd class="govuk-summary-list__value">
-                        {{ business_individuals_work_for.name }}
+                        {{ individual.full_name }}
                     </dd>
                 </div>
                 <div class="govuk-summary-list__row">
                     <dt class="govuk-summary-list__key govuk-!-font-weight-regular">
-                        Address
+                        Connection to the UK
                     </dt>
                     <dd class="govuk-summary-list__value">
-                        {% include "apply_for_a_licence/partials/truncated_text.html" with text=business_individuals_work_for.readable_address|linebreaksbr %}
+                        {{ individual.get_nationality_and_location_display }}
                     </dd>
                 </div>
-            </dl>
-        {% endif %}
-        {% for individual in licence.individuals.all %}
-            <h3 class="govuk-heading-s"> Individual {{ forloop.counter }}</h3>
-            <dl class="govuk-summary-list">
                 <div class="govuk-summary-list__row">
                     <dt class="govuk-summary-list__key govuk-!-font-weight-regular">
-                        Name
+                        Location of individual
                     </dt>
                     <dd class="govuk-summary-list__value">
-                        {{ individual.full_name }}
+                        {{ individual.get_country_display }}
                     </dd>
                 </div>
                 <div class="govuk-summary-list__row">
                     <dt class="govuk-summary-list__key govuk-!-font-weight-regular">
-                        Connection to the UK
+                        Address
                     </dt>
                     <dd class="govuk-summary-list__value">
-                        {{ individual.get_nationality_and_location_display }}
+                        {% include "apply_for_a_licence/partials/truncated_text.html" with text=individual.readable_address|linebreaksbr %}
                     </dd>
                 </div>
+            </dl>
+        {% endfor %}
+        <h2 class="govuk-heading-m">Business the individuals work for</h2>
+        {% if licence.who_do_you_want_the_licence_to_cover == "individual" %}
+            <dl class="govuk-summary-list">
                 <div class="govuk-summary-list__row">
                     <dt class="govuk-summary-list__key govuk-!-font-weight-regular">
-                        Location of individual
+                        Business name
                     </dt>
                     <dd class="govuk-summary-list__value">
-                        {{ individual.get_country_display }}
+                        {{ business_individuals_work_for.name }}
                     </dd>
                 </div>
                 <div class="govuk-summary-list__row">
@@ -137,11 +137,11 @@ <h3 class="govuk-heading-s"> Individual {{ forloop.counter }}</h3>
                         Address
                     </dt>
                     <dd class="govuk-summary-list__value">
-                        {% include "apply_for_a_licence/partials/truncated_text.html" with text=individual.readable_address|linebreaksbr %}
+                        {% include "apply_for_a_licence/partials/truncated_text.html" with text=business_individuals_work_for.readable_address|linebreaksbr %}
                     </dd>
                 </div>
             </dl>
-        {% endfor %}
+        {% endif %}
     {% endif %}
     <div class="action-wrapper">
         <h2 class="govuk-heading-m">Previous licence</h2>