ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2254 from matakuka/mini_issues 

Repairs assignment ballots for candidates with structure_level
This commit is contained in:
Emanuel Schütze 2016-08-09 20:43:33 +02:00 committed by GitHub
parent 320de66783 350a60722c
commit d2c5646ce4
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
openslides/assignments/views.py
View File

@ -497,32 +497,31 @@ class AssignmentPollPDF(PDFView):
cell.append(Paragraph( cell.append(Paragraph(
"(%s)" % candidate.structure_level, "(%s)" % candidate.structure_level,
stylesheet['Ballot_option_suffix_YNA'])) stylesheet['Ballot_option_suffix_YNA']))
if self.poll.yesnoabstain:
cell.append(Paragraph(
" ", stylesheet['Ballot_option_suffix_YNA']))
cell.append(Paragraph("<font name='circlefont' size='15'>%(circle)s</font> \
<font name='Ubuntu'>%(yes)s &nbsp;&nbsp;&nbsp;</font> \
<font name='circlefont' size='15'>%(circle)s</font> \
<font name='Ubuntu'>%(no)s &nbsp;&nbsp;&nbsp;</font> \
<font name='circlefont' size='15'>%(circle)s</font> \
<font name='Ubuntu'>%(abstain)s</font>" %
{'circle': circle,
'yes': _("Yes"),
'no': _("No"),
'abstain': _("Abstain")},
stylesheet['Ballot_option_circle_YNA']))
else: else:
if self.poll.yesnoabstain: cell.append(Paragraph(
cell.append(Paragraph( "&nbsp;", stylesheet['Ballot_option_suffix_YNA']))
"&nbsp;", stylesheet['Ballot_option_suffix_YNA'])) cell.append(Paragraph("<font name='circlefont' size='15'>%(circle)s</font> \
cell.append(Paragraph("<font name='circlefont' size='15'>%(circle)s</font> \ <font name='Ubuntu'>%(yes)s &nbsp;&nbsp;&nbsp;</font> \
<font name='Ubuntu'>%(yes)s &nbsp;&nbsp;&nbsp;</font> \ <font name='circlefont' size='15'>%(circle)s</font> \
<font name='circlefont' size='15'>%(circle)s</font> \ <font name='Ubuntu'>%(no)s &nbsp;&nbsp;&nbsp;</font>" %
<font name='Ubuntu'>%(no)s &nbsp;&nbsp;&nbsp;</font> \ {'circle': circle,
<font name='circlefont' size='15'>%(circle)s</font> \ 'yes': _("Yes"),
<font name='Ubuntu'>%(abstain)s</font>" % 'no': _("No")},
{'circle': circle, stylesheet['Ballot_option_circle_YNA']))
'yes': _("Yes"),
'no': _("No"),
'abstain': _("Abstain")},
stylesheet['Ballot_option_circle_YNA']))
else:
cell.append(Paragraph(
"&nbsp;", stylesheet['Ballot_option_suffix_YNA']))
cell.append(Paragraph("<font name='circlefont' size='15'>%(circle)s</font> \
<font name='Ubuntu'>%(yes)s &nbsp;&nbsp;&nbsp;</font> \
<font name='circlefont' size='15'>%(circle)s</font> \
<font name='Ubuntu'>%(no)s &nbsp;&nbsp;&nbsp;</font>" %
{'circle': circle,
'yes': _("Yes"),
'no': _("No")},
stylesheet['Ballot_option_circle_YNA']))
if counter == 13: if counter == 13:
cellcolumnA = cell cellcolumnA = cell
cell = [] cell = []