From 57e966a97b464f21807278040f986a2fc712df78 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 7 Sep 2011 18:43:25 +0200 Subject: [PATCH] Updated application pdf. --- openslides/utils/pdf.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/openslides/utils/pdf.py b/openslides/utils/pdf.py index b0d2e6bfd..0bb5518bf 100755 --- a/openslides/utils/pdf.py +++ b/openslides/utils/pdf.py @@ -336,11 +336,9 @@ def print_passwords(request): def get_application(application, story): # application number if application.number is None: - story.append(Paragraph(_("Application No.")+" [-]", stylesheet['Heading1'])) + story.append(Paragraph(_("Application No."), stylesheet['Heading1'])) else: story.append(Paragraph(_("Application No.")+" %s" % application.number, stylesheet['Heading1'])) - # title - story.append(Paragraph(_("Subject")+": "+application.title, stylesheet['Heading3'])) # submitter cell1a = [] @@ -350,7 +348,9 @@ def get_application(application, story): cell1b.append(Spacer(0,0.2*cm)) if application.status == "pub": cell1b.append(Paragraph("__________________________________________",stylesheet['Signaturefield'])) + cell1b.append(Spacer(0,0.1*cm)) cell1b.append(Paragraph("       "+unicode(application.submitter.profile), stylesheet['Small'])) + cell1b.append(Spacer(0,0.2*cm)) else: cell1b.append(Paragraph(unicode(application.submitter.profile), stylesheet['Normal'])) @@ -373,7 +373,10 @@ def get_application(application, story): cell3a.append(Paragraph("%s:" % _("Status"), stylesheet['Heading4'])) cell3b = [] if note != "": - cell3b.append(Paragraph("%s | %s" % (application.get_status_display(), note), stylesheet['Normal'])) + if application.status == "pub": + cell3b.append(Paragraph(note, stylesheet['Normal'])) + else: + cell3b.append(Paragraph("%s | %s" % (application.get_status_display(), note), stylesheet['Normal'])) else: cell3b.append(Paragraph("%s" % application.get_status_display(), stylesheet['Normal'])) @@ -402,6 +405,9 @@ def get_application(application, story): ])) story.append(t) story.append(Spacer(0,1*cm)) + + # title + story.append(Paragraph(application.title, stylesheet['Heading3'])) # text story.append(Paragraph("%s" % application.text.replace('\r\n','
'), stylesheet['Paragraph'])) # reason