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

Automated merge with ssh://openslides.org/openslides

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-09-09 16:34:33 +02:00
commit 9de5e25ae1
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/assignment/templates/assignment/poll_view.html
View File

@ -7,6 +7,7 @@
{% blocktrans count counter=options|length %}candidate{% plural %}candidates{% endblocktrans %}
</p>
<p><b>{% trans "Short description" %}:</b> {{ poll.description }}</p>
<i>-1 := {% trans 'majority' %}, -2 := {% trans 'undocumented' %}</i>
<form action="" method="post">{% csrf_token %}
<table class="table" style="width:auto;">
<tr>
@ -41,7 +42,7 @@
</tr>
</table>
<p>
<a href='{% url print_assignment_poll poll.id %}'>
<button type="button">
@ -49,7 +50,7 @@
</button>
</a>
</p>
<p>
<button type="submit">
<span class="icon ok">{%trans 'Save' %}</span>

6
openslides/poll/forms.py
View File

@ -42,6 +42,6 @@ class OptionResultForm(Form):
error_css_class = 'error'
required_css_class = 'required'
yes = IntegerField(min_value=-1, widget=TextInput(attrs={'class': 'small-input'}), label=_("Yes"))
no = IntegerField(min_value=-1, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("No"))
undesided = IntegerField(min_value=-1, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("Abstention"))
yes = IntegerField(min_value=-2, widget=TextInput(attrs={'class': 'small-input'}), label=_("Yes"))
no = IntegerField(min_value=-2, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("No"))
undesided = IntegerField(min_value=-2, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("Abstention"))

16
openslides/poll/models.py
View File

@ -71,7 +71,7 @@ class Poll(models.Model):
if self.assignment:
return Poll.objects.filter(assignment=self.assignment).count()
return None
@property
def ballot(self):
if self.application:
@ -125,6 +125,8 @@ class Option(models.Model):
def yes(self):
if self.voteyes == -1:
return _('majority')
if self.voteyes == -2:
return _('undocumented')
if self.voteyes:
return self.voteyes
return '0'
@ -133,6 +135,8 @@ class Option(models.Model):
def no(self):
if self.voteno == -1:
return _('majority')
if self.voteno == -2:
return _('undocumented')
if self.voteno:
return self.voteno
return '0'
@ -141,6 +145,8 @@ class Option(models.Model):
def undesided(self):
if self.voteundesided == -1:
return _('majority')
if self.voteundesided == -2:
return _('undocumented')
if self.voteundesided:
return self.voteundesided
return '0'
@ -156,10 +162,6 @@ class Option(models.Model):
return None
def __unicode__(self):
if self.text != "" and self.text is not None:
return self.text
if self.user is not None:
return unicode(self.user)
if self.application is not None:
return unicode(self.application)
if self.value:
return unicode(self.value)
return _("No options")