Merge branch 'feature/238_add_role_column_worker_list' into 'master'

added role column to worker list. Issue #238

See merge request NCER-PD/scheduling-system!162

smash/web/models/worker.py

@@ -7,7 +7,7 @@ from django.db import models
 
 from web.models.constants import GLOBAL_STUDY_ID, COUNTRY_OTHER_ID
 from web.models.worker_study_role import STUDY_ROLE_CHOICES, HEALTH_PARTNER_ROLE_CHOICES, \
-    VOUCHER_PARTNER_ROLE_CHOICES, WORKER_STAFF, WORKER_HEALTH_PARTNER, WORKER_VOUCHER_PARTNER
+    VOUCHER_PARTNER_ROLE_CHOICES, WORKER_STAFF, WORKER_HEALTH_PARTNER, WORKER_VOUCHER_PARTNER, ROLE_CHOICES
 
 logger = logging.getLogger(__name__)
 
@@ -161,6 +161,16 @@ 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
+        if role not in [role_type for role_type, _ in ROLE_CHOICES]:
+            raise TypeError("Unknown worker role")
+        return role
+
     @staticmethod
     def get_by_user(the_user):
         if isinstance(the_user, User):

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 %}

smash/web/tests/models/test_worker.py

@@ -91,3 +91,29 @@ class WorkerModelTests(TestCase):
         worker.roles.update(role="unk")
         with self.assertRaises(Exception):
             worker_type_by_worker(worker)
+
+    #worker role tests
+
+    def test_worker_role_by_worker_without_role(self):
+        self.assertEqual(WORKER_STAFF, Worker().role)
+
+    def test_worker_role_by_worker_with_secretary_role(self):
+        worker = create_worker()
+        worker.roles.update(role=ROLE_CHOICES_SECRETARY)
+        self.assertEqual(ROLE_CHOICES_SECRETARY, worker.role)
+
+    def test_worker_role_by_worker_with_health_partner_role(self):
+        worker = create_worker()
+        worker.roles.update(role=ROLE_CHOICES_HEALTH_PARTNER)
+        self.assertEqual(ROLE_CHOICES_HEALTH_PARTNER, worker.role)
+
+    def test_worker_role_by_worker_with_voucher_partner_role(self):
+        worker = create_worker()
+        worker.roles.update(role=ROLE_CHOICES_VOUCHER_PARTNER)
+        self.assertEqual(ROLE_CHOICES_VOUCHER_PARTNER, worker.role)
+
+    def test_worker_role_by_worker_with_invalid_role(self):
+        worker = create_worker()
+        worker.roles.update(role="unk")
+        with self.assertRaises(Exception):
+            worker.role