]> git.0d.be Git - django-panik-emissions.git/commitdiff
do not compact schedules if they have different week recurrences main
authorFrédéric Péters <fpeters@0d.be>
Thu, 14 Mar 2024 16:09:56 +0000 (17:09 +0100)
committerFrédéric Péters <fpeters@0d.be>
Thu, 14 Mar 2024 16:09:56 +0000 (17:09 +0100)
emissions/models.py

index a17b445b7b11938c6f24d843318f765f20622e20..ffd12bd22fec823f64513b2ca9ef5ded61d65380 100644 (file)
@@ -267,7 +267,11 @@ class Emission(models.Model):
 
     def get_compacted_schedules(self, rerun=None):
         schedules = self.get_week_compacted_schedules(rerun=rerun)
-        if len(schedules) > 1 and len({x.datetime.time() for x in schedules}) == 1:
+        if (
+            len(schedules) > 1
+            and len({x.datetime.time() for x in schedules}) == 1
+            and len({x.weeks for x in schedules}) == 1
+        ):
             # multiple schedules for same hour, join consecutive weekdays
             sequences = [[schedules[0].datetime]]
             for schedule in schedules[1:]: