[whimsy] branch master updated: fix skippable for meeting day; minor refactoring

[rubys]

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

rubys 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 7b32008  fix skippable for meeting day; minor refactoring
7b32008 is described below

commit 7b3200830d436f999b7b60959f2c1d1880efb78c
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Dec 18 11:31:56 2019 -0500

    fix skippable for meeting day; minor refactoring
---
 www/board/agenda/views/layout/footer.js.rb | 3 +--
 www/board/agenda/views/models/agenda.js.rb | 9 +++++++--
 www/board/agenda/views/pages/flagged.js.rb | 3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/www/board/agenda/views/layout/footer.js.rb 
b/www/board/agenda/views/layout/footer.js.rb
index 1b0f892..622e871 100644
--- a/www/board/agenda/views/layout/footer.js.rb
+++ b/www/board/agenda/views/layout/footer.js.rb
@@ -11,8 +11,7 @@
 class Footer < Vue
   def render
     
-    meeting_day = Minutes.started ||
-      Date.new().toISOString().slice(0,10) >= Agenda.date
+    meeting_day = Minutes.started || Agenda.meeting_day
 
     _footer.navbar.navbar_fixed_bottom class: @@item.color do
 
diff --git a/www/board/agenda/views/models/agenda.js.rb 
b/www/board/agenda/views/models/agenda.js.rb
index 3468ae2..8051d1f 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -328,6 +328,11 @@ class Agenda
     @@date
   end
 
+  # is today the meeting day?
+  def self.meeting_day
+    Date.new().toISOString().slice(0,10) >= @@date
+  end
+
   # the default title for the agenda as a whole
   def self.title
     @@date
@@ -568,8 +573,8 @@ class Agenda
   # determine if this report can be skipped during the course of the meeting
   def skippable
     return false if self.flagged
-    return (@to == 'president') if Minutes.started and self.missing
-    return false if Minutes.started and @approved and @approved.length < 5
+    return (@to == 'president') if self.missing and Agenda.meeting_day
+    return false if @approved and @approved.length < 5 and Agenda.meeting_day
     return true
   end
 
diff --git a/www/board/agenda/views/pages/flagged.js.rb 
b/www/board/agenda/views/pages/flagged.js.rb
index 6a48d0b..99f2441 100644
--- a/www/board/agenda/views/pages/flagged.js.rb
+++ b/www/board/agenda/views/pages/flagged.js.rb
@@ -7,8 +7,7 @@
 class Flagged < Vue
   def render
     first = true
-    meeting_day = Minutes.started ||
-      Date.new().toISOString().slice(0,10) >= Agenda.date
+    meeting_day = Minutes.started || Agenda.meeting_day
 
     if meeting_day
       _p do