[whimsy] branch master updated: Keep voting info together

[se...@apache.org]

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

sebb 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 3da05c7  Keep voting info together
3da05c7 is described below

commit 3da05c705e118407aa7be2dd31c2222ca4b69fa7
Author: Sebb <se...@apache.org>
AuthorDate: Thu Jul 5 19:36:59 2018 +0100

    Keep voting info together
---
 www/project/icla/views/pages/vote.js.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/www/project/icla/views/pages/vote.js.rb b/www/project/icla/views/pages/vote.js.rb
index b0a7e46..3be5bb6 100644
--- a/www/project/icla/views/pages/vote.js.rb
+++ b/www/project/icla/views/pages/vote.js.rb
@@ -88,6 +88,8 @@ class Vote < Vue
         end
       end
 
+      _h5 'Voting history'
+
       tally = {} # most recent vote details for each member
       # previous votes
       @votes.each {|v|
@@ -95,12 +97,6 @@ class Vote < Vue
         _p v.vote + ' From: ' + v.member + ' Date: ' + v.timestamp
       }
 
-      # previous comments
-      @comments.each {|c|
-        _b 'From: ' + c.member + ' Date: ' + c.timestamp
-        _p c.comment
-      }
-
       _h5 'Summary of voting so far'
       
       vote_count = {}
@@ -120,11 +116,18 @@ class Vote < Vue
 
       started = new Date(@votes[0]['timestamp'])
       now = new Date()
-      elapsed = (now - started) / (1000 * 60 * 60 * 24)
-      _ 'Voting started: ' + started.toISOString().slice(0,10) + ' Days elapsed: ' + elapsed.to_i
+      elapsed = (now - started) / (1000 * 60 * 60)
+      _ 'Voting started: ' + started.toISOString() + ' Hours elapsed: ' + elapsed.to_i
 
       _p
 
+      _h5 'Previous discussion'
+
+      # previous comments
+      @comments.each {|c|
+        _b 'From: ' + c.member + ' Date: ' + c.timestamp
+        _p c.comment
+      }
 
       #
       # Submission buttons