[whimsy] 03/04: move attendance into the template

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 9ec2666fdb2b921f78d503243ca93bc23042768e
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed May 23 09:35:39 2018 -0400

    move attendance into the template
---
 www/board/agenda/views/committers_report.text.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/www/board/agenda/views/committers_report.text.rb b/www/board/agenda/views/committers_report.text.rb
index 6e63b5d..7c4800d 100644
--- a/www/board/agenda/views/committers_report.text.rb
+++ b/www/board/agenda/views/committers_report.text.rb
@@ -34,7 +34,7 @@ attendance.each do |name, info|
 end
 
 # group attendance by role (directors, officers, guests)
-attendance = attendance.group_by {|name, info| info[:role]}.
+@attendance = attendance.group_by {|name, info| info[:role]}.
   map {|group, list| [group, list.map {|name, info| name}]}.to_h
 
 # get a list of missing attachments
@@ -82,11 +82,6 @@ next_meeting = ASF::Board.nextMeeting
 @next_meeting = prefixNumber(next_meeting.day) + " of " + 
   next_meeting.strftime('%B')
 
-##### Prepare the arrays for output
-@directors = attendance[:director].join(", ")
-@officers = attendance[:officer].join(", ")
-@guests = attendance[:guest].join(", ")
-
 if !approved_minutes.empty?
   @minutes = "\nThe " + approved_minutes.join(", ").sub(/, ([^,]*)$/, ' and \1') + " minutes were " + (approved_minutes.length > 1 ? "all " : "") + "approved. \nMinutes will be posted to http://www.apache.org/foundation/records/minutes/\n"
 else
@@ -122,15 +117,15 @@ The #{@date.strftime('%B')} board meeting took place on the #{prefixNumber(@date
 
 The following directors were present:
 
-  #{@directors}
+  <%= @attendance[:director].join(", ") %>
 
 The following officers were present:
 
-  #{@officers}
+  <%= @attendance[:officer].join(", ") %>
 
 The following guests were present:
 
-  #{@guests}
+  <%= @attendance[:guest].join(", ") %>
 #{@minutes}
 All of the received reports to the board were approved.
 

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.