From scm@users.chorem.org Fri Jan  5 17:44:57 2018
From: "chorem.org scm" <scm@users.chorem.org>
To: pollen-commits@list.chorem.org
Subject: [Pollen-commits] branch
 feature/182_correction_affichage_resultats_coombs created (now f7e67c35)
Date: Fri, 05 Jan 2018 17:44:56 +0100
Message-ID: <20180105164456.7755.27014@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5755250106616187097=="

--===============5755250106616187097==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New change to branch feature/182_correction_affichage_resultats_coombs in rep=
ository pollen.

See https://gitlab.nuiton.org/chorem/pollen.git

        at  f7e67c35  fixes #182 Correction de l'affichage quand un choix coo=
mbs est =C3=A9limin=C3=A9

This branch includes the following new commits:

       new  f7e67c35  fixes #182 Correction de l'affichage quand un choix coo=
mbs est =C3=A9limin=C3=A9

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit f7e67c35d6ab1d206c37ada4d5cdb4e385a80fa6
Author: Arnaud Thimel <thimel@codelutin.com>
Date:   Fri Jan 5 17:43:33 2018 +0100

    fixes #182 Correction de l'affichage quand un choix coombs est =C3=A9limi=
n=C3=A9

--=20
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

--===============5755250106616187097==--


From scm@users.chorem.org Fri Jan  5 17:44:57 2018
From: "chorem.org scm" <scm@users.chorem.org>
To: pollen-commits@list.chorem.org
Subject: [Pollen-commits]  01/01: fixes #182 Correction de l'affichage quand
 un choix coombs est =?utf-8?b?w6lsaW1pbsOp?=
Date: Fri, 05 Jan 2018 17:44:57 +0100
Message-ID: <20180105164457.03B2E5C2A00@goh.codelutin.com>
In-Reply-To: <20180105164456.7755.27014@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5812165356800765254=="

--===============5812165356800765254==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/182_correction_affichage_resultats_coombs in rep=
ository pollen.

See https://gitlab.nuiton.org/chorem/pollen.git

commit f7e67c35d6ab1d206c37ada4d5cdb4e385a80fa6
Author: Arnaud Thimel <thimel@codelutin.com>
Date:   Fri Jan 5 17:43:33 2018 +0100

    fixes #182 Correction de l'affichage quand un choix coombs est =C3=A9limi=
n=C3=A9
---
 pollen-ui-riot-js/src/main/web/i18n/en.json               | 2 ++
 pollen-ui-riot-js/src/main/web/i18n/fr.json               | 2 ++
 pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html | 8 +++++++-
 pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html  | 8 +++++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/=
src/main/web/i18n/en.json
index f01540d8..b6c63d83 100644
--- a/pollen-ui-riot-js/src/main/web/i18n/en.json
+++ b/pollen-ui-riot-js/src/main/web/i18n/en.json
@@ -78,6 +78,7 @@
   "poll_results_rank": "Rank",
   "poll_results_choices": "Choice",
   "poll_results_results": "Result",
+  "poll_results_eliminated": "Eliminated",
   "poll_results_unit_1_one": "vote",
   "poll_results_unit_1_many": "votes",
   "poll_results_unit_2_one": "point",
@@ -138,6 +139,7 @@
   "poll_votes_choices": "Choices",
   "poll_votes_delete": "Delete vote?",
   "poll_votes_results": "Result",
+  "poll_votes_eliminated": "Eliminated",
   "poll_votes_noVote": "No vote",
   "poll_votes_results_unit_1_one": "vote",
   "poll_votes_results_unit_1_many": "votes",
diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/=
src/main/web/i18n/fr.json
index 9c6345cf..1697df4b 100644
--- a/pollen-ui-riot-js/src/main/web/i18n/fr.json
+++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json
@@ -78,6 +78,7 @@
   "poll_results_rank": "Rang",
   "poll_results_choices": "Choix",
   "poll_results_results": "R=C3=A9sultat",
+  "poll_results_eliminated": "=C3=89limin=C3=A9",
   "poll_results_unit_1_one": "vote",
   "poll_results_unit_1_many": "votes",
   "poll_results_unit_2_one": "point",
@@ -138,6 +139,7 @@
   "poll_votes_choices": "Choix",
   "poll_votes_delete": "Supprimer le vote ?",
   "poll_votes_results": "R=C3=A9sultat",
+  "poll_votes_eliminated": "=C3=89limin=C3=A9",
   "poll_votes_noVote": "Aucun vote",
   "poll_votes_results_unit_1_one": "vote",
   "poll_votes_results_unit_1_many": "votes",
diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html b/poll=
en-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html
index 3f670177..e3514865 100644
--- a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html
+++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html
@@ -89,7 +89,12 @@
                               <i if=3D"{choice.score.scoreOrder =3D=3D=3D 0}=
" class=3D"fa fa-trophy fa-15x winner"></i>
                               <span if=3D{!pollTypeSelect}>
                                   {choice.score.scoreValue}
-                                  {parent.__["results_unit_" + poll.voteCoun=
tingType + "_" + (choice.score.scoreValue > 1 ? "many" : "one")]}
+                                  <span if=3D{choice.score.scoreValue || !po=
llTypeCoombs}>
+                                      {parent.__["results_unit_" + poll.vote=
CountingType + "_" + (choice.score.scoreValue > 1 ? "many" : "one")]}
+                                  </span>
+                                  <span if=3D{!choice.score.scoreValue && po=
llTypeCoombs}>
+                                      {parent.__.eliminated}
+                                  </span>
                               </span>
                               <span if=3D{pollTypeSelect}>
                                   {poll.voteCountingConfig.grades[choice.sco=
re.scoreValue]}
@@ -158,6 +163,7 @@
             this.poll =3D poll;
             this.pollTypeCheckbox =3D poll.voteCountingTypeValue && poll.vot=
eCountingTypeValue.renderType =3D=3D=3D "checkbox";
             this.pollTypeSelect =3D poll.voteCountingTypeValue && poll.voteC=
ountingTypeValue.renderType =3D=3D=3D "select";
+            this.pollTypeCoombs =3D poll.voteCountingType && poll.voteCounti=
ngType =3D=3D=3D 7;
             this.onVoteChanged();
             this.update();
         };
diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html b/polle=
n-ui-riot-js/src/main/web/tag/poll/Results.tag.html
index 56b1614a..b713965b 100644
--- a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html
+++ b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html
@@ -45,7 +45,12 @@ require("../voteCountingType/MajorityJudgmentDetailResult.=
tag.html");
                         <td class=3D"votes separator-top">
                             <span if=3D{parent.poll.voteCountingType !=3D=3D=
 8}>
                                 {result.scoreValue}
-                                {parent.__["unit_" + poll.voteCountingType +=
 "_" + (result.scoreValue > 1 ? "many" : "one")]}
+                                <span if=3D{result.scoreValue || !pollTypeCo=
ombs}>
+                                    {parent.__["unit_" + poll.voteCountingTy=
pe + "_" + (result.scoreValue > 1 ? "many" : "one")]}
+                                </span>
+                                <span if=3D{!result.scoreValue && pollTypeCo=
ombs}>
+                                    {parent.__.eliminated}
+                                </span>
                             </span>
                             <span if=3D{parent.poll.voteCountingType =3D=3D=
=3D 8}>
                                 {parent.poll.voteCountingConfig.grades[resul=
t.scoreValue]}
@@ -76,6 +81,7 @@ require("../voteCountingType/MajorityJudgmentDetailResult.t=
ag.html");
         this.onPollChange =3D poll =3D> {
             this.loaded =3D !poll.resultIsVisible || poll.results !=3D=3D un=
defined;
             this.poll =3D poll;
+            this.pollTypeCoombs =3D poll.voteCountingType && poll.voteCounti=
ngType =3D=3D=3D 7;
             this.update();
         };
=20

--=20
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

--===============5812165356800765254==--


