diff --git a/program/models.py b/program/models.py index 2d8fc1f9eac9a4a071003a3835cca3873623952a..fe132cea2e652d914d3892623d0e9995a294a5f7 100644 --- a/program/models.py +++ b/program/models.py @@ -526,10 +526,10 @@ class Schedule(models.Model): # Get note try: - note = Note.objects.get(timeslot=c.id).values_list("id", flat=True) - collision["note_id"] = note + note = Note.objects.get(timeslot=c.id) + collision["note_id"] = note.pk except ObjectDoesNotExist: - pass + collision["note_id"] = None collisions.append(collision) @@ -607,6 +607,7 @@ class Schedule(models.Model): projected_entry["collisions"] = collisions projected_entry["solution_choices"] = solution_choices + projected_entry["error"] = None projected.append(projected_entry) conflicts["projected"] = projected