add group field to klettertreff

jdav_web/members/admin.py

@@ -135,24 +135,44 @@ class KlettertreffAdminForm(forms.ModelForm):
         super(KlettertreffAdminForm, self).__init__(*args, **kwargs)
         self.fields['jugendleiter'].queryset = Member.objects.filter(group__name='Jugendleiter')
 
-class KlettertreffAttendeeInline(admin.StackedInline):
 
+class KlettertreffAttendeeInlineForm(forms.ModelForm):
+    class Meta:
+        model = KlettertreffAttendee
+        exclude = []
+
+    """
+    def __init__(self, *args, **kwargs):
+        super(KlettertreffAttendeeInlineForm, self).__init__(*args, **kwargs)
+        self.fields['member'].queryset = Member.objects.filter(group__name='J1')
+    """
+
+class KlettertreffAttendeeInline(admin.StackedInline):
     model = KlettertreffAttendee
+    form = KlettertreffAttendeeInlineForm
     extra = 0
 
+
 class KlettertreffAdmin(admin.ModelAdmin):
     form = KlettertreffAdminForm
     exclude = []
     inlines = [KlettertreffAttendeeInline]
     list_display = ['__str__', 'date', 'get_jugendleiter']
-    list_filter = [('date', DateFieldListFilter)]
+    list_filter = [('date', DateFieldListFilter), 'group__name']
     actions = ['overview']
 
     def overview(self, request, queryset):
+        group = request.GET.get('group__name')
+        if group != 'NONE':
+            members = Member.objects.filter(group__name__contains=group)
+        else:
+            members = Member.objects.all()
         context = {
                    'klettertreffs': queryset,
-                   'members': Member.objects.all(),
+                   'members': members,
-                   'attendees': KlettertreffAttendee.objects.all()
+                   'attendees': KlettertreffAttendee.objects.all(),
+                   'jugendleiters':
+                   Member.objects.filter(group__name='Jugendleiter')
                    }
 
         return render(request, 'admin/klettertreff_overview.html',

jdav_web/members/models.py

@@ -111,6 +111,7 @@ class Klettertreff(models.Model):
     date = models.DateField(_('Date'), default=datetime.today)
     location = models.CharField(_('Location'), default='', max_length=60)
     jugendleiter = models.ManyToManyField(Member)
+    group = models.ForeignKey(Group, default='')
     
     def __str__(self):
         return self.location + ' ' + self.date.strftime('%d.%m.%Y')
@@ -121,10 +122,15 @@ class Klettertreff(models.Model):
         return jl_string
 
     def has_attendee(self, member):
-        attendees = KlettertreffAttendee.objects.filter(
+        queryset = KlettertreffAttendee.objects.filter(
                 member__id__contains=member.id,
                 klettertreff__id__contains=self.id)
-        if attendees:
+        if queryset:
+            return True
+        return False
+
+    def has_jugendleiter(self, jugendleiter):
+        if jugendleiter in self.jugendleiter.all():
             return True
         return False
 

jdav_web/members/templates/admin/klettertreff_overview.html

@@ -4,9 +4,9 @@
 {% load overview_extras %}
 
 {% block content %}
-<table>
+<table style="height=100%">
     <tr>
-        <th>Datum</th>
+        <th>{% trans 'date' %}</th>
         {% for klettertreff in klettertreffs %}
         <td>{{ klettertreff.date }}</td>
         {% endfor %}
@@ -17,18 +17,27 @@
         <td>{{ klettertreff.location }}</td>
         {% endfor %}
     </tr>
+    <tr>
+        <th>Jugendleiter</th>
+    </tr>
+    {% for jugendleiter in jugendleiters %}
+    <tr>
+        <th>{{ jugendleiter.name }}
+        {% for klettertreff in klettertreffs %}
+        {% has_jugendleiter_wrapper klettertreff jugendleiter as color %}
+        <td style="background-color:{{ color }}"></td>
+        {% endfor %}
+    </tr>
+    {% endfor %}
+    <tr>
+        <th>Teilnehmer</th>
+    </tr>
     {% for member in members %}
     <tr>
         <th>{{ member.name }}
         {% for klettertreff in klettertreffs %}
-        <td>
+            {% has_attendee_wrapper klettertreff member as color %}
-            {% has_attendee_wrapper klettertreff member as test %}
+        <td style="background-color:{{ color }}"></td>
-            {% if test %}
-                yes
-            {% else %}
-                no
-            {% endif %}
-        </td>
         {% endfor %}
     </tr>
     {% endfor %}

jdav_web/members/templatetags/overview_extras.py

@@ -2,6 +2,16 @@ from django import template
 
 register = template.Library()
 
+def blToColor(bl):
+    if bl:
+        return 'green'
+    else:
+        return 'red'
+
 @register.assignment_tag
 def has_attendee_wrapper(klettertreff, member):
-    return klettertreff.has_attendee(member)
+    return blToColor(klettertreff.has_attendee(member))
+
+@register.assignment_tag
+def has_jugendleiter_wrapper(klettertreff, jugendleiter):
+    return blToColor(klettertreff.has_jugendleiter(jugendleiter))