DWPF-618 & DWPF-619 Profile page updates (#410)

uktrade · Jul 27, 2023 · 1c696de · 1c696de
1 parent 21144fa
commit 1c696de
Showing 1 changed file with 36 additions and 35 deletions.
diff --git a/src/peoplefinder/templates/peoplefinder/profile.html b/src/peoplefinder/templates/peoplefinder/profile.html
@@ -201,15 +201,6 @@ <h2 class="govuk-summary-card__title">My role</h2>
                     {% profile_completion_field_actions "manager" profile %}
                 </div>
 
-                {% if profile.workdays.exists %}
-                    <div class="govuk-summary-list__row">
-                        <dt class="govuk-summary-list__key">Days I work</dt>
-                        <dd class="govuk-summary-list__value">
-                            {{ profile.get_workdays_display }}
-                        </dd>
-                    </div>
-                {% endif %}
-
                 {% if profile.key_skills.exists or profile.other_key_skills %}
                     <div class="govuk-summary-list__row">
                         <dt class="govuk-summary-list__key">Skills</dt>
@@ -246,6 +237,23 @@ <h2 class="govuk-summary-card__title">My role</h2>
                     </div>
                 {% endif %}
 
+                {% if roles %}
+                    <div class="govuk-summary-list__row">
+                        <dt class="govuk-summary-list__key">My role(s)</dt>
+                        <dd class="govuk-summary-list__value">
+                            {% for role in roles %}
+                                {% if role.job_title %}
+                                    {{ role.job_title }} in
+                                {% else %}
+                                    Member of
+                                {% endif %}
+                                <a class="govuk-link" href="{% url 'team-view' role.team.slug %}">{{ role.team.name }}</a>
+                                <br>
+                            {% endfor %}
+                        </dd>
+                    </div>
+                {% endif %}
+
                 {% if profile.previous_experience %}
                     <div class="govuk-summary-list__row">
                         <dt class="govuk-summary-list__key">Previous positions held</dt>
@@ -296,41 +304,33 @@ <h2 class="govuk-summary-card__title">My role</h2>
 
     <div class="govuk-summary-card">
         <div class="govuk-summary-card__title-wrapper">
-            <h2 class="govuk-summary-card__title">Where I work</h2>
+            <h2 class="govuk-summary-card__title">Where to find me</h2>
         </div>
         <div class="govuk-summary-card__content">
             <dl class="govuk-summary-list">
-                {% if profile.buildings.all.exists %}
-                    <div class="govuk-summary-list__row">
-                        <dt class="govuk-summary-list__key">Place(s) I usually work</dt>
-                        <dd class="govuk-summary-list__value">
-                            {{ profile.buildings.all|join:", " }}
-                        </dd>
-                    </div>
-                {% endif %}
-
-                {% if profile.location_in_building %}
-                    <div class="govuk-summary-list__row">
-                        <dt class="govuk-summary-list__key">Location in building</dt>
-                        <dd class="govuk-summary-list__value">
-                            {{ profile.location_in_building }}
-                        </dd>
-                    </div>
-                {% endif %}
+                <div class="govuk-summary-list__row">
+                    <dt class="govuk-summary-list__key">Where I work</dt>
+                    <dd class="govuk-summary-list__value">
+                        {% if profile.remote_working %}{{ profile.get_remote_working_display }}{% endif %}
+                    </dd>
+                    {% profile_completion_field_actions "remote_working" profile %}
+                </div>
 
                 {% if profile.uk_office_location or profile.international_building %}
                     {% if profile.uk_office_location %}
                         <div class="govuk-summary-list__row">
                             <dt class="govuk-summary-list__key">Office location</dt>
                             <dd class="govuk-summary-list__value">
                                 {{ profile.uk_office_location }}
+                                <br>
+                                {{ profile.location_in_building }}
                             </dd>
                         </div>
                     {% endif %}
 
                     {% if profile.international_building %}
                         <div class="govuk-summary-list__row">
-                            <dt class="govuk-summary-list__key">Other - Overseas</dt>
+                            <dt class="govuk-summary-list__key">International location</dt>
                             <dd class="govuk-summary-list__value">
                                 {{ profile.international_building }}
                             </dd>
@@ -345,13 +345,14 @@ <h2 class="govuk-summary-card__title">Where I work</h2>
                     </div>
                 {% endif %}
 
-                <div class="govuk-summary-list__row">
-                    <dt class="govuk-summary-list__key">Working</dt>
-                    <dd class="govuk-summary-list__value">
-                        {% if profile.remote_working %}{{ profile.get_remote_working_display }}{% endif %}
-                    </dd>
-                    {% profile_completion_field_actions "remote_working" profile %}
-                </div>
+                {% if profile.workdays.exists %}
+                    <div class="govuk-summary-list__row">
+                        <dt class="govuk-summary-list__key">Days I work</dt>
+                        <dd class="govuk-summary-list__value">
+                            {{ profile.get_workdays_display }}
+                        </dd>
+                    </div>
+                {% endif %}
             </dl>
         </div>
     </div>