You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cu...@apache.org on 2018/04/04 14:54:40 UTC
[whimsy] branch master updated: Add last meeting date and normalize
related links
This is an automated email from the ASF dual-hosted git repository.
curcuru 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 5d8fea9 Add last meeting date and normalize related links
5d8fea9 is described below
commit 5d8fea9b9e32c10f727da296d1faf18f861243b7
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Wed Apr 4 10:54:34 2018 -0400
Add last meeting date and normalize related links
---
www/members/attendance-xcheck.cgi | 10 ++++++----
www/members/non-participants.cgi | 5 +++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/www/members/attendance-xcheck.cgi b/www/members/attendance-xcheck.cgi
index 0a129ee..6715749 100755
--- a/www/members/attendance-xcheck.cgi
+++ b/www/members/attendance-xcheck.cgi
@@ -35,26 +35,28 @@ _html do
_whimsy_body(
title: PAGETITLE,
related: {
+ '/members/non-participants' => 'Members Not Attending X Meetings',
'/members/inactive' => 'Inactive Member Feedback Form',
'/members/proxy' => 'Members Meeting Proxy Assignment',
'/members/subscriptions' => 'Members@ Mailing List Crosscheck'
},
helpblock: -> {
_ 'This script cross-checks all people listed in members.txt versus the official attendance.json file that notes which members attended (or proxied) which meetings.'
+ _ "Includes data through #{json['dates'].last} meeting."
}
) do
- _h2_ 'Listed as attending a members meeting, but not in members.txt'
+ _h2_ 'Listed as attending a members meeting, but not in members.txt; note name changes or spelling differences may be the culprit.'
_ul do
attend.sort.each do |name|
_li name
end
end
- _h2_ 'Listed in members.txt but not listed as attending a members meeting'
+ _h2_ 'Listed in members.txt but not listed as attending a members meeting.'
_table do
_thead do
- _th 'name'
- _th 'date added as a member'
+ _th 'Name'
+ _th 'Date added as a member'
end
missing.sort.each do |name, meeting|
next if meeting =~ /^2015/
diff --git a/www/members/non-participants.cgi b/www/members/non-participants.cgi
index 46a6d1f..4eb0a20 100755
--- a/www/members/non-participants.cgi
+++ b/www/members/non-participants.cgi
@@ -43,6 +43,7 @@ _html do
title: PAGETITLE,
subtitle: 'Select A Date:',
related: {
+ '/members/attendance-xcheck' => 'Members Meeting Attendance Crosscheck',
'/members/inactive' => 'Inactive Member Feedback Form',
'/members/proxy' => 'Members Meeting Proxy Assignment',
'/members/subscriptions' => 'Members@ Mailing List Crosscheck'
@@ -55,13 +56,13 @@ _html do
_option name, value: i+1, selected: (i+1 == @meetingsMissed)
end
end
- _span "meeting. Active members does not include emeritus or deceased members."
+ _span "meeting. Active members does not include emeritus or deceased members. Includes data thru #{attendance['dates'].last} meeting."
end
_h4 'Definitions'
_p do
_ 'Participating is defined by doing at least one of the following:'
_ul do
- _li 'Attending a members meeting'
+ _li 'Attending a members meeting in IRC'
_li 'Voting in an election'
_li 'Assigning a proxy'
end
--
To stop receiving notification emails like this one, please contact
curcuru@apache.org.