Merge pull request #65 from agoravoting/desborda3

add desborda3
sequentech · Sep 19, 2017 · 7ec7ffe · 7ec7ffe
2 parents 3bf0ea9 + 5a85abb
commit 7ec7ffe
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 5 deletions.
diff --git a/avBooth/accordion-option-directive/accordion-option-directive.js b/avBooth/accordion-option-directive/accordion-option-directive.js
@@ -107,6 +107,10 @@ angular.module('avBooth')
           {
             return;
           },
+          "desborda3": function()
+          {
+            return Math.max(1, Math.floor(scope.question.num_winners * 1.3) - scope.option.selected);
+          },
           "desborda2": function()
           {
             return Math.max(1, Math.floor(scope.question.num_winners * 1.3) - scope.option.selected);

diff --git a/avBooth/booth-directive/booth-directive.js b/avBooth/booth-directive/booth-directive.js
@@ -125,6 +125,11 @@ angular.module('avBooth')
             sorted: true,
             ordered: true
           },
+          "desborda3": {
+            state: stateEnum.multiQuestion,
+            sorted: true,
+            ordered: true
+          },
           "desborda2": {
             state: stateEnum.multiQuestion,
             sorted: true,

diff --git a/avBooth/review-ballot-directive/review-ballot-directive.js b/avBooth/review-ballot-directive/review-ballot-directive.js
@@ -59,6 +59,10 @@ angular.module('avBooth')
           {
             return;
           },
+          "desborda3": function()
+          {
+            return Math.max(1, Math.floor(question.num_winners * 1.3) - answer.selected);
+          },
           "desborda2": function()
           {
             return Math.max(1, Math.floor(question.num_winners * 1.3) - answer.selected);

diff --git a/crypto/answer-encoder-service.js b/crypto/answer-encoder-service.js
@@ -50,7 +50,7 @@ angular.module('avCrypto')
 
     return function (requestedCodec, numAvailableOptions) {
       var multi = {
-        validCodecs: ["plurality-at-large", "borda-nauru", "borda", "desborda2", "desborda"],
+        validCodecs: ["plurality-at-large", "borda-nauru", "borda", "desborda3", "desborda2", "desborda"],
         numAvailableOptions: numAvailableOptions,
 
         /**

diff --git a/locales/ca.json b/locales/ca.json
@@ -22,7 +22,7 @@
     "poweredBy": "Funciona amb <strong>__name__</strong>",
     "shareLink": "¡Tuitgeu aquesta votació!",
     "votingSystem": "Sistema de votació",
-    "votings": {"plurality-at-large": "Plurality at large", "borda-nauru": "Nauru's Borda Count or Borda Dowdall (1/n)", "borda": "Borda Count (traditional)", "pairwise-beta": "Pairwise (beta-distribution)", "desborda2": "DesBorda2", "desborda": "DesBorda"}
+    "votings": {"plurality-at-large": "Plurality at large", "borda-nauru": "Nauru's Borda Count or Borda Dowdall (1/n)", "borda": "Borda Count (traditional)", "pairwise-beta": "Pairwise (beta-distribution)", "desborda3": "DesBorda3", "desborda2": "DesBorda2", "desborda": "DesBorda"}
   },
   "avBooth": {
     "legal": {

diff --git a/locales/en.json b/locales/en.json
@@ -24,7 +24,7 @@
     "poweredBy": "Powered by <strong><a href=\"__url__\" target=\"_blank\">__name__</a></strong>",
     "shareLink": "¡Tweet this election!",
     "votingSystem": "Voting System",
-    "votings": {"plurality-at-large": "Plurality at large", "borda-nauru": "Nauru's Borda Count or Borda Dowdall (1/n)", "borda": "Borda Count (traditional)", "pairwise-beta": "Pairwise (beta-distribution)", "desborda2": "DesBorda2", "desborda": "DesBorda"}
+    "votings": {"plurality-at-large": "Plurality at large", "borda-nauru": "Nauru's Borda Count or Borda Dowdall (1/n)", "borda": "Borda Count (traditional)", "pairwise-beta": "Pairwise (beta-distribution)", "desborda3": "DesBorda3", "desborda2": "DesBorda2", "desborda": "DesBorda"}
   },
   "avBooth": {
     "legal": {

diff --git a/locales/es.json b/locales/es.json
@@ -24,7 +24,7 @@
     "poweredBy": "Funciona con <strong><a href=\"__url__\" target=\"_blank\">__name__</a></strong>",
     "shareLink": "¡Twittea esta votación!",
     "votingSystem": "Sistema de Voto",
-    "votings": {"plurality-at-large": "Voto en bloque o Escrutinio Mayoritario Plurinominal", "borda-nauru": "Borda de Nauru o Borda Dowdall (1/n)", "borda": "Borda Count (tradicional)", "pairwise-beta": "Comparación de pares (distribución beta)", "desborda2": "DesBorda2", "desborda": "DesBorda"}
+    "votings": {"plurality-at-large": "Voto en bloque o Escrutinio Mayoritario Plurinominal", "borda-nauru": "Borda de Nauru o Borda Dowdall (1/n)", "borda": "Borda Count (tradicional)", "pairwise-beta": "Comparación de pares (distribución beta)", "desborda3": "DesBorda3", "desborda2": "DesBorda2", "desborda": "DesBorda"}
   },
   "avBooth": {
     "legal": {

diff --git a/locales/gl.json b/locales/gl.json
@@ -22,7 +22,7 @@
     "poweredBy": "Funciona amb <strong><a href=\"__url__\" target=\"_blank\">__name__</a></strong>",
     "shareLink": "Comparte en Twitter que xa votaches nas primarias de En Marea",
     "votingSystem": "Voting System",
-    "votings": {"plurality-at-large": "Plurality at large", "borda-nauru": "Nauru's Borda Count or Borda Dowdall (1/n)", "borda": "Borda Count (traditional)", "pairwise-beta": "Pairwise (beta-distribution)", "desborda2": "DesBorda2", "desborda": "DesBorda"}
+    "votings": {"plurality-at-large": "Plurality at large", "borda-nauru": "Nauru's Borda Count or Borda Dowdall (1/n)", "borda": "Borda Count (traditional)", "pairwise-beta": "Pairwise (beta-distribution)", "desborda3": "DesBorda3", "desborda2": "DesBorda2", "desborda": "DesBorda"}
   },
   "avBooth": {
     "legal": {