From a8a57102ffc0b5fcb6fe70eed55bade1a3f2c26c Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Tue, 12 Nov 2019 21:44:57 +0100
Subject: [PATCH] Use django_select2 everywhere in alsijil. Advances
BiscuIT-ng#102.
---
biscuit/apps/alsijil/forms.py | 7 ++++---
biscuit/apps/alsijil/templates/alsijil/week_view.html | 10 ++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/biscuit/apps/alsijil/forms.py b/biscuit/apps/alsijil/forms.py
index dd64517d6..7912bcf8b 100644
--- a/biscuit/apps/alsijil/forms.py
+++ b/biscuit/apps/alsijil/forms.py
@@ -1,6 +1,7 @@
from django import forms
from django.db.models import Count
from django.utils.translation import ugettext_lazy as _
+from django_select2.forms import Select2Widget
from biscuit.apps.chronos.models import Room
from biscuit.core.models import Group, Person
@@ -33,15 +34,15 @@ class PersonalNoteForm(forms.ModelForm):
class SelectForm(forms.Form):
group = forms.ModelChoiceField(
queryset=Group.objects.annotate(lessons_count=Count('lessons')).filter(lessons_count__gt=0),
- label=_('Group'), required=False)
+ label=_('Group'), required=False, widget=Select2Widget)
teacher = forms.ModelChoiceField(
queryset=Person.objects.annotate(lessons_count=Count(
'lessons_as_teacher')).filter(lessons_count__gt=0),
- label=_('Teacher'), required=False)
+ label=_('Teacher'), required=False, widget=Select2Widget)
room = forms.ModelChoiceField(
queryset=Room.objects.annotate(lessons_count=Count(
'lesson_periods')).filter(lessons_count__gt=0),
- label=_('Room'), required=False)
+ label=_('Room'), required=False, widget=Select2Widget)
PersonalNoteFormSet = forms.modelformset_factory(
diff --git a/biscuit/apps/alsijil/templates/alsijil/week_view.html b/biscuit/apps/alsijil/templates/alsijil/week_view.html
index 5b4949504..3bf3c91c1 100644
--- a/biscuit/apps/alsijil/templates/alsijil/week_view.html
+++ b/biscuit/apps/alsijil/templates/alsijil/week_view.html
@@ -3,6 +3,16 @@
{% extends "core/turnable.html" %}
{% load bootstrap4 font_awesome i18n week_helpers %}
+{% block bootstrap4_extra_head %}
+ {{ block.super }}
+ {{ select_form.media.css }}
+{% endblock %}
+
+{% block bootstrap4_extra_script %}
+ {{ block.super }}
+ {{ select_form.media.js }}
+{% endblock %}
+
{% block bootstrap4_title %}{% blocktrans%}Current week{% endblocktrans %} — {{ block.super }}{% endblock %}
{% block current_content %}
--
GitLab