Merge pull request #238 from hltcoe/improve_admin_stats_pages

Improve admin stats pages

Author: cash

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Upgraded to Django 4.2
  - Made the main batch table sortable
  - Updated documentation on the API including the client
+ - Updated theme for admin stats pages
 ### Added
  - QuickStart guide for setting up a server
  - TURKLE_AUTO_ACCPET_DEFAULT setting

turkle/admin.py

@@ -523,7 +523,10 @@ def batch_stats(self, request, batch_id):
             mean_work_time = 'N/A'
             median_work_time = 'N/A'
 
-        return render(request, 'admin/turkle/batch_stats.html', {
+        context = admin.site.each_context(request)
+        context['title'] = f'Stats for Batch: {batch.name}'
+
+        context.update({
             'batch': batch,
             'batch_total_work_time': total_work_time,
             'batch_mean_work_time': mean_work_time,
@@ -534,6 +537,8 @@ def batch_stats(self, request, batch_id):
             'stats_users': stats_users,
         })
 
+        return render(request, 'admin/turkle/batch_stats.html', context)
+
     def cancel_batch(self, request, batch_id):
         try:
             batch = Batch.objects.get(id=batch_id)
@@ -1111,7 +1116,10 @@ def project_stats(self, request, project_id):
             mean_work_time = 'N/A'
             median_work_time = 'N/A'
 
-        return render(request, 'admin/turkle/project_stats.html', {
+        context = admin.site.each_context(request)
+        context['title'] = f'Stats for Project: {project.name}'
+
+        context.update({
             'project': project,
             'project_total_completed_assignments': len(tasks),
             'project_total_completed_assignments_1_day': tca_1_day,
@@ -1131,6 +1139,8 @@ def project_stats(self, request, project_id):
             'uncompleted_tas_inactive_batches': uncompleted_tas_inactive_batches,
         })
 
+        return render(request, 'admin/turkle/project_stats.html', context)
+
     def publish_tasks(self, instance):
         publish_tasks_url = '%s?project=%d' % (
             reverse('admin:turkle_batch_add'),

turkle/templates/admin/base_bootcamp.html

@@ -0,0 +1,12 @@
+{% extends "admin/base_site.html" %}
+{% load static %}
+
+{% block extrahead %}
+  {{ block.super }}
+  <script type="text/javascript" src="{% static 'turkle/jquery-3.3.1.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'turkle/datatables/datatables.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'turkle/d3-3.5.17.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'turkle/cal-heatmap-3.6.2.min.js' %}"></script>
+  <link href="{% static 'turkle/datatables/datatables.bootstrap4.min.css' %}" rel="stylesheet" type="text/css"/>
+  <link href="{% static 'turkle/cal-heatmap.css' %}" rel="stylesheet" type="text/css"/>
+{% endblock %}

turkle/templates/admin/stats.html

@@ -1,13 +1,8 @@
-{% extends "admin/base_bootcamp.html" %}
+{% extends "admin/stats.html" %}
 {% load static %}
 
-{% block header %}
-<script type="text/javascript" src="{% static 'turkle/jquery-3.3.1.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'turkle/datatables/datatables.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'turkle/d3-3.5.17.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'turkle/cal-heatmap-3.6.2.min.js' %}"></script>
-<link href="{% static 'turkle/datatables/datatables.bootstrap4.min.css' %}" rel="stylesheet" type="text/css"/>
-<link href="{% static 'turkle/cal-heatmap.css' %}" rel="stylesheet" type="text/css"/>
+{% block extrahead %}
+  {{ block.super }}
 <style>
 #activity-calendar-container {
   margin-bottom: 1em;
@@ -54,14 +49,18 @@
 </script>
 {% endblock %}
 
-{% block body %}
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">Home</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label='turkle' %}">Turkle</a>
+&rsaquo; <a href="{% url 'admin:turkle_batch_changelist' %}">Batches</a>
+&rsaquo; Stats
+</div>
+{% endblock %}
 
+{% block content %}
 <div class="container mt-2">
 
-  {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
-
-  <h2>Batch Statistics</h2>
-
   <div>
     <table class="table table-sm table-bordered thead-light">
       <tr>
@@ -129,12 +128,6 @@ <h2>Batch Statistics</h2>
         <th>Median Time / Assignment</th>
         <td>{{ batch_median_work_time}}</td>
       </tr>
-      <!--
-      <tr>
-        <th></th>
-        <td></td>
-      </tr>
-      -->
     </table>
   </div>
 

turkle/templates/admin/turkle/batch_stats.html

@@ -1,13 +1,8 @@
-{% extends "admin/base_bootcamp.html" %}
+{% extends "admin/stats.html" %}
 {% load static %}
 
-{% block header %}
-<script type="text/javascript" src="{% static 'turkle/jquery-3.3.1.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'turkle/datatables/datatables.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'turkle/d3-3.5.17.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'turkle/cal-heatmap-3.6.2.min.js' %}"></script>
-<link href="{% static 'turkle/datatables/datatables.bootstrap4.min.css' %}" rel="stylesheet" type="text/css"/>
-<link href="{% static 'turkle/cal-heatmap.css' %}" rel="stylesheet" type="text/css"/>
+{% block extrahead %}
+  {{ block.super }}
 <style>
 .substat td {
   padding-left: 2em;
@@ -58,14 +53,18 @@
 </script>
 {% endblock %}
 
-{% block body %}
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">Home</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label='turkle' %}">Turkle</a>
+&rsaquo; <a href="{% url 'admin:turkle_project_changelist' %}">Projects</a>
+&rsaquo; Stats
+</div>
+{% endblock %}
 
+{% block content %}
 <div class="container mt-2">
 
-  {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
-
-  <h2>Project Statistics</h2>
-
   <div>
     <table class="table table-sm table-bordered thead-light">
       <tr>