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

branch feature/28_avatars updated (24e6ad02 -> d7f90355)
by chorem.org scm 29 Sep '17

29 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/28_avatars in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 24e6ad02 rebase new d7f90355 refs #28 utilisation des avatars un peu partout + verif de la taille et du type de fichier pour l'avatar 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 d7f90355d7e952058a11fbef1c552b67e620f0a3 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 29 18:56:56 2017 +0200 refs #28 utilisation des avatars un peu partout + verif de la taille et du type de fichier pour l'avatar Summary of changes: .../pollen/rest/api/v1/PollenResourceApi.java | 6 ++- .../chorem/pollen/services/bean/CommentBean.java | 10 +++++ .../org/chorem/pollen/services/bean/VoteBean.java | 10 +++++ .../pollen/services/service/CommentService.java | 17 ++++++--- .../pollen/services/service/PollService.java | 16 ++++---- .../services/service/PollenResourceService.java | 16 ++++++-- .../pollen/services/service/VoteService.java | 18 +++++++-- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 + .../src/main/web/js/ResourceService.js | 13 +++++-- .../src/main/web/tag/PollenHeader.tag.html | 8 +++- .../src/main/web/tag/UserProfile.tag.html | 44 ++++++++++++++++++---- .../src/main/web/tag/components/Avatar.tag.html | 25 +++++------- .../src/main/web/tag/poll/Comments.tag.html | 7 +++- .../src/main/web/tag/poll/PollCard.tag.html | 11 +++++- .../src/main/web/tag/poll/Votes.tag.html | 15 ++++++-- 16 files changed, 165 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/28_avatars updated (350108b4 -> 24e6ad02)
by chorem.org scm 29 Sep '17

29 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/28_avatars in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits 350108b4 ajout e variable dans le package.json omits a9ba220a refs #28 utilisation de l'avatar omits c0153a85 refs #28 forumlaire d'upload de l'avatar omits 8c8503c4 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers omits 7d02cf80 refs #28 message si avatar non chargé omits 13096a6c refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles 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 new 9b760b6e refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles new 47dd3508 refs #28 message si avatar non chargé new 9caec977 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers new d1e7140e refs #28 forumlaire d'upload de l'avatar new 16c884e0 refs #28 utilisation de l'avatar new 0b084777 ajout e variable dans le package.json new 24e6ad02 rebase 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 (350108b4) \ N -- N -- N refs/heads/feature/28_avatars (24e6ad02) 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. The 7 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 24e6ad02ac0ead09b2d055f551f32bcc7c94b723 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 29 11:37:16 2017 +0200 rebase commit 0b0847773d28b33d3f335a57b42e2c788011d9de Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 29 10:02:28 2017 +0200 ajout e variable dans le package.json commit 16c884e01c8cbead7aaf4c8e2bee6d01fdbd578b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 28 11:12:43 2017 +0200 refs #28 utilisation de l'avatar commit d1e7140e8550cec3c833305d93de37a8e085768d Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 26 10:55:28 2017 +0200 refs #28 forumlaire d'upload de l'avatar commit 9caec9779a14f73cb004f551f9a8bc138da298c6 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 22 17:42:51 2017 +0200 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers commit 47dd3508f0a2309a4be61a6098b72a14673d475a Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 22 10:39:10 2017 +0200 refs #28 message si avatar non chargé commit 9b760b6ec8ce7bd2f9ae40ee98071fe32e86c597 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 19 18:10:32 2017 +0200 refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles Summary of changes: 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 + ..._2__add_avatar.sql => V3_1_0_2__add_avatar.sql} | 0 .../migration/postgresql/V3_1_0_1__add_premium.sql | 8 + ..._2__add_avatar.sql => V3_1_0_2__add_avatar.sql} | 0 pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 28921 -> 29157 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 | 133 ++-------------- .../chorem/pollen/services/bean/PollenBean.java | 4 - .../chorem/pollen/services/bean/PollenBeans.java | 49 +----- .../pollen/services/bean/PollenUserBean.java | 66 +++----- .../chorem/pollen/services/bean/ReportBean.java | 21 --- .../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 -- .../bean/resource/AbstractResourceBean.java | 27 +--- .../services/bean/resource/ResourceFileBean.java | 46 +++--- .../services/bean/resource/ResourceMetaBean.java | 12 +- .../services/bean/resource/ResourceStreamBean.java | 34 +---- .../pollen/services/service/ChoiceService.java | 57 ++++--- .../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 | 168 +++++++++++++++------ .../services/service/PollenResourceService.java | 50 ++++-- .../services/service/PollenServiceSupport.java | 43 +----- .../pollen/services/service/PollenUserService.java | 127 +++++++++------- .../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/UserProfile.tag.html | 1 + .../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-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 +- 86 files changed, 1010 insertions(+), 1049 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_1__add_premium.sql rename pollen-persistence/src/main/resources/db/migration/h2/{V3_0_1_2__add_avatar.sql => V3_1_0_2__add_avatar.sql} (100%) create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_1__add_premium.sql rename pollen-persistence/src/main/resources/db/migration/postgresql/{V3_0_1_2__add_avatar.sql => V3_1_0_2__add_avatar.sql} (100%) 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(a)chorem.org>.

1 7

branch feature/28_avatars updated (a04e635a -> 350108b4)
by chorem.org scm 29 Sep '17

29 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/28_avatars in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits a04e635a refs #28 forumlaire d'upload de l'avatar omits f0692bd5 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers omits 95718ac2 refs #28 message si avatar non chargé omits c7550c51 refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles adds aa1b84a5 Correction affichage votes anoymes adds 053f9ed8 fixes #146 The registration form does not display on mobiles adds a1227dbd logout en delete et oubli de mot de passe en post adds 80d82627 Corretion de la methode pour les votes alternatifs adds 9913fcb0 update gitlab ci for release adds d9f7d087 update gitlab ci for release adds 9366dcba update gitlab ci for release adds 26842f63 update gitlab ci for release adds 92897a30 update gitlab ci for release adds edaa1be6 fixes #150 bouchage des trous de secu adds 72199763 Maj des dépendances et entêtes en vue de la release. adds 66b90103 update gitlab ci for release adds 02a5af9d ajout de l'url de voe à partager dans la page de résumé du sondage + warning pour ne pas partager la page de résumé adds 6e45bf56 ajout d'un tooltip sur le bouton copier + suppression du warning adds 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 new 13096a6c refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles new 7d02cf80 refs #28 message si avatar non chargé new 8c8503c4 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers new c0153a85 refs #28 forumlaire d'upload de l'avatar new a9ba220a refs #28 utilisation de l'avatar new 350108b4 ajout e variable dans le package.json 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 (a04e635a) \ N -- N -- N refs/heads/feature/28_avatars (350108b4) 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. The 6 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 350108b48a96f0a707008da0f8d2d78aa21aaf9c Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 29 10:02:28 2017 +0200 ajout e variable dans le package.json commit a9ba220a76c759a9daf6527930fb88fb6156245d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 28 11:12:43 2017 +0200 refs #28 utilisation de l'avatar commit c0153a8599aeab4c0b35f79cc3f449fdc978a26e Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 26 10:55:28 2017 +0200 refs #28 forumlaire d'upload de l'avatar commit 8c8503c4e5c11165e7efbddf4a9991f12d788d39 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 22 17:42:51 2017 +0200 refs #28 finalement on stocke l'avatar dans une resource en base meme quand ça vient d'un tiers commit 7d02cf80f1d8d04bb993e4931c9e38516db75189 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 22 10:39:10 2017 +0200 refs #28 message si avatar non chargé commit 13096a6c8b30e8effc6f070c3776b0ab430bb917 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 19 18:10:32 2017 +0200 refs #28 ajout de l'avatar pour l'utilisateur + possibilité d'en choisir un parmi les providers disponibles Summary of changes: .gitlab-ci.yml | 73 ++++++++++++++++++ CHANGELOG | 23 ++++++ pollen-persistence/pom.xml | 2 +- .../org/chorem/pollen/persistence/DaoUtils.java | 21 ++++++ .../persistence/PollenFlywayServiceImpl.java | 21 ++++++ .../entity/ChildFavoriteListTopiaDao.java | 23 +++++- .../entity/FavoriteListMemberTopiaDao.java | 21 ++++++ .../pollen/persistence/entity/PollenUserImpl.java | 21 ++++++ .../pollen/persistence/entity/ReportResume.java | 21 ++++++ .../pollen/persistence/entity/ReportTopiaDao.java | 21 ++++++ .../persistence/entity/UserCredentialTopiaDao.java | 27 ++++++- .../entity/VoterListMemberTopiaDao.java | 21 ++++++ pollen-rest-api/pom.xml | 7 +- pollen-rest-api/src/license/THIRD-PARTY.properties | 28 ++++--- .../pollen/rest/api/PollenRestApiApplication.java | 21 ++++++ .../pollen/rest/api/beans/ChangePasswordBean.java | 23 +++++- .../pollen/rest/api/beans/PollCreateBean.java | 21 ++++++ .../pollen/rest/api/beans/Resource64Bean.java | 21 ++++++ .../pollen/rest/api/beans/VoterListSaveBean.java | 21 ++++++ .../pollen/rest/api/converter/JacksonConfig.java | 21 ++++++ .../api/converter/PollenConverterProvider.java | 21 ++++++ .../api/converter/PollenEntityIdDeserializer.java | 21 ++++++ .../api/converter/PollenEntityIdSerializer.java | 21 ++++++ .../api/converter/PollenEntityRefDeserializer.java | 21 ++++++ .../api/converter/PollenEntityRefSerializer.java | 21 ++++++ .../FavoriteListImportExceptionMapper.java | 21 ++++++ .../InvalidEntityLinkExceptionMapper.java | 21 ++++++ .../InvalidFormExceptionMapper.java | 21 ++++++ .../PollenAbstractExceptionMapper.java | 21 ++++++ .../PollenAuthenticationExceptionMapper.java | 21 ++++++ .../PollenEmailNotValidatedExceptionMapper.java | 21 ++++++ ...rProviderAccountAlreadyUsedExceptionMapper.java | 21 ++++++ ...InvalidEmailActivationTokenExceptionMapper.java | 21 ++++++ .../PollenInvalidPermissionExceptionMapper.java | 21 ++++++ .../PollenInvalidSessionTokenExceptionMapper.java | 21 ++++++ .../PollenUnauthorizedExceptionMapper.java | 21 ++++++ .../PollenUserBannedExceptionMapper.java | 21 ++++++ .../TopiaNoResultExceptionMapper.java | 21 ++++++ .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 21 ++++++ .../org/chorem/pollen/rest/api/v1/AuthApi.java | 8 +- .../org/chorem/pollen/rest/api/v1/FeedbackApi.java | 21 ++++++ .../java/org/chorem/pollen/rest/api/v1/GtuApi.java | 21 ++++++ .../pollen/rest/api/v1/PollenResourceApi.java | 15 ---- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 3 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 13 ---- .../org/chorem/pollen/rest/api/AuthApiTest.java | 2 +- pollen-services/pom.xml | 2 +- .../chorem/pollen/services/PollenUIContext.java | 21 ++++++ .../java/org/chorem/pollen/services/UnitHuman.java | 21 ++++++ .../services/bean/ChildFavoriteListBean.java | 21 ++++++ .../chorem/pollen/services/bean/FeedbackBean.java | 21 ++++++ .../pollen/services/bean/LoginProviderBean.java | 21 ++++++ .../org/chorem/pollen/services/bean/PollBean.java | 13 ++++ .../chorem/pollen/services/bean/ReportBean.java | 21 ++++++ .../chorem/pollen/services/bean/ReportLevel.java | 21 ++++++ .../pollen/services/bean/ReportResumeBean.java | 21 ++++++ .../pollen/services/bean/UserCredentialBean.java | 21 ++++++ .../bean/export/ChildFavoriteListExport.java | 21 ++++++ .../pollen/services/bean/export/ExportBean.java | 21 ++++++ .../services/bean/export/FavoriteListsExport.java | 21 ++++++ .../pollen/services/bean/resource/GtuMetaBean.java | 21 ++++++ .../services/bean/resource/ResourceMetaBean.java | 2 +- .../Coombs/CoombsDetailResultBean.java | 21 ++++++ .../bean/voteCounting/Coombs/CoombsRoundBean.java | 21 ++++++ .../voteCounting/Coombs/CoombsRoundChoiceBean.java | 21 ++++++ .../InstantRunoffDetailResultBean.java | 21 ++++++ .../InstantRunoff/InstantRunoffRoundBean.java | 21 ++++++ .../InstantRunoffRoundChoiceBean.java | 21 ++++++ .../voteCounting/VoteCountingDetailResultBean.java | 21 ++++++ .../voteCounting/borda/BordaChoiceRankBean.java | 21 ++++++ .../voteCounting/borda/BordaDetailResultBean.java | 21 ++++++ .../condorcet/CondorcetBattleBean.java | 21 ++++++ .../condorcet/CondorcetDetailResultBean.java | 21 ++++++ .../pollen/services/job/AbstractPollenJob.java | 21 ++++++ .../pollen/services/job/SendEmailInErrorsJob.java | 21 ++++++ .../services/job/SendPollEndReminderJob.java | 21 ++++++ .../pollen/services/service/ChoiceService.java | 1 + .../services/service/FavoriteListService.java | 77 +++++++------------ .../pollen/services/service/FeedService.java | 21 ++++++ .../pollen/services/service/FeedbackService.java | 21 ++++++ .../chorem/pollen/services/service/GtuService.java | 28 ++++++- .../pollen/services/service/PollService.java | 20 ++--- .../services/service/PollenResourceService.java | 19 +---- .../services/service/PollenServiceSupport.java | 5 ++ .../pollen/services/service/PollenUserService.java | 22 +++--- .../pollen/services/service/ReportService.java | 21 ++++++ .../pollen/services/service/SocialAuthService.java | 33 ++++++-- .../services/service/VoteCountingService.java | 1 + .../services/service/mail/AbstractReportEmail.java | 21 ++++++ .../service/mail/AbstractReportForAdminEmail.java | 21 ++++++ .../services/service/mail/ChoiceReportEmail.java | 21 ++++++ .../service/mail/ChoiceReportForAdminEmail.java | 21 ++++++ .../services/service/mail/CommentReportEmail.java | 21 ++++++ .../service/mail/CommentReportForAdminEmail.java | 21 ++++++ .../services/service/mail/FeedbackEmail.java | 21 ++++++ .../services/service/mail/PollReportEmail.java | 21 ++++++ .../service/mail/PollReportForAdminEmail.java | 21 ++++++ ...EmailOrProviderAccountAlreadyUsedException.java | 21 ++++++ .../src/main/resources/oauth_consumer.properties | 22 +++++- .../pollen/services/service/PollServiceTest.java | 2 +- pollen-ui-riot-js/package.json | 2 +- .../jetty-context.xml => pollen-ui-riot-js/pom.xml | 23 ++++-- pollen-ui-riot-js/src/main/web/conf.js | 20 +++++ pollen-ui-riot-js/src/main/web/css/blaze.css | 20 +++++ .../src/main/web/css/custom-code-lutin.css | 20 +++++ pollen-ui-riot-js/src/main/web/css/custom.css | 20 +++++ pollen-ui-riot-js/src/main/web/css/main.css | 1 + pollen-ui-riot-js/src/main/web/css/print.css | 22 +++++- .../src/main/web/help/voteCountingTypes-en.html | 22 +++++- .../src/main/web/help/voteCountingTypes-fr.html | 22 +++++- pollen-ui-riot-js/src/main/web/home/en.html | 22 +++++- pollen-ui-riot-js/src/main/web/home/fr.html | 22 +++++- pollen-ui-riot-js/src/main/web/home/style.css | 22 +++++- pollen-ui-riot-js/src/main/web/homeCL/en.html | 22 +++++- pollen-ui-riot-js/src/main/web/homeCL/fr.html | 22 +++++- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 22 +++++- pollen-ui-riot-js/src/main/web/homeCL/style.css | 22 +++++- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 + pollen-ui-riot-js/src/main/web/js/AuthService.js | 4 +- pollen-ui-riot-js/src/main/web/js/Logger.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/PageTracker.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/Pagination.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/Poll.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/PollenBus.js | 20 +++++ .../src/main/web/js/ResourceService.js | 4 + pollen-ui-riot-js/src/main/web/js/UIHelper.js | 20 +++++ pollen-ui-riot-js/src/main/web/js/UserService.js | 2 +- .../src/main/web/js/VoterListService.js | 20 +++++ .../src/main/web/tag/HeaderI18n.tag.html | 36 ++++----- pollen-ui-riot-js/src/main/web/tag/Home.tag.html | 36 ++++----- .../src/main/web/tag/Pagination.tag.html | 20 +++++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 48 +++++++----- .../src/main/web/tag/PollenFooter.tag.html | 36 ++++----- .../src/main/web/tag/PollenHeader.tag.html | 40 +++++----- .../src/main/web/tag/PollenMessageManager.tag.html | 20 +++++ .../src/main/web/tag/PollenWaiter.tag.html | 20 +++++ .../src/main/web/tag/Privacy.tag.html | 20 +++++ pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html | 20 +++++ .../src/main/web/tag/SignCheck.tag.html | 36 ++++----- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 40 +++++----- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 43 ++++++----- .../src/main/web/tag/UserProfile.tag.html | 38 ++++++++-- .../src/main/web/tag/admin/GtuCard.tag.html | 20 +++++ .../src/main/web/tag/admin/Gtus.tag.html | 20 +++++ .../src/main/web/tag/admin/LoginProviders.tag.html | 20 +++++ .../src/main/web/tag/admin/UserCard.tag.html | 20 +++++ .../src/main/web/tag/admin/UserEditModal.tag.html | 20 +++++ .../src/main/web/tag/admin/Users.tag.html | 20 +++++ .../src/main/web/tag/components/Avatar.tag.html | 36 +++++++++ .../src/main/web/tag/components/Card.tag.html | 20 +++++ .../src/main/web/tag/components/Checkbox.tag.html | 22 +++++- .../web/tag/components/ContextualMenu.tag.html | 20 +++++ .../main/web/tag/components/GtuValidation.tag.html | 20 +++++ .../main/web/tag/components/HumanInput.tag.html | 20 +++++ .../src/main/web/tag/components/LazyLoad.tag.html | 20 +++++ .../main/web/tag/components/LetterAvatar.tag.html | 20 +++++ .../main/web/tag/components/LoadingCard.tag.html | 20 +++++ .../web/tag/components/MultiLineLabel.tag.html | 22 +++++- .../src/main/web/tag/components/Search.tag.html | 20 +++++ .../main/web/tag/components/date-picker.tag.html | 20 +++++ .../web/tag/components/date-time-picker.tag.html | 20 +++++ .../main/web/tag/components/time-picker.tag.html | 20 +++++ .../web/tag/favoriteList/ChildListCard.tag.html | 20 +++++ .../tag/favoriteList/ChildListEditModal.tag.html | 20 +++++ .../web/tag/favoriteList/FavoriteList.tag.html | 22 +++++- .../web/tag/favoriteList/FavoriteListCard.tag.html | 20 +++++ .../favoriteList/FavoriteListEditModal.tag.html | 20 +++++ .../web/tag/favoriteList/FavoriteLists.tag.html | 20 +++++ .../web/tag/favoriteList/ImportCsvModal.tag.html | 20 +++++ .../web/tag/favoriteList/ImportLdapModal.tag.html | 20 +++++ .../main/web/tag/favoriteList/MemberCard.tag.html | 20 +++++ .../web/tag/favoriteList/MemberEditModal.tag.html | 20 +++++ .../src/main/web/tag/poll/Choice.tag.html | 23 +++++- .../src/main/web/tag/poll/ChoiceView.tag.html | 26 ++++++- .../src/main/web/tag/poll/Choices.tag.html | 20 +++++ .../src/main/web/tag/poll/Comments.tag.html | 20 +++++ .../src/main/web/tag/poll/Description.tag.html | 36 ++++----- .../src/main/web/tag/poll/EditPoll.tag.html | 36 ++++----- .../src/main/web/tag/poll/Podium.tag.html | 20 +++++ .../src/main/web/tag/poll/Poll.tag.html | 20 +++++ .../src/main/web/tag/poll/PollCard.tag.html | 23 +++++- .../src/main/web/tag/poll/Polls.tag.html | 20 +++++ .../src/main/web/tag/poll/Report.tag.html | 20 +++++ .../src/main/web/tag/poll/Results.tag.html | 20 +++++ .../src/main/web/tag/poll/Settings.tag.html | 36 ++++----- .../src/main/web/tag/poll/Summary.tag.html | 78 ++++++++++++++++--- .../src/main/web/tag/poll/Votes.tag.html | 25 +++++- .../src/main/web/tag/popup/ConfirmPopup.tag.html | 20 +++++ .../src/main/web/tag/popup/FeedbackModal.tag.html | 20 +++++ .../src/main/web/tag/popup/GtuChangeModal.tag.html | 36 ++++----- .../main/web/tag/popup/InformationPopup.tag.html | 20 +++++ .../src/main/web/tag/popup/Modal.tag.html | 20 +++++ .../src/main/web/tag/popup/NewPassword.tag.html | 36 ++++----- .../src/main/web/tag/popup/QrCodeButton.tag.html | 20 +++++ .../main/web/tag/popup/ResendValidation.tag.html | 36 ++++----- .../voteCountingType/BordaDetailResult.tag.html | 20 +++++ .../CondorcetDetailResult.tag.html | 20 +++++ .../voteCountingType/CoombsDetailResult.tag.html | 20 +++++ .../InstantRunoffDetailResult.tag.html | 20 +++++ .../tag/voterList/ImportFavoritListModal.tag.html | 20 +++++ .../src/main/web/tag/voterList/VoterList.tag.html | 20 +++++ .../main/web/tag/voterList/VoterListCard.tag.html | 20 +++++ .../web/tag/voterList/VoterListEditModal.tag.html | 20 +++++ .../web/tag/voterList/VoterListMemberCard.tag.html | 20 +++++ .../voterList/VoterListMemberEditModal.tag.html | 20 +++++ pollen-ui-riot-js/webpack.config.js | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- .../model/VoteCountingDetailResult.java | 21 ++++++ pollen-votecounting-borda/pom.xml | 2 +- .../pollen/votecounting/BordaChoiceRank.java | 21 ++++++ .../pollen/votecounting/BordaDetailResult.java | 21 ++++++ pollen-votecounting-condorcet/pom.xml | 2 +- .../pollen/votecounting/CondorcetBattle.java | 21 ++++++ .../pollen/votecounting/CondorcetDetailResult.java | 21 ++++++ pollen-votecounting-coombs/pom.xml | 2 +- .../pollen/votecounting/CoombsDetailResult.java | 21 ++++++ .../chorem/pollen/votecounting/CoombsRound.java | 21 ++++++ .../pollen/votecounting/CoombsRoundChoice.java | 21 ++++++ pollen-votecounting-instant-runoff/pom.xml | 2 +- .../votecounting/InstantRunoffDetailResult.java | 21 ++++++ .../pollen/votecounting/InstantRunoffRound.java | 21 ++++++ .../votecounting/InstantRunoffRoundChoice.java | 21 ++++++ .../InstantRunoffVoteCountingStrategy.java | 6 +- .../InstantRunoffVoteCountingStrategyTest.java | 29 ++++--- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 88 +++++++++++++++------- 230 files changed, 4283 insertions(+), 504 deletions(-) create mode 100644 CHANGELOG copy pollen-rest-api/src/jetty/jetty-context.xml => pollen-ui-riot-js/pom.xml (58%) create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/Avatar.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 6

branch feature/148-configuration-methodes-de-votes updated (863823eb -> a59ea622)
by chorem.org scm 29 Sep '17

29 Sep '17

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

1 0

branch develop updated (8ab5eda8 -> a59ea622)
by chorem.org scm 29 Sep '17

29 Sep '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 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) new a59ea622 Merge branch 'feature/58-limitation-des-votants' 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 a59ea62216bc6fe05534e6a9988832667898d37c Merge: 8ab5eda8 9f142759 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 29 09:28:09 2017 +0200 Merge branch 'feature/58-limitation-des-votants' into develop Summary of changes: .../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 .../org/chorem/pollen/rest/api/AuthApiTest.java | 8 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 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/src/main/web/css/custom.css | 6 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 9 ++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 9 ++ 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 ++- 67 files changed, 935 insertions(+), 1020 deletions(-) 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(a)chorem.org>.

1 1

branch feature/58-limitation-des-votants deleted (was 9f142759)
by chorem.org scm 29 Sep '17

29 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/58-limitation-des-votants in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 9f142759 envoyer un mail quand le nombre de votants dépasse la valeur max (ref #58) 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/58-limitation-des-votants updated (627ddf75 -> 9f142759)
by chorem.org scm 29 Sep '17

29 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/58-limitation-des-votants in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits 627ddf75 envoyer un mail quand le nombre de votants dépasse la valeur max (ref #58) omits 3e454d67 Création et modification d'un sondage restreint, avertir si le nombre de participant dépasse le nombre maximum de votants (ref #58) omits 7bf3bbd6 Dans les listes des sondages : voir les sondage hors limites du nombre de votants (ref #58) omits 9703cece ne pas afficher les votes ignorés (ref #58) omits 1c59baba indiquer la limite de votants pour un sondage (ref #58) omits 6b9eb30f Limitations du nombre votants (ref #58), Déplacement des méthodes de transformation des entités en bean dans les services 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 new a774bbd8 Limitations du nombre votants (ref #58), Déplacement des méthodes de transformation des entités en bean dans les services new 6b46dc9a indiquer la limite de votants pour un sondage (ref #58) new bf74bb03 ne pas afficher les votes ignorés (ref #58) new 9ba5ccb2 Dans les listes des sondages : voir les sondage hors limites du nombre de votants (ref #58) new 5cd67c81 Création et modification d'un sondage restreint, avertir si le nombre de participant dépasse le nombre maximum de votants (ref #58) new 9f142759 envoyer un mail quand le nombre de votants dépasse la valeur max (ref #58) 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 (627ddf75) \ N -- N -- N refs/heads/feature/58-limitation-des-votants (9f142759) 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. The 6 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 9f14275916fe0dc5ae9a4ab7948d376a06bb66f9 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 28 16:26:07 2017 +0200 envoyer un mail quand le nombre de votants dépasse la valeur max (ref #58) commit 5cd67c81e7049b24905aa855a180fcfab7e2b03d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 28 13:33:36 2017 +0200 Création et modification d'un sondage restreint, avertir si le nombre de participant dépasse le nombre maximum de votants (ref #58) commit 9ba5ccb24f25c7bde8bb87b75be72958c97c033f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 28 09:14:46 2017 +0200 Dans les listes des sondages : voir les sondage hors limites du nombre de votants (ref #58) commit bf74bb03112fbfe9ae53a2260e61e6e54b5ba5c5 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 28 08:43:02 2017 +0200 ne pas afficher les votes ignorés (ref #58) commit 6b46dc9a47fc2d3b8fae81c94bf196b665962443 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 27 16:48:26 2017 +0200 indiquer la limite de votants pour un sondage (ref #58) commit a774bbd856377919c1326fd69e225f41d19ffc11 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 26 11:21:41 2017 +0200 Limitations du nombre votants (ref #58), Déplacement des méthodes de transformation des entités en bean dans les services Summary of changes: .gitlab-ci.yml | 20 ++++++++++++-------- CHANGELOG | 23 +++++++++++++++++++++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 4 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 +- 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 +- 20 files changed, 54 insertions(+), 27 deletions(-) create mode 100644 CHANGELOG -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

04/06: Dans les listes des sondages : voir les sondage hors limites du nombre de votants (ref #58)
by chorem.org scm 29 Sep '17

29 Sep '17

This is an automated email from the git hooks/post-receive script. New commit to branch feature/58-limitation-des-votants in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 9ba5ccb24f25c7bde8bb87b75be72958c97c033f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 28 09:14:46 2017 +0200 Dans les listes des sondages : voir les sondage hors limites du nombre de votants (ref #58) --- pollen-ui-riot-js/src/main/web/i18n/en.json | 1 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + .../src/main/web/tag/poll/PollCard.tag.html | 26 +++++++++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index fbcc6012..86a57fb5 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -65,6 +65,7 @@ "poll_subscribers": "subscribers", "poll_participants": "participants", "poll_participation": "of participation", + "poll_maxVoters": "Limited to {0}", "poll_maxVotersAlert_title": "Number of voters limitation", "poll_maxVotersAlert": "Strandard offers has limited to {0} voters. Users can continue to vote but only the first {0} votes are taken into account in the calculation of the resultles.", "poll_maxVotersAlert_offers": "Read <a href=\"#home\">the offers page</a> to unlock this limit.", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index d3b0585a..edeb87ac 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -65,6 +65,7 @@ "poll_subscribers": "invités", "poll_participants": "participants", "poll_participation": "de participation", + "poll_maxVoters": "Limité à {0}", "poll_maxVotersAlert_title": "Limitation du Nombre de votants", "poll_maxVotersAlert": "L'offre standard est limitée à {0} votants. Les utilisateurs peuvent continuer à voter mais seul les {0} premiers votes sont pris en compte dans le calcul du résultat.", "poll_maxVotersAlert_offers": "Cousulter <a href=\"#home\">la page des nos offres</a> pour déverrouiller cette limite.", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html index b70f2bca..a2347c15 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html @@ -8,12 +8,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -57,10 +57,16 @@ </div> </div> - <a class="poll-votes" - href="#poll/{opts.poll.id}/vote/{opts.poll.permission}"> - {opts.poll.voteCount === 0 ? __.noVote : (opts.poll.voteCount + " " + (count === 1 ? __.vote : __.votes))} - </a> + <span class="poll-votes"> + <a href="#poll/{opts.poll.id}/vote/{opts.poll.permission}"> + {opts.poll.voteCount === 0 ? __.noVote : (opts.poll.voteCount + " " + (count === 1 ? __.vote : __.votes))} + </a> + <a if={opts.poll.maxVoters > 0 &&opts.poll.voteCount > opts.poll.maxVoters} + class="c-badge c-badge--rounded c-badge--warning" + onclick={toggleMaxVoters}>{_l("maxVoters", opts.poll.maxVoters)} + </a> + </span> + </div> <script type="es6"> @@ -80,6 +86,14 @@ }); }; + this.toggleMaxVoters = () => { + let message = this._l("maxVotersAlert", this.opts.poll.maxVoters); + if (this.opts.poll.permission) { + message += " " + this.__.maxVotersAlert_offers; + } + this.info(this.__.maxVotersAlert_title, message, null, "warning"); + }; + </script> <style> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/06: ne pas afficher les votes ignorés (ref #58)
by chorem.org scm 29 Sep '17

29 Sep '17

This is an automated email from the git hooks/post-receive script. New commit to branch feature/58-limitation-des-votants in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit bf74bb03112fbfe9ae53a2260e61e6e54b5ba5c5 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 28 08:43:02 2017 +0200 ne pas afficher les votes ignorés (ref #58) --- .../pollen/persistence/entity/VoteTopiaDao.java | 11 ++++++++ .../org/chorem/pollen/services/bean/VoteBean.java | 8 ++++++ .../pollen/services/service/VoteService.java | 27 +++++++++----------- pollen-ui-riot-js/src/main/web/css/custom.css | 6 +++-- pollen-ui-riot-js/src/main/web/i18n/en.json | 1 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + .../src/main/web/tag/poll/Votes.tag.html | 29 ++++++++++++++++++---- 7 files changed, 61 insertions(+), 22 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java index a8ada816..6af63b31 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java @@ -21,6 +21,8 @@ package org.chorem.pollen.persistence.entity; * #L% */ +import org.nuiton.topia.persistence.HqlAndParametersBuilder; + import java.util.Date; import java.util.List; @@ -33,6 +35,15 @@ public class VoteTopiaDao extends AbstractVoteTopiaDao<Vote> { .findAll(); } + public long getVoteIndex(Vote vote) { + + HqlAndParametersBuilder<Vote> builder = newHqlAndParametersBuilder(); + builder.addEquals(Vote.PROPERTY_POLL, vote.getPoll()); + builder.addLowerOrEquals(Vote.PROPERTY_TOPIA_CREATE_DATE, vote.getTopiaCreateDate()); + builder.setSelectClause("select count(" + Vote.PROPERTY_TOPIA_ID + ")"); + return count(builder.getHql(), builder.getHqlParameters()); + } + public List<Vote> findAllSince(Poll poll, Date since) { if (since == null) { return findAll(poll); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java index cf2ead11..7b79f09a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java @@ -138,4 +138,12 @@ public class VoteBean extends PollenBean<Vote> { public ReportResumeBean getReport() { return report; } + + public boolean isIgnored() { + return ignored; + } + + public void setIgnored(boolean ignored) { + this.ignored = ignored; + } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index fc907339..724178f8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -45,12 +45,12 @@ import org.chorem.pollen.votecounting.VoteCounting; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; -import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.l; @@ -100,12 +100,19 @@ public class VoteService extends PollenServiceSupport { if (entity.isAnonymous()) { bean.setVoterName(null); } + + int maxVoters = getPollService().getMaxVoters(entity.getPoll()); + if (maxVoters > 0 && getVoteDao().getVoteIndex(entity) >= maxVoters) { + bean.setIgnored(true); + bean.getChoice().forEach(vc -> vc.setVoteValue(null)); + } + } else { ReportResumeBean report = getReportService().getReport(entity.getTopiaId()); bean.setReport(report); } return bean; - }; + } public VoteToChoiceBean toVoteToChoiceBean(VoteToChoice entity) { @@ -155,19 +162,9 @@ public class VoteService extends PollenServiceSupport { checkNotNull(pollId); Poll poll = getPollService().getPoll0(pollId); - List<Vote> allVotes = getVotes0(poll); - int maxVoters = getPollService().getMaxVoters(poll); - - List<Vote> votes = new ArrayList<>(); - - int indexVote = 0; - for (Vote vote : allVotes) { - if (isPermitted(PermissionVerb.editVote, vote.getTopiaId()) - || (isPermitted(PermissionVerb.readVote, vote.getTopiaId()) && (maxVoters == 0 || indexVote < maxVoters))) { - votes.add(vote); - } - indexVote++; - } + List<Vote> votes = getVotes0(poll).stream() + .filter(vote -> isPermitted(PermissionVerb.readVote, vote.getTopiaId())) + .collect(Collectors.toList()); PaginationResult<Vote> votePaginationResult = PaginationResult.fromFullList(votes, getPaginationParameter(paginationParameter)); diff --git a/pollen-ui-riot-js/src/main/web/css/custom.css b/pollen-ui-riot-js/src/main/web/css/custom.css index 6545f121..ecd2d8a5 100644 --- a/pollen-ui-riot-js/src/main/web/css/custom.css +++ b/pollen-ui-riot-js/src/main/web/css/custom.css @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -116,4 +116,6 @@ --report-hover: #04c4bb; --list-alternate-row: #f3f3f3; + + --hatching: #f3f3f3; } diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 31cd9921..fbcc6012 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -154,6 +154,7 @@ "poll_votes_results_unit_7_many": "votes", "poll_votes_voteNotOpen": "Votes are not open.", "poll_votes_voteClosed": "Votes are closed", + "poll_votes_ignored": "Ignored", "polls_createdPolls": "My polls", "polls_assignPollToMe": "Link a poll to my account", "polls_assignPollToMe_title": "Link the poll", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index e36851b0..d3b0585a 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -154,6 +154,7 @@ "poll_votes_results_unit_7_many": "votes", "poll_votes_voteNotOpen": "Les votes ne sont pas encore ouverts.", "poll_votes_voteClosed": "Les votes sont clos.", + "poll_votes_ignored": "Ignoré", "polls_createdPolls": "Mes sondages", "polls_assignPollToMe": "Attacher le sondage", "polls_assignPollToMe_title": "Attacher un sondage à mon compte", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index fec772d8..182bc16b 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -8,12 +8,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -194,7 +194,7 @@ require("../components/LazyLoad.tag.html"); <i class="fa fa-trash"></i> </button> </div> - <div class="results separator-left" ref="results{index}"> + <div class="results separator-left {'ignored': element.ignored}" ref="results{index}"> <div each="{choice in parent.parent.poll.choices}" class="result separator-right {'checkbox' : parent.parent.pollTypeCheckbox} {'selected' : parent.parent.pollTypeCheckbox && parent.parent.poll.getVoteValue(element, choice) == 1}" onmouseenter="{parent.parent.parent.showTooltip(element, choice)}" onclick="{parent.parent.parent.showTooltip(element, choice)}" onmouseleave="{parent.parent.parent.hideTooltip}"> @@ -223,7 +223,8 @@ require("../components/LazyLoad.tag.html"); <div class="vote-tooltip" ref="voteTooltip" show="{voteTooltip.show}"> <ChoiceView if="{voteTooltip.choice}" choice="{voteTooltip.choice}" center="true" hideReport="true"></ChoiceView> - <div class="vote-value" if="{!pollTypeCheckbox && voteTooltip.vote && voteTooltip.choice}">{poll.getVoteValue(voteTooltip.vote, voteTooltip.choice)}</div> + <div class="vote-value" if="{!pollTypeCheckbox && voteTooltip.vote && voteTooltip.choice}"> + {voteTooltip.vote.ignored ? __.ignored :poll.getVoteValue(voteTooltip.vote, voteTooltip.choice)}</div> <div if="{voteTooltip.vote && !voteTooltip.choice}">{voteTooltip.vote.voterName}</div> </div> </div> @@ -723,10 +724,28 @@ require("../components/LazyLoad.tag.html"); text-overflow:ellipsis; } - .voters .row:hover .result { + .voters .row .ignored { + background: repeating-linear-gradient( + 45deg, + transparent, + transparent 10px, + var(--hatching) 10px, + var(--hatching) 20px); + } + + .voters .row:hover { background-color: var(--vote-hover); } + .voters .row:hover .ignored { + background: repeating-linear-gradient( + 45deg, + var(--vote-hover), + var(--vote-hover) 10px, + var(--hatching) 10px, + var(--hatching) 20px); + } + .voters .result.checkbox { background-color: var(--vote-not-selected); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/06: indiquer la limite de votants pour un sondage (ref #58)
by chorem.org scm 29 Sep '17

29 Sep '17

This is an automated email from the git hooks/post-receive script. New commit to branch feature/58-limitation-des-votants in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6b46dc9a47fc2d3b8fae81c94bf196b665962443 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 27 16:48:26 2017 +0200 indiquer la limite de votants pour un sondage (ref #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/Poll.tag.html | 29 ++++++++++++++++------ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index b96fc33b..31cd9921 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -65,7 +65,8 @@ "poll_subscribers": "subscribers", "poll_participants": "participants", "poll_participation": "of participation", - "poll_maxVotersAlert": "<strong>Warnning</strong> : Strandard offers has limited to {0} voters. Users can continue to vote but only the first {0} votes are taken into account in the calculation of the resultles.", + "poll_maxVotersAlert_title": "Number of voters limitation", + "poll_maxVotersAlert": "Strandard offers has limited to {0} voters. Users can continue to vote but only the first {0} votes are taken into account in the calculation of the resultles.", "poll_maxVotersAlert_offers": "Read <a href=\"#home\">the offers page</a> to unlock this limit.", "poll_closedFrom": "Closing from", "poll_urlForAdmin" : "Administrate poll with this address", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index d33dfa2f..e36851b0 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -65,7 +65,8 @@ "poll_subscribers": "invités", "poll_participants": "participants", "poll_participation": "de participation", - "poll_maxVotersAlert": "<strong>Attention</strong> : L'offre standard est limitée à {0} votants. Les utilisateurs peuvent continuer à voter mais seul les {0} premiers votes sont pris en compte dans le calcul du résultat.", + "poll_maxVotersAlert_title": "Limitation du Nombre de votants", + "poll_maxVotersAlert": "L'offre standard est limitée à {0} votants. Les utilisateurs peuvent continuer à voter mais seul les {0} premiers votes sont pris en compte dans le calcul du résultat.", "poll_maxVotersAlert_offers": "Cousulter <a href=\"#home\">la page des nos offres</a> pour déverrouiller cette limite.", "poll_closedFrom": "Fermé depuis le", "poll_urlForAdmin" : "Administrer ce sondage avec cette adresse", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html index ba136545..d36b97c5 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html @@ -8,12 +8,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -113,11 +113,15 @@ require("./Report.tag.html"); <p>{__.createdBy} <span class="brand">{poll.creatorName}</span></p> </div> - <div class="left-icon"> + <div class="left-icon" onclick="{toggleMaxVoters}"> <i class="fa fa-envelope"></i> - <p if={poll.voteCount === 0}>{__.noVote}</p> - <p if={poll.voteCount === 1}><span class="brand">1</span> {__.vote}</p> - <p if={poll.voteCount > 1}><span class="brand">{poll.voteCount}</span> {__.votes}</p> + <p> + <span if={poll.voteCount > 0} class="brand">{poll.voteCount}</span> + {poll.voteCount === 0 ? __.noVote : (poll.voteCount === 1 ? __.vote : __.votes)} + <a if={poll.maxVoters > 0} class="info-label"> + <i class="fa fa-exclamation-circle" aria-hidden="true"></i> + </a> + </p> </div> <div class="left-icon" if="{poll.pollType === 'RESTRICTED'}"> @@ -134,7 +138,10 @@ require("./Report.tag.html"); <div if={poll.maxVoters > 0 && poll.voteCount > poll.maxVoters} class="c-alert c-alert--warning"> - <InnerHtml html={_l("maxVotersAlert", poll.maxVoters)}/> + <div> + <strong> {__.maxVotersAlert_title}</strong> + </div> + {_l("maxVotersAlert", poll.maxVoters)} <InnerHtml if={poll.permission} html={__.maxVotersAlert_offers} /> </div> @@ -204,6 +211,14 @@ require("./Report.tag.html"); this.info(this.poll.voteCountingTypeValue.name, this.poll.voteCountingTypeValue.helper, null, "info"); }; + this.toggleMaxVoters = () => { + let message = this._l("maxVotersAlert", this.poll.maxVoters); + if (this.poll.permission) { + message += " " + this.__.maxVotersAlert_offers; + } + this.info(this.__.maxVotersAlert_title, message, null, "warning"); + }; + </script> <style> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0