This is an automated email from the git hooks/post-receive script. New commit to branch feature/182_correction_affichage_resultats_coombs in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit daf59bbc9f332db559a65cbb73ddf230e7a9153d 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 éliminé --- 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ésultat", + "poll_results_eliminated": "Éliminé", "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ésultat", + "poll_votes_eliminated": "Éliminé", "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/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html index 06f17118..981b9b7c 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="{choice.score.scoreOrder === 0}" class="fa fa-trophy fa-15x winner"></i> <span if={!pollTypeSelect}> {choice.score.scoreValue} - {parent.__["results_unit_" + poll.voteCountingType + "_" + (choice.score.scoreValue > 1 ? "many" : "one")]} + <span if={choice.score.scoreValue || !pollTypeCoombs}> + {parent.__["results_unit_" + poll.voteCountingType + "_" + (choice.score.scoreValue > 1 ? "many" : "one")]} + </span> + <span if={!choice.score.scoreValue && pollTypeCoombs}> + {parent.__.eliminated} + </span> </span> <span if={pollTypeSelect}> {poll.voteCountingConfig.grades[choice.score.scoreValue]} @@ -158,6 +163,7 @@ this.poll = poll; this.pollTypeCheckbox = poll.voteCountingTypeValue && poll.voteCountingTypeValue.renderType === "checkbox"; this.pollTypeSelect = poll.voteCountingTypeValue && poll.voteCountingTypeValue.renderType === "select"; + this.pollTypeCoombs = poll.voteCountingType && poll.voteCountingType === 7; this.onVoteChanged(); this.update(); }; diff --git 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 index 8cc59e24..8f96149e 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="votes separator-top"> <span if={parent.poll.voteCountingType !== 8}> {result.scoreValue} - {parent.__["unit_" + poll.voteCountingType + "_" + (result.scoreValue > 1 ? "many" : "one")]} + <span if={result.scoreValue || !pollTypeCoombs}> + {parent.__["unit_" + poll.voteCountingType + "_" + (result.scoreValue > 1 ? "many" : "one")]} + </span> + <span if={!result.scoreValue && pollTypeCoombs}> + {parent.__.eliminated} + </span> </span> <span if={parent.poll.voteCountingType === 8}> {parent.poll.voteCountingConfig.grades[result.scoreValue]} @@ -76,6 +81,7 @@ require("../voteCountingType/MajorityJudgmentDetailResult.tag.html"); this.onPollChange = poll => { this.loaded = !poll.resultIsVisible || poll.results !== undefined; this.poll = poll; + this.pollTypeCoombs = poll.voteCountingType && poll.voteCountingType === 7; this.update(); }; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.