This is an automated email from the git hooks/post-receive script. New change to branch feature/148-configuration-methodes-de-votes in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 863823eb style adds 791e3415 update gitlab ci for release adds d8b73ea2 update gitlab ci for release adds 846d7878 update gitlab ci for release adds 7c572986 update gitlab ci for release adds 037a7157 update gitlab ci for release adds 3fe11b0b update gitlab ci for release adds fb0d5b02 update gitlab ci for release adds 29e6854a update gitlab ci for release adds 57cf8c08 update gitlab ci for release adds cc88f3f3 Update .gitlab-ci.yml adds a954f3f5 Update .gitlab-ci.yml adds c9a24a48 release 3.0.0 success [skip ci] adds 3afb5b13 release 3.0.0 success [skip ci] adds 66af7606 Update .gitlab-ci.yml adds 628af107 release 3.0.0 success [skip ci] adds 7ce8b58d Update .gitlab-ci.yml adds 9f9d925f suppression d'un mauvais nom de domaine adds 4ed8e91e Empty CHANGELOG adds 3b0a0e98 release 3.0.0 success [skip ci] adds bd177f18 Update .gitlab-ci.yml adds 34698a83 Update CHANGELOG adds f5608178 release 3.0.0 success [skip ci] adds bdf3b65c Merge branch 'release/3.0.0' adds 50cd29bb Merge tag '3.0.0' into develop adds 91d1a280 passage à la version 3.1.0-SNAPSHOT adds 3efc4383 passage à la version 3.1.0 pour le js adds 8ab5eda8 correction du footer en anglais adds a774bbd8 Limitations du nombre votants (ref #58), Déplacement des méthodes de transformation des entités en bean dans les services adds 6b46dc9a indiquer la limite de votants pour un sondage (ref #58) adds bf74bb03 ne pas afficher les votes ignorés (ref #58) adds 9ba5ccb2 Dans les listes des sondages : voir les sondage hors limites du nombre de votants (ref #58) adds 5cd67c81 Création et modification d'un sondage restreint, avertir si le nombre de participant dépasse le nombre maximum de votants (ref #58) adds 9f142759 envoyer un mail quand le nombre de votants dépasse la valeur max (ref #58) adds a59ea622 Merge branch 'feature/58-limitation-des-votants' into develop No new revisions were added by this update. Summary of changes: .gitlab-ci.yml | 20 ++- CHANGELOG | 23 +++ pollen-persistence/pom.xml | 2 +- .../pollen/persistence/entity/PollTopiaDao.java | 12 ++ .../pollen/persistence/entity/VoteToChoices.java | 15 +- .../pollen/persistence/entity/VoteTopiaDao.java | 11 ++ .../db/migration/h2/V3_1_0_1__add_premium.sql | 8 + .../migration/postgresql/V3_1_0_1__add_premium.sql | 8 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 28355 -> 28560 bytes pollen-rest-api/pom.xml | 2 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 8 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 2 +- pollen-services/pom.xml | 2 +- pollen-services/src/main/config/PollenServices.ini | 8 +- .../chorem/pollen/services/PollenUIContext.java | 10 ++ .../services/bean/ChildFavoriteListBean.java | 23 --- .../chorem/pollen/services/bean/ChoiceBean.java | 29 ---- .../chorem/pollen/services/bean/CommentBean.java | 44 ------ .../pollen/services/bean/FavoriteListBean.java | 20 --- .../services/bean/FavoriteListMemberBean.java | 24 --- .../pollen/services/bean/LoginProviderBean.java | 23 --- .../org/chorem/pollen/services/bean/PollBean.java | 129 ++--------------- .../chorem/pollen/services/bean/PollenBean.java | 4 - .../chorem/pollen/services/bean/PollenBeans.java | 49 +------ .../pollen/services/bean/PollenUserBean.java | 63 +++----- .../chorem/pollen/services/bean/ReportBean.java | 21 --- .../pollen/services/bean/ResourceFileBean.java | 31 ---- .../pollen/services/bean/ResourceMetaBean.java | 26 ---- .../pollen/services/bean/ResourceStreamBean.java | 36 ----- .../pollen/services/bean/UserCredentialBean.java | 21 +-- .../org/chorem/pollen/services/bean/VoteBean.java | 80 ++-------- .../pollen/services/bean/VoteToChoiceBean.java | 24 --- .../chorem/pollen/services/bean/VoterListBean.java | 36 ++--- .../pollen/services/bean/VoterListMemberBean.java | 34 ----- .../bean/export/ChildFavoriteListExport.java | 16 -- .../pollen/services/service/ChoiceService.java | 56 +++++-- .../pollen/services/service/CommentService.java | 45 ++++-- .../services/service/FavoriteListService.java | 73 +++++++--- .../pollen/services/service/FeedbackService.java | 3 +- .../pollen/services/service/FixturesService.java | 14 +- .../chorem/pollen/services/service/GtuService.java | 50 ++++--- .../services/service/NotificationService.java | 9 ++ .../pollen/services/service/PollService.java | 161 +++++++++++++++------ .../services/service/PollenResourceService.java | 35 ++++- .../services/service/PollenServiceSupport.java | 43 +----- .../pollen/services/service/PollenUserService.java | 116 ++++++++------- .../pollen/services/service/ReportService.java | 30 +++- .../pollen/services/service/SocialAuthService.java | 17 ++- .../services/service/VoteCountingService.java | 13 +- .../pollen/services/service/VoteService.java | 104 +++++++++---- .../pollen/services/service/VoterListService.java | 89 +++++++----- .../pollen/services/service/mail/EmailService.java | 8 + ...atedEmail.java => ExceedingMaxVotersEmail.java} | 29 ++-- .../email/ExceedingMaxVotersEmail.mustache | 5 + .../email/ExceedingMaxVotersEmail_fr.mustache | 6 + .../i18n/pollen-services_en_GB.properties | 2 + .../i18n/pollen-services_fr_FR.properties | 2 + .../services/service/PollenUserServiceTest.java | 8 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/css/custom.css | 6 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 13 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 11 +- pollen-ui-riot-js/src/main/web/js/Session.js | 3 +- .../src/main/web/js/VoterListService.js | 25 +++- .../src/main/web/tag/admin/UserCard.tag.html | 16 ++ .../src/main/web/tag/admin/UserEditModal.tag.html | 19 +++ .../src/main/web/tag/components/InnerHtml.tag.html | 14 ++ .../main/web/tag/components/date-picker.tag.html | 13 +- .../src/main/web/tag/poll/Poll.tag.html | 34 ++++- .../src/main/web/tag/poll/PollCard.tag.html | 26 +++- .../src/main/web/tag/poll/Votes.tag.html | 29 +++- .../src/main/web/tag/voterList/VoterList.tag.html | 17 ++- pollen-ui-riot-js/webpack.config.js | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 85 files changed, 989 insertions(+), 1047 deletions(-) create mode 100644 CHANGELOG create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_1__add_premium.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_1__add_premium.sql copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{PollCreatedEmail.java => ExceedingMaxVotersEmail.java} (69%) create mode 100644 pollen-services/src/main/resources/email/ExceedingMaxVotersEmail.mustache create mode 100644 pollen-services/src/main/resources/email/ExceedingMaxVotersEmail_fr.mustache create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/InnerHtml.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.