Added append of empty nametags

d120 · Oct 5, 2017 · fc7a00b · fc7a00b
1 parent a565511
commit fc7a00b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/staff/dashboard_views.py b/staff/dashboard_views.py
@@ -276,17 +276,23 @@ def post(self, request, *args, **kwargs):
             # combine this with the freshmen_group-zip
             freshmen_tags = [list(x) for x in zip(
                 freshmen, cycle(groups), cycle(timetable))]
+            timetable = list(timetable)
+            empty_tags = []
+            for i, group in enumerate(groups):
+                for x in range(5):
+                    empty_tags.append((group, timetable[i]))
             (nametags_pdf, nametag_log) = generate_pdf_with_group_pictures(request=request,
                                                                            groups=groups,
                                                                            template='staff/reports/namensschilder-ersties.tex',
-                                                                           context={'freshmen': freshmen_tags})
+                                                                           context={'freshmen': freshmen_tags,
+                                                                                    'empty_tags': empty_tags})
             memoryfile = BytesIO()
             zipfile = ZipFile(memoryfile, 'w')
             zipfile.writestr('assignement-overview.pdf', assignement_pdf)
             zipfile.writestr('nametags.pdf', nametags_pdf)
             zipfile.close()
-            response = HttpResponse(content_type='application/pdf')
-            response['Content-Disposition'] = 'attachment; filename=test.zip'
+            response = HttpResponse(content_type='application/zip')
+            response['Content-Disposition'] = 'attachment; filename=freshmen.zip'
             memoryfile.seek(0)
             response.write(memoryfile.read())
             return response
@@ -296,19 +302,19 @@ def post(self, request, *args, **kwargs):
 
 
 class GroupPictureAdd(StaffAppMixin, TemplateView):
-    permissions=['staff.edit_tutorgroup']
-    template_name='staff/dashboard/grouppicture_add.html'
+    permissions = ['staff.edit_tutorgroup']
+    template_name = 'staff/dashboard/grouppicture_add.html'
 
     def get_context_data(self, **kwargs):
-        context=super(GroupPictureAdd, self).get_context_data(**kwargs)
-        context['groups']=TutorGroup.objects.filter(ophase = Ophase.current())
+        context = super(GroupPictureAdd, self).get_context_data(**kwargs)
+        context['groups'] = TutorGroup.objects.filter(ophase=Ophase.current())
         return context
 
     def post(self, request, *args, **kwargs):
-        tutorgroups=TutorGroup.objects.filter(ophase = Ophase.current())
+        tutorgroups = TutorGroup.objects.filter(ophase=Ophase.current())
         for group in tutorgroups:
             if request.POST['action-' + str(group.id)] == 'change':
-                group.picture=request.FILES[str(group.id)]
+                group.picture = request.FILES[str(group.id)]
                 group.save()
             elif request.POST['action-' + str(group.id)] == 'delete':
                 group.picture.delete()

diff --git a/staff/templates/staff/reports/namensschilder-ersties.tex b/staff/templates/staff/reports/namensschilder-ersties.tex
@@ -113,5 +113,8 @@
 {% for freshman in freshmen %}
 \Namensschild{ {{ freshman.0.1|tex_escape }} }{ {{ freshman.0.0|tex_escape }} }{ {{ freshman.1.name|tex_escape }} }{% templatetag openbrace %}{{ freshman.1.get_picture_name }}{% templatetag closebrace %}{ {{ freshman.1.tutors.all.0|tex_escape }} }{ {{ freshman.1.tutors.all.1|tex_escape }} }{ {% for room in freshman.2 %}\Raum{ {{ room.0|tex_escape }} }{ {{ room.2|tex_escape }} }{ {{ room.1|tex_escape }} }{% endfor %} }
 {% endfor %}
+{% for tag in empty_tags %}
+\Namensschild{~}{~}{ {{ tag.0.name|tex_escape }} }{% templatetag openbrace %}{{ tag.0.get_picture_name }}{% templatetag closebrace %}{ {{ tag.0.tutors.all.0|tex_escape }} }{ {{ tag.0.tutors.all.1|tex_escape }} }{ {% for room in tag.1 %}\Raum{ {{ room.0|tex_escape }} }{ {{ room.2|tex_escape }} }{ {{ room.1|tex_escape }} }{% endfor %} }
+{% endfor %}
 \end{document}
 {% endautoescape %}