This is an automated email from the git hooks/post-receive script. New commit to branch feature/createPreviewRessource in repository pollen. See http://git.chorem.org/pollen.git commit 4a68b5f111eb7a1338d7f95baa9df44e938c929c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 13 17:53:42 2014 +0200 add voteCountingType into poll info --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-info.html | 5 +++++ pollen-ui-angular/src/main/webapp/partials/poll-settings.html | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index d7ebbaa..ac7aabf 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -125,6 +125,7 @@ var translateEN = { 'poll.info.addChoiceAllowed.waring' : 'The period for adding choice and vote overlays', 'poll.info.addChoiceAllowed.waring.help' : 'Votes may can\'t be representative of reality', 'poll.info.vote.noViewChoice' : 'This choice does not exist in the vote', +'poll.info.voteCountingType' : 'Vote Counting : {{name}}', 'poll.info.limitedChoice' : 'This poll has limited the number of choices at {{nb}} choice(s)', 'poll.error.noResource' : 'No resource has send', 'poll.error.listEmpty' : 'No poll find', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 6238511..b59d1ad 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -125,6 +125,7 @@ var translateFR = { 'poll.info.addChoiceAllowed.waring' : 'La période d\'ajout de choix et de vote se superpose', 'poll.info.addChoiceAllowed.waring.help' : 'Les votes peuvent ne pas être représentatif de la réalité.', 'poll.info.vote.noViewChoice' : 'Ce choix n\'existait pas lors du vote', +'poll.info.voteCountingType' : 'Type de scrutin : {{name}}', 'poll.info.limitedChoice' : 'Le nombre de choix est limité à {{nb}} choix', 'poll.error.noResource' : 'Aucune ressource a envoyer', 'poll.error.listEmpty' : 'Aucun sondage trouvé', diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index a343e79..6204cbb 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -729,7 +729,7 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr var setHelper = function () { angular.forEach($scope.data.allVoteCountingType, function (value) { if (value.id == $scope.data.poll.voteCountingType) { - $scope.voteCountingTypeHelper = value.helper; + $scope.data.voteCountingType = angular.copy(value); } }); }; diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-info.html b/pollen-ui-angular/src/main/webapp/partials/poll-info.html index 62f4ad3..5fb145d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-info.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-info.html @@ -34,4 +34,9 @@ <div ng-if="data.poll.limitedVote"> <h4>{{ 'poll.info.limitedChoice' | translate:{'nb':data.poll.maxChoiceNumber} }}</h4> +</div> + +<div> + <h4>{{ 'poll.info.voteCountingType' | translate:{'name':data.voteCountingType.name} }}</h4> + <p ng-bind-html="toHTML(data.voteCountingType.helper)"></p> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html index 552abbb..327e903 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -212,7 +212,7 @@ {{voteCountingType.name}} </label> <hr/> - <p ng-bind-html="toHTML(voteCountingTypeHelper)"></p> + <p ng-bind-html="toHTML(data.voteCountingType.helper)"></p> </div> <div class="col-sm-2"> <info-error error="restError.voteCountingType[0]" data="data.poll.voteCountingType"></info-error> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.