Thomas Molloy has proposed merging lp:~lderan/ubuntu-bots/meeetingology-output
into lp:~ubuntu-bots/ubuntu-bots/meetingology.
Requested reviews:
Ubuntu IRC Bots (ubuntu-bots)
For more details, see:
https://code.launchpad.net/~lderan/ubuntu-bots/meeetingology-output/+merge/205438
Changed the layout for the vote output and set Jose to be the one notified when
a meeting ends
new stuff : changed undo to be more descriptive and removed the action items
list in the moinmoin output as its been replaced by action items per person
--
https://code.launchpad.net/~lderan/ubuntu-bots/meeetingology-output/+merge/205438
Your team Ubuntu IRC Bots is requested to review the proposed merge of
lp:~lderan/ubuntu-bots/meeetingology-output into
lp:~ubuntu-bots/ubuntu-bots/meetingology.
=== modified file 'meeting.py'
--- meeting.py 2014-02-07 16:06:41 +0000
+++ meeting.py 2014-02-07 18:25:01 +0000
@@ -90,7 +90,7 @@
"\n"
"Minutes: %(urlBasename)s.moin.txt")
endMeetingNotification = ("Meeting in %(channel)s has just ended")
- endMeetingNotificationList = ["lderan"]
+ endMeetingNotificationList = ["jose"]
#TODO: endMeetingMessage should get filenames from the writers
@@ -397,7 +397,7 @@
"""Remove the last item from the minutes."""
if not self.isChair(nick): return
if len(self.minutes) == 0: return
- self.reply("Removing item from minutes: %s"%str(self.minutes[-1]))
+ self.reply("Removing item from minutes: %s"%str(self.minutes[-1].itemtype))
del self.minutes[-1]
def do_restrictlogs(self, nick, **kwargs):
"""When saved, remove permissions from the files."""
=== modified file 'writers.py'
--- writers.py 2014-02-07 16:13:27 +0000
+++ writers.py 2014-02-07 18:25:01 +0000
@@ -1217,17 +1217,17 @@
# reversed to show the oldest first
if len(M.votes) > 0:
for m in M.votes:
- # differentiate denied votes somehow, strikethrough perhaps?
- Votes.append(" * [[%(fullLogsFullURL)s#"+str(M.votes[m][3])+" "+m+"]]")
motion = "Deadlock"
if(M.votes[m][0] > M.votes[m][1]):
motion = "Motion carried"
elif(M.votes[m][0] < M.votes[m][2]):
motion = "Motion denied"
- Votes.insert(0," * " + motion + " (For/Against/Abstained "+str(M.votes[m][0])+"/"+str(M.votes[m][2])+"/"+str(M.votes[m][1]) + ")")
if len(M.publicVoters[m]) > 0:
publicVoters = ', '.join(set(M.publicVoters[m]))
- Votes.append(" * Voters " + publicVoters)
+ Votes.insert(0, " * Voters " + publicVoters)
+ Votes.insert(0," * " + motion + " (For/Against/Abstained "+str(M.votes[m][0])+"/"+str(M.votes[m][2])+"/"+str(M.votes[m][1]) + ")")
+ # differentiate denied votes somehow, strikethrough perhaps?
+ Votes.insert(0," * [[%(fullLogsFullURL)s#"+str(M.votes[m][3])+" "+m+"]]"))
Votes = "\n".join(Votes)
return Votes
@@ -1337,7 +1337,6 @@
body.append(self.body_start%repl)
body.append(self.meetingItems())
body.append(self.votes()%repl)
- body.append(self.actionItems())
body.append(self.actionItemsPerson())
body.append(self.doneItems())
body.append(self.peoplePresent())
--
Mailing list: https://launchpad.net/~ubuntu-bots
Post to : ubuntu-bots@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-bots
More help : https://help.launchpad.net/ListHelp
