Further candidate management improvements

generic/templates/generic/ciduser_form.html

@@ -6,33 +6,46 @@
 {% block css %}
 {% endblock %}
 {% block js %}
-<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
-{{form.media}}
+    <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
+    {{form.media}}
 
-<script type="text/javascript">
-</script>
+    <script type="text/javascript">
+    </script>
 
-<!-- {{ form.media }} -->
+    <!-- {{ form.media }} -->
 {% endblock %}
 {% block content %}
-<h2>Edit CID User / {{ciduser.cid}}</h2>
-Use this form to edit a CID user.
-<form action="" method="post" enctype="multipart/form-data" id="condition-form">
-    {% csrf_token %}
+    <h2>Edit CID User / {{ciduser.cid}}</h2>
+    Use this form to edit a CID user.
+    <form action="" method="post" enctype="multipart/form-data" id="condition-form">
+        {% csrf_token %}
 
         {{ form|crispy }}
-    <input type="submit" class="submit-button" value="Submit" name="submit">
-</form>
+        <input type="submit" class="submit-button" value="Submit" name="submit">
+    </form>
 
-<h2>Exams</h2>
-<p>The user is currently part of the following exams</p>
+    <h2>Exams</h2>
+    <p>The user is currently part of the following exams</p>
 
-<p>
-{{ object.get_cid_exams }}
-</p>
+    <p>
+        {% with object.get_cid_exams as exam_map %}
+            {% for exam_type, exams in exam_map.items %}
+                <h4>{{exam_type}}</h4>
+                <ul>
+                    {% for exam in exams %}
+                        <li>
+                            <a href="{{exam.get_absolute_url}}">{{exam}}</a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% empty %}
+                No exams.
+            {% endfor %}
+        {% endwith %}
+    </p>
 
-<p>
-These should be edited via the exam candidate page. If you need to manually toggle you can do so <a href="{% url 'generic:update_cid_exams' object.pk %}">here</a> (you shouldn't)
-</p>
+    <p>
+        These should be edited via the exam candidate page. If you need to manually toggle you can do so <a href="{% url 'generic:update_cid_exams' object.pk %}">here</a> (you shouldn't)
+    </p>
 
 {% endblock %}

generic/templates/generic/user_group_view.html

@@ -6,7 +6,7 @@
     <a href="{% url 'generic:user_group_create' %}">Create new group</a>
     </p>
     {% for group in groups %}
-        <p>{{group.name}} 
+        <p><a href="{% url 'generic:user_group_detail' group.pk %}"><h4>{{group.name}}</h4></a>
 {% comment %}             <button class="small-url-button" data-url="{% url 'generic:group_email' pk=group.pk %}
             ">Email candidate details</button>
             <button class="small-url-button" data-url="{% url 'generic:group_email_resend' pk=group.pk %}

generic/templates/generic/user_group_view_detail.html

@@ -0,0 +1,43 @@
+{% extends 'generic/base.html' %}
+
+{% block content %}
+    <h2>Group: {{group.name}}</h2>
+
+    <h3>Users</h3>
+    <p>Count: {{users|length}}</p>
+
+    {% if users %}
+        <table>
+            <thead>
+                <tr><th>User</th></tr>
+            </thead>
+            {% for user in users %}
+                <tr><td>{{user.username}}</td></tr>
+            {% endfor %}
+        </table>
+    {% else %}
+        This group has no users.
+    {% endif %}
+    <h3>Exams</h3>
+    The group is currently associated with the following exams
+    {% with group.GetGroupExams as exam_map %}
+        {% for key, value in exam_map.items %}
+            <h4>{{key}}</h4>
+            <ul>
+                {% for exam in value %}
+                    <li>
+                        <a href="{{exam.get_absolute_url}}">{{exam}}</a>
+                    </li>
+                {% endfor %}
+            </ul>
+        {% endfor %}
+    {% endwith %}
+
+{% endblock %}
+
+{% block js %}
+
+    <style>
+        td, th { padding-left: 10px }
+    </style>
+{% endblock %}