clean up

generic/templates/generic/base.html

@@ -21,6 +21,7 @@
         <a href="{% url 'generic:manage_cid_exams' %}">Cids (exams)</a> /
         <a href="{% url 'generic:cid_group_view' %}">Cid Groups</a> /
         <a href="{% url 'generic:user_group_view' %}">User Groups</a> /
+        <a href="{% url 'accounts_list' %}">Manage Users</a> /
 
     {% endif %}
 {% endblock %}

generic/templates/generic/cid_group_view.html

@@ -7,22 +7,24 @@
     </p>
     {% for group in groups %}
         <p>{{group.name}} 
-            <button class="url-button" data-url="{% url 'generic:group_email' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:group_email' pk=group.pk %}
             ">Email candidate details</button>
-            <button class="url-button" data-url="{% url 'generic:group_email_resend' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:group_email_resend' pk=group.pk %}
                 ">Resend candidate details</button>
-            <button class="url-button" data-url="{% url 'generic:group_email_results' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:group_email_results' pk=group.pk %}
             ">Email candidate results</button>
-            <button class="url-button" data-url="{% url 'generic:group_email_results_resend' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:group_email_results_resend' pk=group.pk %}
             ">Resend candidate results</button>
-            <button class="url-button" data-url="{% url 'generic:cid_group_update' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:cid_group_update' pk=group.pk %}
             ">Edit</button>
+            <button class="small-url-button" data-url="{% url 'generic:cid_group_delete' pk=group.pk %}
+            ">Delete</button>
         </p>
     {% endfor %}
 
     <script type="text/javascript">
 
-        $(".url-button").click((evt) => {
+        $(".small-url-button").click((evt) => {
             window.location = evt.currentTarget.dataset.url;
         })
 

generic/templates/generic/cidusergroup_form.html

@@ -13,8 +13,13 @@
 <!-- {{ form.media }} -->
 {% endblock %}
 {% block content %}
-<h2>Add / Edit Group / {{cidusergroup.name}}</h2>
-Use this form to create / edit a CID user group.
+    {% if form.instance.id %}
+        <h2>Edit Group: {{cidusergroup.name}}</h2>
+        Use this form to edit a CID user group.
+    {% else %}
+        <h2>Add New Group</h2>
+        Use this form to create a CID user group.
+    {% endif %}
 <form action="" method="post" enctype="multipart/form-data" id="condition-form">
     {% csrf_token %}
 
@@ -25,7 +30,12 @@ Use this form to create / edit a CID user group.
 
     <h3>Users</h3>
 
+    {% if cidusergroup.GetGroupUsers %}
     {{cidusergroup.GetGroupUsers}}
+    {% else %}
+    No users currently added to group.
+    {% endif %}
+    
 
 </form>
 {% endblock %}

generic/templates/generic/exam_index.html

@@ -0,0 +1,25 @@
+{% extends app_name|add:'/base.html' %}
+
+{% block content %}
+    <details>
+        <summary>
+            Filter exam list
+        </summary>
+        <form method="get">
+            {{ filter.form.as_p }}
+            <input type="submit" />
+        </form>
+    </details>
+    <h4>{{filter.qs|length}} exams found.</h4>
+    {% for exam in filter.qs %}
+        <div class="">
+            <h1><a href="{% url app_name|add:':exam_overview' pk=exam.pk %}">Exam: {{ exam.name }} </a></h1>
+            {% if exam.exam_mode %}
+                {% if app_name in "rapids longs anatomy physics" %}
+                    {% if request.user.is_staff %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}">Mark answers</a>{% endif %}
+                {% endif %}
+                {% if request.user.is_staff %}<a href="{% url app_name|add:':exam_scores_cid' pk=exam.pk %}">Scores</a>{% endif %}
+            {% endif %}
+        </div>
+    {% endfor %}
+{% endblock %}

generic/templates/generic/user_group_view.html

@@ -7,22 +7,24 @@
     </p>
     {% for group in groups %}
         <p>{{group.name}} 
-{% comment %}             <button class="url-button" data-url="{% url 'generic:group_email' pk=group.pk %}
+{% comment %}             <button class="small-url-button" data-url="{% url 'generic:group_email' pk=group.pk %}
             ">Email candidate details</button>
-            <button class="url-button" data-url="{% url 'generic:group_email_resend' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:group_email_resend' pk=group.pk %}
                 ">Resend candidate details</button>
-            <button class="url-button" data-url="{% url 'generic:group_email_results' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:group_email_results' pk=group.pk %}
             ">Email candidate results</button>
-            <button class="url-button" data-url="{% url 'generic:group_email_results_resend' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:group_email_results_resend' pk=group.pk %}
             ">Resend candidate results</button> {% endcomment %}
-            <button class="url-button" data-url="{% url 'generic:user_group_update' pk=group.pk %}
+            <button class="small-url-button" data-url="{% url 'generic:user_group_update' pk=group.pk %}
             ">Edit</button>
+            <button class="small-url-button" data-url="{% url 'generic:user_group_delete' pk=group.pk %}
+            ">Delete</button>
         </p>
     {% endfor %}
 
     <script type="text/javascript">
 
-        $(".url-button").click((evt) => {
+        $(".small-url-button").click((evt) => {
             window.location = evt.currentTarget.dataset.url;
         })
 

generic/templates/generic/userusergroup_form.html

@@ -4,28 +4,43 @@
 {% 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>Add / Edit Group / {{userusergroup.name}}</h2>
-Use this form to create / edit a CID user group.
-<form action="" method="post" enctype="multipart/form-data" id="condition-form">
-    {% csrf_token %}
+    {% if form.instance.id %}
+        <h2>Edit Group: {{userusergroup.name}}</h2>
+    {% else %}
+        <h2>Add New Group</h2>
+    {% endif %}
+    Use this form to create / edit a CID user group.
+    <form action="" method="post" enctype="multipart/form-data" id="condition-form">
+        {% csrf_token %}
 
-    <table>
-        {{ form.as_table }}
-    </table>
-    <input type="submit" class="submit-button" value="Submit" name="submit">
+        <table>
+            {{ form.as_table }}
+        </table>
+        <input type="submit" class="submit-button" value="Submit" name="submit">
 
-    <h3>Users</h3>
+        <h3>Users</h3>
 
-    {{userusergroup.GetGroupUsers}}
+        <ul>
+            {% for user in userusergroup.users.all %}
+                <li>{{user}}</li>{% empty %}
+                <li>Group currently has no users.</li>
+            {% endfor %}
+        </ul>
 
-</form>
+        {% comment %}         {% if userusergroup.users.all %}
+            {{userusergroup.GetGroupUsers}}
+        {% else %}
+            No users currently added to group.
+        {% endif %} {% endcomment %}
+
+    </form>
 {% endblock %}