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 37204ee8 mise en page de la section avatar du profil adds 200e8231 implentation du jugement majoritaire (algo de dépouillement) ref #149 adds d989f50e Configuration du jugement majoritaire a l'edition du sondage ref #149 adds dd36bebb modification de l'écran de vote pour la jugement majoritaire ref #149 adds ddf81a43 modification de l'écran de résultat pour la jugement majoritaire ref #149 new 3fe4ce2f Merge branch 'feature/149-jugement-majoritaire' into develop 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 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 Summary of changes: .../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 +- .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 6 +- .../votecounting/MajorityJudgmentChoiceResult.java | 43 +++ .../votecounting/MajorityJudgmentConfig.java | 21 ++ .../votecounting/MajorityJudgmentDetailResult.java | 39 ++- .../votecounting/MajorityJudgmentVoteCounting.java | 36 +-- .../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 | 7 +- .../src/test/resources/log4j.properties | 0 30 files changed, 1271 insertions(+), 49 deletions(-) create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/voteCounting/majorityJugment/MajorityJudgmentChoiceResultBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/voteCounting/majorityJugment/MajorityJudgmentDetailResultBean.java create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MajorityJudgmentConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MajorityJudgmentDetailResult.tag.html copy LICENSE.txt => pollen-votecounting-majority-judgment/LICENSE.txt (100%) copy {pollen-services => pollen-votecounting-majority-judgment}/README.md (100%) copy {pollen-votecounting-normal => pollen-votecounting-majority-judgment}/pom.xml (92%) create mode 100644 pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentChoiceResult.java create mode 100644 pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentConfig.java copy pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffDetailResult.java => pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentDetailResult.java (52%) copy pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java => pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java (68%) create mode 100644 pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java create mode 100644 pollen-votecounting-majority-judgment/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting create mode 100644 pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_en_GB.properties create mode 100644 pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_fr_FR.properties create mode 100644 pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java copy {pollen-votecounting-instant-runoff => pollen-votecounting-majority-judgment}/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java (86%) copy {pollen-votecounting-instant-runoff => pollen-votecounting-majority-judgment}/src/test/resources/log4j.properties (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.