Merge lp:~lderan/ubuntu-bots/meeetingology-output into lp:~ubuntu-bots/ubuntu-bots/meetingology

Proposed by Thomas Molloy
Status: Merged
Merged at revision: 17
Proposed branch: lp:~lderan/ubuntu-bots/meeetingology-output
Merge into: lp:~ubuntu-bots/ubuntu-bots/meetingology
Diff against target: 36 lines (+14/-13)
1 file modified
writers.py (+14/-13)
To merge this branch: bzr merge lp:~lderan/ubuntu-bots/meeetingology-output
Reviewer Review Type Date Requested Status
Alan Bell Approve
Review via email: mp+205384@code.launchpad.net

Description of the change

fix for the vote output

To post a comment you must log in.
Revision history for this message
Alan Bell (alanbell) :
review: Approve
17. By Alan Bell

accept fix of vote output

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'writers.py'
--- writers.py 2013-11-19 23:51:36 +0000
+++ writers.py 2014-02-07 15:24:49 +0000
@@ -1215,19 +1215,20 @@
1215 Votes = [ ]1215 Votes = [ ]
1216 Votes.append(self.heading('Vote results'))1216 Votes.append(self.heading('Vote results'))
1217 # reversed to show the oldest first1217 # reversed to show the oldest first
1218 for m in reversed(M.votes):1218 if len(M.votes) > 0:
1219 # differentiate denied votes somehow, strikethrough perhaps?1219 for m in reversed(M.votes):
1220 Votes.append(" * [[%(fullLogsFullURL)s#"+str(M.votes[m][3])+" "+m+"]]")1220 # differentiate denied votes somehow, strikethrough perhaps?
1221 motion = "Deadlock"1221 Votes.append(" * [[%(fullLogsFullURL)s#"+str(M.votes[m][3])+" "+m+"]]")
1222 if(M.votes[m][0] > M.votes[m][1]):1222 motion = "Deadlock"
1223 motion = "Motion carried"1223 if(M.votes[m][0] > M.votes[m][1]):
1224 elif(M.votes[m][0] < M.votes[m][2]):1224 motion = "Motion carried"
1225 motion = "Motion denied"1225 elif(M.votes[m][0] < M.votes[m][2]):
1226 1226 motion = "Motion denied"
1227 Votes.append(" * " + motion + " (For/Against/Abstained "+str(M.votes[m][0])+"/"+str(M.votes[m][2])+"/"+str(M.votes[m][1]) + ")")1227
1228 if len(M.publicVoters[m]) > 0:1228 Votes.append(" * " + motion + " (For/Against/Abstained "+str(M.votes[m][0])+"/"+str(M.votes[m][2])+"/"+str(M.votes[m][1]) + ")")
1229 publicVoters = ', '.join(set(M.publicVoters[m]))1229 if len(M.publicVoters[m]) > 0:
1230 Votes.append(" * Voters " + publicVoters)1230 publicVoters = ', '.join(set(M.publicVoters[m]))
1231 Votes.append(" * Voters " + publicVoters)
1231 Votes = "\n".join(Votes) 1232 Votes = "\n".join(Votes)
1232 return Votes1233 return Votes
12331234

Subscribers

People subscribed via source and target branches