This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 057498f4c8a8a2cb43e09f719e77d6f165155e61 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 8 16:08:40 2014 +0200 print info conflit between endChoiceDate and beginDate --- pollen-ui-angular/src/main/webapp/partials/poll-info.html | 7 +++++++ pollen-ui-angular/src/main/webapp/partials/poll-settings.html | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-info.html b/pollen-ui-angular/src/main/webapp/partials/poll-info.html index 8fd6892..5c13b50 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-info.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-info.html @@ -23,4 +23,11 @@ <div ng-if="timeToAddChoice.value >= 0" class="anim"> <progressbar max="100" value="timeToAddChoice.value" type="{{timeToAddChoice.type}}"></progressbar> </div> +</div> + +<div ng-if="data.poll.choiceAddAllowed && (!data.poll.endChoiceDate || data.poll.endChoiceDate > data.poll.beginDate)" class="anim"> + <h4>La période d'ajout de choix et de vote se superpose</h4> + <p> + Les votes peuvent ne pas être représatif de la réalité. + </p> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html index c8a4bc5..fc00fc2 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -111,8 +111,7 @@ <div class="form-group row" ng-show="data.poll.choiceAddAllowed"> <label class="col-sm-4 control-label" for="beginChoiceDate">{{ 'poll.config.label.beginChoiceDate' | translate }}</label> <div class="col-sm-8"> - <datetimepicker min-date="data.poll.beginDate" - max-date="data.poll.endChoiceDate" + <datetimepicker max-date="data.poll.endChoiceDate" ng-model="data.poll.beginChoiceDate" auto-save="autoSavePoll()" for-id="beginChoiceDate"></datetimepicker> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.