[Pollen-commits] 02/02: 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

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 2318dc2f2363344000fa7794d2b89188b3e64410 Author: Kevin Morin <morin@codelutin.com> Date: Tue May 16 11:26:41 2017 +0200 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 --- .../org/chorem/pollen/services/service/PollService.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 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 1569927..c06d748 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 @@ -49,7 +49,6 @@ import org.nuiton.util.pagination.PaginationResult; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import java.util.Calendar; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -475,6 +474,10 @@ public class PollService extends PollenServiceSupport { toSave.setBeginDate(poll.getBeginDate()); toSave.setEndDate(poll.getEndDate()); + if (toSave.getBeginDate() == null) { + toSave.setBeginDate(getNow()); + } + if (toSave.getEndDate() != null && toSave.getNotifyMeHoursBeforePollEnds() > 0 && DateUtils.addHours(new Date(), toSave.getNotifyMeHoursBeforePollEnds()).before(toSave.getEndDate())) { toSave.setPollEndReminderSent(false); @@ -485,18 +488,6 @@ public class PollService extends PollenServiceSupport { toSave.setBeginChoiceDate(poll.getBeginChoiceDate()); toSave.setEndChoiceDate(poll.getEndChoiceDate()); - - if (toSave.getBeginDate() == null) { - - Calendar calendar = Calendar.getInstance(); - calendar.setTime(poll.getEndChoiceDate()); - calendar.add(Calendar.MINUTE, 1); - toSave.setBeginDate(calendar.getTime()); - } - } - - if (toSave.getBeginDate() == null) { - toSave.setBeginDate(getNow()); } // -- choice -- // -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.