From df1235eb7b00a1389bc041479e45e184f9b77148 Mon Sep 17 00:00:00 2001
From: Ernesto Rico Schmidt <ernesto@helsinki.at>
Date: Tue, 4 Apr 2023 16:31:17 -0400
Subject: [PATCH] Fixed usage of extracted functions
---
program/services.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/services.py b/program/services.py
index eed89ef9..46269308 100644
--- a/program/services.py
+++ b/program/services.py
@@ -229,7 +229,7 @@ def resolve_conflicts(data, schedule_pk, show_pk):
# If there were any errors, don't make any db changes yet
# but add error messages and return already chosen solutions
if len(errors) > 0:
- conflicts = Schedule.make_conflicts(model_to_dict(schedule), schedule.pk, show.pk)
+ conflicts = make_conflicts(model_to_dict(schedule), schedule.pk, show.pk)
partly_resolved = conflicts["projected"]
saved_solutions = {}
@@ -396,7 +396,7 @@ def make_conflicts(sdl, schedule_pk, show_pk):
timeslots = generate_timeslots(gen_schedule)
# Generate conflicts and add schedule
- conflicts = Schedule.generate_conflicts(timeslots)
+ conflicts = generate_conflicts(timeslots)
conflicts["schedule"] = model_to_dict(schedule)
return conflicts
--
GitLab