Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'lca2017' into chrisjrn/20160815

Browse source 
Conflicts:
	symposion/reviews/views.py
This commit is contained in:
Scott Bragg 2016-08-15 23:02:49 +10:00
commit 124335cc7c
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
symposion/reviews/views.py
View file

@ -257,16 +257,13 @@ def review_admin(request, section_slug):
continue continue
already_seen.add(user.pk) already_seen.add(user.pk)
user.comment_count = Review.objects.filter( user.comment_count = Review.objects.filter(user=user).count()
user=user,
proposal__kind__section__slug=section_slug,
).count()
user_votes = LatestVote.objects.filter( user_votes = LatestVote.objects.filter(
user=user, user=user,
proposal__kind__section__slug=section_slug, proposal__kind__section__slug=section_slug,
) )
print section_slug
print [vote.proposal.kind.section.slug for vote in user_votes]
user.total_votes = user_votes.exclude( user.total_votes = user_votes.exclude(
vote=LatestVote.VOTES.ABSTAIN, vote=LatestVote.VOTES.ABSTAIN,
).count() ).count()
@ -285,13 +282,12 @@ def review_admin(request, section_slug):
user.abstain = user_votes.filter( user.abstain = user_votes.filter(
vote=LatestVote.VOTES.ABSTAIN, vote=LatestVote.VOTES.ABSTAIN,
).count() ).count()
if user.total_votes == 0: if user.total_votes == 0:
user.average = "-" user.average = "-"
else: else:
user.average = ( user.average = (
((user.plus_two * 2) + user.plus_one) - user.plus_two + user.plus_one +
((user.minus_two * 2) + user.minus_one) user.minus_one + user.minus_two
) / (user.total_votes * 1.0) ) / (user.total_votes * 1.0)
yield user yield user
@ -301,7 +297,7 @@ def review_admin(request, section_slug):
ctx = { ctx = {
"section_slug": section_slug, "section_slug": section_slug,
"reviewers": reviewers_sorted, "reviewers": reviewers(),
} }
return render(request, "symposion/reviews/review_admin.html", ctx) return render(request, "symposion/reviews/review_admin.html", ctx)