From 2079d3dcf288160587484db7fa8a762e13796466 Mon Sep 17 00:00:00 2001
From: Santino Molinaro <85284133+Santino-Trade@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:18:13 +0000
Subject: [PATCH] Feature/tss 2283/dashboard group tasks by barrier merge
 (#861)

* Rearrange dashboard task HTML to accomidate links in content

* Update URL links

* Bugfix for single task barriers

---------

Co-authored-by: santinomolinaro <santino.molinaro@mail>
Co-authored-by: Feroze Rub <feroze@taridigital.com>
---
 .../barriers/partials/dashboard_tasks.html    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/templates/barriers/partials/dashboard_tasks.html b/templates/barriers/partials/dashboard_tasks.html
index 86410e86f..3c726caa8 100644
--- a/templates/barriers/partials/dashboard_tasks.html
+++ b/templates/barriers/partials/dashboard_tasks.html
@@ -17,11 +17,27 @@ <h3 class="govuk-summary-card__title">Tasks you need to complete for barriers yo
                         <p class="govuk-body m-b-0 m-t-2"><strong>{{ barrier.task_list|length }} Tasks on this barrier</strong></p>
                         <ul class="govuk-list govuk-list--bullet govuk-body">
                             {% for task in barrier.task_list %}
-                                <li>{{ task.message }}</li>
+                                <li>
+                                    {% for text_section in task.message %}
+                                        {% if text_section == task.link_text %}
+                                            <a class="govuk-link" href="{% url task.task_url barrier.barrier_id %}">{{ text_section }}</a>
+                                        {% else %}
+                                            {{ text_section }}
+                                        {% endif %}
+                                    {% endfor %}
+                                </li>
                             {% endfor %}
                         </ul>
                     {% else %}
-                        <p>{{ barrier.task_list.0.message }}</p>
+                        <p>
+                            {% for text_section in barrier.task_list.0.message %}
+                                {% if text_section == barrier.task_list.0.link_text %}
+                                    <a class="govuk-link" href="{% url barrier.task_list.0.task_url barrier.barrier_id %}">{{ text_section }}</a>
+                                {% else %}
+                                    {{ text_section }}
+                                {% endif %}
+                            {% endfor %}
+                        </p>
                     {% endif %}
                     <p class="govuk-hint">{{ barrier.modified_by }} updated on {{ barrier.modified_on }}</p>
                 </div>