diff --git a/jdav_web/jdav_web/settings/components/jet.py b/jdav_web/jdav_web/settings/components/jet.py index 720fe7d..6c19166 100644 --- a/jdav_web/jdav_web/settings/components/jet.py +++ b/jdav_web/jdav_web/settings/components/jet.py @@ -12,12 +12,15 @@ JET_SIDE_MENU_ITEMS = [ {'name': 'membernotelist', 'permissions': ['members.view_membernotelist']}, {'name': 'klettertreff', 'permissions': ['members.view_klettertreff']}, {'name': 'activitycategory', 'permissions': ['members.view_activitycategory']}, - {'name': 'trainingcategory', 'permissions': ['members.view_trainingcategory']}, ]}, {'label': 'Neue Mitglieder', 'app_label': 'members', 'permissions': ['members.view_memberunconfirmedproxy'], 'items': [ {'name': 'memberunconfirmedproxy', 'permissions': ['members.view_memberunconfirmedproxy']}, {'name': 'memberwaitinglist', 'permissions': ['members.view_memberwaitinglist']}, ]}, + {'label': 'Ausbildung', 'app_label': 'members', 'permissions': ['members.view_membertraining'], 'items': [ + {'name': 'membertraining', 'permissions': ['members.view_membertraining']}, + {'name': 'trainingcategory', 'permissions': ['members.view_trainingcategory']}, + ]}, {'app_label': 'mailer', 'items': [ {'name': 'message', 'permissions': ['mailer.view_message']}, {'name': 'emailaddress', 'permissions': ['mailer.view_emailaddress']}, diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 5e2a3e7..ab5b387 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -1403,6 +1403,19 @@ class KlettertreffAdmin(admin.ModelAdmin): # ForeignKey: {'widget': apply_select2(forms.Select)} #} +class MemberTrainingAdminForm(forms.ModelForm): + class Meta: + model = MemberTraining + exclude = [] +class MemberTrainingAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin): + + form = MemberTrainingAdminForm + list_display = ['title', 'member', 'date', 'category', 'get_activities', 'participated', 'passed', 'certificate'] + search_fields = ('member__name', 'title') + list_filter = (('date', DateFieldListFilter), 'category', 'passed', 'activity__name') + + + admin.site.register(Member, MemberAdmin) admin.site.register(MemberUnconfirmedProxy, MemberUnconfirmedAdmin) @@ -1413,3 +1426,4 @@ admin.site.register(MemberNoteList, MemberNoteListAdmin) admin.site.register(Klettertreff, KlettertreffAdmin) admin.site.register(ActivityCategory, ActivityCategoryAdmin) admin.site.register(TrainingCategory, TrainingCategoryAdmin) +admin.site.register(MemberTraining, MemberTrainingAdmin)