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 f9877aee Add meeting type, date to headers
f9877aee is described below
commit f9877aee016212af8d19e4c85374663ea715b360
Author: Shane Curcuru <[email protected]>
AuthorDate: Fri Jan 24 14:54:50 2025 -0500
Add meeting type, date to headers
---
www/members/nominations.cgi | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/www/members/nominations.cgi b/www/members/nominations.cgi
index 7c1ffe5c..2ca4fc16 100755
--- a/www/members/nominations.cgi
+++ b/www/members/nominations.cgi
@@ -11,8 +11,9 @@ require_relative '../../tools/parsemail'
require 'whimsy/asf/time-utils'
# Countdown until nominations for current meeting close
+timelines = ASF::MeetingUtil.get_timeline(ASF::MeetingUtil.latest_meeting_dir)
t_now = Time.now.to_i
-t_end = Time.parse(ASF::MeetingUtil.nominations_close).to_i
+t_end = Time.parse(timelines['nominations_close']).to_i
nomclosed = t_now > t_end
# link to members private-arch
@@ -117,6 +118,7 @@ _html do
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
+ _b "For: #{timelines['meeting_type']} Meeting on:
#{timelines['meeting_iso']}"
_ 'This script checks new member nomination statements from members@
against the official meeting ballot files, and highlights differences. '
_ 'This only works in the period shortly before or after a Members
meeting!'
_br
@@ -127,10 +129,10 @@ _html do
}
) do
if nomclosed
- _h1 'Nominations are now closed!'
+ _h1 "Nominations are CLOSED for Meeting: #{timelines['meeting_iso']}"
_p 'Nominations must no longer be added to the nominations file'
else
- _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc}"
+ _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc} for Meeting: #{timelines['meeting_iso']}"
_p 'Please ensure all posted nominations are added to
nominated-members.txt before then.'
end
cur_mtg_dir = File.basename(ASF::MeetingUtil.get_latest(MEETINGS))