[whimsy] 02/02: Handle multiple mtgs/yr better

[sebb]

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

commit 9b0f3ef64fa6ca94bd1b688fb2074d1c6b8cc767
Author: Sebb <s...@apache.org>
AuthorDate: Wed May 4 00:25:41 2022 +0100

    Handle multiple mtgs/yr better
---
 www/members/meeting.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/www/members/meeting.cgi b/www/members/meeting.cgi
index d1813cc0..80317380 100755
--- a/www/members/meeting.cgi
+++ b/www/members/meeting.cgi
@@ -66,10 +66,13 @@ def emit_meeting(cur_mtg_dir, svn_mtg_dir, dt, num_members, 
quorum_need, num_pro
   end
 end
 
+MEETINGS = ASF::SVN['Meetings']
+
 # produce HTML
 _html do
   _body? do
-    MEETINGS = ASF::SVN['Meetings']
+    last_mtg_dir = ASF::MeetingUtil.get_latest_completed(MEETINGS)
+    last_mtg_date = Date.parse(File.basename(last_mtg_dir))
     cur_mtg_dir = ASF::MeetingUtil.get_latest(MEETINGS)
     meeting = File.basename(cur_mtg_dir)
     svn_mtg_dir = File.join(ASF::MeetingUtil::RECORDS, meeting)
@@ -116,7 +119,7 @@ _html do
         if today > m2_date # Based on the reconvene date
           _p do
             _ %{
-              The last Annual Member's Meeting was held 
#{mtg_date.strftime('%A, %d %B %Y')}.  Expect the
+              The last Annual Member's Meeting was held 
#{last_mtg_date.strftime('%A, %d %B %Y')}.  Expect the
               next Member's meeting to be scheduled between 12 - 13 months 
after the previous meeting, as per
             }
             _a 'https://www.apache.org/foundation/bylaws.html#3.2', 'the 
bylaws 3.2.'
@@ -148,6 +151,8 @@ _html do
         end
       }
     ) do
+      # if there is a new meeting in the offing, use its date
+      m1_date = mtg_date if m1_date == ERROR_DATE && cur_mtg_dir > last_mtg_dir
       help, copypasta = ASF::MeetingUtil.is_user_proxied(cur_mtg_dir, $USER)
       # attendance = JSON.parse(IO.read(File.join(MEETINGS, 
'attendance.json')))
       user = ASF::Person.find($USER)