Rename Institution to OrganisationalUnit - #30

Accounts for them to be created to manage e.g. research projects

profiles/admin.py

@@ -7,6 +7,6 @@ from . import models
 admin.site.register(models.User, UserAdmin)
 
 
-@admin.register(models.Institution)
-class InstitutionAdmin(admin.ModelAdmin):
+@admin.register(models.OrganisationalUnit)
+class OrganisationalUnitAdmin(admin.ModelAdmin):
     pass

profiles/migrations/0003_rename_institution.py

+# Generated by Django 2.0.8 on 2018-11-15 09:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('profiles', '0002_add_institution'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Institution',
+            new_name='OrganisationalUnit',
+        ),
+        migrations.RenameField(
+            model_name='user',
+            old_name='institution',
+            new_name='organisational_unit',
+        ),
+    ]

profiles/models.py

@@ -7,12 +7,12 @@ from django.urls import reverse
 from core.models import MAX_LENGTH_NAME
 
 
-class Institution(models.Model):
+class OrganisationalUnit(models.Model):
     """
-    Model representing the institution with which a user is associated.
+    Model representing the organisational unit with which a user is associated.
     """
     @enum.unique
-    class InstitutionType(enum.Enum):
+    class OrganisationalUnitType(enum.Enum):
         ACADEMIC = 'aca'
         BUSINESS = 'bus'
         CHARITY = 'cha'
@@ -23,18 +23,24 @@ class Institution(models.Model):
         def choices(cls):
             return tuple((i.value, i.name.title()) for i in cls)
 
-    #: Name of the institution
+    #: Name of the organisational unit
     name = models.CharField(max_length=MAX_LENGTH_NAME,
                             blank=False, null=False)
 
-    #: Type of institution - e.g. academic, business, etc.
+    #: Type of organisational_unit - e.g. academic, business, etc.
     type = models.CharField(max_length=3,
-                            choices=InstitutionType.choices(),
+                            choices=OrganisationalUnitType.choices(),
                             blank=False, null=False)
 
+    @property
+    def all_auditors(self):
+        return self.auditors.union(
+            User.objects.filter(is_superauditor=True)
+        )
+
     @property
     def auditors(self):
-        return self.users.filter(is_auditor=True) + User.objects.filter(is_superauditor=True)
+        return self.users.filter(is_auditor=True)
 
     def __str__(self):
         return self.name
@@ -44,12 +50,12 @@ class User(AbstractUser):
     """
     Model representing a user of PEDASI.
     """
-    #: Institution to which this user belongs
-    institution = models.ForeignKey(Institution, related_name='users',
+    #: Organisational unit to which this user belongs
+    organisational_unit = models.ForeignKey(OrganisationalUnit, related_name='users',
                                             on_delete=models.SET_NULL,
                                             blank=True, null=True)
 
-    #: Is this user an auditor of their institution?
+    #: Is this user an auditor of their organisational unit?
     is_auditor = models.BooleanField(default=False,
                                      blank=False, null=False)
 

profiles/templates/profiles/institution/detail.html → profiles/templates/profiles/organisational_unit/detail.html

@@ -8,14 +8,32 @@
                 <a href="{% url 'index' %}">Home</a>
             </li>
             <li class="breadcrumb-item" aria-current="page">
-                Institutions
+                Organisational Units
             </li>
             <li class="breadcrumb-item active" aria-current="page">
-                {{ institution.name }}
+                {{ organisational_unit.name }}
             </li>
         </ol>
     </nav>
 
-    <h2>{{ institution.name }}</h2>
+    <h2>{{ organisational_unit.name }}</h2>
+
+    <h4 class="pt-3">Auditors</h4>
+
+    <table class="table">
+        <thead>
+            <tr>
+                <th scope="col">Name</th>
+            </tr>
+        </thead>
+
+        <tbody>
+            {% for auditor in organisational_unit.auditors.all %}
+                <tr>
+                    <td>{{ auditor.get_full_name }}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 
 {% endblock %}
\ No newline at end of file

profiles/templates/profiles/user/profile.html

@@ -22,12 +22,12 @@
         </thead>
 
         <tbody>
-        {% if request.user.institution %}
+        {% if request.user.organisational_unit %}
             <tr>
-                <td>Institution</td>
+                <td>Organisational Unit</td>
                 <td>
-                    {{ request.user.institution.name }}
-                    <a href="{% url 'profiles:institution.detail' pk=request.user.institution_id %}"
+                    {{ request.user.organisational_unit.name }}
+                    <a href="{% url 'profiles:organisational_unit.detail' pk=request.user.organisational_unit_id %}"
                        class="btn btn-info">Detail</a>
                 </td>
             </tr>

profiles/urls.py

@@ -19,7 +19,7 @@ urlpatterns = [
          views.user.UserUriView.as_view(),
          name='uri'),
 
-    path('institutions/<int:pk>',
-         views.institution.InstitutionDetailView.as_view(),
-         name='institution.detail'),
+    path('orgunit/<int:pk>',
+         views.organisational_unit.OrganisationalUnitDetailView.as_view(),
+         name='organisational_unit.detail'),
 ]

profiles/views/__init__.py

@@ -3,9 +3,9 @@ from django.views.generic import TemplateView
 from applications.models import Application
 from datasources.models import DataSource
 
-from . import institution, user
+from . import organisational_unit, user
 
-__all__ = ['IndexView', 'institution', 'user']
+__all__ = ['IndexView', 'organisational_unit', 'user']
 
 
 class IndexView(TemplateView):

profiles/views/institution.py

-from django.views.generic.detail import DetailView
-
-from profiles import models
-
-
-class InstitutionDetailView(DetailView):
-    model = models.Institution
-    template_name = 'profiles/institution/detail.html'
-    context_object_name = 'institution'

profiles/views/organisational_unit.py

+from django.views.generic.detail import DetailView
+
+from profiles import models
+
+
+class OrganisationalUnitDetailView(DetailView):
+    model = models.OrganisationalUnit
+    template_name = 'profiles/organisational_unit/detail.html'
+    context_object_name = 'organisational_unit'