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

[Thomas Molloy]

fix for the moinmoin output & DONE items

[Alan Bell (alanbell)]

fix typo

review: Approve

[lp:~lderan/ubuntu-bots/meeetingology-output]

21. By Alan Bell on 2014-04-15

accpeting merge

22. By Thomas Molloy on 2015-02-11

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

Unmerged revisions

=== modified file 'meeting.py'
--- meeting.py	2014-02-07 17:30:02 +0000
+++ meeting.py	2014-04-15 19:06:02 +0000
@@ -574,10 +574,10 @@
         commands = ["action", "info", "idea", "nick", "link", "commands"]
         commands.sort()
         self.reply("Available commands: "+(" ".join(commands)))
-    def do_done(self, nick, **kwargs):
+    def do_done(self, nick, line, **kwargs):
         """Add aggreement to the minutes - chairs only."""
         if not self.isChair(nick): return
-        m = items.Done(**kwargs)
+        m = items.Done(nick=nick, line=line, **kwargs)
         self.additem(m)
 
 
 
=== modified file 'writers.py'
--- writers.py	2014-02-08 12:05:30 +0000
+++ writers.py	2014-04-15 19:06:02 +0000
@@ -1213,7 +1213,6 @@
         M = self.M
         # Votes
         Votes = [ ]
-        Votes.append(self.heading('Vote results'))
         # reversed to show the oldest first
         if len(M.votes) > 0:
             for m in M.votes:
@@ -1227,7 +1226,9 @@
                     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+"]]")
+                voteLink = "%(fullLogsFullURL)s"%self.replacements()
+                Votes.insert(0, " * [["+voteLink+"#"+str(M.votes[m][3])+" "+m+"]]")
+        Votes.insert(0, self.heading('Vote results'))
         Votes = "\n".join(Votes) 
         return Votes
 
@@ -1336,7 +1337,7 @@
         body = [ ]
         body.append(self.body_start%repl)
         body.append(self.meetingItems())
-        body.append(self.votes()%repl)
+        body.append(self.votes())
         body.append(self.actionItemsPerson())
         body.append(self.doneItems())
         body.append(self.peoplePresent())