More improvements to user management

generic/templates/generic/exam_cids.html

@@ -9,7 +9,7 @@
 
             <li><a href="{% url 'generic:update_cid' cid.pk %}">{{cid.cid}}</a> [{{cid.passcode}}] {{cid.name}} /
                 Email: {{cid.email}}
-                {% if cid.supervisor_email %} / Supervisor email: {{cid.supervisor_email}}{% endif %} <br />
+                {% if cid.supervisor %} / Supervisor email: {{cid.supervisor.email}}{% endif %} <br />
                 Internal candidate: {{cid.internal_candidate}}
                 {% if cid.login_email_sent %} / Login email sent{% endif %}
                 {% if cid.results_email_sent %} / Results email sent{% endif %}

generic/templates/generic/group_emailed.html

@@ -13,7 +13,7 @@
                 {% else %}
                     data-posturl='{{user.get_email_details_url}}'
                 {% endif %}
-            >{{user.cid}}/{{user.name}}: {{user.email}} [{{user.supervisor_email}}] </li>
+            >{{user.cid}}/{{user.name}}: {{user.email}} [{{user.supervisor.email}}] </li>
         {% endfor %}
     </ul>
 

generic/templates/generic/user_creation_form.html

@@ -14,7 +14,7 @@
 {% endblock %}
 {% block content %}
 <h2>Edit User / {{ciduser.cid}}</h2>
-Use this form to create a user.
+Use this form to create a user. Only existing supervisors can be added (create it first or add it later if it does not exist).
 {% if errors %}
     <div class="alert alert-info" role="alert">{{errors}}</a></div>
 {% endif %}

generic/templates/generic/user_view.html

@@ -0,0 +1,31 @@
+{% extends 'generic/base.html' %}
+
+{% load render_table from django_tables2 %}
+{% block css %}
+{% endblock %}
+
+{% block content %}
+
+    <div id="view-filter-options">
+    <details class="filter">
+        <summary>
+        <h3>Filter Users </h3>
+        </summary>
+        <form action="" method="get">
+            {{ filter.form }}
+            <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
+        </form>
+    </details>
+    </div>
+
+    <div>
+        <span id="manage-span">
+            {% render_table table %}
+        </span>
+    </div>
+
+    <a href="{% url 'accounts_bulk_create' %}">Bulk create users</a>
+    <a href="{% url 'create_user' %}">Create single user</a>
+
+
+{% endblock %}