whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: initial update of the FY23 budget projections. I have some questions out to Kevin and Tom to confirm my understanding, so this may not yet be the final numbers.
Date Sat, 17 Feb 2018 03:21:36 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


The following commit(s) were added to refs/heads/master by this push:
     new 1dc2ea8  initial update of the FY23 budget projections.  I have some questions out
to Kevin and Tom to confirm my understanding, so this may not yet be the final numbers.
1dc2ea8 is described below

commit 1dc2ea87671cc435cb9f83023c2a457efe67749d
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Fri Feb 16 22:20:53 2018 -0500

    initial update of the FY23 budget projections.  I have some questions
    out to Kevin and Tom to confirm my understanding, so this may not yet
    be the final numbers.
---
 www/board/agenda/views/pages/fy23.js.rb | 4 ++--
 www/board/agenda/views/router.js.rb     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/board/agenda/views/pages/fy23.js.rb b/www/board/agenda/views/pages/fy23.js.rb
index 2391d7f..2071198 100644
--- a/www/board/agenda/views/pages/fy23.js.rb
+++ b/www/board/agenda/views/pages/fy23.js.rb
@@ -266,7 +266,7 @@ class FY23 < Vue
 
         _tr do
           _td 'Cash'
-          _td.num (1_318).toLocaleString()
+          _td.num (1_767).toLocaleString()
           _td.num 595
           _td.num.cash! @budget.cash.toLocaleString(),
             class: (@budget.cash < 0 ? 'danger' : 'success')
@@ -288,7 +288,7 @@ class FY23 < Vue
 
     @budget.net = @budget.income - @budget.expense
 
-    @budget.cash = 1318 - 2*212 + 3*@budget.net
+    @budget.cash = 1767 + 3*@budget.net + 2*100 + 500 # EA+BTC adjustment
   end
 
   # update budget item when an input field changes
diff --git a/www/board/agenda/views/router.js.rb b/www/board/agenda/views/router.js.rb
index 2992fcc..599c428 100644
--- a/www/board/agenda/views/router.js.rb
+++ b/www/board/agenda/views/router.js.rb
@@ -99,7 +99,7 @@ class Router
     else
       item = Agenda.find(path)
 
-      if path == 'Discussion-Items' and Agenda.date =~ /^2018-01/
+      if path == 'Discussion-Items' and Agenda.date =~ /^2018-02/
         item.next = {title: 'FY23 Budget Worksheet', href: 'fy23'}
       end
     end

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

Mime
View raw message