This is an automated email from the git hooks/post-receive script. New commit to branch feature/239-confirmationVote in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 843938b2097b8d1bf393242570fc79371881893e Author: jcouteau <couteau@codelutin.com> Date: Tue Dec 3 14:41:39 2019 +0100 fixes #239 - Confirmation de vote --- pollen-ui-riot-js/src/main/web/i18n/en.json | 1 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 5 +++++ 3 files changed, 7 insertions(+) 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 649ec254..75716a8e 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -175,6 +175,7 @@ "poll_votes_voteNotOpen": "Votes are not open.", "poll_votes_voteClosed": "Votes are closed", "poll_votes_ignored": "Ignored", + "poll_votes_thankYouForVoting": "Thank you for voting", "poll_votes_pointsDistribution": "Distribute {0} points among the proposed choices", "poll_votes_voteByOrder": "Rank choices by preference order (1 = favorite)", "poll_votes_voteByOrderWithMax": "Rank the {0} firsts choices by preference order (1 = favorite)", 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 52b60ade..4f38534b 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -175,6 +175,7 @@ "poll_votes_voteNotOpen": "Les votes ne sont pas encore ouverts.", "poll_votes_voteClosed": "Les votes sont clos.", "poll_votes_ignored": "Ignoré", + "poll_votes_thankYouForVoting": "Merci d'avoir voté", "poll_votes_pointsDistribution": "Distribuer {0} points parmis les choix proposés", "poll_votes_voteByOrder": "Classer les choix par ordre de préférence (1 = préféré)", "poll_votes_voteByOrderWithMax": "Classer vos {0} premiers choix par ordre de préférence (1 = préféré)", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index 11b506f9..d2cbb4cb 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -40,6 +40,10 @@ show={isVoteByOrder && voteClickAndDrop} on-save-vote={saveVote}/> + <p class="warning-label warning" if="{thankYouVoted}"> + <span>Merci d'avoir voté{_t.thankYouForVoting}</span> + </p> + <!-- Form to vote --> <p class="warning-label warning" if="{loaded && !poll.canVote}"> <span if="{moment().isBefore(poll.beginDate)}">{_t.voteNotOpen}</span> @@ -119,6 +123,7 @@ let promise = vote.id ? this.poll.updateVote(this.poll.questions[0].id, vote) : this.poll.addVote(this.poll.questions[0].id, vote); return promise.then(result => { + this.bus.trigger("message", this._t.thankYouForVoting, "success"); if (this.poll.getPermission() && oldPermission !== this.poll.getPermission()) { setTimeout( () => route("poll/" + this.poll.id + "/vote/" + this.poll.getPermission()), -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.