Minor code improvements

Author: schrjako

web/courses/models.py

@@ -200,12 +200,8 @@ def observed_students(self):
     def student_success(self):
         students = self.observed_students()
         problem_sets = self.problem_sets.filter(visible=True)
-        part_count = Part.objects.filter(
-            problem__problem_set__in=problem_sets, problem__visible=True
-        ).count()
-        attempts = Attempt.objects.filter(
-            part__problem__problem_set__in=problem_sets, part__problem__visible=True
-        )
+        part_count = Part.objects.filter(problem__problem_set__in=problem_sets).count()
+        attempts = Attempt.objects.filter(part__problem__problem_set__in=problem_sets)
         valid_attempts = (
             attempts.filter(valid=True).values("user").annotate(Count("user"))
         )
@@ -260,7 +256,7 @@ def student_success_by_problem_set(self):
             "problems", "problems__parts"
         ):
             different_subtasks = 0
-            for problem in problem_set.visible_problems:
+            for problem in problem_set.problems.all():
                 different_subtasks += problem.parts.count()
 
             # In case there are no parts, we do not want to divide by 0
@@ -276,7 +272,6 @@ def student_success_by_problem_set(self):
             attempts = Attempt.objects.filter(
                 part__problem__problem_set=problem_set,
                 user__in=students,
-                part__problem__visible=True,
             )
             for attempt in attempts:
                 if attempt.valid:

web/problems/models.py

@@ -74,9 +74,9 @@ def attempt_file(self, user):
         url = settings.SUBMISSION_URL + reverse("attempts-submit")
         problem_slug = slugify(self.title).replace("-", "_")
         extension = self.EXTENSIONS[self.language]
-        filename = "{0}.{1}".format(problem_slug, extension)
+        filename = f"{problem_slug}.{extension}"
         contents = render_to_string(
-            "{0}/attempt.{1}".format(self.language, extension),
+            f"{self.language}/attempt.{extension}",
             {
                 "problem": self,
                 "parts": parts,
@@ -90,9 +90,9 @@ def solution_file(self):
         parts = [(part, part.solution) for part in self.parts.all()]
         problem_slug = slugify(self.title).replace("-", "_")
         extension = self.EXTENSIONS[self.language]
-        filename = "{0}_solution.{1}".format(problem_slug, extension)
+        filename = f"{problem_slug}_solution.{extension}"
         contents = render_to_string(
-            "{0}/solution.{1}".format(self.language, extension),
+            f"{self.language}/solution.{extension}",
             {
                 "problem": self,
                 "parts": parts,
@@ -147,9 +147,9 @@ def edit_file(self, user):
         authentication_token = Token.objects.get(user=user)
         url = settings.SUBMISSION_URL + reverse("problems-submit")
         problem_slug = slugify(self.title).replace("-", "_")
-        filename = "{0}_edit.{1}".format(problem_slug, self.EXTENSIONS[self.language])
+        filename = f"{problem_slug}_edit.{self.EXTENSIONS[self.language]}"
         contents = render_to_string(
-            "{0}/edit.{1}".format(self.language, self.EXTENSIONS[self.language]),
+            f"{self.language}/edit.{self.EXTENSIONS[self.language]}",
             {
                 "problem": self,
                 "submission_url": url,