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

branch develop updated (3cc449cd -> b1bbd56f)
by chorem.org scm 02 Jun '17

02 Jun '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 3cc449cd correction des permission en cas d'ajout de vote ou de commentaire pour des sondage restreint + correction style pour les choix new 84d92fd3 refs #14 création du flux atom à la création du sondage + ajout des entrées dans le flux pour l'ajout, la suppression et la modification d'un vote + ajout du bouton pour lire le flux à partir du sondage new 023a6f7b refs #14 add feed content in poll + migration new 9ac68cf4 refs #14 add permission to feed url new 6533396c modification des emails (pas d'affichage du contenu du vote) new a48ef556 refs #14 do not display user name if the vote is anonymous new 8362eed3 refs #14 fix tests new b1bbd56f fixes #14 add the missing events in the feed 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 b1bbd56f8c8bf2ad336311d985d802c6d5cdb865 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 17:39:57 2017 +0200 fixes #14 add the missing events in the feed commit 8362eed38ece5cacc4e980227c650dcd11fc99dc Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:09:31 2017 +0200 refs #14 fix tests commit a48ef55638b40fee8c7eb59567f187a04546da3e Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:09:03 2017 +0200 refs #14 do not display user name if the vote is anonymous commit 6533396ca12a22822751e06053d0809bb0a4352b Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:08:06 2017 +0200 modification des emails (pas d'affichage du contenu du vote) commit 9ac68cf471e58834bdf2963473186360a311a811 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:06:10 2017 +0200 refs #14 add permission to feed url commit 023a6f7ba765615c3c5466ed1f0630065cf85b3f Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:03:43 2017 +0200 refs #14 add feed content in poll + migration commit 84d92fd3eec9fd5eb04f338f2704b012c1bf732f Author: Kevin Morin <morin(a)codelutin.com> Date: Fri May 12 09:26:40 2017 +0200 refs #14 création du flux atom à la création du sondage + ajout des entrées dans le flux pour l'ajout, la suppression et la modification d'un vote + ajout du bouton pour lire le flux à partir du sondage Summary of changes: .../db/migration/common/V3_0_0_1__exemple.sql | 2 - .../h2/V3_0_0_1__add_feed_content_in_poll.sql | 2 + .../db/migration/h2/V3_0_0_2__exemple.sql | 2 - .../V3_0_0_1__add_feed_content_in_poll.sql | 2 + .../db/migration/postgresql/V3_0_0_2__exemple.sql | 3 - pollen-persistence/src/main/xmi/pollen.properties | 3 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 24262 -> 24351 bytes .../org/chorem/pollen/rest/api/v1/PollApi.java | 6 + pollen-rest-api/src/main/resources/mapping | 2 + .../pollen/rest/api/AbstractPollenRestApiTest.java | 3 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 10 +- pollen-services/pom.xml | 6 +- .../pollen/services/service/ChoiceService.java | 1 + .../pollen/services/service/CommentService.java | 3 + .../pollen/services/service/FeedService.java | 158 +++++++++++++++++++++ .../services/service/NotificationService.java | 2 +- .../pollen/services/service/PollService.java | 4 + .../services/service/PollenServiceSupport.java | 28 ++++ .../pollen/services/service/VoteService.java | 3 + .../services/service/mail/AbstractVoteEmail.java | 36 ++--- .../pollen/services/service/mail/EmailService.java | 62 ++------ .../services/service/mail/VoteAddedEmail.java | 15 +- .../services/service/mail/VoteDeletedEmail.java | 15 +- .../services/service/mail/VoteEditedEmail.java | 15 +- .../main/resources/email/VoteAddedEmail.mustache | 12 +- .../resources/email/VoteAddedEmail_fr.mustache | 12 +- .../main/resources/email/VoteDeletedEmail.mustache | 12 +- .../resources/email/VoteDeletedEmail_fr.mustache | 12 +- .../main/resources/email/VoteEditedEmail.mustache | 12 +- .../resources/email/VoteEditedEmail_fr.mustache | 10 -- .../main/resources/email/VoteSummaryEmail.mustache | 26 ---- .../resources/email/VoteSummaryEmail_fr.mustache | 26 ---- .../i18n/pollen-services_en_GB.properties | 13 ++ .../i18n/pollen-services_fr_FR.properties | 14 +- pollen-ui-riot-js/src/main/web/conf.js | 2 +- .../src/main/web/tag/poll/Poll.tag.html | 3 +- pom.xml | 8 +- 37 files changed, 284 insertions(+), 261 deletions(-) delete mode 100644 pollen-persistence/src/main/resources/db/migration/common/V3_0_0_1__exemple.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_1__add_feed_content_in_poll.sql delete mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_2__exemple.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_1__add_feed_content_in_poll.sql delete mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_2__exemple.sql create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/FeedService.java delete mode 100644 pollen-services/src/main/resources/email/VoteSummaryEmail.mustache delete mode 100644 pollen-services/src/main/resources/email/VoteSummaryEmail_fr.mustache -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 5

03/07: refs #14 add permission to feed url
by chorem.org scm 02 Jun '17

02 Jun '17

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 9ac68cf471e58834bdf2963473186360a311a811 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:06:10 2017 +0200 refs #14 add permission to feed url --- pollen-ui-riot-js/src/main/web/conf.js | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/conf.js b/pollen-ui-riot-js/src/main/web/conf.js index 6a5f7120..19b836c1 100644 --- a/pollen-ui-riot-js/src/main/web/conf.js +++ b/pollen-ui-riot-js/src/main/web/conf.js @@ -1,5 +1,5 @@ window.pollenConf = { - endPoint: "http://felteu:8888/pollen-rest-api", + endPoint: "http://localhost:8888/pollen-rest-api", defaultErrorTimeout: 15, resourceMaxSize: 10000000 // octets => 10 Mo }; 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 144f1b74..85c3d77e 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 @@ -120,7 +120,7 @@ require("../popup/QrCodeButton.tag.html"); <h1> <QrCodeButton if={poll.pollType === "FREE"} value="{window.location.origin}{window.location.pathname}#poll/{poll.id}/vote"/> {poll.title} - <a href="{session.configuration.endPoint}/v1/polls/{poll.id}/feed" class="fa fa-rss-square" aria-hidden="true"></a> + <a href="{session.configuration.endPoint}/v1/polls/{poll.id}/feed?permission={poll.permission}" class="fa fa-rss-square" aria-hidden="true"></a> </h1> <h3>{poll.description}</h3> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/07: refs #14 add feed content in poll + migration
by chorem.org scm 02 Jun '17

02 Jun '17

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 023a6f7ba765615c3c5466ed1f0630065cf85b3f Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:03:43 2017 +0200 refs #14 add feed content in poll + migration --- .../db/migration/common/V3_0_0_1__exemple.sql | 2 -- .../h2/V3_0_0_1__add_feed_content_in_poll.sql | 2 ++ .../resources/db/migration/h2/V3_0_0_2__exemple.sql | 2 -- .../V3_0_0_1__add_feed_content_in_poll.sql | 2 ++ .../db/migration/postgresql/V3_0_0_2__exemple.sql | 3 --- pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 24262 -> 24351 bytes 7 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pollen-persistence/src/main/resources/db/migration/common/V3_0_0_1__exemple.sql b/pollen-persistence/src/main/resources/db/migration/common/V3_0_0_1__exemple.sql deleted file mode 100644 index c6496384..00000000 --- a/pollen-persistence/src/main/resources/db/migration/common/V3_0_0_1__exemple.sql +++ /dev/null @@ -1,2 +0,0 @@ - --- Ici un script de migration commun aux bases H2 et PostgreSQL diff --git a/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_1__add_feed_content_in_poll.sql b/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_1__add_feed_content_in_poll.sql new file mode 100644 index 00000000..4b5dc3d6 --- /dev/null +++ b/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_1__add_feed_content_in_poll.sql @@ -0,0 +1,2 @@ +-- add feed content in poll +alter table poll add feedContent longvarchar; \ No newline at end of file diff --git a/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_2__exemple.sql b/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_2__exemple.sql deleted file mode 100644 index 766ee6c1..00000000 --- a/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_2__exemple.sql +++ /dev/null @@ -1,2 +0,0 @@ - --- Ici un script de migration specifique pour les bases H2 diff --git a/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_1__add_feed_content_in_poll.sql b/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_1__add_feed_content_in_poll.sql new file mode 100644 index 00000000..fdca6945 --- /dev/null +++ b/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_1__add_feed_content_in_poll.sql @@ -0,0 +1,2 @@ +-- add feed content in poll +alter table poll add feedContent text; \ No newline at end of file diff --git a/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_2__exemple.sql b/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_2__exemple.sql deleted file mode 100644 index 19b11200..00000000 --- a/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_2__exemple.sql +++ /dev/null @@ -1,3 +0,0 @@ - - --- Ici un script de migration specifique pour les bases PostgreSQL diff --git a/pollen-persistence/src/main/xmi/pollen.properties b/pollen-persistence/src/main/xmi/pollen.properties index 73dd47bf..1bde58c0 100644 --- a/pollen-persistence/src/main/xmi/pollen.properties +++ b/pollen-persistence/src/main/xmi/pollen.properties @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ###m -model.tagvalue.version=3.0.0.0 +model.tagvalue.version=3.0.0.1 #model.tagValue.notGenerateToString=true #model.tagValue.constantPrefix=PROPERTY_ #model.tagValue.useEnumerationName=true diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index 4754bcf1..498ac22d 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/14_add_rss_feed updated (dc0581ec -> 52abd984)
by chorem.org scm 02 Jun '17

02 Jun '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/14_add_rss_feed in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from dc0581ec refs #14 fix tests adds 52abd984 fixes #14 add the missing events in the feed No new revisions were added by this update. Summary of changes: .../pollen/services/service/ChoiceService.java | 1 + .../pollen/services/service/CommentService.java | 3 ++ .../pollen/services/service/FeedService.java | 45 +++++++++++++++++++--- .../pollen/services/service/PollService.java | 3 ++ .../i18n/pollen-services_en_GB.properties | 9 ++++- .../i18n/pollen-services_fr_FR.properties | 7 ++++ 6 files changed, 62 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/14_add_rss_feed updated (a8face4b -> dc0581ec)
by chorem.org scm 02 Jun '17

02 Jun '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/14_add_rss_feed in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits a8face4b refs #14 création du flux atom à la création du sondage + ajout des entrées dans le flux pour l'ajout, la suppression et la modification d'un vote + ajout du bouton pour lire le flux à partir du sondage adds b8c44987 Les dates étaient retournées formatées selon la timezone du serveur. Renvoi des dates sous forme de timestamp pour que le client les affiche dans sa timezone. adds 87237839 Création de sondage : validation des choix avant de passer à l'étape suivante. adds 233ce949 ref #64 correction de la NPE adds 2318dc2f fixes #64 par défaut, on ne met pas la date de début de vote à la fin de la période d'ajout de choix adds d059538c gestion des participant d'un sondage adds 1f0b53c2 gestion des participant d'un sondage : fix test adds 4a48b234 fixes #66 Type de sondage dans la description adds cc3fd2d1 vote pour de sondage restreint adds f18cc728 vote pour de sondage restreint adds c58910b0 refs #23 remove vote summary notification as we cannot really determine the vote edition and deletion for a period adds 739ccaea fix validation du choix de fichier qui ne s'affichait pas sous Chrome adds a2fde28a refs #23 remove forgotten method adds 6bfa1b6d utilisation de la lib Object.values pour les navigateurs ne supportant pas encore cette function native js adds 50e10760 correction de l'édition des dates dans le sondage adds 30c80cc3 dépouillement des sondages restreints adds a51dafd8 Mise en page du login et de la creation de compte adds ad502bb0 import et export des participants d'un sondage restreint vers une liste de votants adds 1cf983bd validation des participants au vote + correction du noms de la liste principal d'un vote adds 7de2afcc edition du sondage : ne pas modifier les champ pour un sondage clos et corriger le bouton précédent adds dc69fb7f participants a un sondage : ajout des actions en bas d'une liste, demande de confirmation avant adds 9b78da36 factorisé le desenregistrement des tag sur le bus adds b1712689 création d'un utilitaire de log pour le JS adds 5c3fb9ad création et utilisation des composants : Modal, confirmation et information. adds 98a2d75f correction taille du QrCode adds 48602581 correction gestion de erreur en cas de sondage non accessible adds af16d6a7 devMode à false par défaut, et a vrai dans la configuration des tests. adds 9330980a afficher quels participants ont votés et leur renvoyer des invitations (#51, #36 et #33) adds d2b378d7 afficher le % d'abstention (#33) adds a701c5c3 ajout d'un parametre dans webpack pour faire echoué la tâche gitlab-CI build-js si la compilation webpack echoue adds 3579daaf les regExp dans les expression riot ne sont pas compiler correctement pas adds b6b6b17c vérification de la taille des fichiers, coté client adds 4d97782c vérification de la taille des fichiers, coté serveur (#55) adds 528bb4b2 ne pas afficher le bouton de renvoie des invitation à la création du sondage adds f966c64b log d'error a l'import du LDAP adds e0244fb9 fix NPE if the choice adding end date is null adds 7c7c7123 add log adds c24f5e75 display validation errors on poll edition adds f3b7d92b use a datetime component for the browsers which do not support datetime inputs adds 7f5b0e57 revert commit adds f510580d Merge remote-tracking branch 'origin/develop' into develop adds fb934a32 fix author adds b3c86e11 tentative de correction des jobs de rappels de fin de sondage adds 6cfb92d5 mise à jour du docker de base pour la construction du JS adds f15c7cfc wording + modification de la conf de notification d'un sondage : boolean au lieu d'une enum (il n'y avait plus que 2 valeurs pour l'énum) adds fb8573a7 Fix animation in Choice tag adds 3105f48b modification de libellé, correction sur les doit les lecture de commentaire adds 921300ad utilisation de la ShortTopiaIdFactory pour avoir des URLs plus courtes adds 6aaa7488 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop adds e1b806b0 "datediff" n'est pas un fonction prise en charge par postgres adds 28b4528f correction de l'affichage des date picker et time picker suite aux modifications sur les animations adds c82a9f5e mise en place de flyway pour la migration de base de données + utilisé un autre fichier de properties pour les tests (evite les conflits avec les conf local) adds a7bb7bb8 "datediff" n'est pas un fonction prise en charge par postgres new 602caeb1 refs #14 création du flux atom à la création du sondage + ajout des entrées dans le flux pour l'ajout, la suppression et la modification d'un vote + ajout du bouton pour lire le flux à partir du sondage new 82c0964c refs #14 add feed content in poll + migration new b08c01c6 refs #14 add permission to feed url new a0e6368b modification des emails (pas d'affichage du contenu du vote) new 42b7384c refs #14 do not display user name if the vote is anonymous new dc0581ec refs #14 fix tests 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 (a8face4b) \ N -- N -- N refs/heads/feature/14_add_rss_feed (dc0581ec) 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 dc0581ec60c325f7c26a6a1342d71da1fdd447f2 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:09:31 2017 +0200 refs #14 fix tests commit 42b7384ca379b8e4779c2964dd746304a4f20bc1 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:09:03 2017 +0200 refs #14 do not display user name if the vote is anonymous commit a0e6368bd69a00eebac919d3dc02ba4c064074d8 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:08:06 2017 +0200 modification des emails (pas d'affichage du contenu du vote) commit b08c01c6510d868a9d52321efc2640f766d2afa7 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:06:10 2017 +0200 refs #14 add permission to feed url commit 82c0964c26a7ef99fd223bfb6412be2ead911ae1 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jun 2 10:03:43 2017 +0200 refs #14 add feed content in poll + migration commit 602caeb1ff262bfc4246816cc3d83188222adf92 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri May 12 09:26:40 2017 +0200 refs #14 création du flux atom à la création du sondage + ajout des entrées dans le flux pour l'ajout, la suppression et la modification d'un vote + ajout du bouton pour lire le flux à partir du sondage Summary of changes: .gitlab-ci.yml | 2 +- pollen-persistence/pom.xml | 5 + .../persistence/PollenFlywayServiceImpl.java | 29 +++ .../pollen/persistence/entity/PollTopiaDao.java | 22 +- .../entity/VoterListMemberTopiaDao.java | 24 ++ .../persistence/entity/VoterListTopiaDao.java | 13 ++ .../h2/V3_0_0_1__add_feed_content_in_poll.sql | 2 + .../V3_0_0_1__add_feed_content_in_poll.sql | 2 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 25019 -> 24351 bytes .../org/chorem/pollen/rest/api/JsonHelper.java | 2 +- .../rest/api/PollenRestApiApplicationListener.java | 15 -- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 7 + .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 7 + .../org/chorem/pollen/rest/api/v1/PollApi.java | 8 +- .../pollen/rest/api/v1/PollenResourceApi.java | 5 +- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 4 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 46 +++- pollen-rest-api/src/main/resources/mapping | 29 ++- .../src/main/resources/pollen-rest-api.properties | 5 +- .../pollen/rest/api/AbstractPollenRestApiTest.java | 5 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 14 +- .../resources/pollen-rest-api-test.properties} | 13 +- pollen-services/pom.xml | 7 +- pollen-services/src/main/config/PollenServices.ini | 23 +- .../java/org/chorem/pollen/services/UnitHuman.java | 43 ++++ ...ltBean.java => ListVoteCountingResultBean.java} | 18 +- .../org/chorem/pollen/services/bean/PollBean.java | 24 +- .../chorem/pollen/services/bean/PollenBean.java | 10 +- .../pollen/services/bean/PollenEntityId.java | 18 +- .../org/chorem/pollen/services/bean/VoteBean.java | 36 ++- .../chorem/pollen/services/bean/VoterListBean.java | 5 +- .../pollen/services/bean/VoterListMemberBean.java | 10 + .../services/config/PollenServicesConfig.java | 5 +- .../services/job/SendPollEndReminderJob.java | 68 +++--- .../pollen/services/job/SendVoteSummariesJob.java | 71 ------ .../pollen/services/service/CommentService.java | 4 +- .../services/service/FavoriteListService.java | 66 ++++++ .../pollen/services/service/FeedService.java | 9 +- .../pollen/services/service/FixturesService.java | 5 - .../services/service/NotificationService.java | 38 ++-- .../pollen/services/service/PollService.java | 42 ++-- .../services/service/PollenResourceService.java | 32 ++- .../services/service/VoteCountingService.java | 96 ++++---- .../pollen/services/service/VoteService.java | 45 ++-- .../pollen/services/service/VoterListService.java | 194 +++++++++++++---- .../services/service/mail/AbstractVoteEmail.java | 36 +-- .../pollen/services/service/mail/EmailService.java | 35 +-- .../services/service/mail/VoteAddedEmail.java | 15 +- .../services/service/mail/VoteDeletedEmail.java | 15 +- .../services/service/mail/VoteEditedEmail.java | 15 +- .../services/service/mail/VoteSummaryEmail.java | 69 ------ .../services/service/security/SecurityService.java | 36 +-- .../main/resources/email/VoteAddedEmail.mustache | 12 +- .../resources/email/VoteAddedEmail_fr.mustache | 12 +- .../main/resources/email/VoteDeletedEmail.mustache | 12 +- .../resources/email/VoteDeletedEmail_fr.mustache | 12 +- .../main/resources/email/VoteEditedEmail.mustache | 12 +- .../resources/email/VoteEditedEmail_fr.mustache | 10 - .../main/resources/email/VoteSummaryEmail.mustache | 26 --- .../resources/email/VoteSummaryEmail_fr.mustache | 26 --- .../i18n/pollen-services_en_GB.properties | 3 + .../i18n/pollen-services_fr_FR.properties | 4 +- .../src/test/resources/pollen-services.properties | 1 + pollen-ui-riot-js/package.json | 13 +- pollen-ui-riot-js/src/main/web/conf.js | 17 +- pollen-ui-riot-js/src/main/web/css/main.css | 39 +++- pollen-ui-riot-js/src/main/web/i18n.json | 118 ++++++++-- pollen-ui-riot-js/src/main/web/index.html | 2 +- pollen-ui-riot-js/src/main/web/index.js | 1 + pollen-ui-riot-js/src/main/web/js/Error.js | 10 +- .../src/main/web/js/FavoriteListService.js | 4 + pollen-ui-riot-js/src/main/web/js/FormHelper.js | 4 +- pollen-ui-riot-js/src/main/web/js/I18nHelper.js | 13 +- pollen-ui-riot-js/src/main/web/js/Logger.js | 18 ++ pollen-ui-riot-js/src/main/web/js/Poll.js | 27 ++- pollen-ui-riot-js/src/main/web/js/PollForm.js | 53 +++-- pollen-ui-riot-js/src/main/web/js/PollService.js | 4 +- .../src/main/web/js/ResourceService.js | 3 +- pollen-ui-riot-js/src/main/web/js/Session.js | 21 +- pollen-ui-riot-js/src/main/web/js/UIHelper.js | 45 +++- pollen-ui-riot-js/src/main/web/js/VoteService.js | 8 + .../src/main/web/js/VoterListService.js | 226 +++++++++++++++++++ .../src/main/web/tag/HeaderI18n.tag.html | 6 +- pollen-ui-riot-js/src/main/web/tag/Home.tag.html | 12 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 27 ++- .../src/main/web/tag/PollenErrorManager.tag.html | 6 +- .../src/main/web/tag/PollenHeader.tag.html | 53 +++-- .../src/main/web/tag/PollenWaiter.tag.html | 4 +- pollen-ui-riot-js/src/main/web/tag/QrCode.tag.html | 11 +- .../src/main/web/tag/SignCheck.tag.html | 28 ++- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 23 +- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 18 +- .../src/main/web/tag/UserCard.tag.html | 24 +- .../src/main/web/tag/UserProfile.tag.html | 7 +- .../main/web/tag/components/date-picker.tag.html | 40 +++- .../web/tag/components/date-time-picker.tag.html | 78 +++++++ .../main/web/tag/components/time-picker.tag.html | 70 ++++-- .../web/tag/favoriteList/ChildListCard.tag.html | 16 +- .../web/tag/favoriteList/FavoriteList.tag.html | 10 +- .../web/tag/favoriteList/FavoriteListCard.tag.html | 12 +- .../web/tag/favoriteList/FavoriteLists.tag.html | 3 +- .../main/web/tag/favoriteList/MemberCard.tag.html | 16 +- .../src/main/web/tag/poll/Choice.tag.html | 94 ++++---- .../src/main/web/tag/poll/ChoiceDate.tag.html | 8 +- .../src/main/web/tag/poll/ChoiceView.tag.html | 24 +- .../src/main/web/tag/poll/Choices.tag.html | 4 + .../src/main/web/tag/poll/Comments.tag.html | 16 +- .../src/main/web/tag/poll/Created.tag.html | 4 +- .../src/main/web/tag/poll/Description.tag.html | 6 +- .../src/main/web/tag/poll/EditPoll.tag.html | 15 +- .../src/main/web/tag/poll/Podium.tag.html | 6 +- .../src/main/web/tag/poll/Poll.tag.html | 70 ++++-- .../src/main/web/tag/poll/Polls.tag.html | 2 +- .../src/main/web/tag/poll/Results.tag.html | 6 +- .../src/main/web/tag/poll/Settings.tag.html | 125 ++++++----- .../src/main/web/tag/poll/Voters.tag.html | 89 +++++--- .../src/main/web/tag/poll/Votes.tag.html | 25 +-- .../src/main/web/tag/popup/AccountCreated.tag.html | 81 ------- .../src/main/web/tag/popup/ConfirmPopup.tag.html | 76 +++++++ .../main/web/tag/popup/InformationPopup.tag.html | 67 ++++++ .../src/main/web/tag/popup/Modal.tag.html | 81 +++++++ .../src/main/web/tag/popup/NewPassword.tag.html | 98 +++------ .../src/main/web/tag/popup/QrCodeButton.tag.html | 8 +- .../main/web/tag/popup/ResendValidation.tag.html | 100 +++------ .../src/main/web/tag/voterList/VoterList.tag.html | 145 +++++++++++++ .../web/tag/voterList/VoterListActions.tag.html | 178 +++++++++++++++ .../web/tag/voterList/VoterListMember.tag.html | 101 +++++++++ .../votecounting/AbstractVoteCountingStrategy.java | 30 +-- .../pollen/votecounting/VoteCountingStrategy.java | 16 +- .../pollen/votecounting/model/ChoiceScore.java | 30 +++ .../votecounting/model/GroupOfVoterBuilder.java | 90 -------- .../model/{GroupOfVoter.java => ListOfVoter.java} | 34 +-- ...tingResult.java => ListVoteCountingResult.java} | 28 +-- pollen-votecounting-borda/pom.xml | 5 + .../votecounting/BordaVoteCountingStrategy.java | 17 ++ .../BordaVoteCountingStrategyTest.java | 189 +++++++++------- pollen-votecounting-condorcet/pom.xml | 5 + .../CondorcetVoteCountingStrategy.java | 16 ++ .../CondorcetVoteCountingStrategyTest.java | 192 +++++++++------- pollen-votecounting-coombs/pom.xml | 5 + .../votecounting/CoombsVoteCountingStrategy.java | 16 ++ .../CoombsVoteCountingStrategyTest.java | 127 +++++------ pollen-votecounting-instant-runoff/pom.xml | 5 + .../InstantRunoffVoteCountingStrategy.java | 16 ++ .../InstantRunoffVoteCountingStrategyTest.java | 136 +++++------- pollen-votecounting-normal/pom.xml | 6 + .../votecounting/NormalVoteCountingStrategy.java | 18 ++ .../NormalVoteCountingStrategyTest.java | 241 +++++++++------------ pollen-votecounting-number/pom.xml | 5 + .../votecounting/NumberVoteCountingStrategy.java | 16 ++ .../NumberVoteCountingStrategyTest.java | 173 +++++++++------ pollen-votecounting-percentage/pom.xml | 5 + .../PercentageVoteCountingStrategy.java | 28 +++ .../PercentageVoteCountingStrategyTest.java | 191 +++++++++------- pom.xml | 12 + 156 files changed, 3480 insertions(+), 2172 deletions(-) create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenFlywayServiceImpl.java create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoterListMemberTopiaDao.java create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_1__add_feed_content_in_poll.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_1__add_feed_content_in_poll.sql copy pollen-rest-api/src/{main/resources/pollen-rest-api.properties => test/resources/pollen-rest-api-test.properties} (84%) create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/UnitHuman.java rename pollen-services/src/main/java/org/chorem/pollen/services/bean/{GroupVoteCountingResultBean.java => ListVoteCountingResultBean.java} (72%) delete mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/job/SendVoteSummariesJob.java delete mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteSummaryEmail.java delete mode 100644 pollen-services/src/main/resources/email/VoteSummaryEmail.mustache delete mode 100644 pollen-services/src/main/resources/email/VoteSummaryEmail_fr.mustache create mode 100644 pollen-ui-riot-js/src/main/web/js/Logger.js create mode 100644 pollen-ui-riot-js/src/main/web/js/VoterListService.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/date-time-picker.tag.html delete mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/AccountCreated.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/ConfirmPopup.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/InformationPopup.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/popup/Modal.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voterList/VoterListActions.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/voterList/VoterListMember.tag.html delete mode 100644 pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java rename pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/{GroupOfVoter.java => ListOfVoter.java} (75%) rename pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/{GroupVoteCountingResult.java => ListVoteCountingResult.java} (64%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 6

branch develop updated (a7bb7bb -> 3cc449c)
by chorem.org scm 01 Jun '17

01 Jun '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 a7bb7bb "datediff" n'est pas un fonction prise en charge par postgres adds 3cc449c correction des permission en cas d'ajout de vote ou de commentaire pour des sondage restreint + correction style pour les choix No new revisions were added by this update. Summary of changes: .../org/chorem/pollen/rest/api/v1/CommentApi.java | 6 ++++++ pollen-rest-api/src/main/resources/mapping | 1 + .../pollen/services/service/CommentService.java | 19 ++++++++++++++++++ .../src/main/web/js/CommentService.js | 16 +++++++++++++-- pollen-ui-riot-js/src/main/web/js/Poll.js | 23 ++++++++++++---------- .../src/main/web/tag/poll/Choices.tag.html | 3 ++- .../src/main/web/tag/poll/Comments.tag.html | 5 +---- 7 files changed, 56 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (c82a9f5 -> a7bb7bb)
by chorem.org scm 01 Jun '17

01 Jun '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 c82a9f5 mise en place de flyway pour la migration de base de données + utilisé un autre fichier de properties pour les tests (evite les conflits avec les conf local) new a7bb7bb "datediff" n'est pas un fonction prise en charge par postgres 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 a7bb7bb862881c7ffcd1243aaf727091d1a43679 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Jun 1 15:50:31 2017 +0200 "datediff" n'est pas un fonction prise en charge par postgres Summary of changes: ...rest-api.properties => pollen-rest-api-test.properties} | 14 ++++++++++++++ 1 file changed, 14 insertions(+) rename pollen-rest-api/src/test/resources/{pollen-rest-api.properties => pollen-rest-api-test.properties} (52%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (28b4528 -> c82a9f5)
by chorem.org scm 01 Jun '17

01 Jun '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 28b4528 correction de l'affichage des date picker et time picker suite aux modifications sur les animations new c82a9f5 mise en place de flyway pour la migration de base de données + utilisé un autre fichier de properties pour les tests (evite les conflits avec les conf local) 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 c82a9f5eb759a0a4c8d20b198aeaa41892824a72 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Jun 1 15:27:30 2017 +0200 mise en place de flyway pour la migration de base de données + utilisé un autre fichier de properties pour les tests (evite les conflits avec les conf local) Summary of changes: pollen-persistence/pom.xml | 5 ++++ .../persistence/PollenFlywayServiceImpl.java | 29 ++++++++++++++++++++++ .../db/migration/common/V3_0_0_1__exemple.sql | 2 ++ .../db/migration/h2/V3_0_0_2__exemple.sql | 2 ++ .../db/migration/postgresql/V3_0_0_2__exemple.sql | 3 +++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- .../src/main/resources/pollen-rest-api.properties | 1 + .../pollen/rest/api/AbstractPollenRestApiTest.java | 2 +- pollen-services/pom.xml | 7 +++--- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/src/main/web/conf.js | 2 +- pom.xml | 6 +++++ 12 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenFlywayServiceImpl.java create mode 100644 pollen-persistence/src/main/resources/db/migration/common/V3_0_0_1__exemple.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_2__exemple.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_2__exemple.sql -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (e1b806b -> 28b4528)
by chorem.org scm 01 Jun '17

01 Jun '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 e1b806b "datediff" n'est pas un fonction prise en charge par postgres new 28b4528 correction de l'affichage des date picker et time picker suite aux modifications sur les animations 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 28b4528f3e0d7dacf73ec3ffccfcc4f4d7203073 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jun 1 11:16:14 2017 +0200 correction de l'affichage des date picker et time picker suite aux modifications sur les animations Summary of changes: pollen-ui-riot-js/src/main/web/tag/components/date-picker.tag.html | 2 ++ pollen-ui-riot-js/src/main/web/tag/components/time-picker.tag.html | 2 ++ 2 files changed, 4 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1