Merge pull request #1107 from thecourseforum/sb_fix_partial_credits

fix: server 500 on partial credits for schedules

Author: kmd2zjw

tcf_website/models/models.py

@@ -2,6 +2,7 @@
 """TCF Database models."""
 
 import math
+from decimal import Decimal
 
 from django.contrib.auth.models import AbstractUser
 from django.contrib.postgres.aggregates.general import ArrayAgg
@@ -1522,7 +1523,11 @@ def get_schedule(self):
         ret = [0] * 5  # intialize return array for the schedule, which will have 5 fields
         ret[0] = courses  # list of courses in the schedule
         # pylint: disable=not-an-iterable
-        ret[1] = sum(int(course.section.units) for course in ret[0])  # total amount of credits
+        ret[1] = sum(
+            Decimal(course.section.units)
+            for course in ret[0]
+            if course.section.units
+        )
         ret[2] = (
             self.average_rating_for_schedule()
         )  # average rating for the courses in this schedule
@@ -1533,7 +1538,7 @@ def get_schedule(self):
         # calculate weighted gpa based on credits
         for course in courses:
             course_gpa = course.gpa
-            course_credits = course.credits if course.credits else 0
+            course_credits = float(course.credits) if course.credits else 0.0
 
             if not course_gpa:
                 continue  # pass a given course if there is no gpa for it
@@ -1555,7 +1560,7 @@ def get_scheduled_courses(self):
         queryset = (
             self.scheduledcourse_set.select_related("section", "instructor")
             .annotate(
-                credits=Cast("section__units", output_field=models.IntegerField()),
+                credits=Cast("section__units", output_field=models.DecimalField(max_digits=3, decimal_places=2)),
                 avg_recommendability=Coalesce(
                     models.Avg(
                         "section__course__review__recommendability",

tcf_website/templates/schedule/schedule.html

@@ -117,7 +117,7 @@ <h6>{{ course.instructor|remove_email }}</h6>
                                         <i class="fas fa-clock"></i>&nbsp;Units
                                       </small>
                                       <p class="mb-0 info text-break">
-                                        {% if course.credits %}
+                                        {% if course.credits and course.credits != 0.0 %}
                                         {{ course.credits }}
                                         {% else %}
                                         &mdash;
@@ -180,7 +180,7 @@ <h6>{{ course.instructor|remove_email }}</h6>
       let courses = this_schedule.querySelectorAll('.schedule_course_card');
       courses.forEach(course => {
           let courseRating = parseFloat(course.getAttribute("course_rating"));
-          let courseCredits = parseInt(course.getAttribute("course_credits"));
+          let courseCredits = parseFloat(course.getAttribute("course_credits"));
           let courseDifficulty = parseFloat(course.getAttribute("course_diff"));
           let courseGpa = parseFloat(course.getAttribute("course_gpa"));
           if (!isNaN(courseRating) || courseRating == 0) {
@@ -202,11 +202,12 @@ <h6>{{ course.instructor|remove_email }}</h6>
        let final_gpa = gpa_credits ? (cumulative_grade_point / gpa_credits).toFixed(2) : "\u2014";
        let final_rating = r_count ? (rating / r_count).toFixed(2) : "\u2014";
        let final_difficulty = d_count ? (difficulty / d_count).toFixed(2) : "\u2014";
+       let final_credit = credit ? (credit).toFixed(2) : "\u2014";
 
       this_schedule.querySelector('#ScheduleGPA-{{schedule.id}}').innerText = final_gpa;
       this_schedule.querySelector('#ScheduleRating-{{schedule.id}}').innerText = final_rating;
       this_schedule.querySelector('#ScheduleDifficulty-{{schedule.id}}').innerText = final_difficulty;
-      this_schedule.querySelector('#ScheduleCredits-{{schedule.id}}').innerText = credit;
+      this_schedule.querySelector('#ScheduleCredits-{{schedule.id}}').innerText = final_credit;
   }
 
   function addCourse(course) {
@@ -222,6 +223,7 @@ <h6>{{ course.instructor|remove_email }}</h6>
       let gpa = isNaN(parseFloat(course.gpa)) ? "\u2014" : parseFloat(course.gpa).toFixed(2);
       let rating = isNaN(parseFloat(course.rating)) ? "\u2014" : parseFloat(course.rating).toFixed(2);
       let difficulty = isNaN(parseFloat(course.difficulty)) ? "\u2014" : parseFloat(course.difficulty).toFixed(2);
+      let credits = isNaN(parseFloat(course.credits)) || course.credits == 0.0 ? "\u2014" : parseFloat(course.credits).toFixed(2);
       const course_name = document.getElementById('course-name-value').textContent.split('|')[0].trim();
 
       let courseCardHTML = `
@@ -263,7 +265,7 @@ <h6>${course.instructor_name}</h6>
                                       <small class="mb-0 text-uppercase">
                                           <i class="fas fa-clock"></i>&nbsp;Units
                                       </small>
-                                      <p class="mb-0 info text-break">${course.credits}</p>
+                                      <p class="mb-0 info text-break">${credits}</p>
                                   </div>
                                   <div class="col-4 col-lg-3 col-md-2 text-nowrap">
                                       <small class="mb-0 text-uppercase">