From 850d9637c3b743755aba13559c9f878400070eda Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 28 Aug 2024 18:06:18 +0100
Subject: [PATCH] update rcr

---
 rcr/templates/rcr/results.html | 80 ++++++++++++++++++++++------------
 1 file changed, 51 insertions(+), 29 deletions(-)

diff --git a/rcr/templates/rcr/results.html b/rcr/templates/rcr/results.html
index e44ad5dc..acb9e46a 100644
--- a/rcr/templates/rcr/results.html
+++ b/rcr/templates/rcr/results.html
@@ -2,35 +2,57 @@
 
 {% block content %}
 
-<table>
-    <thead>
-        <tr>
-            <th>Specialty</th>
-            <th>Name</th>
-            <th>ID</th>
-            <th>Assessed by</th>
-            <th>Outcome</th>
-            <th>Outcome (reason)</th>
-            <th>Outcome (free text)</th>
-            <th>Comments</th>
-        </tr>
-    </thead>
-    <tbody>
-        
-        {% for item in items %}
-        <tr>
-            <td>{{item.specialty}}</td>
-            <td>{{item.name}}</td>
-            <td>{{item.rcr_platform_id}}</td>
-            <td>{{item.get_assessed_by_name|safe}}</td>
-            <td>{{item.outcome}}</td>
-            <td>{{item.outcome_reason}}</td>
-            <td>{{item.outcome_free_text}}</td>
-            <td>{{item.comments}}</td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
+    <table>
+        <thead>
+            <tr>
+                <th>Specialty</th>
+                <th>Name</th>
+                <th>ID</th>
+                <th>Assessed by</th>
+                <th>Outcome</th>
+                <th>Outcome (reason)</th>
+                <th>Outcome (free text)</th>
+                <th>Comments</th>
+                <th>Radiology Category</th>
+                <th>Oncology Category</th>
+                <th>Radiology Condition</th>
+            </tr>
+        </thead>
+        <tbody>
+
+            {% for item in items %}
+                <tr>
+                    <td>{{item.specialty}}</td>
+                    <td>{{item.name}}</td>
+                    <td>{{item.rcr_platform_id}}</td>
+                    <td>{{item.get_assessed_by_name|safe}}</td>
+                    <td>{{item.outcome}}</td>
+                    <td>{{item.outcome_reason}}</td>
+                    <td>{{item.outcome_free_text}}</td>
+                    <td>{{item.comments}}</td>
+                    <td>{% for cat in item.radiology_categories.all %}
+                        {% if forloop.last %}
+                            {{cat}}
+                        {% else %}
+                            {{cat}},
+
+                        {% endif %}
+                    {% endfor %}
+                    </td>
+                    <td>{{item.oncology_category}}</td>
+                    <td>{% for cat in item.radiology_condition.all %}
+                        {% if forloop.last %}
+                            {{cat}}
+                        {% else %}
+                            {{cat}},
+
+                        {% endif %}
+                    {% endfor %}
+                    </td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 
 {% endblock %}