From 574315a64f91309805cd7655360d0f082f3cb1ab Mon Sep 17 00:00:00 2001
From: Carlos Vega <carlos.vega@.uni.lu>
Date: Fri, 21 Sep 2018 11:07:34 +0200
Subject: [PATCH] added role column to worker list. Issue #238
---
smash/web/models/worker.py | 8 ++++++++
smash/web/templates/doctors/index.html | 2 ++
2 files changed, 10 insertions(+)
diff --git a/smash/web/models/worker.py b/smash/web/models/worker.py
index c631fd4e..daadd9c6 100644
--- a/smash/web/models/worker.py
+++ b/smash/web/models/worker.py
@@ -161,6 +161,14 @@ class Worker(models.Model):
else:
return False
+ @property
+ def role(self):
+ roles = self.roles.filter(study=GLOBAL_STUDY_ID)
+ if roles.count() == 0:
+ return WORKER_STAFF
+ role = roles[0].role
+ return role
+
@staticmethod
def get_by_user(the_user):
if isinstance(the_user, User):
diff --git a/smash/web/templates/doctors/index.html b/smash/web/templates/doctors/index.html
index 6960412e..93d2bf58 100644
--- a/smash/web/templates/doctors/index.html
+++ b/smash/web/templates/doctors/index.html
@@ -38,6 +38,7 @@
<th>First name</th>
<th>Last name</th>
<th>Unit</th>
+ <th>Role</th>
{% else %}
<th>Name</th>
{% endif %}
@@ -57,6 +58,7 @@
<td>{{ worker.first_name }}</td>
<td>{{ worker.last_name }}</td>
<td>{{ worker.unit }}</td>
+ <td>{{ worker.role }}</td>
{% else %}
<td>{{ worker.name }}</td>
{% endif %}
--
GitLab