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

07/16: Better debugging
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 4934720f9747a48f03ec1eb0cac6a2c75eaccf2e Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 13 09:15:01 2020 +0200 Better debugging --- pollen-ui-riot-js/webpack.config.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pollen-ui-riot-js/webpack.config.js b/pollen-ui-riot-js/webpack.config.js index 68d5ace0..d4b35f88 100644 --- a/pollen-ui-riot-js/webpack.config.js +++ b/pollen-ui-riot-js/webpack.config.js @@ -10,7 +10,8 @@ module.exports = { output: { filename: "[name].js", - path: __dirname + "/target/dist/" + path: __dirname + "/target/dist/", + sourceMapFilename: "[name].js.map" }, plugins: [ @@ -39,8 +40,6 @@ module.exports = { ]) ], - devtool: "source-map", - module: { rules: [ { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

06/16: fixes #335 : Wrong poll displayed - There was a useless refresh too soon messing up
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 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 --- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 1 - 1 file changed, 1 deletion(-) 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 1b4f44b9..7e5d10e0 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 @@ -243,7 +243,6 @@ } }; - this.refresh(); this.intervalId = window.setInterval(this.refresh, 60000); this.on("unmount", () => { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

05/16: fixes #334 - How this feature could have been so badly tested
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 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 --- .../org/chorem/pollen/rest/api/v1/PollApi.java | 3 +- .../pollen/services/service/PollService.java | 46 +++++++++++++++++----- .../pollen/services/service/QuestionService.java | 3 ++ .../src/main/web/tag/poll/Poll.tag.html | 6 +-- .../src/main/web/tag/poll/Summary.tag.html | 6 +-- .../src/main/web/tag/poll/Votes.tag.html | 2 +- 6 files changed, 48 insertions(+), 18 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java index da55f175..96d2f81c 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.persistence.entity.Choice; import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.Poll; +import org.chorem.pollen.persistence.entity.Question; import org.chorem.pollen.rest.api.beans.PollCreateBean; import org.chorem.pollen.services.bean.ChoiceBean; import org.chorem.pollen.services.bean.PaginationParameterBean; @@ -205,7 +206,7 @@ public class PollApi { @POST public PollenEntityRef<Choice> addChoice(@Context ChoiceService choiceService, @PathParam("pollId") PollenEntityId<Poll> pollId, - @PathParam("questionId") PollenEntityId<Poll> questionId, + @PathParam("questionId") PollenEntityId<Question> questionId, ChoiceBean choice) throws InvalidFormException { return choiceService.addChoice(pollId.getEntityId(), questionId.getEntityId(), choice); 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 1a17922c..0b012cb4 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 @@ -124,14 +124,12 @@ public class PollService extends PollenServiceSupport { bean.setClosed(false); bean.setStatus(PollBean.PollStatus.CREATED); - //FIXME JC181001 - ADDING_CHOICES toujours pertinent sur le Poll ? - if (PollBean.PollStatus.ADDING_CHOICES != bean.getStatus()) { - Date beginDate = entity.getBeginDate(); - Date endDate = entity.getEndDate(); - if (beginDate != null && now.after(beginDate) && (endDate == null || now.before(endDate))) { - bean.setStatus(PollBean.PollStatus.VOTING); - } + Date beginDate = entity.getBeginDate(); + Date endDate = entity.getEndDate(); + if (beginDate != null && now.after(beginDate) && (endDate == null || now.before(endDate))) { + bean.setStatus(PollBean.PollStatus.VOTING); } + } /* Questions and choices */ @@ -141,6 +139,31 @@ public class PollService extends PollenServiceSupport { bean.setQuestions(questions); } + /* Check adding choices */ + //XXX JC-200512 adding choice status should be on question instead of poll + 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 (addChoiceEnabled && + ( + (beginAddChoiceDate == null && (endAddChoiceDate == null || now.before(endAddChoiceDate))) || + (beginAddChoiceDate != null && now.after(beginAddChoiceDate) && (endAddChoiceDate == null || now.before(endAddChoiceDate))) + ) + ){ + bean.setStatus(PollBean.PollStatus.ADDING_CHOICES); + } + + if (isNotPermitted(PollenPermissions.edit(entity))) { bean.setPermission(null); bean.setCreatorEmail(null); @@ -588,10 +611,13 @@ public class PollService extends PollenServiceSupport { QuestionService questionService = getQuestionService(); for (QuestionBean question : poll.getQuestions()) { - - question.setQuestionOrder(existingQuestions.size()); Question persistedQuestion = questionService.saveQuestion(toSave, question); - existingQuestions.add(persistedQuestion); + existingQuestions.remove(persistedQuestion); + } + + // the remaining questions have been deleted by the user and must be removed + if (CollectionUtils.isNotEmpty(existingQuestions)) { + getQuestionDao().deleteAll(existingQuestions); } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java index 1bfabe84..f72dbdd0 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java @@ -67,6 +67,9 @@ public class QuestionService extends PollenServiceSupport { bean.setCreateDate(entity.getTopiaCreateDate()); bean.setVoteCountingType(entity.getVoteCountingType()); bean.setVoteCountingConfig(getVoteCountingService().getVoteCountingConfig(entity)); + bean.setChoiceAddAllowed(entity.isChoiceAddAllowed()); + bean.setEndChoiceDate(entity.getEndChoiceDate()); + bean.setBeginChoiceDate(entity.getBeginChoiceDate()); /* Choices */ ChoiceService choiceService = getChoiceService(); 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 bad8d44a..1b4f44b9 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 @@ -84,16 +84,16 @@ <p if={poll.endDate}> {_t.dateTo} <span class="brand">{formatDate(poll.endDate)}</span></p> </div> - <div class="left-icon" if={poll.choiceAddAllowed}> + <div class="left-icon" if={poll.questions[0] && poll.questions[0].choiceAddAllowed}> <i class="fa fa-check-square" aria-hidden="true"></i> <p>{_t.dateAddChoices}</p> <p> {poll.endChoiceDate || poll.endDate ? _t.dateFrom : _t.dateFromNoEnd} <span class="brand">{formatDate(poll.beginChoiceDate ? poll.beginChoiceDate : poll.beginDate)}</span> </p> - <p if={poll.endChoiceDate || poll.endDate}> + <p if={poll.questions[0].endChoiceDate || poll.endDate}> {_t.dateTo} - <span class="brand">{formatDate(poll.endChoiceDate ? poll.endChoiceDate : poll.endDate)}</span> + <span class="brand">{formatDate(poll.questions[0].endChoiceDate ? poll.questions[0].endChoiceDate : poll.endDate)}</span> </p> </div> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html index fee9f4e2..cd46a7f3 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html @@ -48,10 +48,10 @@ <div class="summary-part"> <h3>{_t.dates}</h3> - <div if={opts.form.model.choiceAddAllowed}> + <div if={opts.form.model.questions[0].choiceAddAllowed}> {_t.addingChoices} - <span if={opts.form.model.beginChoiceDate}>{_t.fromDate} <strong>{formatDate(opts.form.model.beginChoiceDate)}</strong></span> - <span if={opts.form.model.endChoiceDate}> {_t.toDate} <strong>{formatDate(opts.form.model.endChoiceDate)}</strong></span> + <span if={opts.form.model.questions[0].beginChoiceDate}>{_t.fromDate} <strong>{formatDate(opts.form.model.questions[0].beginChoiceDate)}</strong></span> + <span if={opts.form.model.questions[0].endChoiceDate}> {_t.toDate} <strong>{formatDate(opts.form.model.questions[0].endChoiceDate)}</strong></span> </div> <div> {_t.voting} 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 d2cbb4cb..e60b7832 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 @@ -156,7 +156,7 @@ this.update(); this.refs.choice.submit(); - this.poll.addChoice(this.choiceToAdd).then(() => { + this.poll.addChoice(this.poll.questions[0].id, this.choiceToAdd).then(() => { this.addingChoice = false; this.choiceToAdd = this.poll.initChoice(this.choiceToAdd); this.refs.choice.updateChoice(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/16: Lint
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 acd2b46b2ae4970bfda789a0a53a17fbcfad8d15 Author: jcouteau <couteau(a)codelutin.com> Date: Tue May 12 10:04:22 2020 +0200 Lint --- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 781a6bbc..bad8d44a 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 @@ -198,7 +198,7 @@ this.refresh = () => { if (this.poll && this.poll.questions[0] && this.poll.questions[0].canVote) { this.tempVoteValues = {}; - if(this.tags.votes) { + if (this.tags.votes) { //Store temporary vote values let refs = this.tags.votes.tags.editvote.refs; this.poll.questions[0].choices.forEach(choice => { @@ -222,7 +222,7 @@ this.poll.reloadVoteCountingTypeValue(this.poll.questions[0]).then(() => { this.update(); //Set back temporary stored values - if(this.tags.votes) { + if (this.tags.votes) { let refs = this.tags.votes.tags.editvote.refs; this.poll.questions[0].choices.forEach(choice => { let input = refs[choice.id + "_voteValue"]; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/refonte-ui updated (271a14a7 -> 2376d098)
by chorem.org scm 01 Jul '20

01 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 271a14a7 Refonte ui : ajout de nouveaux filtres pour la récupération des sondages new 2376d098 Ajout d'un nouvel attribut au sondage (image d'illustration) 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 2376d098bf3444420202e9150234c6ea44fa06e0 Author: Cécilia Bossard <bossard(a)codelutin.com> Date: Wed Jul 1 11:45:49 2020 +0200 Ajout d'un nouvel attribut au sondage (image d'illustration) Summary of changes: .../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/services/bean/PollBean.java | 10 ++++++++++ .../chorem/pollen/services/service/PollService.java | 2 ++ 6 files changed, 23 insertions(+), 1 deletion(-) 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 develop updated (2e79d7b6 -> eea6b421)
by chorem.org scm 27 May '20

27 May '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 2e79d7b6 Add some rest api tests new 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) 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 eea6b4217f33d6d9a986a3be47888802cd9238d6 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) Summary of changes: .../java/org/chorem/pollen/services/service/VoterListService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (3670b6e4 -> 2e79d7b6)
by chorem.org scm 27 May '20

27 May '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 3670b6e4 refs #339 fix tests new 2e79d7b6 Add some rest api tests 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 2e79d7b63a84ad48ae53eef14f053d45f473c6b0 Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 27 08:26:04 2020 +0200 Add some rest api tests Summary of changes: .../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 +++ 5 files changed, 64 insertions(+), 49 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (e6f3edcd -> 3670b6e4)
by chorem.org scm 27 May '20

27 May '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 e6f3edcd fixes #339 : Vote restreint - impossible de voter authentifié new 3670b6e4 refs #339 fix tests 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 3670b6e4b558adb699edacf1bf6819a5803b6b4a Author: jcouteau <couteau(a)codelutin.com> Date: Wed May 27 08:22:31 2020 +0200 refs #339 fix tests Summary of changes: pollen-services/src/main/resources/fixtures.yaml | 44 ------------------- .../{fixtures.yaml => restricted-fixtures.yaml} | 49 ---------------------- .../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 | 2 + .../services/service/VoterListServiceTest.java | 4 +- 8 files changed, 17 insertions(+), 98 deletions(-) copy pollen-services/src/main/resources/{fixtures.yaml => restricted-fixtures.yaml} (58%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (54e2f20e -> e6f3edcd)
by chorem.org scm 27 May '20

27 May '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 54e2f20e Next development version adds e6f3edcd fixes #339 : Vote restreint - impossible de voter authentifié No new revisions were added by this update. Summary of changes: .../pollen/services/service/FixturesService.java | 87 +++++++----- .../pollen/services/service/PollService.java | 10 +- .../pollen/services/service/QuestionService.java | 10 +- .../pollen/services/service/VoteService.java | 24 ++-- .../pollen/services/service/VoterListService.java | 2 +- .../test/FakePollenApplicationContext.java | 21 +-- pollen-services/src/main/resources/fixtures.yaml | 99 ++++++-------- .../src/main/resources/user-fixtures.yaml | 58 ++++++++ .../pollen/services/service/VoteServiceTest.java | 151 +++++++++++++++++++-- 9 files changed, 336 insertions(+), 126 deletions(-) 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 0

branch develop updated (10c4d6ef -> 54e2f20e)
by chorem.org scm 13 May '20

13 May '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 10c4d6ef Merge tag '3.3.8' into develop adds 54e2f20e Next development version No new revisions were added by this update. Summary of changes: 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(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0