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 2ee86353 Say when noms close
2ee86353 is described below
commit 2ee863532171e65a7630b6bf4c71654b45aa6f0b
Author: Sebb <s...@apache.org>
AuthorDate: Sun Feb 18 13:16:12 2024 +0000
Say when noms close
---
www/members/board-nominate.cgi | 9 +++++++--
www/members/member_nominations.cgi | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/www/members/board-nominate.cgi b/www/members/board-nominate.cgi
index 254547e5..dcfb4d22 100755
--- a/www/members/board-nominate.cgi
+++ b/www/members/board-nominate.cgi
@@ -10,8 +10,11 @@ require 'whimsy/asf/forms'
require 'whimsy/asf/member-files'
require 'whimsy/asf/wunderbar_updates'
require 'whimsy/asf/meeting-util'
+require 'whimsy/asf/time-utils'
-nomclosed = Time.now.to_i > ASF::MeetingUtil.get_invite_times.first
+t_now = Time.now.to_i
+t_end = ASF::MeetingUtil.get_invite_times.first
+nomclosed = t_now > t_end
def emit_form(title, prev_data)
_whimsy_panel(title, style: 'panel-success') do
@@ -94,7 +97,9 @@ _html do
) do
if nomclosed
- _h1 'Nominations are now closed!'
+ _h1 'Nominations are now closed!'
+ else
+ _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc}"
end
_div id: 'nomination-form' do
diff --git a/www/members/member_nominations.cgi
b/www/members/member_nominations.cgi
index d4631327..71087e9a 100755
--- a/www/members/member_nominations.cgi
+++ b/www/members/member_nominations.cgi
@@ -10,8 +10,11 @@ require 'whimsy/asf/forms'
require 'whimsy/asf/member-files'
require 'whimsy/asf/wunderbar_updates'
require 'whimsy/asf/meeting-util'
+require 'whimsy/asf/time-utils'
-nomclosed = Time.now.to_i > ASF::MeetingUtil.get_invite_times.first
+t_now = Time.now.to_i
+t_end = ASF::MeetingUtil.get_invite_times.first
+nomclosed = t_now > t_end
def emit_form(title, prev_data)
_whimsy_panel(title, style: 'panel-success') do
@@ -99,7 +102,9 @@ _html do
) do
if nomclosed
- _h1 'Nominations are now closed!'
+ _h1 'Nominations are now closed!'
+ else
+ _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc}"
end
_div id: 'nomination-form' do
