[whimsy] branch master updated: Use table for showing current signers

[se...@apache.org]

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

sebb 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 b3989d4  Use table for showing current signers
b3989d4 is described below

commit b3989d4ea2b38f6deb06ca84e6bcc2879ec2332e
Author: Sebb <se...@apache.org>
AuthorDate: Fri Jun 26 15:17:56 2020 +0100

    Use table for showing current signers
---
 www/officers/coi.cgi | 70 ++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index d5965a1..993835e 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -38,12 +38,6 @@ signerfiles.each do |signerfile|
 end
 USER_AFFIRMATION_FILE = user_affirmation_file
 
-# Get the list of required users who have not yet signed
-NONSIGNERS = []
-IDS.each do |required|
-  NONSIGNERS.push(required) unless SIGNERS.include? required
-end
-
 # Determine if user should sign the affirmation form
 user_is_required = IDS.include? USERID
 not_required_message = user_is_required ?' required':' not required'
@@ -92,33 +86,45 @@ _html do
         _ 'This page allows officers to sign their Conflict of Interest annual affirmation.'
       end
       if _.get?
-      _p 'The following are currently required to affirm the Conflict of Interest:'
-      IDS.each do |id|
-       affirmer = ASF::Person.find(id)
-       _ "#{affirmer.cn} (#{affirmer.id}) "
-      end
-      _p
-      _b 'Signers for this year:'
-      SIGNERS.each do |signer, signerfile|
-        _a signer, href: "#{COI_CURRENT_URL}/#{signerfile}"
-      end
-      _p
-      _b 'Nonsigners for this year:'
-      NONSIGNERS.each do |nonsigner|
-        _ nonsigner
-      end
-      _p
-      _p "You are signed in as #{USERNAME} (#{USERID}) at #{current_timestamp}."
-      _p {_ "You are ";_b "#{not_required_message}";_ " to affirm the Conflict of Interest policy for this year."}
-      _p {_ "You ";_b "#{have_affirmed_message}";_  "the Conflict of Interest policy for this year."}
-      if  USER_AFFIRMATION_FILE
-        _a "Your Conflict of Interest affirmation",
-          href: "#{COI_CURRENT_URL}/#{USER_AFFIRMATION_FILE}"
-      end
-      if USER_IS_REQUIRED_BUT_NOT_AFFIRMED
-        _p {_b "You are invited to sign the affirmation below"}
+        _p 'The following are currently required to affirm the Conflict of Interest:'
+        _table.table.table_striped do
+          _thead do
+            _tr do
+              _th 'Name'
+              _th 'AvailId'
+              _th 'Link to affirmation'
+            end
+          end
+          _tbody do
+            IDS.each do |id|
+              affirmer = ASF::Person.find(id)
+              _tr do
+                _td affirmer.cn
+                _td affirmer.id 
+                _td do
+                  signerfile = SIGNERS[affirmer.id]
+                  if signerfile
+                    _a affirmer.id, href: "#{COI_CURRENT_URL}/#{signerfile}"
+                  else
+                    _ 'Not yet signed this calendar year'
+                  end
+                end
+              end
+            end
+          end
+        end
+        _p
+        _p "You are signed in as #{USERNAME} (#{USERID}) at #{current_timestamp}."
+        _p {_ "You are ";_b "#{not_required_message}";_ " to affirm the Conflict of Interest policy for this year."}
+        _p {_ "You ";_b "#{have_affirmed_message}";_  "the Conflict of Interest policy for this year."}
+        if  USER_AFFIRMATION_FILE
+          _a "Your Conflict of Interest affirmation",
+            href: "#{COI_CURRENT_URL}/#{USER_AFFIRMATION_FILE}"
+        end
+        if USER_IS_REQUIRED_BUT_NOT_AFFIRMED
+          _p {_b "You are invited to sign the affirmation below"}
+        end
       end
-    end
     }
     ) do
       if _.get?