[whimsy] branch master updated: don't skip over reports without sufficient preapprovals

[ru...@apache.org]

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 153e3f1  don't skip over reports without sufficient preapprovals
153e3f1 is described below

commit 153e3f1925eafe24ba09a3c6b5a167140d14c952
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Mon Apr 23 10:04:54 2018 -0400

    don't skip over reports without sufficient preapprovals
---
 www/board/agenda/public/stylesheets/app.css |  2 +-
 www/board/agenda/views/layout/footer.js.rb  | 11 +++++++----
 www/board/agenda/views/models/agenda.js.rb  |  8 +++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/www/board/agenda/public/stylesheets/app.css b/www/board/agenda/public/stylesheets/app.css
index f4880a5..d8bf770 100644
--- a/www/board/agenda/public/stylesheets/app.css
+++ b/www/board/agenda/public/stylesheets/app.css
@@ -15,7 +15,7 @@ a {color: #000}
 .ready      {background-color: #FC8 !important}
 .available  {background-color: #BFB !important}
 .reviewed   {background-color: #8F8 !important}
-.commented  {background-color: #FD6 !important}
+.commented  {background-color: #FE0 !important}
 
 .navbar-brand.blank {background-color: rgba(221, 221, 221, 0.7) !important}
 .navbar-brand.missing {background-color: rgba(255, 136, 136, 0.7) !important}
diff --git a/www/board/agenda/views/layout/footer.js.rb b/www/board/agenda/views/layout/footer.js.rb
index 4e30ce8..8cd2c6d 100644
--- a/www/board/agenda/views/layout/footer.js.rb
+++ b/www/board/agenda/views/layout/footer.js.rb
@@ -4,7 +4,7 @@
 #
 # Overrides previous and next links when traversal is queue, shepherd, or
 # Flagged.  Injects the flagged items into the flow once the meeting starts
-# (last additional officer <-> first flagged &&
+# (last executive officer <-> first flagged &&
 #  last flagged <-> first Special order)
 #
 
@@ -103,7 +103,7 @@ class Footer < Vue
         link ||= {href: "shepherd/#{@@item.shepherd}", title: 'shepherd'}
       elsif @@options.traversal == :flagged
         prefix = 'flagged/'
-        while link and not link.flagged
+        while link and link.skippable
           if Minutes.started and link.index
             prefix = ''
             break
@@ -112,8 +112,11 @@ class Footer < Vue
           end
         end
         link ||= {href: "flagged", title: 'Flagged'}
-      elsif Minutes.started and link and link.attach == 'A'
-        while link and not link.flagged and link.attach =~ /^[A-Z]/
+      elsif 
+        Minutes.started and link and 
+        @@item.attach =~ /^\d[A-Z]/ and link.attach =~ /^\d/
+      then
+        while link and link.skippable and link.attach =~ /^([A-Z]|\d+$)/
           link = link.next
         end
 
diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index 9370160..c843699 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -506,7 +506,6 @@ class Agenda
   # determine if this item is flagged, accounting for pending actions
   def flagged
     return true if Pending.flagged and Pending.flagged.include? @attach
-    return true if Minutes.started and self.missing
     return false unless @flagged_by
     return false if @flagged_by.length == 1 and 
       @flagged_by.first == User.initials and 
@@ -514,6 +513,13 @@ class Agenda
     return ! @flagged_by.empty?
   end
 
+  # determine if this report can be skipped during the course of the meeting
+  def skippable
+    return false if Minutes.started and self.missing
+    return false if Minutes.started and @approved and @approved.length < 5
+    return !self.flagged
+  end
+
   # banner color for this agenda item
   def color
     if @color

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.