From 9d69ac28e946eb3c4bad4ab661cd254644c0e93e Mon Sep 17 00:00:00 2001 From: Rytikov Maksim Date: Wed, 9 Mar 2016 14:44:39 +0300 Subject: [PATCH 1/3] Add yet another card pack --- app/js/controllers.js | 3 +++ app/partials/room.html | 1 + 2 files changed, 4 insertions(+) diff --git a/app/js/controllers.js b/app/js/controllers.js index 08151fd..3587ccf 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -169,6 +169,7 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { var seq = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '?']; var play = ['A\u2660', '2', '3', '5', '8', '\u2654']; var tshirt = ['XL', 'L', 'M', 'S', 'XS', '?']; + var seq2 = ['0', '\u00BD', '1', '2', '3', '4', '5', '10', '\u221E', '?']; switch (val) { case ('fib'): return fib; @@ -180,6 +181,8 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { return play; case ('tshirt'): return tshirt; + case ('seq2'): + return seq2; default: return []; } diff --git a/app/partials/room.html b/app/partials/room.html index 0de418b..4434182 100644 --- a/app/partials/room.html +++ b/app/partials/room.html @@ -21,6 +21,7 @@
  • Sequential
  • Playing Cards
  • T-Shirt
    • +
  • Sequential 2
    • From 8b398054d75bddd71f31a91e202466df908f7308 Mon Sep 17 00:00:00 2001 From: Rytikov Maksim Date: Wed, 9 Mar 2016 16:38:10 +0300 Subject: [PATCH 2/3] Return average --- app/css/app.css | 9 +++++++ app/js/controllers.js | 55 +++++++++++++++++++++++++++++++++++++++++- app/partials/room.html | 3 ++- 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/app/css/app.css b/app/css/app.css index 937f76a..b636cea 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -558,6 +558,15 @@ a:focus { .vote.card { cursor: default; } .vote.card--selected { cursor: pointer; } + .voting-average, .voting-median { + display: none; + } + + .flipped-stagger .voting-average, .flipped-stagger .voting-median { + display: block; + clear: both; + } + /* Buttons diff --git a/app/js/controllers.js b/app/js/controllers.js index 3587ccf..6df70d5 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -84,6 +84,55 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { } }; + var sumOfTwo = function (a, b) { + return a + b; + }; + + var myParseFloat = function (a) { + var res = parseFloat(a); + if (!isNaN(res)) { + return res; + } + if (a == '\u00BD') { + return 0.5 + } + return NaN + }; + + var floatVotes = function (votes) { + return _.map(_.pluck(votes, 'vote'), myParseFloat).filter(function(obj) {return !isNaN(obj);}); + }; + + var calculateAverage = function (votes) { + var legalVotes = floatVotes(votes); + if (legalVotes.length == 0) { + return '\u221E'; + } + var total = _.reduce(legalVotes, sumOfTwo, 0); + return Math.round(total * 2 / legalVotes.length) / 2; + }; + + var findMedian = function (data) { + var m = data.sort(function(a, b) { + return a - b; + }); + + var middle = Math.floor((m.length - 1) / 2); + if (m.length % 2) { + return m[middle]; + } else { + return (m[middle] + m[middle + 1]) / 2.0; + } + } + + var calculateMedian = function (votes) { + var legalVotes = floatVotes(votes); + if (legalVotes.length == 0) { + return '\u221E'; + } + return findMedian(legalVotes); + }; + // wipe out vote if voting state is not yet finished to prevent cheating. // if it has already been set - use the actual vote. This works for unvoting - so that // before the flip occurs - we don't display 'oi' @@ -97,9 +146,11 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { voteArr.length = $scope.voterCount - voteCount; $scope.placeholderVotes = voteArr; - $scope.forceRevealDisable = (!$scope.forcedReveal && ($scope.votes.length < $scope.voterCount || $scope.voterCount === 0)) ? false : true; + $scope.votingAverage = calculateAverage($scope.votes.slice()); + $scope.votingMedian = calculateMedian($scope.votes.slice()); + if ($scope.votes.length === $scope.voterCount || $scope.forcedReveal) { var uniqVotes = _.chain($scope.votes).pluck('vote').uniq().value().length; if (uniqVotes === 1) { @@ -382,6 +433,8 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) { $scope.votingState = ""; $scope.forcedReveal = false; $scope.forceRevealDisable = true; + $scope.votingAverage = 0; + $scope.votingMedian = 0; $scope.scrollToSelectedCards = new ScrollIntoView($('#chosenCards')); $scope.dropDown = new DropDown('#dd'); diff --git a/app/partials/room.html b/app/partials/room.html index 4434182..e1fe74e 100644 --- a/app/partials/room.html +++ b/app/partials/room.html @@ -72,7 +72,8 @@
     
    - +
    Average: {{votingAverage}}
    +
    Median: {{votingMedian}}
    From 767a7d9030c4ca5656150f735f03bf22b3609503 Mon Sep 17 00:00:00 2001 From: Rytikov Maksim Date: Thu, 31 Mar 2016 14:07:51 +0300 Subject: [PATCH 3/3] Use seq2 by default --- app/partials/room.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/partials/room.html b/app/partials/room.html index e1fe74e..94dad40 100644 --- a/app/partials/room.html +++ b/app/partials/room.html @@ -16,12 +16,12 @@