Merge pull request #2733 from carpentries/feature/2262-count-role-occ…

…urrences-instructor-profile Display tasks per role summary in instructor dashboard
carpentries · Jan 8, 2025 · 95640d2 · 95640d2
2 parents f8a9519 + 52ab337
commit 95640d2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/amy/dashboard/views.py b/amy/dashboard/views.py
@@ -137,21 +137,25 @@ def admin_dashboard(request):
 
 @login_required
 def instructor_dashboard(request):
-    qs = Person.objects.select_related("airport").prefetch_related(
-        "badges",
-        "lessons",
-        "domains",
-        "languages",
-        Prefetch(
-            "task_set",
-            queryset=Task.objects.select_related("event", "role").order_by(
-                "event__start", "event__slug"
+    qs = (
+        Person.objects.annotate_with_role_count()  # type: ignore
+        .select_related("airport")
+        .prefetch_related(
+            "badges",
+            "lessons",
+            "domains",
+            "languages",
+            Prefetch(
+                "task_set",
+                queryset=Task.objects.select_related("event", "role").order_by(
+                    "event__start", "event__slug"
+                ),
             ),
-        ),
-        Prefetch(
-            "membershiptask_set",
-            queryset=MembershipTask.objects.select_related("membership", "role"),
-        ),
+            Prefetch(
+                "membershiptask_set",
+                queryset=MembershipTask.objects.select_related("membership", "role"),
+            ),
+        )
     )
     user = get_object_or_404(qs, id=request.user.id)
 

diff --git a/amy/templates/dashboard/instructor_dashboard.html b/amy/templates/dashboard/instructor_dashboard.html
@@ -139,6 +139,18 @@
         {% endif %}
         {% endwith %}
     </td></tr>
+    <tr>
+      <th>Your activity summary:</th>
+      <td>
+        <ul>
+          <li>Instructor: {{ user.num_instructor }} times</li>
+          <li>Trainer: {{ user.num_trainer }} times</li>
+          <li>Supporting Instructor: {{ user.num_supporting }} times</li>
+          <li>Helper: {{ user.num_helper }} times</li>
+          <li>Learner: {{ user.num_learner }} times</li>
+        </ul>
+      </td>
+    </tr>
     {% with membership_tasks=user.membershiptask_set.all %}
     {% if membership_tasks %}
     <tr><th>Your roles in memberships:</th>