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

merge error

Browse Source
This commit is contained in:
Oskar Hahn 2011-09-03 11:56:35 +02:00
parent f5d2a503d0
commit 98ee433cd3
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openslides/assignment/models.py
View File

@ -91,7 +91,7 @@ class Assignment(models.Model):
def gen_poll(self): def gen_poll(self):
from poll.models import Poll from poll.models import Poll
poll = Poll() poll = Poll()
candidates = list(self.profile.all()) candidates = list(self.profile.all())
for elected in self.elected.all(): for elected in self.elected.all():
try: try:
@ -104,17 +104,17 @@ class Assignment(models.Model):
poll.optiondecision = True poll.optiondecision = True
else: else:
poll.optiondecision = False poll.optiondecision = False
# Option B: candidates == 1 -> yes/no/abstention # Option B: candidates == 1 -> yes/no/abstention
#if self.profile.count() == 1: #if self.profile.count() == 1:
# poll.optiondecision = True # poll.optiondecision = True
#else: #else:
# poll.optiondecision = False # poll.optiondecision = False
poll.assignment = self poll.assignment = self
poll.description = self.polldescription poll.description = self.polldescription
poll.save() poll.save()
for candidate in candidates: for candidate in candidates:
poll.add_option(candidate) poll.add_option(candidate)
return poll return poll

35
openslides/assignment/views.py
View File

@ -65,24 +65,18 @@ def view(request, assignment_id=None):
if request.user.has_perm('assignment.can_nominate_other'): if request.user.has_perm('assignment.can_nominate_other'):
form = AssignmentRunForm() form = AssignmentRunForm()
# list of candidates
candidates = set()
for option in Option.objects.filter(poll__assignment=assignment):
candidates.add(option.value)
votes = [] votes = []
for candidate in candidates: for candidate in assignment.candidates:
tmplist = [] tmplist = [[candidate, assignment.is_elected(candidate)], []]
tmplist.append(candidate)
for poll in assignment.poll_set.all(): for poll in assignment.poll_set.all():
if candidate in poll.options_values: if candidate in poll.options_values:
option = Option.objects.filter(poll=poll).filter(user=candidate)[0] option = Option.objects.filter(poll=poll).filter(user=candidate)[0]
if poll.optiondecision: if poll.optiondecision:
tmplist.append([option.yes, option.no, option.undesided]) tmplist[1].append([option.yes, option.no, option.undesided])
else: else:
tmplist.append(option.yes) tmplist[1].append(option.yes)
else: else:
tmplist.append("-") tmplist[1].append("-")
votes.append(tmplist) votes.append(tmplist)
return {'assignment': assignment, return {'assignment': assignment,
@ -241,3 +235,22 @@ def delete_poll(request, poll_id):
else: else:
del_confirm_form(request, poll, name=_("the %s. ballot") % ballot) del_confirm_form(request, poll, name=_("the %s. ballot") % ballot)
return redirect(reverse('assignment_view', args=[assignment.id])) return redirect(reverse('assignment_view', args=[assignment.id]))
@permission_required('assignment.can_manage_assignment')
def set_elected(request, assignment_id, profile_id, elected=True):
assignment = Assignment.objects.get(pk=assignment_id)
profile = Profile.objects.get(pk=profile_id)
assignment.set_elected(profile, elected)
if request.is_ajax():
if elected:
link = reverse('assignment_user_not_elected', args=[assignment.id, profile.id])
text = _('not elected')
else:
link = reverse('assignment_user_elected', args=[assignment.id, profile.id])
text = _('elected')
return ajax_request({'elected': elected,
'link': link,
'text': text})
return redirect(reverse('assignment_view', args=[assignment_id]))