- Pollen-commits - mailman.cloud.codelutin.com

branch develop updated (3fe4ce2f -> 7249b09f)
by chorem.org scm 10 Oct '17

10 Oct '17

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 3fe4ce2f Merge branch 'feature/149-jugement-majoritaire' into develop new 7249b09f correction de l'id de la resource pour les choix de type resource 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 7249b09f0224a65820dec01eba009e1aff076893 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 10 15:52:22 2017 +0200 correction de l'id de la resource pour les choix de type resource Summary of changes: .../src/main/java/org/chorem/pollen/services/service/ChoiceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (37204ee8 -> 3fe4ce2f)
by chorem.org scm 10 Oct '17

10 Oct '17

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(a)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(a)chorem.org>.

1 1

branch feature/149-jugement-majoritaire deleted (was ddf81a43)
by chorem.org scm 10 Oct '17

10 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/149-jugement-majoritaire in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was ddf81a43 modification de l'écran de résultat pour la jugement majoritaire ref #149 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/149-jugement-majoritaire updated (dd36bebb -> ddf81a43)
by chorem.org scm 10 Oct '17

10 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/149-jugement-majoritaire in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from dd36bebb modification de l'écran de vote pour la jugement majoritaire ref #149 new ddf81a43 modification de l'écran de résultat pour la jugement majoritaire ref #149 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 ddf81a43ec216fa8fe87a7aa1b34a6cbe64b5d50 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 10 15:24:47 2017 +0200 modification de l'écran de résultat pour la jugement majoritaire ref #149 Summary of changes: pollen-services/pom.xml | 5 + .../voteCounting/VoteCountingDetailResultBean.java | 8 + .../MajorityJudgmentChoiceResultBean.java | 62 ++++++ .../MajorityJudgmentDetailResultBean.java | 58 ++++++ pollen-ui-riot-js/src/main/web/i18n/en.json | 3 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 3 + .../src/main/web/tag/poll/Results.tag.html | 16 +- .../MajorityJudgmentDetailResult.tag.html | 222 +++++++++++++++++++++ 8 files changed, 374 insertions(+), 3 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/MajorityJudgmentDetailResult.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/44_several_email_address updated (57687fee -> 57d016d0)
by chorem.org scm 09 Oct '17

09 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/44_several_email_address in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 57687fee corrections exceptions adds 57d016d0 refs #44 correction de la migration No new revisions were added by this update. Summary of changes: .../V3_1_0_5__Extract_email_addresses.java} | 30 ++++++++++++---------- .../h2/V3_1_0_4__add_email_address_table.sql | 13 ++++++++++ .../h2/V3_1_0_6__drop_email_from_user.sql | 2 ++ .../V3_1_0_4__add_email_address_table.sql | 13 ++++++++++ .../postgresql/V3_1_0_6__drop_email_from_user.sql | 2 ++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- 6 files changed, 47 insertions(+), 15 deletions(-) rename pollen-persistence/src/main/java/db/migration/{V3_0_1_4__Extract_email_addresses.java => common/V3_1_0_5__Extract_email_addresses.java} (68%) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_4__add_email_address_table.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_6__drop_email_from_user.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_4__add_email_address_table.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_6__drop_email_from_user.sql -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/44_several_email_address updated (beb73f87 -> 57687fee)
by chorem.org scm 09 Oct '17

09 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/44_several_email_address in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from beb73f87 refs #44 checks de sécurité + refactoring + tests unitaires new 57687fee corrections exceptions 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 57687fee3a1c054d03d9f459b20e912e59fb2401 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 9 17:01:01 2017 +0200 corrections exceptions Summary of changes: .../org/chorem/pollen/rest/api/PollenRestApiApplication.java | 2 ++ ...er.java => PollenDefaultEmailAddressExceptionMapper.java} | 12 ++++++------ .../java/org/chorem/pollen/rest/api/v1/PollenUserApi.java | 8 ++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) copy pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/exceptionMappers/{PollenUserBannedExceptionMapper.java => PollenDefaultEmailAddressExceptionMapper.java} (68%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/44_several_email_address created (now beb73f87)
by chorem.org scm 09 Oct '17

09 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/44_several_email_address in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at beb73f87 refs #44 checks de sécurité + refactoring + tests unitaires This branch includes the following new commits: new cc5d175c refs #44 debut de modifs du back pour accepter plusieurs emails par utilisateur new f9cdab49 fichier oublié new beb73f87 refs #44 checks de sécurité + refactoring + tests unitaires The 3 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 beb73f87483cbf14c39e1c1f0e5786dac77d71b2 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 9 16:43:06 2017 +0200 refs #44 checks de sécurité + refactoring + tests unitaires commit cc5d175cab85ae3cf0dac5989c64fefe56b7fa21 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 10:34:12 2017 +0200 refs #44 debut de modifs du back pour accepter plusieurs emails par utilisateur commit f9cdab49b012e83a7e7a3c2f09c94d0729179ef8 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 5 10:46:13 2017 +0200 fichier oublié -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch feature/149-jugement-majoritaire updated (d989f50e -> dd36bebb)
by chorem.org scm 09 Oct '17

09 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/149-jugement-majoritaire in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from d989f50e Configuration du jugement majoritaire a l'edition du sondage ref #149 new dd36bebb modification de l'écran de vote pour la jugement majoritaire ref #149 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 dd36bebb5ae59580ddb4b69821563c6be627bde7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 9 14:33:10 2017 +0200 modification de l'écran de vote pour la jugement majoritaire ref #149 Summary of changes: .../pollen/services/bean/VoteCountingTypeBean.java | 4 +++ pollen-ui-riot-js/src/main/web/js/Poll.js | 6 +++- .../src/main/web/tag/poll/Votes.tag.html | 40 +++++++++++++++++++--- .../votecounting/model/ChoiceToVoteRenderType.java | 5 ++- .../votecounting/MajorityJudgmentVoteCounting.java | 6 ++-- .../MajorityJudgmentVoteCountingStrategy.java | 5 +-- 6 files changed, 54 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/149-jugement-majoritaire updated (200e8231 -> d989f50e)
by chorem.org scm 09 Oct '17

09 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/149-jugement-majoritaire in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 200e8231 implentation du jugement majoritaire (algo de dépouillement) ref #149 new d989f50e Configuration du jugement majoritaire a l'edition du sondage ref #149 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 d989f50e4b1039112096b458b6abc5c1376a1875 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 9 11:00:59 2017 +0200 Configuration du jugement majoritaire a l'edition du sondage ref #149 Summary of changes: .../converter/VoteCountingConfigDeserializer.java | 17 +++++ pollen-ui-riot-js/src/main/web/i18n/en.json | 5 ++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 5 ++ .../src/main/web/tag/poll/Settings.tag.html | 5 ++ .../MajorityJudgmentConfig.tag.html | 84 ++++++++++++++++++++++ 5 files changed, 116 insertions(+) create mode 100644 pollen-ui-riot-js/src/main/web/tag/voteCountingType/MajorityJudgmentConfig.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/149-jugement-majoritaire updated (df14354a -> 200e8231)
by chorem.org scm 06 Oct '17

06 Oct '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/149-jugement-majoritaire in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits df14354a implentation du jugement majoritaire (algo de dépouillement) ref #149 adds bd2be132 on ne cherche l'image d'avatar que si l'utilisateur a un avatar adds 1d19af87 correction de la valeur de la conf par défaut des types de sondage adds 540d368f Erreur de sérialisation de la config vide adds 2b6afd92 fixes #151 placement du bouton adds 37204ee8 mise en page de la section avatar du profil adds 200e8231 implentation du jugement majoritaire (algo de dépouillement) ref #149 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (df14354a) \ N -- N -- N refs/heads/feature/149-jugement-majoritaire (200e8231) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../h2/V3_1_0_3__add_vote_counting_config.sql | 6 +- .../V3_1_0_3__add_vote_counting_config.sql | 6 +- ...java => EmptyVoteCountingConfigSerializer.java} | 21 +++--- .../pollen/rest/api/converter/JacksonConfig.java | 2 + pollen-ui-riot-js/src/main/web/i18n/en.json | 7 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 6 +- .../src/main/web/tag/UserProfile.tag.html | 79 +++++++++++++--------- .../src/main/web/tag/components/Avatar.tag.html | 2 +- 8 files changed, 75 insertions(+), 54 deletions(-) copy pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/{PollenEntityIdSerializer.java => EmptyVoteCountingConfigSerializer.java} (60%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0