[whimsy.git] [1/1] Commit 1dd6e73: rough in chair, committers, groups

[Sam Ruby]

Commit 1dd6e739219066f06ac701d8166d73a95877b249:
    rough in chair, committers, groups


Branch: refs/heads/master
Author: Sam Ruby <ru...@intertwingly.net>
Committer: Sam Ruby <ru...@intertwingly.net>
Pusher: rubys <ru...@apache.org>

------------------------------------------------------------
www/roster/models/committee.rb                               | + 
www/roster/public/stylesheets/app.css                        | + 
www/roster/views/committee.js.rb                             | ++++++++++++ -
www/roster/views/committer.js.rb                             | ++++++++++ 
------------------------------------------------------------
37 changes: 36 additions, 1 deletions.
------------------------------------------------------------


diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index ed09d36..5eab65b 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -11,6 +11,7 @@ def self.serialize(id)
 
     response = {
       id: id,
+      chair: pmc.chair.id,
       display_name: pmc.display_name,
       description: pmc.description,
       schedule: pmc.schedule,
diff --git a/www/roster/public/stylesheets/app.css 
b/www/roster/public/stylesheets/app.css
index 2f3ca2d..46a4840 100644
--- a/www/roster/public/stylesheets/app.css
+++ b/www/roster/public/stylesheets/app.css
@@ -1,5 +1,6 @@
 body {margin: 10px 33px}
 h1 .note, h2 .note {font-size: small}
+h1 small {font-weight: normal; font-size: medium}
 h2 {margin-bottom: 0}
 h4 {margin-left: 1em}
 table ul {margin: 0; padding: 0; list-style: none}
diff --git a/www/roster/views/committee.js.rb b/www/roster/views/committee.js.rb
index 4414521..b7dfb9e 100644
--- a/www/roster/views/committee.js.rb
+++ b/www/roster/views/committee.js.rb
@@ -10,7 +10,6 @@ def render
 
     _h2 'PMC'
     _table do
-
       roster = @@committee.roster
 
       for id in roster
@@ -19,6 +18,30 @@ def render
         _tr do
           _td {_a id, href: "committer/#{id}"}
           _td person.name
+          _td person.date
+
+          if id == @@committee.chair
+            _td.chair 'chair'
+          end
+        end
+      end
+    end
+
+    if @@committee.committers.keys().all? {|id| @@committee.roster[id]}
+      _p 'All committers are members of the PMC'
+    else
+      _h2 'Committers'
+      _table do
+        committers = @@committee.committers
+
+        for id in committers
+          next if @@committee.roster[id]
+          person = committers[id]
+
+          _tr do
+            _td {_a id, href: "committer/#{id}"}
+            _td person
+          end
         end
       end
     end
diff --git a/www/roster/views/committer.js.rb b/www/roster/views/committer.js.rb
index ec4d141..21ebfd5 100644
--- a/www/roster/views/committer.js.rb
+++ b/www/roster/views/committer.js.rb
@@ -46,6 +46,16 @@ def render
           end
         end
       end
+
+      _tr do
+        _td 'Groups'
+        _td do
+          _ul @@committer.groups do |pmc|
+            next if @@committer.committees.include? pmc
+            _li {_a pmc, href: "committee/#{pmc}"}
+          end
+        end
+      end
     end
   end
 end