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 3fe4ce2f39b7c47cda613e2edb07f927bb1b5d6c Merge: 37204ee8 ddf81a43 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 10 15:26:25 2017 +0200 Merge branch 'feature/149-jugement-majoritaire' into develop .../converter/VoteCountingConfigDeserializer.java | 17 + pollen-services/pom.xml | 5 + .../pollen/services/bean/VoteCountingTypeBean.java | 4 + .../voteCounting/VoteCountingDetailResultBean.java | 8 + .../MajorityJudgmentChoiceResultBean.java | 62 ++ .../MajorityJudgmentDetailResultBean.java | 58 ++ pollen-ui-riot-js/src/main/web/i18n/en.json | 8 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 8 + pollen-ui-riot-js/src/main/web/js/Poll.js | 6 +- .../src/main/web/tag/poll/Results.tag.html | 16 +- .../src/main/web/tag/poll/Settings.tag.html | 5 + .../src/main/web/tag/poll/Votes.tag.html | 40 +- .../MajorityJudgmentConfig.tag.html | 84 +++ .../MajorityJudgmentDetailResult.tag.html | 222 +++++++ pollen-votecounting-aggregator/pom.xml | 6 + .../votecounting/model/ChoiceToVoteRenderType.java | 5 +- pollen-votecounting-majority-judgment/LICENSE.txt | 661 +++++++++++++++++++++ pollen-votecounting-majority-judgment/README.md | 0 pollen-votecounting-majority-judgment/pom.xml | 93 +++ .../votecounting/MajorityJudgmentChoiceResult.java | 43 ++ .../votecounting/MajorityJudgmentConfig.java | 21 + .../votecounting/MajorityJudgmentDetailResult.java | 65 ++ .../votecounting/MajorityJudgmentVoteCounting.java | 108 ++++ .../MajorityJudgmentVoteCountingStrategy.java | 264 ++++++++ .../org.chorem.pollen.votecounting.VoteCounting | 1 + ...votecounting-majority-judgment_en_GB.properties | 4 + ...votecounting-majority-judgment_fr_FR.properties | 4 + .../MajorityJudgmentVoteCountingStrategyTest.java | 341 +++++++++++ .../votecounting/VoteCountingFactoryTest.java | 30 +- .../src/test/resources/log4j.properties | 28 + 30 files changed, 2191 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.