branch develop updated (9330980 -> d2b378d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 9330980 afficher quels participants ont votés et leur renvoyer des invitations (#51, #36 et #33) new d2b378d afficher le % d'abstention (#33) 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 d2b378d7c8731e8afbcca3c7d9529fcdccf11927 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 24 17:05:41 2017 +0200 afficher le % d'abstention (#33) Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 2 ++ pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit d2b378d7c8731e8afbcca3c7d9529fcdccf11927 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 24 17:05:41 2017 +0200 afficher le % d'abstention (#33) --- pollen-ui-riot-js/src/main/web/i18n.json | 2 ++ pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n.json b/pollen-ui-riot-js/src/main/web/i18n.json index 781e712..a3b4447 100644 --- a/pollen-ui-riot-js/src/main/web/i18n.json +++ b/pollen-ui-riot-js/src/main/web/i18n.json @@ -44,6 +44,7 @@ "poll_vote": "vote", "poll_votes": "votes", "poll_participants": "participants", + "poll_abstention": "d'abstention", "poll_closedFrom": "Fermé depuis le", "poll_urlForAdmin" : "Administrer ce sondage avec cette adresse", "poll_urlForVote" : "Inviter de nouveaux participants en leur envoyant cette adresse", @@ -473,6 +474,7 @@ "poll_vote": "vote", "poll_votes": "votes", "poll_participants": "participants", + "poll_abstention": "of abstention", "poll_closedFrom": "Closing from", "poll_urlForAdmin" : "Administrate poll with this address", "poll_urlForVote" : "Invited new participants with this address", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html index 137d91f..4676deb 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html @@ -158,7 +158,9 @@ require("../popup/QrCodeButton.tag.html"); <span if={poll.voteCount === 0}>{__.noVote}</span> <span if={poll.voteCount === 1}>1 {__.vote}</span> <span if={poll.voteCount > 1}>{poll.voteCount} {__.votes}</span> - <span if={poll.pollType === "RESTRICTED"}>({poll.participantCount} {__.participants})</span> + <span if={poll.pollType === "RESTRICTED"}> + - {poll.participantCount} {__.participants} + - {((1 - poll.voteCount / poll.participantCount) * 100).toFixed(2)} % {__.abstention}</span> <span if={poll.status === "VOTING" && poll.endDate}> {__.votingTo} {formatDate(poll.endDate)}</span> <span if={poll.status === "CLOSED" && poll.endDate}> {__.closedFrom} {formatDate(poll.endDate)}</span> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm