cleanup

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'),

jdav_web/members/templates/admin/generate_seminar_vbk.html

@@ -1,56 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n admin_urls static %}
-
-{% block extrahead %}
-    {{ block.super }}
-    {{ media }}
-    <script src="{% static 'admin/js/cancel.js' %}" async></script>
-    <script type="text/javascript" src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
-    <script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} invite-waiter
-{% endblock %}
-
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
-&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
-&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
-&rsaquo; <a href="{% url opts|admin_urlname:'change' object.pk|admin_urlquote %}">{{ object|truncatewords:"18" }}</a>
-&rsaquo; {% translate 'Generate LJP V-BK form' %}
-</div>
-{% endblock %}
-
-{% block content %}
-
-<p>
-{% 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 %}
-</p>
-{% if not memberlist.statement %}
-<p>
-{% blocktrans %}Your excursion currently has no cost-plan attached, hence the total costs can't be automatically
-calculated and added to the form.{% endblocktrans %}
-</p>
-{% endif %}
-<p>
-{% blocktrans %}Depending on the type of seminar, please select one of the two options below.{% endblocktrans %}
-</p>
-
-<form action="" method="post">
-    {% csrf_token %}
-    <p>
-    <table>
-    {{ form }}
-    </table>
-    </p>
-    <br>
-    <input type="hidden" name="action" value="seminar_vbk">
-    <input type="hidden" name="seminar_vbk">
-    <input class="default" style="color: $default-link-color" type="submit" name="apply"
-        value="{% translate 'Generate' %}">
-    <a href="#" class="button cancel-link">{% translate "Cancel" %}</a>
-</form>
-
-{% endblock %}