implement image template for coursebook export

Author: tobi-werner

content/templates/content/export/Image.tex

@@ -2,14 +2,5 @@
 {% autoescape off %}
 
 \textbf{ {{content.description}} }
-{{content.imagecontent.image.path|tex_escape}}
-
-\includegraphics{ {{ content.imagecontent.image.path }} }
-
-%\begin{figure}[H]
-%\centering
-%\includegraphics[width=\textwidth ext=.png]{ {{ content.imagecontent.image.url }} }
-%\caption{ {{content.description}} }
-%\end{figure}
-
+\Image{ {{content.description}} }{% templatetag openbrace %}{{content.imagecontent.image.path}}{% templatetag closebrace%}
 {% endautoescape %}

content/templates/content/export/base.tex

@@ -12,14 +12,23 @@
 \usepackage{hyperref}
 \usepackage[left=1cm, right=1cm, top=2cm, bottom=2cm]{geometry}
 
+%% Generate a latex graphic
+% 1: caption
+% 2: image path
+\newcommand{\Image}[2]{
+    \begin{figure}[H]
+    \centering
+    \includegraphics{#2}
+    \caption{#1}
+    \end{figure}
+}
+
 \begin{document}
 
     \title{ {{ course.title|tex_escape }} }
     \author{ {{user|tex_escape}} }
     \maketitle
 
-%    {% for content in contents %}
-%        \input{ {{ content.type|export_template }} }
-%    {% endfor %}
+% \end{document} gets appended in code
 
 {% endautoescape %}

export/helper_functions.py

@@ -39,7 +39,7 @@ def render(context, template_name, assets, app='export', external_assets=None):
                     pdf = f.read()
             except FileNotFoundError:
                 pdf = None
-        return pdf, pdflatex_output
+        return pdf, pdflatex_output, rendered_tpl
 
     @staticmethod
     def pre_render(content):

export/views.py

@@ -14,20 +14,20 @@ def generate_coursebook(request, pk, template="content/export/base.tex", context
     context['user'] = user
     context['course'] = course
     context['contents'] = [favorite.content for favorite in Favorite.objects.filter(user=user.profile, course=course)]
-    (pdf, pdflatex_output) = LaTeX.render(context, template, [])
-    return pdf, pdflatex_output
+    (pdf, pdflatex_output, tex_template) = LaTeX.render(context, template, [])
+    return pdf, pdflatex_output, tex_template
 
 
 def generate_coursebook_response(request, pk, filename='coursebook.pdf'):
     """ Generates a PDF file with nametags for students in the queryset and sends it to the browser"""
-    (pdf, pdflatex_output) = generate_coursebook(request, pk)
+    (pdf, pdflatex_output, tex_template) = generate_coursebook(request, pk)
 
-    return write_response(request, pdf, pdflatex_output, filename)
+    return write_response(request, pdf, pdflatex_output, tex_template, filename)
 
 
-def write_response(request, pdf, pdflatex_output, filename, content_type='application/pdf'):
+def write_response(request, pdf, pdflatex_output, tex_template, filename, content_type='application/pdf'):
     if not pdf:
-        return render(request, "frontend/coursebook/rendering-error.html", {"content": pdflatex_output[0].decode("utf-8")})
+        return render(request, "frontend/coursebook/rendering-error.html", {"content": pdflatex_output[0].decode("utf-8"), "tex_template": tex_template.decode("utf-8")})
     response = HttpResponse(content_type=content_type)
     response['Content-Disposition'] = 'attachment; filename=' + filename
     response.write(pdf)

frontend/templates/frontend/coursebook/rendering-error.html

@@ -8,6 +8,8 @@
 
 {% block content %}
     <h1>Error</h1>
-    <p>An error occured while generating your coursebook.</p>
-    <p>{{ content }}</p>
+    <p>An error occured while generating your coursebook. Please see the log file below.</p>
+    <p>{{ content|linebreaks}}</p>
+    <h3>Latex Template</h3>
+    <p>{{ tex_template|linebreaksbr }}</p>
 {% endblock %}