Mirrors/wireguard_webadmin
1
0
Fork 0
mirror of https://github.com/eduardogsilva/wireguard_webadmin.git synced 2026-02-20 03:36:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve time interval forms

Browse Source
This commit is contained in:
Eduardo Silva
2026-02-04 15:07:28 -03:00
parent f4182aa2aa
commit 1db04a222f
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scheduler/forms.py
View File

@@ -51,6 +51,17 @@ def _intervals_overlap(a_start, a_end, b_start, b_end) -> bool:
return a_start < b_end and b_start < a_end
def _circular_gap(a_start, a_end, b_start, b_end, week_minutes):
if a_start < b_end and b_start < a_end:
return 0
gaps = [
(b_start - a_end) % week_minutes,
(a_start - b_end) % week_minutes,
]
return min(gaps)
class ScheduleSlotForm(forms.ModelForm):
class Meta:
model = ScheduleSlot
@@ -98,7 +109,7 @@ class ScheduleSlotForm(forms.ModelForm):
def clean(self):
cleaned = super().clean()
week_minutes = 7 * 24 * 60
start_weekday = cleaned.get("start_weekday")
start_time = cleaned.get("start_time")
end_weekday = cleaned.get("end_weekday")
@@ -112,6 +123,14 @@ class ScheduleSlotForm(forms.ModelForm):
new_intervals = _slot_to_week_intervals(start_weekday, start_time, end_weekday, end_time)
total_minutes = sum((end - start) for start, end in new_intervals)
if total_minutes < 10:
raise ValidationError(_("The minimum duration between start and end must be at least 10 minutes."))
if total_minutes > (week_minutes - 10):
raise ValidationError(_("The minimum duration between start and end must be at least 10 minutes."))
qs = ScheduleSlot.objects.filter(profile=self.profile)
if self.instance and self.instance.pk:
qs = qs.exclude(pk=self.instance.pk)
@@ -135,4 +154,10 @@ class ScheduleSlotForm(forms.ModelForm):
},
)
gap = _circular_gap(ns, ne, es, ee, week_minutes)
if gap < 10:
raise ValidationError(
_("There must be at least 10 minutes between time slots.")
)
return cleaned