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 050ad685 fixes #130 sauvegarde de la langue de l'UI adds 065aa161 Ajouter la configuration des méthodes vote (ref #148). Adaptation pour Normal, Cumulatif (ancien pourcentage), Nombre et Borda No new revisions were added by this update. Summary of changes: .../h2/V3_1_0_3__add_vote_counting_config.sql | 23 +++++ .../V3_1_0_3__add_vote_counting_config.sql | 23 +++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 29157 -> 29234 bytes pollen-rest-api/pom.xml | 1 - .../pollen/rest/api/converter/JacksonConfig.java | 2 + .../converter/VoteCountingConfigDeserializer.java | 111 +++++++++++++++++++++ .../org/chorem/pollen/services/bean/PollBean.java | 20 ++-- .../pollen/services/service/PollService.java | 10 +- .../services/service/VoteCountingService.java | 66 ++++++++++-- .../pollen/services/service/VoteService.java | 28 ++++-- pollen-ui-riot-js/src/main/web/i18n/en.json | 17 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 17 ++-- pollen-ui-riot-js/src/main/web/js/PollForm.js | 2 +- .../src/main/web/tag/poll/Settings.tag.html | 58 ++++------- .../src/main/web/tag/poll/Votes.tag.html | 8 +- .../web/tag/voteCountingType/BordaConfig.tag.html | 107 ++++++++++++++++++++ .../voteCountingType/BordaDetailResult.tag.html | 12 +-- .../tag/voteCountingType/CumulativeConfig.tag.html | 34 +++++++ .../MaxChoicesNumberConfig.tag.html | 60 +++++++++++ pollen-votecounting-aggregator/pom.xml | 4 +- pollen-votecounting-api/pom.xml | 4 + .../pollen/votecounting/AbstractVoteCounting.java | 14 ++- .../votecounting/AbstractVoteCountingStrategy.java | 10 +- .../chorem/pollen/votecounting/VoteCounting.java | 14 ++- .../pollen/votecounting/VoteCountingFactory.java | 3 +- .../pollen/votecounting/VoteCountingStrategy.java | 5 +- .../model/EmptyVoteCountingConfig.java | 7 ++ .../votecounting/model/MaxChoicesNumberConfig.java | 17 ++++ .../votecounting/model/VoteCountingConfig.java | 7 ++ .../chorem/pollen/votecounting/BordaConfig.java | 21 ++++ .../pollen/votecounting/BordaVoteCounting.java | 7 +- .../votecounting/BordaVoteCountingStrategy.java | 38 ++++++- .../pollen-votecounting-borda_fr_FR.properties | 2 +- .../BordaVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/CondorcetVoteCounting.java | 8 +- .../CondorcetVoteCountingStrategy.java | 3 +- .../pollen-votecounting-condorcet_fr_FR.properties | 2 +- .../CondorcetVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/CoombsVoteCounting.java | 8 +- .../votecounting/CoombsVoteCountingStrategy.java | 3 +- .../pollen-votecounting-coombs_en_GB.properties | 2 +- .../pollen-votecounting-coombs_fr_FR.properties | 2 +- .../CoombsVoteCountingStrategyTest.java | 8 +- .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 6 +- .../pollen/votecounting/CumulativeConfig.java | 19 ++++ .../votecounting/CumulativeVoteCounting.java | 21 ++-- .../CumulativeVoteCountingStrategy.java | 2 +- .../org.chorem.pollen.votecounting.VoteCounting | 1 + ...pollen-votecounting-cumulative_en_GB.properties | 4 + ...pollen-votecounting-cumulative_fr_FR.properties | 4 + .../CumulativeVoteCountingStrategyTest.java | 14 +-- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j.properties | 0 .../votecounting/InstantRunoffVoteCounting.java | 16 +-- .../InstantRunoffVoteCountingStrategy.java | 3 +- .../InstantRunoffVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/NormalVoteCounting.java | 16 +-- .../votecounting/NormalVoteCountingStrategy.java | 3 +- .../NormalVoteCountingStrategyTest.java | 8 +- .../pollen/votecounting/NumberVoteCounting.java | 16 +-- .../votecounting/NumberVoteCountingStrategy.java | 9 +- .../NumberVoteCountingStrategyTest.java | 9 +- .../org.chorem.pollen.votecounting.VoteCounting | 1 - ...pollen-votecounting-percentage_en_GB.properties | 4 - ...pollen-votecounting-percentage_fr_FR.properties | 4 - 68 files changed, 781 insertions(+), 195 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_3__add_vote_counting_config.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_3__add_vote_counting_config.sql create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/VoteCountingConfigDeserializer.java create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/CumulativeConfig.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MaxChoicesNumberConfig.tag.html create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/EmptyVoteCountingConfig.java create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/MaxChoicesNumberConfig.java create mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingConfig.java create mode 100644 pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaConfig.java rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/LICENSE.txt (100%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/README.md (100%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/pom.xml (93%) create mode 100644 pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeConfig.java rename pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java => pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCounting.java (77%) rename pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java => pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java (97%) create mode 100644 pollen-votecounting-cumulative/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting create mode 100644 pollen-votecounting-cumulative/src/main/resources/i18n/pollen-votecounting-cumulative_en_GB.properties create mode 100644 pollen-votecounting-cumulative/src/main/resources/i18n/pollen-votecounting-cumulative_fr_FR.properties rename pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java => pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategyTest.java (97%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java (95%) rename {pollen-votecounting-percentage => pollen-votecounting-cumulative}/src/test/resources/log4j.properties (100%) delete mode 100644 pollen-votecounting-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting delete mode 100644 pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties delete mode 100644 pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.