diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 975f2a0..aed2fd9 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -1165,37 +1165,6 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
return render(request, 'admin/generate_seminar_report.html', context=context)
seminar_report.short_description = _('Generate seminar report')
- def seminar_report_old(self, request, memberlist):
- if not self.may_view_excursion(request, memberlist):
- return self.not_allowed_view(request, memberlist)
- if "apply" in request.POST:
- form = GenerateSeminarReportForm(request.POST)
- if not form.is_valid():
- messages.error(request, _('Please select a mode.'))
- return self.render_seminar_report_options(request, memberlist, form)
- mode = form.cleaned_data['mode']
- prepend_v32 = form.cleaned_data['prepend_v32']
- fmt = form.cleaned_data['fmt']
- title = memberlist.ljpproposal.title if hasattr(memberlist, 'ljpproposal') else memberlist.name
- if mode == 'full' and not hasattr(memberlist, 'ljpproposal'):
- messages.error(request, _('Full mode is only available, if the seminar report section is filled out.'))
- return self.render_seminar_report_options(request, memberlist, form)
- context = dict(memberlist=memberlist, settings=settings, mode=mode)
- if fmt == 'pdf':
- fp = render_tex(title + '_Seminarbericht', 'members/seminar_report.tex', context, save_only=True)
- if prepend_v32:
- context = memberlist.v32_fields()
- v32_fp = fill_pdf_form(title + "_LJP_V32",
- 'members/V32-1_Themenorientierte_Bildungsmassnahmen.pdf',
- context,
- save_only=True)
- return merge_pdfs(title + '_LJP_Antrag', [v32_fp, fp])
- return serve_pdf(fp)
- else:
- return render_docx(title + '_Seminarbericht', 'members/seminar_report_docx.tex', context)
- return self.render_seminar_report_options(request, memberlist, GenerateSeminarReportForm())
- seminar_report.short_description = _('Generate seminar report')
-
def render_sjr_options(self, request, memberlist, form):
context = dict(self.admin_site.each_context(request),
title=_('Generate SJR application'),
@@ -1204,7 +1173,7 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
form=form,
object=memberlist)
return render(request, 'admin/generate_sjr_application.html', context=context)
-
+
def sjr_application(self, request, memberlist):
if hasattr(memberlist, 'statement'):
attachment_names = [f"{b.short_description}: {b.explanation} ({b.amount:.2f}€)" for b in memberlist.statement.bill_set.all() if b.proof]
@@ -1213,7 +1182,7 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
attachment_names = []
attachment_paths = []
attachments = zip(attachment_paths, attachment_names)
-
+
if not self.may_view_excursion(request, memberlist):
return self.not_allowed_view(request, memberlist)
if "apply" in request.POST:
@@ -1221,15 +1190,15 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
if not form.is_valid():
messages.error(request, _('Please select an invoice.'))
return self.render_sjr_options(request, memberlist, form)
-
+
selected_attachments = [form.cleaned_data['invoice']]
context = memberlist.sjr_application_fields()
title = memberlist.ljpproposal.title if hasattr(memberlist, 'ljpproposal') else memberlist.name
-
+
return fill_pdf_form(title + "_SJR_Antrag", 'members/sjr_template.pdf', context, selected_attachments)
-
+
return self.render_sjr_options(request, memberlist, GenerateSjrForm(attachments=attachments))
-
+
sjr_application.short_description = _('Generate SJR application')
def finance_overview(self, request, memberlist):
diff --git a/jdav_web/members/templates/admin/generate_seminar_vbk.html b/jdav_web/members/templates/admin/generate_seminar_vbk.html
deleted file mode 100644
index f028989..0000000
--- a/jdav_web/members/templates/admin/generate_seminar_vbk.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n admin_urls static %}
-
-{% block extrahead %}
- {{ block.super }}
- {{ media }}
-
-
-
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} invite-waiter
-{% endblock %}
-
-{% block breadcrumbs %}
-
-{% endblock %}
-
-{% block content %}
-
-
-{% blocktrans %}Every LJP application needs a V-BK form containing the most important facts about the seminar.
-Here you can automatically generate such a form in Excel format.{% endblocktrans %}
-
-{% if not memberlist.statement %}
-
-{% blocktrans %}Your excursion currently has no cost-plan attached, hence the total costs can't be automatically
-calculated and added to the form.{% endblocktrans %}
-
-{% endif %}
-
-{% blocktrans %}Depending on the type of seminar, please select one of the two options below.{% endblocktrans %}
-
-
-
-
-{% endblock %}