Ubuntu IRC Bots

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

  1. meeetingology-output
  2. Merge into meetingology
Proposed by Thomas Molloy
Status: Superseded
Proposed branch: lp:~lderan/ubuntu-bots/meeetingology-output
Merge into: lp:~ubuntu-bots/ubuntu-bots/meetingology
Diff against target: 55 lines (+6/-7)
2 files modified
meeting.py (+2/-2)
writers.py (+4/-5)
To merge this branch: bzr merge lp:~lderan/ubuntu-bots/meeetingology-output
Reviewer Review Type Date Requested Status
Ubuntu IRC Bots Pending
Review via email: mp+205433@code.launchpad.net

This proposal supersedes a proposal from 2014-02-07.

This proposal has been superseded by a proposal from 2014-02-07.

Description of the change

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

To post a comment you must log in.
lp:~lderan/ubuntu-bots/meeetingology-output updated
19. By Alan Bell

accepting merge

20. By Alan Bell

accepting fix

21. By Alan Bell

accpeting merge

22. By Thomas Molloy

DONE items for MoinMoin outputs now show up as DONE instead of ACTION

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'meeting.py'
2--- meeting.py 2014-02-07 16:06:41 +0000
3+++ meeting.py 2014-02-07 18:24:37 +0000
4@@ -90,7 +90,7 @@
5 "\n"
6 "Minutes: %(urlBasename)s.moin.txt")
7 endMeetingNotification = ("Meeting in %(channel)s has just ended")
8- endMeetingNotificationList = ["lderan"]
9+ endMeetingNotificationList = ["jose"]
10
11 #TODO: endMeetingMessage should get filenames from the writers
12
13@@ -397,7 +397,7 @@
14 """Remove the last item from the minutes."""
15 if not self.isChair(nick): return
16 if len(self.minutes) == 0: return
17- self.reply("Removing item from minutes: %s"%str(self.minutes[-1]))
18+ self.reply("Removing item from minutes: %s"%str(self.minutes[-1].itemtype))
19 del self.minutes[-1]
20 def do_restrictlogs(self, nick, **kwargs):
21 """When saved, remove permissions from the files."""
22
23=== modified file 'writers.py'
24--- writers.py 2014-02-07 16:13:27 +0000
25+++ writers.py 2014-02-07 18:24:37 +0000
26@@ -1217,17 +1217,17 @@
27 # reversed to show the oldest first
28 if len(M.votes) > 0:
29 for m in M.votes:
30- # differentiate denied votes somehow, strikethrough perhaps?
31- Votes.append(" * [[%(fullLogsFullURL)s#"+str(M.votes[m][3])+" "+m+"]]")
32 motion = "Deadlock"
33 if(M.votes[m][0] > M.votes[m][1]):
34 motion = "Motion carried"
35 elif(M.votes[m][0] < M.votes[m][2]):
36 motion = "Motion denied"
37- Votes.insert(0," * " + motion + " (For/Against/Abstained "+str(M.votes[m][0])+"/"+str(M.votes[m][2])+"/"+str(M.votes[m][1]) + ")")
38 if len(M.publicVoters[m]) > 0:
39 publicVoters = ', '.join(set(M.publicVoters[m]))
40- Votes.append(" * Voters " + publicVoters)
41+ Votes.insert(0, " * Voters " + publicVoters)
42+ Votes.insert(0," * " + motion + " (For/Against/Abstained "+str(M.votes[m][0])+"/"+str(M.votes[m][2])+"/"+str(M.votes[m][1]) + ")")
43+ # differentiate denied votes somehow, strikethrough perhaps?
44+ Votes.insert(0," * [[%(fullLogsFullURL)s#"+str(M.votes[m][3])+" "+m+"]]"))
45 Votes = "\n".join(Votes)
46 return Votes
47
48@@ -1337,7 +1337,6 @@
49 body.append(self.body_start%repl)
50 body.append(self.meetingItems())
51 body.append(self.votes()%repl)
52- body.append(self.actionItems())
53 body.append(self.actionItemsPerson())
54 body.append(self.doneItems())
55 body.append(self.peoplePresent())

Subscribers

People subscribed via source and target branches