Merge branch 'dev' into issue-991-icon-fixes

Author: barrettruth

tcf_website/models/models.py

@@ -966,8 +966,10 @@ def sort(reviews: "QuerySet[Review]", method="") -> "QuerySet[Review]":
                         output_field=fields.FloatField(),
                     )
                 ).order_by("average")
-            case "Most Recent" | _:
+            case "Most Recent":
                 return reviews.order_by("-created")
+            case "Default" | _:
+                return reviews
 
     @staticmethod
     def paginate(reviews: "QuerySet[Review]", page_number, reviews_per_page=10) -> "Page[Review]":

tcf_website/templates/course/course_professor.html

@@ -65,7 +65,7 @@ <h2 class="mr-md-3">{{ course.title }}</h2>
                     <div class="ratings-row">
                         <div class="rating-card">
                             <span class="rating-card-num rating-num">&mdash;</span>
-                            <p class="rating-card-desc"><i class="fa fa-star fa-fw"></i>&nbsp;{{ num_reviews }} {% if num_reviews == 1 %} Rating {% else %} Ratings {% endif %}</p>
+                            <p class="rating-card-desc"><i class="fa fa-star fa-fw"></i>&nbsp;{{ num_ratings }} {% if num_ratings == 1 %} Rating {% else %} Ratings {% endif %}</p>
                         </div>
                         <div class="info-container">
                             <div class="info-row">
@@ -242,7 +242,7 @@ <h2 class="mr-md-3">{{ course.title }}</h2>
             <div class="tab-pane fade show active" id="reviewsTabContent" role="tabpanel" aria-labelledby="reviews-tab">
                 <div class="reviews-container mb-5 mt-3">
                     <div class="reviews-toolbar pb-2 d-flex flex-md-row flex-column justify-content-left justify-content-md-center">
-                        <h3 class="reviews-heading mb-0 mt-1 mr-4">{{ num_reviews }} {% if num_reviews == 1 %} Comment {% else %} Comments {% endif %}</h3>
+                        <h3 class="reviews-heading mb-0 mt-1 mr-4">{{ num_reviews }} {% if num_reviews == 1 %} Review {% else %} Reviews {% endif %}</h3>
                         <div class="reviews-options d-flex flex-sm-row flex-column col p-0">
                             {% if user.is_authenticated %}
                                 <a href="{% url 'new_review' %}?subdept_id={{course.subdepartment.id}}&course_id={{course.id}}&instr_id={{instructor.id}}" class="btn bg-tcf-orange text-white mb-3">

tcf_website/views/browse.py

@@ -6,7 +6,7 @@
 from typing import Any
 
 from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import Avg, CharField, F, Q, Value
+from django.db.models import Avg, CharField, Count, F, Q, Value
 from django.db.models.functions import Concat
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
@@ -182,7 +182,7 @@ def course_view(
     )
 
 
-def course_instructor(request, course_id, instructor_id, method="Most Recent"):
+def course_instructor(request, course_id, instructor_id, method="Default"):
     """View for course instructor page."""
     section_last_taught = (
         Section.objects.filter(course=course_id, instructors=instructor_id)
@@ -194,8 +194,11 @@ def course_instructor(request, course_id, instructor_id, method="Most Recent"):
     course = section_last_taught.course
     instructor = section_last_taught.instructors.get(pk=instructor_id)
 
-    # Find the total number of reviews (with or without text) for the given course
-    num_reviews = Review.objects.filter(instructor=instructor_id, course=course_id).count()
+    # ratings: reviews with and without text; reviews: ratings with text
+    reviews = Review.objects.filter(instructor=instructor_id, course=course_id).aggregate(
+        num_ratings=Count("id"), num_reviews=Count("id", filter=~Q(text=""))
+    )
+    num_reviews, num_ratings = reviews["num_reviews"], reviews["num_ratings"]
 
     dept = course.subdepartment.department
 
@@ -295,6 +298,7 @@ def course_instructor(request, course_id, instructor_id, method="Most Recent"):
             "course_id": course_id,
             "instructor": instructor,
             "semester_last_taught": section_last_taught.semester,
+            "num_ratings": num_ratings,
             "num_reviews": num_reviews,
             "paginated_reviews": paginated_reviews,
             "breadcrumbs": breadcrumbs,