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

branch develop updated (fee354e7 -> ba7fb6bf)
by chorem.org scm 02 Jul '20

02 Jul '20

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 fee354e7 fix poll#picture type in uml new ba7fb6bf fix poll#picture relation 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 ba7fb6bf94bd7b7faaf0aafb24fd5b00afdb48cf Author: Cécilia Bossard <bossard(a)codelutin.com> Date: Thu Jul 2 18:10:01 2020 +0200 fix poll#picture relation Summary of changes: data /db/pollen-rest-api.mv.db | Bin 0 -> 688128 bytes pollen-persistence/src/main/xmi/pollen.zargo | Bin 31302 -> 31876 bytes .../chorem/pollen/services/service/PollService.java | 10 +++++++--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 data /db/pollen-rest-api.mv.db -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (810e91e4 -> fee354e7)
by chorem.org scm 02 Jul '20

02 Jul '20

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 810e91e4 Merge branch 'feature/refonte-ui' into 'develop' new fee354e7 fix poll#picture type in uml 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 fee354e7572109e34d346465ebb692ca29bb53fe Author: Yannick Martel <martel(a)codelutin.com> Date: Thu Jul 2 14:10:18 2020 +0200 fix poll#picture type in uml Summary of changes: pollen-persistence/src/main/xmi/pollen.zargo | Bin 31337 -> 31302 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/refonte-ui deleted (was 2c5ffb09)
by chorem.org scm 02 Jul '20

02 Jul '20

This is an automated email from the git hooks/post-receive script. New change to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 2c5ffb09 Correction problème de merge 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 develop updated (eea6b421 -> 810e91e4)
by chorem.org scm 02 Jul '20

02 Jul '20

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 eea6b421 fixes #337 : La liste des participants n'a pas d'ordre déterministe : Ordre sur les noms (mais É... se retrouve après Y...)... Ordre déterministe après enregistrement. Pas avant par contre (odre de saisie) adds 271a14a7 Refonte ui : ajout de nouveaux filtres pour la récupération des sondages adds 2376d098 Ajout d'un nouvel attribut au sondage (image d'illustration) adds 347a8728 Hack to fix #332 : Really not clean, but working adds d553060d fixes #333 - Cannot create poll : Unrecognized field 'choiceAddAllowed' adds acd2b46b Lint adds 10ac4d81 release 3.3.7 success [skip ci] adds 2a3d401b fixes #334 - How this feature could have been so badly tested adds 9926ec38 fixes #335 : Wrong poll displayed - There was a useless refresh too soon messing up adds 4934720f Better debugging adds 6fc6f8b3 Next development version adds 6ae6aa23 Fix tests if no questions in poll coming from services (should happen only during tests) adds a46ce552 release 3.3.8 success [skip ci] adds bde4bdc0 Next development version adds 31025a5d fixes #339 : Vote restreint - impossible de voter authentifié adds b7d4ef37 refs #339 fix tests adds 99ba5626 Add some rest api tests adds a7936eb8 fixes #337 : La liste des participants n'a pas d'ordre déterministe : Ordre sur les noms (mais É... se retrouve après Y...)... Ordre déterministe après enregistrement. Pas avant par contre (odre de saisie) adds 5d7948ff Corrections suite à revue adds 2c5ffb09 Correction problème de merge new 810e91e4 Merge branch 'feature/refonte-ui' 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 810e91e4d2bf30f0a6572457aafaab174f0b34a9 Merge: eea6b421 2c5ffb09 Author: Yannick Martel <martel(a)codelutin.com> Date: Thu Jul 2 11:51:51 2020 +0200 Merge branch 'feature/refonte-ui' into 'develop' Feature/refonte ui Closes #337, #339, #335, #334, #333, and #332 See merge request chorem/pollen!42 Summary of changes: .../pollen/persistence/entity/PollTopiaDao.java | 85 ++++++++++++++++++++- .../db/migration/h2/V3_3_0_2__add_poll_picture.sql | 5 ++ .../postgresql/V3_3_0_2__add_poll_picture.sql | 5 ++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 31242 -> 31337 bytes .../org/chorem/pollen/rest/api/v1/PollApi.java | 21 +++-- .../org/chorem/pollen/services/bean/PollBean.java | 10 +++ .../pollen/services/service/PollService.java | 24 ++++-- 8 files changed, 135 insertions(+), 17 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_3_0_2__add_poll_picture.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_3_0_2__add_poll_picture.sql -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/refonte-ui updated (5d7948ff -> 2c5ffb09)
by chorem.org scm 02 Jul '20

02 Jul '20

This is an automated email from the git hooks/post-receive script. New change to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 5d7948ff Corrections suite à revue new 2c5ffb09 Correction problème de merge 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 2c5ffb0958e0027240d1b62bac82f6f07946db73 Author: Cécilia Bossard <bossard(a)codelutin.com> Date: Thu Jul 2 10:48:10 2020 +0200 Correction problème de merge Summary of changes: .../pollen/persistence/entity/PollTopiaDao.java | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/refonte-ui updated (2376d098 -> 5d7948ff)
by chorem.org scm 02 Jul '20

02 Jul '20

This is an automated email from the git hooks/post-receive script. New change to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 2376d098 Ajout d'un nouvel attribut au sondage (image d'illustration) new 347a8728 Hack to fix #332 : Really not clean, but working new d553060d fixes #333 - Cannot create poll : Unrecognized field 'choiceAddAllowed' new acd2b46b Lint new 10ac4d81 release 3.3.7 success [skip ci] new 2a3d401b fixes #334 - How this feature could have been so badly tested new 9926ec38 fixes #335 : Wrong poll displayed - There was a useless refresh too soon messing up new 4934720f Better debugging new 6fc6f8b3 Next development version new 6ae6aa23 Fix tests if no questions in poll coming from services (should happen only during tests) new a46ce552 release 3.3.8 success [skip ci] new bde4bdc0 Next development version new 31025a5d fixes #339 : Vote restreint - impossible de voter authentifié new b7d4ef37 refs #339 fix tests new 99ba5626 Add some rest api tests new a7936eb8 fixes #337 : La liste des participants n'a pas d'ordre déterministe : Ordre sur les noms (mais É... se retrouve après Y...)... Ordre déterministe après enregistrement. Pas avant par contre (odre de saisie) new 5d7948ff Corrections suite à revue The 16 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 5d7948ff5e36b3b303333c37a517889bef765728 Author: Cécilia Bossard <bossard(a)codelutin.com> Date: Thu Jul 2 10:21:19 2020 +0200 Corrections suite à revue commit a7936eb88c80edfcc9dcb25eb47aeb0f43acec70 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 27 10:18:00 2020 +0200 fixes #337 : La liste des participants n'a pas d'ordre déterministe : Ordre sur les noms (mais É... se retrouve après Y...)... Ordre déterministe après enregistrement. Pas avant par contre (odre de saisie) commit 99ba56268224be03a1e964d6c245c3f299507d21 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 27 08:26:04 2020 +0200 Add some rest api tests commit b7d4ef37f76282fdfc81221d393d659f45da929e Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 27 08:22:31 2020 +0200 refs #339 fix tests commit 31025a5d5d5ced40b274b16b30c4f5710e956177 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 27 07:36:21 2020 +0200 fixes #339 : Vote restreint - impossible de voter authentifié commit bde4bdc0e5390dcab3de253e8046c567e5428f24 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 11:39:11 2020 +0200 Next development version commit a46ce55226afbb574a2213ba0c6602cc3d3beb32 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed May 13 08:17:19 2020 +0000 release 3.3.8 success [skip ci] commit 6ae6aa2383b0d76ce4af130b40603213940ae449 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 10:03:05 2020 +0200 Fix tests if no questions in poll coming from services (should happen only during tests) commit 6fc6f8b34ad90694ae034bfc31171821bdfe4643 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 09:26:03 2020 +0200 Next development version commit 4934720f9747a48f03ec1eb0cac6a2c75eaccf2e Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 09:15:01 2020 +0200 Better debugging commit 9926ec381f05fdbc56ec69fbb1d185227ecf8164 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 09:14:30 2020 +0200 fixes #335 : Wrong poll displayed - There was a useless refresh too soon messing up commit 2a3d401b93a04a1b203ae8bed639674068471fc9 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 09:02:37 2020 +0200 fixes #334 - How this feature could have been so badly tested commit 10ac4d81d7af1fc0c4483cf51024f74eca2a8040 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue May 12 08:17:11 2020 +0000 release 3.3.7 success [skip ci] commit acd2b46b2ae4970bfda789a0a53a17fbcfad8d15 Author: jcouteau <couteau(a)codelutin.com> Date: Tue May 12 10:04:22 2020 +0200 Lint commit d553060dae2a8194efbdd28725989a7ac326dc7e Author: jcouteau <couteau(a)codelutin.com> Date: Tue May 12 09:40:50 2020 +0200 fixes #333 - Cannot create poll : Unrecognized field 'choiceAddAllowed' commit 347a87280a2bab916b9138ae7eee985f46de1272 Author: jcouteau <couteau(a)codelutin.com> Date: Tue May 12 08:59:09 2020 +0200 Hack to fix #332 : Really not clean, but working Summary of changes: CHANGELOG | 13 ++ pollen-persistence/pom.xml | 2 +- .../pollen/persistence/entity/PollTopiaDao.java | 20 +++ pollen-rest-api/pom.xml | 2 +- .../org/chorem/pollen/rest/api/v1/PollApi.java | 3 +- .../pollen/rest/api/AbstractPollenRestApiTest.java | 49 ++++++- .../org/chorem/pollen/rest/api/AuthApiTest.java | 2 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 5 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 52 +------ .../chorem/pollen/rest/api/RestApiFixtures.java | 5 + pollen-services/pom.xml | 2 +- .../pollen/services/service/FixturesService.java | 87 +++++++----- .../pollen/services/service/PollService.java | 58 ++++++-- .../pollen/services/service/QuestionService.java | 13 +- .../pollen/services/service/VoteService.java | 24 ++-- .../pollen/services/service/VoterListService.java | 7 +- .../test/FakePollenApplicationContext.java | 21 +-- pollen-services/src/main/resources/fixtures.yaml | 59 -------- .../src/main/resources/restricted-fixtures.yaml | 55 ++++++++ .../src/main/resources/user-fixtures.yaml | 58 ++++++++ .../services/service/FavoriteListServiceTest.java | 4 +- .../pollen/services/service/PollServiceTest.java | 4 +- .../services/service/PollenUserServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 4 +- .../pollen/services/service/VoteServiceTest.java | 153 +++++++++++++++++++-- .../services/service/VoterListServiceTest.java | 4 +- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- .../src/main/web/tag/poll/Poll.tag.html | 59 +++++--- .../src/main/web/tag/poll/Settings.tag.html | 2 +- .../src/main/web/tag/poll/Summary.tag.html | 6 +- .../src/main/web/tag/poll/Votes.tag.html | 2 +- pollen-ui-riot-js/webpack.config.js | 5 +- 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-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 45 files changed, 576 insertions(+), 236 deletions(-) create mode 100644 pollen-services/src/main/resources/restricted-fixtures.yaml create mode 100644 pollen-services/src/main/resources/user-fixtures.yaml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 8

11/16: Next development version
by chorem.org scm 02 Jul '20

02 Jul '20

This is an automated email from the git hooks/post-receive script. New commit to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit bde4bdc0e5390dcab3de253e8046c567e5428f24 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 11:39:11 2020 +0200 Next development version --- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/pom.xml | 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-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 21dc04af..41a85104 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index 8267bdea..ea63bcf3 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 64aa3090..ee86168d 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-riot-js/pom.xml b/pollen-ui-riot-js/pom.xml index 272d85c9..e4a2719e 100644 --- a/pollen-ui-riot-js/pom.xml +++ b/pollen-ui-riot-js/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index efae517c..c8d2643b 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 7663879a..ba550b8b 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 21622cad..41515344 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index b5a2cf88..b79c4ee2 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index aa37e161..20a1715f 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-cumulative/pom.xml b/pollen-votecounting-cumulative/pom.xml index b043fca7..52c5c201 100644 --- a/pollen-votecounting-cumulative/pom.xml +++ b/pollen-votecounting-cumulative/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 4b71efc1..ef94a51d 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-majority-judgment/pom.xml b/pollen-votecounting-majority-judgment/pom.xml index e8fcca81..b158bf3f 100644 --- a/pollen-votecounting-majority-judgment/pom.xml +++ b/pollen-votecounting-majority-judgment/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index a049f116..ec9a1f90 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index f6983d90..c5d8f116 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index c736cf3f..4e27d994 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8</version> + <version>3.3.9-SNAPSHOT</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

10/16: release 3.3.8 success [skip ci]
by chorem.org scm 02 Jul '20

02 Jul '20

This is an automated email from the git hooks/post-receive script. New commit to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a46ce55226afbb574a2213ba0c6602cc3d3beb32 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed May 13 08:17:19 2020 +0000 release 3.3.8 success [skip ci] --- CHANGELOG | 7 +++++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 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-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4264e5bd..c0722f19 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -167,3 +167,10 @@ PROJECT : 13 - Cannot create poll : Unrecognized field "choiceAddAllowed" - Reset automatique des choix +PROJECT : 13 +3.3.8 (2020/05/13) + + - Wrong poll displayed + - Adding choice feature not working + - Format incorrect des cases à cocher pour le vote "normal" + diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 4644dba0..21dc04af 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index a3b8c77a..8267bdea 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 4b7da1b4..64aa3090 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-riot-js/package-lock.json b/pollen-ui-riot-js/package-lock.json index ce62a0d4..86aa4d14 100644 --- a/pollen-ui-riot-js/package-lock.json +++ b/pollen-ui-riot-js/package-lock.json @@ -1,6 +1,6 @@ { "name": "Pollen", - "version": "3.3.7", + "version": "3.3.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/pollen-ui-riot-js/package.json b/pollen-ui-riot-js/package.json index 645ff9b9..9144f4e5 100644 --- a/pollen-ui-riot-js/package.json +++ b/pollen-ui-riot-js/package.json @@ -1,6 +1,6 @@ { "name": "Pollen", - "version": "3.3.7", + "version": "3.3.8", "description": "Pollen UI", "main": "index.html", "repository": { diff --git a/pollen-ui-riot-js/pom.xml b/pollen-ui-riot-js/pom.xml index d90c5afd..272d85c9 100644 --- a/pollen-ui-riot-js/pom.xml +++ b/pollen-ui-riot-js/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index dec155b0..efae517c 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 19279057..7663879a 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 9d5849d1..21622cad 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 38c40729..b5a2cf88 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index 7b331baa..aa37e161 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-cumulative/pom.xml b/pollen-votecounting-cumulative/pom.xml index deb146f4..b043fca7 100644 --- a/pollen-votecounting-cumulative/pom.xml +++ b/pollen-votecounting-cumulative/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 98ebc377..4b71efc1 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-majority-judgment/pom.xml b/pollen-votecounting-majority-judgment/pom.xml index 0b079639..e8fcca81 100644 --- a/pollen-votecounting-majority-judgment/pom.xml +++ b/pollen-votecounting-majority-judgment/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index 91a8999a..a049f116 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index 8b8cb844..f6983d90 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 5e719968..c736cf3f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.8-SNAPSHOT</version> + <version>3.3.8</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

09/16: Fix tests if no questions in poll coming from services (should happen only during tests)
by chorem.org scm 02 Jul '20

02 Jul '20

This is an automated email from the git hooks/post-receive script. New commit to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6ae6aa2383b0d76ce4af130b40603213940ae449 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 10:03:05 2020 +0200 Fix tests if no questions in poll coming from services (should happen only during tests) --- .../org/chorem/pollen/services/service/PollService.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index 0b012cb4..fc4114e8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -144,13 +144,15 @@ public class PollService extends PollenServiceSupport { Date beginAddChoiceDate = null; Date endAddChoiceDate = null; Boolean addChoiceEnabled = false; - for(QuestionBean question: bean.getQuestions()) { - addChoiceEnabled = addChoiceEnabled || question.isChoiceAddAllowed(); - if (question.getBeginChoiceDate() != null && (beginAddChoiceDate == null || question.getBeginChoiceDate().before(beginAddChoiceDate))) { - beginAddChoiceDate = question.getBeginChoiceDate(); - } - if (question.getEndChoiceDate() != null && (endAddChoiceDate == null || question.getEndChoiceDate().after(endAddChoiceDate))) { - endAddChoiceDate = question.getEndChoiceDate(); + if (bean.getQuestions() != null) { + for (QuestionBean question : bean.getQuestions()) { + addChoiceEnabled = addChoiceEnabled || question.isChoiceAddAllowed(); + if (question.getBeginChoiceDate() != null && (beginAddChoiceDate == null || question.getBeginChoiceDate().before(beginAddChoiceDate))) { + beginAddChoiceDate = question.getBeginChoiceDate(); + } + if (question.getEndChoiceDate() != null && (endAddChoiceDate == null || question.getEndChoiceDate().after(endAddChoiceDate))) { + endAddChoiceDate = question.getEndChoiceDate(); + } } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

08/16: Next development version
by chorem.org scm 02 Jul '20

02 Jul '20

This is an automated email from the git hooks/post-receive script. New commit to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6fc6f8b34ad90694ae034bfc31171821bdfe4643 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 09:26:03 2020 +0200 Next development version --- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/pom.xml | 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-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 2afb7ab4..4644dba0 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index a9a3011a..a3b8c77a 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index fc3067ae..4b7da1b4 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-riot-js/pom.xml b/pollen-ui-riot-js/pom.xml index 7584e796..d90c5afd 100644 --- a/pollen-ui-riot-js/pom.xml +++ b/pollen-ui-riot-js/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 520fa6da..dec155b0 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 00380aea..19279057 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index b8184752..9d5849d1 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 35df1b09..38c40729 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index 9ebc0646..7b331baa 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-cumulative/pom.xml b/pollen-votecounting-cumulative/pom.xml index fe49aa36..deb146f4 100644 --- a/pollen-votecounting-cumulative/pom.xml +++ b/pollen-votecounting-cumulative/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index cbb3d2c5..98ebc377 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-majority-judgment/pom.xml b/pollen-votecounting-majority-judgment/pom.xml index 3077579f..0b079639 100644 --- a/pollen-votecounting-majority-judgment/pom.xml +++ b/pollen-votecounting-majority-judgment/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index 145b0ee9..91a8999a 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index db5174be..8b8cb844 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index acaf66e6..5e719968 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.3.7</version> + <version>3.3.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0