PyKubeGrader 0.3.12__py3-none-any.whl → 0.3.13__py3-none-any.whl

{PyKubeGrader-0.3.12.dist-info → PyKubeGrader-0.3.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyKubeGrader
-Version: 0.3.12
+Version: 0.3.13
 Summary: Add a short description here!
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: jagar2

{PyKubeGrader-0.3.12.dist-info → PyKubeGrader-0.3.13.dist-info}/RECORD

@@ -13,8 +13,8 @@ pykubegrader/build/markdown_questions.py,sha256=cSh8mkHK3hh-etJdgrZu9UQi1WPrKQto
 pykubegrader/grade_reports/__grade_reports.py,sha256=n8H_n9jdZRSPn2zlIf-GQt_Y8w91p6M8ZbdVH76Sg5k,2303
 pykubegrader/grade_reports/assignments.py,sha256=I9NesLhwLelgqUekXfQCEGH-zTMAOjfb942eZYeh-Yo,7811
 pykubegrader/grade_reports/class_grade_report.py,sha256=9Uuvy-xoABtjTjv-05VYhmowebgTrgEFSgh1Grws-cQ,5078
-pykubegrader/grade_reports/grade_report.py,sha256=ugX0nojj8RdSmVluP9dbGl3B5W0OIb1AjTshDUrVSSs,16267
-pykubegrader/grade_reports/grading_config.py,sha256=o_68FrjOLQWqDzEptnA8p42zClLHyqEadAiaa9K2cm0,2374
+pykubegrader/grade_reports/grade_report.py,sha256=iTOe1sRNbsJc-Q4M_ELEMHePObLjHd0z-pm3G0sG37E,16962
+pykubegrader/grade_reports/grading_config.py,sha256=FIK25yW0MbYCqCiCX9pxGLonnTjRvXFIOLrf9qZvFwY,2531
 pykubegrader/grade_reports/test.ipynb,sha256=NkMZHcfBd-uJw3i1Y9ux-epBP5GiVFEhda5wxEbK0cU,808
 pykubegrader/graders/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/graders/late_assignments.py,sha256=_2-rA5RqO0BWY9WAQA_mbCxxPKTOiJOl-byD2CYWaE0,1393
@@ -39,9 +39,9 @@ pykubegrader/widgets_base/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-
 pykubegrader/widgets_base/multi_select.py,sha256=WhpS7a8V3BOuEfEyFPzcDhMbgr7p1a4FFh_mKU1HLbI,4226
 pykubegrader/widgets_base/reading.py,sha256=ChUS3NOTa_HLtNpxR8hGX80LPKMvYMypnR6dFknfxus,5430
 pykubegrader/widgets_base/select.py,sha256=qP31bjTWIn8LEgKwtNUJbgJnum6P7bx6A_At-u1ivFk,2750
-PyKubeGrader-0.3.12.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.3.12.dist-info/METADATA,sha256=7USplQzGd4_ZEtmIrZtZIoB3pI89kOLaPHvn_hWeWdw,2758
-PyKubeGrader-0.3.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyKubeGrader-0.3.12.dist-info/entry_points.txt,sha256=RR57KvzDRJrP4omy5heS5cZ3E7g56YxcxJhDnp57ZU0,253
-PyKubeGrader-0.3.12.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.3.12.dist-info/RECORD,,
+PyKubeGrader-0.3.13.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.3.13.dist-info/METADATA,sha256=QXj0QbWpmsOkRnSlhMKyhpFrG8pPQcaNLqHOY_hArRk,2758
+PyKubeGrader-0.3.13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyKubeGrader-0.3.13.dist-info/entry_points.txt,sha256=RR57KvzDRJrP4omy5heS5cZ3E7g56YxcxJhDnp57ZU0,253
+PyKubeGrader-0.3.13.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.3.13.dist-info/RECORD,,

pykubegrader/grade_reports/grade_report.py

@@ -10,6 +10,7 @@ from pykubegrader.grade_reports.grading_config import (
     optional_drop_week,
     exclude_from_running_avg,
     custom_grade_adjustments,
+    duplicated_scores,
 )
 
 import pandas as pd
@@ -29,7 +30,7 @@ class GradeReport:
             start_date (str, optional): The start date of the course. Defaults to "2025-01-06".
             verbose (bool, optional): Indicates if verbose output should be displayed. Defaults to True.
         """
-        self.assignments, self.student_subs = get_assignments_submissions(params=params)
+        self.assignments, self.student_subs = get_assignments_submissions(params=params) 
 
         self.start_date = start_date
         self.verbose = verbose
@@ -48,6 +49,7 @@ class GradeReport:
         self.calculate_grades()
         self.update_assignments_not_due_yet()
         self.calculate_grades()
+        self.duplicate_scores()
         self.drop_lowest_n_for_types(1)
         self.update_weekly_table()
         self._build_running_avg()
@@ -400,13 +402,26 @@ class GradeReport:
 
             # Exempt the lowest `n` assignments
             dropped = []
-            i = -1
+            i = 0
+            j = 0
             while i < n:
-                i += 1
-                valid_assignments[i].exempted = True
-                if valid_assignments[i].week in self.optional_drop_week:
+                valid_assignments[i+j].exempted = True
+                if valid_assignments[i+j].week in self.optional_drop_week:
+                    j += 1
                     continue
-                dropped.append(valid_assignments[i])
-                self.student_assignments_dropped.append(valid_assignments[i])
+                dropped.append(valid_assignments[i+j])
+                self.student_assignments_dropped.append(valid_assignments[i+j])
+                i += 1
                 
         self.calculate_grades()
+
+    def duplicate_scores(self):
+        """Duplicate scores from one assignment to another"""
+        
+        for (week, assignment_type), (duplicate_week, duplicate_assignment_type) in duplicated_scores:
+            assignment = self.get_graded_assignment(week, assignment_type)[0]
+            duplicate_assignment = self.get_graded_assignment(duplicate_week, duplicate_assignment_type)[0]
+            duplicate_assignment.score = assignment.score
+            duplicate_assignment._score = assignment._score
+            duplicate_assignment.exempted = assignment.exempted
+            

pykubegrader/grade_reports/grading_config.py

@@ -61,6 +61,9 @@ dropped_assignments = [
     "labattendance",
 ]
 
+# Duplicated scores, a list of tuples of assignment types and weeks where the scores will be duplicated
+duplicated_scores = [[(7, "lab"), (7, "homework")]]
+
 # TAs and other users to skip in class grade report
 skipped_users = ['JCA', 'jca92', 'cnp68', 'dak329', 'xz498', 'ag4328', 'rg897', 'jce63', 'qt49']