From 30cd998d84916f2fea6ff910b982d428d4a1104a Mon Sep 17 00:00:00 2001 From: Ross Date: Sat, 22 Jun 2024 09:48:40 +0100 Subject: [PATCH] switch to full name --- rcr/models.py | 10 ++++++++++ rcr/templates/rcr/results.html | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rcr/models.py b/rcr/models.py index 0d977a17..86f4f61f 100644 --- a/rcr/models.py +++ b/rcr/models.py @@ -89,6 +89,16 @@ class Item(models.Model): return ",".join([f"{i.email[:2]}" for i in assessors]) else: return "" + + def get_assessed_by_name(self): + assessors = self.assessed_by.all() + if assessors: + try: + return "
".join([f"{i.first_name} {i.last_name}" for i in assessors]) + except IndexError: + return "
".join([f"{i.email[:2]}" for i in assessors]) + else: + return "" diff --git a/rcr/templates/rcr/results.html b/rcr/templates/rcr/results.html index dd83fd2a..afb55836 100644 --- a/rcr/templates/rcr/results.html +++ b/rcr/templates/rcr/results.html @@ -21,7 +21,7 @@ {{item.specialty}} {{item.name}} {{item.rcr_platform_id}} - {{item.get_assessed_by|safe}} + {{item.get_assessed_by_name|safe}} {{item.outcome}} {{item.outcome_reason}} {{item.outcome_free_text}}