[whimsy] 02/04: move missing reports to 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 34c05df721356ddb1ea35e17451098afdff5f05b
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed May 23 09:30:30 2018 -0400

    move missing reports to the template
---
 www/board/agenda/views/committers_report.text.rb | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/www/board/agenda/views/committers_report.text.rb b/www/board/agenda/views/committers_report.text.rb
index 95a6fa6..6e63b5d 100644
--- a/www/board/agenda/views/committers_report.text.rb
+++ b/www/board/agenda/views/committers_report.text.rb
@@ -38,12 +38,11 @@ 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
-missing_reports = Array.new
+@missing_reports = Array.new
 agenda.each do |item|
   next unless item['missing']
   next if item['to'] == 'president'
-  missing_reports << "Report from the Apache #{item['title']} Project" +
-    "  [#{item['owner']}]"
+  @missing_reports << item
 end
 
 # extract date of the meeting
@@ -98,14 +97,6 @@ if !other_minutes.empty?
   @minutes += other_minutes.join("\n") + "\n"
 end
 
-if !missing_reports.empty?
-  @missing_reports = "The following reports were not received and are expected next month: \n\n  "
-  @missing_reports += missing_reports.join("\n  ")
-  @missing_reports += "\n"
-else
-  @missing_reports = ""
-end
-
 if !approved_resolutions.empty?
   @resolutions = "The following resolutions were passed unanimously: \n\n"
   approved_resolutions.each() do |resolution|
@@ -143,7 +134,14 @@ The following guests were present:
 #{@minutes}
 All of the received reports to the board were approved.
 
-#{@missing_reports}
+<% unless @missing_reports.empty? %>
+The following reports were not received and are expected next month:
+
+<% @missing_reports.each do |report| %>
+  Report from the Apache <%= report['title'] %> Project [<%= report['owner'] %>]
+<% end %>
+
+<% end %>
 #{@resolutions}
 The next board meeting will be on the #{@next_meeting}.
 REPORT

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