You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/10/10 14:57:24 UTC
[whimsy] branch master updated (7c7f0cc -> 9866f42)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 7c7f0cc restore deleted statement
new 08e34d9 export view properly
new 9866f42 add a page showing rejected reports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
www/board/agenda/views/app.js.rb | 1 +
www/board/agenda/views/layout/main.js.rb | 6 +++---
www/board/agenda/views/models/agenda.js.rb | 8 ++++++++
www/board/agenda/views/pages/{flagged.js.rb => rejected.js.rb} | 9 +++------
www/board/agenda/views/router.js.rb | 3 +++
5 files changed, 18 insertions(+), 9 deletions(-)
copy www/board/agenda/views/pages/{flagged.js.rb => rejected.js.rb} (62%)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 01/02: export view properly
Posted by 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
commit 08e34d94c6018bda47208e01cf3dc4f2f46b14fc
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Oct 10 10:56:10 2017 -0400
export view properly
TODO: investigate whether or not it should be elmintated
---
www/board/agenda/views/layout/main.js.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/board/agenda/views/layout/main.js.rb b/www/board/agenda/views/layout/main.js.rb
index 5e2e2c5..3a9e52e 100644
--- a/www/board/agenda/views/layout/main.js.rb
+++ b/www/board/agenda/views/layout/main.js.rb
@@ -19,8 +19,7 @@ class Main < Vue
view = nil
_main do
- Vue.createElement(@item.view, props: {item: @item,
- ref: proc {|component| Main.view=component}})
+ Vue.createElement(@item.view, props: {item: @item}, ref: 'view')
end
_Footer item: @item, buttons: @buttons, options: @options
@@ -86,9 +85,10 @@ class Main < Vue
# additional client side initialization
def mounted()
- # export navigate and refresh methods
+ # export navigate and refresh methods as well as view
Main.navigate = self.navigate
Main.refresh = self.refresh
+ Main.view = $refs.view
# store initial state in history, taking care not to overwrite
# history set by the Search component.
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 02/02: add a page showing rejected reports
Posted by 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
commit 9866f4221450f4bf249caad215fb9f9df0f549ba
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Oct 10 10:56:51 2017 -0400
add a page showing rejected reports
---
www/board/agenda/views/app.js.rb | 1 +
www/board/agenda/views/models/agenda.js.rb | 8 ++++++++
www/board/agenda/views/pages/rejected.js.rb | 25 +++++++++++++++++++++++++
www/board/agenda/views/router.js.rb | 3 +++
4 files changed, 37 insertions(+)
diff --git a/www/board/agenda/views/app.js.rb b/www/board/agenda/views/app.js.rb
index 002c6f4..846e203 100644
--- a/www/board/agenda/views/app.js.rb
+++ b/www/board/agenda/views/app.js.rb
@@ -25,6 +25,7 @@ require_relative 'pages/help'
require_relative 'pages/shepherd'
require_relative 'pages/queue'
require_relative 'pages/flagged'
+require_relative 'pages/rejected'
require_relative 'pages/missing'
require_relative 'pages/backchannel'
require_relative 'pages/roll-call'
diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index cda4c9e..4545cc7 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -374,6 +374,14 @@ class Agenda
results << {color: 'missing', count: count, href: 'missing',
text: 'missing reports'}
+ # rejected reports
+ count = 0
+ Agenda.index.each {|item| count += 1 if item.rejected}
+ if Minutes.started or count > 0
+ results << {color: 'missing', count: count, href: 'rejected',
+ text: 'not accepted'}
+ end
+
return results
end
diff --git a/www/board/agenda/views/pages/rejected.js.rb b/www/board/agenda/views/pages/rejected.js.rb
new file mode 100644
index 0000000..1d57501
--- /dev/null
+++ b/www/board/agenda/views/pages/rejected.js.rb
@@ -0,0 +1,25 @@
+#
+# A page showing all reports that were NOT accepted
+#
+
+class Rejected < Vue
+ def render
+ first = true
+
+ Agenda.index.each do |item|
+ if item.rejected
+ _h3 class: item.color do
+ _Link text: item.title, href: "flagged/#{item.href}",
+ class: ('default' if first)
+ first = false
+
+ _span.owner " [#{item.owner} / #{item.shepherd}]"
+ end
+
+ _AdditionalInfo item: item, prefix: true
+ end
+ end
+
+ _em.comment 'None' if first
+ end
+end
diff --git a/www/board/agenda/views/router.js.rb b/www/board/agenda/views/router.js.rb
index c4e9aaa..02e4fb5 100644
--- a/www/board/agenda/views/router.js.rb
+++ b/www/board/agenda/views/router.js.rb
@@ -32,6 +32,9 @@ class Router
elsif path == 'flagged'
item = {view: Flagged, title: 'Flagged reports'}
+ elsif path == 'rejected'
+ item = {view: Rejected, title: 'Reports which were NOT accepted'}
+
elsif path == 'missing'
item = {view: Missing, title: 'Missing reports',
buttons: [{form: InitialReminder}, {button: FinalReminder}]}
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.