From c96e3ee2f96d9b3568da85f9f2b5fa155834a849 Mon Sep 17 00:00:00 2001
From: Anand Chitipothu <anandology@gmail.com>
Date: Thu, 2 Dec 2021 10:36:17 +0530
Subject: [PATCH] feat: show counts on cohort listing and view pages

Issue #271
---
 school/lms/doctype/cohort/cohort.py | 28 ++++++++++++++-------
 school/www/cohorts/cohort.html      |  9 +++++++
 school/www/cohorts/cohort.py        |  2 +-
 school/www/cohorts/index.html       | 38 ++++++++++++++++-------------
 school/www/cohorts/subgroup.py      |  2 +-
 5 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/school/lms/doctype/cohort/cohort.py b/school/lms/doctype/cohort/cohort.py
index 6dbec93d..c2ace214 100644
--- a/school/lms/doctype/cohort/cohort.py
+++ b/school/lms/doctype/cohort/cohort.py
@@ -16,21 +16,31 @@ class Cohort(Document):
         if include_counts:
             mentors = self._get_subgroup_counts("Cohort Mentor")
             students = self._get_subgroup_counts("LMS Batch Membership")
-            join_requests = self._get_subgroup_counts("Cohort Join Request")
+            join_requests = self._get_subgroup_counts("Cohort Join Request", status="Pending")
             for s in subgroups:
                 s.num_mentors = mentors.get(s.name, 0)
                 s.num_students = students.get(s.name, 0)
                 s.num_join_requests = join_requests.get(s.name, 0)
         return subgroups
 
-    def _get_subgroup_counts(self, doctype):
-        q = f"""
-            SELECT subgroup, count(*) as count
-            FROM `tab{doctype}`
-            WHERE cohort = %(cohort)s
-            GROUP BY subgroup"""
-        rows = frappe.db.sql(q, values={"cohort": self.name})
-        return {subgroup: count for subgroup, count in rows}
+    def _get_subgroup_counts(self, doctype, **kw):
+        rows = frappe.get_list(doctype,
+            filters={"cohort": self.name, **kw},
+            fields=['subgroup', 'count(*) as count'],
+            group_by='subgroup')
+        return {row['subgroup']: row['count'] for row in rows}
+
+    def _get_count(self, doctype, **kw):
+        filters = {"cohort": self.name, **kw}
+        return frappe.db.count(doctype, filters=filters)
+
+    def get_stats(self):
+        return {
+            "subgroups": self._get_count("Cohort Subgroup"),
+            "mentors": self._get_count("Cohort Mentor"),
+            "students": self._get_count("LMS Batch Membership"),
+            "join_requests": self._get_count("Cohort Join Request", status="Pending"),
+        }
 
     def get_subgroup(self, slug):
         q = dict(cohort=self.name, slug=slug)
diff --git a/school/www/cohorts/cohort.html b/school/www/cohorts/cohort.html
index 761a8406..e8c17abd 100644
--- a/school/www/cohorts/cohort.html
+++ b/school/www/cohorts/cohort.html
@@ -4,6 +4,15 @@
 {% block page_content %}
 <h2>{{cohort.title}} <span class="badge badge-secondary">Cohort</span></h2>
 
+<p>
+  {% set stats = cohort.get_stats() %}
+
+  {{ stats.subgroups }} Subgroups
+  | {{ stats.mentors }} Mentors
+  | {{ stats.students }} students
+  | {{ stats.join_requests }} join requests
+</p>
+
 <h5>Subgroups</h5>
 <ul class="list-group">
   {% for sg in cohort.get_subgroups(include_counts=True) %}
diff --git a/school/www/cohorts/cohort.py b/school/www/cohorts/cohort.py
index da120492..54fb17af 100644
--- a/school/www/cohorts/cohort.py
+++ b/school/www/cohorts/cohort.py
@@ -16,7 +16,7 @@ def get_context(context):
 
     utils.add_nav(context, "All Courses", "/courses")
     utils.add_nav(context, course.title, "/courses/" + course.name)
-    utils.add_nav(context, "Cohorts", "/courses/" + course.name + "/cohorts")
+    utils.add_nav(context, "Cohorts", "/courses/" + course.name + "/manage")
 
     context.course = course
     context.cohort = cohort
diff --git a/school/www/cohorts/index.html b/school/www/cohorts/index.html
index dcb4c5d8..68009df8 100644
--- a/school/www/cohorts/index.html
+++ b/school/www/cohorts/index.html
@@ -2,23 +2,19 @@
 {% block title %}Manage {{ course.title  }}{% endblock %}
 
 {% block page_content %}
-<div class="common-page-style">
-  <div class="container">
-    {% if cohorts %}
-      <h2>Cohorts</h2>
-      <div class="row">
-      {% for cohort in cohorts %}
-        <div class="col-md-4">
-        {{ render_cohort(course, cohort) }}
-        </div>
-      {% endfor %}
-    {% else %}
-        <h2>Permission Denied</h2>
-        <p>You don't have permission to manage this course.</p>
-    {% endif %}
-   </div>
-  </div>
-</div>
+  {% if cohorts %}
+    <h2>Cohorts</h2>
+    <div class="row">
+    {% for cohort in cohorts %}
+      <div class="col-md-6">
+      {{ render_cohort(course, cohort) }}
+      </div>
+    {% endfor %}
+    </div>
+  {% else %}
+      <h2>Permission Denied</h2>
+      <p>You don't have permission to manage this course.</p>
+  {% endif %}
 {% endblock %}
 
 {% macro render_cohort(course, cohort) %}
@@ -26,6 +22,14 @@
   <div class="card-body">
     <h5 class="card-title">{{cohort.title}}</h5>
     <h6 class="card-subtitle mb-2 text-muted">{{cohort.begin_date}} - {{cohort.end_date}}</h6>
+    <p>
+      {% set stats = cohort.get_stats() %}
+
+      {{ stats.subgroups }} Subgroups
+      | {{ stats.mentors }} Mentors
+      | {{ stats.students }} students
+      | {{ stats.join_requests }} join requests
+    </p>
 
     <a href="/courses/{{course.name}}/cohorts/{{cohort.slug}}" class="card-link">Manage</a>
   </div>
diff --git a/school/www/cohorts/subgroup.py b/school/www/cohorts/subgroup.py
index b8b1c894..7a4794b1 100644
--- a/school/www/cohorts/subgroup.py
+++ b/school/www/cohorts/subgroup.py
@@ -17,7 +17,7 @@ def get_context(context):
 
     utils.add_nav(context, "All Courses", "/courses")
     utils.add_nav(context, course.title, f"/courses/{course.name}")
-    utils.add_nav(context, "Cohorts", f"/courses/{course.name}/cohorts")
+    utils.add_nav(context, "Cohorts", f"/courses/{course.name}/manage")
     utils.add_nav(context, cohort.title, f"/courses/{course.name}/cohorts/{cohort.slug}")
 
     context.course = course