Correction

studio1247 · Feb 28, 2018 · 4991a83 · 4991a83
1 parent 51b86b3
commit 4991a83
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/database.py b/database.py
@@ -1382,7 +1382,9 @@ def GetUnionTimeslots(timeslots, value=0):
                 elif timeslot1.debut >= timeslot2.debut and timeslot1.fin <= timeslot2.fin:
                     found = True
                 elif timeslot1.debut <= timeslot2.debut or timeslot1.fin >= timeslot2.fin:
-                    timeslots[i] = Timeslot(min(timeslot2.debut, timeslot1.debut), max(timeslot2.debut, timeslot1.fin), timeslot1.activity, value=value)
+                    timeslots[i] = Timeslot(min(timeslot2.debut, timeslot1.debut), max(timeslot2.fin, timeslot1.fin), timeslot1.activity, value=value)
+                    # TODO non reg test à ajouter pour lutins canal L.H. le 22 février (supplement le soir)
+                    # timeslots[i] = Timeslot(min(timeslot2.debut, timeslot1.debut), max(timeslot2.fin, timeslot1.fin), timeslot1.activity, value=value)
                     found = True
             if not found:
                 timeslots.append(timeslot1)