Skip to content
Snippets Groups Projects

Implement school term and validity range, remove photo cropping

Merged Jonathan Weth requested to merge fix/school-term-valditiy-and-cropping into master
3 files
+ 10
6
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -47,9 +47,7 @@ class SelectForm(forms.Form):
@@ -47,9 +47,7 @@ class SelectForm(forms.Form):
layout = Layout(Row("group", "teacher"))
layout = Layout(Row("group", "teacher"))
group = forms.ModelChoiceField(
group = forms.ModelChoiceField(
queryset=Group.objects.annotate(lessons_count=Count("lessons")).filter(
queryset=None,
lessons_count__gt=0
),
label=_("Group"),
label=_("Group"),
required=False,
required=False,
widget=Select2Widget,
widget=Select2Widget,
@@ -81,6 +79,12 @@ class SelectForm(forms.Form):
@@ -81,6 +79,12 @@ class SelectForm(forms.Form):
data["instance"] = instance
data["instance"] = instance
return data
return data
 
def __init__(self, *args, **kwargs):
 
super().__init__(*args, **kwargs)
 
self.fields["group"].queryset = Group.objects.for_current_school_term_or_all().annotate(lessons_count=Count("lessons")).filter(
 
lessons_count__gt=0
 
)
 
PersonalNoteFormSet = forms.modelformset_factory(
PersonalNoteFormSet = forms.modelformset_factory(
PersonalNote, form=PersonalNoteForm, max_num=0, extra=0
PersonalNote, form=PersonalNoteForm, max_num=0, extra=0
Loading