added expanded courses panel for easy double counting, fixed double counting when transcript parsing and adding courses, miscellaneous fixes (edit mode, renaming, copying)

Author: samuel-lao

backend/degree/migrations/0002_fulfillment_selected_rules.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.2 on 2025-03-12 02:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("degree", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="fulfillment",
+            name="selected_rules",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="\nThe rules this course fulfills that should be shown in the open-ended rule box \n(as opposed to the expandable box). Blank if this course should not be included in\nany open-ended rule boxes.\n",
+                related_name="+",
+                to="degree.rule",
+            ),
+        ),
+    ]

backend/degree/migrations/0003_remove_fulfillment_selected_rules_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.0.2 on 2025-03-12 06:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("degree", "0002_fulfillment_selected_rules"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="fulfillment",
+            name="selected_rules",
+        ),
+        migrations.AddField(
+            model_name="fulfillment",
+            name="unselected_rules",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="\nThe rules this course fulfills that should be shown in the open-ended rule box \n(as opposed to the expandable box). Blank if this course should not be included in\nany open-ended rule boxes.\n",
+                related_name="selected",
+                to="degree.rule",
+            ),
+        ),
+    ]

backend/degree/models.py

@@ -397,10 +397,21 @@ def copy(self, new_name: str) -> DegreePlan:
             new_degree_plan.degrees.add(degree)
 
         # this also handles updating satisfaction statuses
+
+
         for fulfillment in self.fulfillments.all():
+            for field in fulfillment._meta.fields:
+                    print(getattr(fulfillment, field.name))
+
+            rules = fulfillment.rules.all()
+            unselected_rules = fulfillment.unselected_rules.all()
+
             fulfillment.pk = None
             fulfillment.degree_plan = new_degree_plan
             fulfillment.save()
+            fulfillment.rules.set(rules)
+            fulfillment.unselected_rules.set(unselected_rules)
+            
 
         return new_degree_plan
 
@@ -443,6 +454,18 @@ class Fulfillment(models.Model):
             """
         ),
     )
+    unselected_rules = models.ManyToManyField(
+        Rule,
+        related_name="selected",
+        blank=True,
+        help_text=dedent(
+            """
+            The rules this course fulfills that should be shown in the open-ended rule box 
+            (as opposed to the expandable box). Blank if this course should not be included in
+            any open-ended rule boxes.
+            """
+        ),
+    )
 
     class Meta:
         unique_together = ("degree_plan", "full_code")

backend/degree/serializers.py

@@ -121,20 +121,27 @@ def to_internal_value(self, data):
 
     class Meta:
         model = Fulfillment
-        fields = ["id", "degree_plan", "full_code", "course", "semester", "rules"]
+        fields = ["id", "degree_plan", "full_code", "course", "semester", "rules", "unselected_rules"]
 
     def validate(self, data):
         data = super().validate(data)
         rules = data.get("rules")  # for patch requests without a rules field
+        unselected_rules = data.get("unselected_rules")
         full_code = data.get("full_code")
         degree_plan = data.get("degree_plan")
 
-        if rules is None and full_code is None and degree_plan is None:
+        if rules is None and unselected_rules is None and full_code is None and degree_plan is None:
             return data  # Nothing to validate
         if rules is None and self.instance is not None:
             rules = self.instance.rules.all()
         elif rules is None:
             rules = []
+
+        if unselected_rules is None and self.instance is not None:
+            unselected_rules = self.instance.unselected_rules.all()
+        elif unselected_rules is None:
+            unselected_rules = []
+            
         if full_code is None:
             full_code = self.instance.full_code
         if degree_plan is None: