From a6c220ca02aa5a2e7ec36a344ed86583ad62b9b6 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 6 Jun 2012 13:51:54 +0200 Subject: [PATCH] Reverted wrong testing code (for participants) from last commit. --- .../participant/base_participant.html | 1 - openslides/participant/urls.py | 8 +--- openslides/participant/views.py | 46 +------------------ 3 files changed, 2 insertions(+), 53 deletions(-) diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html index ad688d2bc..cf531f158 100644 --- a/openslides/participant/templates/participant/base_participant.html +++ b/openslides/participant/templates/participant/base_participant.html @@ -25,7 +25,6 @@ {% endif %} {% if perms.participant.can_manage_participant %}
  • {% trans 'First time passwords as PDF' %}
  • -
  • Namenskarten als PDF
  • {% endif %} {% endblock %} diff --git a/openslides/participant/urls.py b/openslides/participant/urls.py index eb5051fc2..a7d152c21 100644 --- a/openslides/participant/urls.py +++ b/openslides/participant/urls.py @@ -13,7 +13,7 @@ from django.conf.urls.defaults import * from django.core.urlresolvers import reverse -from participant.views import ParticipantsListPDF, ParticipantsPasswordsPDF, ParticipantsBadgePDF +from participant.views import ParticipantsListPDF, ParticipantsPasswordsPDF urlpatterns = patterns('participant.views', url(r'^$', @@ -80,10 +80,4 @@ urlpatterns = patterns('participant.views', ParticipantsPasswordsPDF.as_view(), name='print_passwords', ), - - url(r'^badges/print$', - ParticipantsBadgePDF.as_view(), - name='print_badges', - ), - ) diff --git a/openslides/participant/views.py b/openslides/participant/views.py index 195518962..1bb656eca 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -53,8 +53,6 @@ from utils.template import Tab from utils.views import (FormView, PDFView) from utils.utils import delete_default_permissions -from openslides import settings -import qrcode @permission_required('participant.can_see_participant') @template('participant/overview.html') @@ -553,10 +551,6 @@ class ParticipantsPasswordsPDF(PDFView): for user in User.objects.all().order_by('last_name'): try: user.get_profile() - qrcode_img = qrcode.make(participant_pdf_system_url) - qrcode_img.save( settings.MEDIA_ROOT + 'qr-code_systemurl.png', 'PNG') - imgfile = settings.MEDIA_ROOT + 'qr-code_systemurl.png'; - qrcode_systemurl = "" % imgfile cell = [] cell.append(Spacer(0,0.8*cm)) cell.append(Paragraph(_("Account for OpenSlides"), stylesheet['Ballot_title'])) @@ -566,8 +560,7 @@ class ParticipantsPasswordsPDF(PDFView): cell.append(Paragraph(_("Password: %s") % (user.profile.firstpassword), stylesheet['Monotype'])) cell.append(Spacer(0,0.5*cm)) cell.append(Paragraph(_("URL: %s") % (participant_pdf_system_url), stylesheet['Ballot_option'])) - cell.append(Spacer(0,1*cm)) - cell.append(Paragraph(qrcode_systemurl, stylesheet['Ballot_option'])) + cell.append(Spacer(0,0.5*cm)) cell2 = [] cell2.append(Spacer(0,0.8*cm)) if participant_pdf_welcometext is not None: @@ -585,44 +578,7 @@ class ParticipantsPasswordsPDF(PDFView): ])) story.append(t) -class ParticipantsBadgePDF(PDFView): - permission_required = 'participant.can_manage_participant' - filename = _("participant-badges") - top_space = 0 - def get_template(self, buffer): - return SimpleDocTemplate(buffer, topMargin=-6, bottomMargin=-6, leftMargin=0, rightMargin=0, showBoundary=False) - - def build_document(self, pdf_document, story): - pdf_document.build(story) - - def append_to_pdf(self, story): - data= [] - for user in User.objects.all().order_by('last_name'): - try: - user.get_profile() - qrcode_img = qrcode.make( "%s%s" % (config['participant_pdf_system_url'], reverse('user_status', args=[user.id])) ) - qrcode_img.save( settings.MEDIA_ROOT + 'qr-code_statusurl.png', 'PNG') - imgfile = settings.MEDIA_ROOT + 'qr-code_statusurl.png'; - qrcode_statusurl = "" % imgfile - cell = [] - cell.append(Spacer(0,0.8*cm)) - cell.append(Paragraph("%s %s" % (user.first_name, user.last_name), stylesheet['Badge_title'])) - cell.append(Spacer(0,0.5*cm)) - cell.append(Paragraph("%s" % (user.profile.group), stylesheet['Badge_subtitle'])) - cell.append(Paragraph("%s" % (user.profile.committee), stylesheet['Badge_italic'])) - cell.append(Spacer(0,2.25*cm)) - cell.append(Paragraph(qrcode_statusurl, stylesheet['Badge_qrcode'])) - # print cards - data.append([cell,cell]) - except Profile.DoesNotExist: - pass - - t=Table(data, 10.5*cm, 7.42*cm) - t.setStyle(TableStyle([ ('GRID', (0,0), (-1,-1), 0.25, colors.grey), - ('VALIGN', (0,0), (-1,-1), 'TOP'), - ])) - story.append(t) class Config(FormView): permission_required = 'config.can_manage_config'