whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] 03/03: Don't wait until meeting started to adjust meeting flow or show missing and unapproved reports on the flagged items page.
Date Thu, 21 Nov 2019 02:33:23 GMT
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

View the commit online:
https://github.com/apache/whimsy/commit/3fda811b056c3be4ff36d1b20e7099cdb02c0e44

commit 3fda811b056c3be4ff36d1b20e7099cdb02c0e44
Author: Sam Ruby <rubys@Sams-MacBook-Pro.local>
AuthorDate: Wed Nov 20 21:31:45 2019 -0500

    Don't wait until meeting started to adjust meeting flow or show
    missing and unapproved reports on the flagged items page.
---
 www/board/agenda/views/layout/footer.js.rb | 18 +++++++++++-------
 www/board/agenda/views/pages/flagged.js.rb |  6 +++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/www/board/agenda/views/layout/footer.js.rb b/www/board/agenda/views/layout/footer.js.rb
index ae94b3f..b6d9f47 100644
--- a/www/board/agenda/views/layout/footer.js.rb
+++ b/www/board/agenda/views/layout/footer.js.rb
@@ -3,13 +3,17 @@
 # followed by a next link.
 #
 # Overrides previous and next links when traversal is queue, shepherd, or
-# Flagged.  Injects the flagged items into the flow once the meeting starts
-# (last executive officer <-> first flagged &&
-#  last flagged <-> first Special order)
+# Flagged.  Injects the flagged items into the flow on the meeting day
+# (last executive officer <-> first flagged/unapproved/missing &&
+#  last flagged/unapproved/missing <-> first Special order)
 #
 
 class Footer < Vue
   def render
+    
+    meeting_day = Minutes.started or
+      Date.new().toISOString().slice(0,10) >= Agenda.date
+
     _footer.navbar.navbar_fixed_bottom class: @@item.color do
 
       #
@@ -42,7 +46,7 @@ class Footer < Vue
         end
 
         unless link
-          if Minutes.started
+          if meeting_day
             link = Agenda.index.find do |item| 
               item.next && item.next.attach =~ /^\d+$/
             end
@@ -52,7 +56,7 @@ class Footer < Vue
           link ||= {href: "flagged", title: 'Flagged'}
         end
       elsif 
-        Minutes.started and @@item.attach =~ /\d/ and
+        meeting_day and @@item.attach =~ /\d/ and
         link and link.attach =~ /^[A-Z]/
       then
         Agenda.index.each do |item| 
@@ -111,7 +115,7 @@ class Footer < Vue
       elsif @@options.traversal == :flagged
         prefix = 'flagged/'
         while link and link.skippable
-          if Minutes.started and link.attach !~ /^(\d+|[A-Z]+)$/
+          if meeting_day and link.attach !~ /^(\d+|[A-Z]+)$/
             prefix = ''
             break
           else
@@ -120,7 +124,7 @@ class Footer < Vue
         end
         link ||= {href: "flagged", title: 'Flagged'}
       elsif 
-        Minutes.started and link and 
+        meeting_day and link and 
         @@item.attach =~ /^\d[A-Z]/ and link.attach =~ /^\d/
       then
         while link and link.skippable and link.attach =~ /^([A-Z]|\d+$)/
diff --git a/www/board/agenda/views/pages/flagged.js.rb b/www/board/agenda/views/pages/flagged.js.rb
index 82eddb4..1390eb2 100644
--- a/www/board/agenda/views/pages/flagged.js.rb
+++ b/www/board/agenda/views/pages/flagged.js.rb
@@ -1,15 +1,19 @@
 #
 # A page showing all flagged reports
 #
+# On the meeting day, also show reports that are missing or don't have enough
+# preapprovals.
 
 class Flagged < Vue
   def render
     first = true
+    meeting_day = Minutes.started or
+      Date.new().toISOString().slice(0,10) >= Agenda.date
 
     Agenda.index.each do |item|
       flagged = item.flagged_by || Pending.flagged.include?(item.attach)
 
-      if not flagged and Minutes.started and item.attach =~ /^(\d+|[A-Z]+)$/
+      if not flagged and meeting_day and item.attach =~ /^(\d+|[A-Z]+)$/
         flagged = !item.skippable
       end
 


Mime
View raw message