whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: highlight which committees are expected to report next month.
Date Sat, 24 Aug 2019 18:19:14 GMT
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


The following commit(s) were added to refs/heads/master by this push:
     new d1676b7  highlight which committees are expected to report next month.
d1676b7 is described below

commit d1676b703c627227a832478c12a83abc8ec3b610
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Sat Aug 24 14:18:43 2019 -0400

    highlight which committees are expected to report next month.
---
 www/board/agenda/routes.rb         | 4 ++++
 www/board/agenda/views/new.html.rb | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb
index 4f9ad0f..296d772 100755
--- a/www/board/agenda/routes.rb
+++ b/www/board/agenda/routes.rb
@@ -510,6 +510,10 @@ get '/new' do
   revision, contents = ASF::SVN.get(cinfo, env.user, env.password)
   ASF::Committee.load_committee_info(contents, info)
 
+  # extract committees expected to report 'next month'
+  next_month = contents[/Next month.*?\n\n/m].chomp
+  @next_month = next_month[/(.*#.*\n)+/] || ''
+
   # Get directors, list of pmcs due to report, and shepherds
   @directors = ASF::Board.directors
   @pmcs = ASF::Board.reporting(@meeting)
diff --git a/www/board/agenda/views/new.html.rb b/www/board/agenda/views/new.html.rb
index 816b1ef..48d2674 100644
--- a/www/board/agenda/views/new.html.rb
+++ b/www/board/agenda/views/new.html.rb
@@ -9,6 +9,13 @@ _html do
   _meta name: 'viewport', content: 'width=device-width, initial-scale=1.0'
 
   _div.container.new_agenda! do
+    if @next_month and not @next_month.empty?
+      _div.commented do
+        _h4 'Committees expected to report next month, and why:'
+        _pre.commented @next_month
+      end
+    end
+
     _form method: 'post',  action: @meeting.strftime("%Y-%m-%d/") do
 
       _div.text_center do


Mime
View raw message