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

01/02: fix name result for type date
by chorem.org scm 02 Jul '14

02 Jul '14

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 6bb1d317eec19d2c67efbcfed89695615c0c50d5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 14:42:26 2014 +0200 fix name result for type date --- .../src/main/webapp/js/controllers/pollCtrl.js | 17 ++++++++++++++--- .../src/main/webapp/partials/poll-result.html | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index ae27703..68baa88 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -1116,8 +1116,8 @@ angular.module('pollControllers', []) }]) -.controller('PollResultCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', - function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate) { +.controller('PollResultCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$filter', + function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate, $filter) { $controller('PollCtrl', {$scope:$scope}); $scope.translateTitle = { @@ -1157,7 +1157,18 @@ angular.module('pollControllers', []) if ($scope.data.choices[i].id == value.choiceId) { value.choice = $scope.data.choices[i]; - scores.push([value.choice.name, value.scoreValue]); + switch (value.choice.choiceType) { + case 'TEXT': + scores.push([value.choice.name, value.scoreValue]); + break; + + case 'DATE': + scores.push([$filter('date')(value.choice.date, $scope.globalVariables.dateFormat), value.scoreValue]); + break; + + default: + scores.push([key, value.scoreValue]); + } // finish loop i = $scope.data.choices.length; diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-result.html b/pollen-ui-angular/src/main/webapp/partials/poll-result.html index 5277130..dd918ea 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -24,7 +24,7 @@ <th>{{ 'poll.result.score' | translate }}</th> </tr> <tr ng-repeat="score in data.result.scores"> - <th> {{score.choice.name}} </th> + <th> {{ score.choice.name || (score.choice.date | date:globalVariables.dateFormat) }} </th> <td> {{score.scoreValue}} </td> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: fix nullPointerException in ChoiceBean
by chorem.org scm 02 Jul '14

02 Jul '14

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 166798e310edd545d4df35144347eb71cf604c5f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 14:00:02 2014 +0200 fix nullPointerException in ChoiceBean --- .../chorem/pollen/services/bean/ChoiceBean.java | 27 ++++++++++++---------- .../pollen/services/service/ChoiceService.java | 1 - 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java index 215498b..7e40513 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java @@ -96,23 +96,26 @@ public class ChoiceBean extends PollenBean<Choice> { entity.setTopiaId(getEntityId()); - switch (getChoiceType()) { - case TEXT: - entity.setName(getName()); + ChoiceType choiceType = getChoiceType(); + if (choiceType != null) { + switch (choiceType) { + case TEXT: + entity.setName(getName()); - break; + break; - case DATE: - if (getDate() != null) { - entity.setName(String.valueOf(getDate().getTime())); - } + case DATE: + if ( getDate() != null ) { + entity.setName(String.valueOf(getDate().getTime())); + } - break; + break; - case IMAGE: + case IMAGE: - throw new IllegalStateException("Not implemented"); - //break; + throw new IllegalStateException("Not implemented"); + //break; + } } entity.setDescription(getDescription()); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index a6c9f2e..1d97812 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -224,7 +224,6 @@ public class ChoiceService extends PollenServiceSupport { // principal.setEmail(creator.getEmail()); // } - toSave.setChoiceType(choice.getChoiceType()); toSave.setCreator(principal); toSave.setPoll(poll); toSave.setChoiceOrder(choice.getChoiceOrder()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: prepare directive.js to minify
by chorem.org scm 02 Jul '14

02 Jul '14

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 1ae33eba47edf411c5790a4f0c0a34702019706d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 12:45:39 2014 +0200 prepare directive.js to minify --- .../src/main/webapp/js/controllers/pollCtrl.js | 1 - pollen-ui-angular/src/main/webapp/js/directives.js | 96 ++++++++++++---------- 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 4f4637a..ae27703 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -184,7 +184,6 @@ angular.module('pollControllers', []) $timeout(function () { $scope.$watch('data.poll.voteCountingType', function (newVal, oldVal) { if (angular.isDefined(oldVal) && (newVal == 1 || oldVal == 1) && newVal != oldVal) { - console.log('vote Change'); angular.forEach($scope.data.votants, function(votant, key) { angular.forEach(votant.choice, function (choice) { choice.inputType = $scope.getInputType(); diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 051cb75..ad58548 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -24,7 +24,7 @@ angular.module('pollenDirective', []) ///// FOCUS ME ///// ////////////////////////////////////// -.directive('focusMe', function($timeout) { +.directive('focusMe', ['$timeout', function($timeout) { return { link: function($scope, element, attrs) { $scope.$watch(attrs.focusMe, function(value) { @@ -37,13 +37,13 @@ angular.module('pollenDirective', []) }); } }; -}) +}]) ////////////////////////////////////// ///// EDIT ME ///// ////////////////////////////////////// -.directive('editMe', function() { +.directive('editMe', [function() { return { restrict:'A', link: function ($scope, element, attrs) { @@ -57,13 +57,13 @@ angular.module('pollenDirective', []) }); } }; -}) +}]) ////////////////////////////////////// ///// CKEDITOR ///// ////////////////////////////////////// -.directive('ckEditor', function ($timeout) { +.directive('ckEditor', ['$timeout', function ($timeout) { return { require: '?ngModel', link: function ($scope, element, attrs, ngModel) { @@ -92,13 +92,13 @@ angular.module('pollenDirective', []) } } }; -}) +}]) ////////////////////////////////////// ///// NG EXIT ///// ////////////////////////////////////// -.directive('ngExit', function ($timeout) { +.directive('ngExit', [ '$timeout', function ($timeout) { return { link: function (scope, element, attrs) { element.bind("keydown keypress", function (event) { @@ -118,13 +118,13 @@ angular.module('pollenDirective', []) }); } }; -}) +}]) ////////////////////////////////////// ///// INFO ERROR ///// ////////////////////////////////////// -.directive('infoError', function() { +.directive('infoError', [function() { return { restrict:'E', scope: { @@ -140,13 +140,13 @@ angular.module('pollenDirective', []) }); } }; -}) +}]) ////////////////////////////////////// ///// INPUT ERROR ///// ////////////////////////////////////// -.directive('inputError', function() { +.directive('inputError', ['$timeout', function($timeout) { return { restrict:'E', scope: { @@ -156,30 +156,32 @@ angular.module('pollenDirective', []) transclude: true, template: '<div tooltip={{error}} ng-transclude></div>', link: function (scope, element, attrs) { - scope.$watch('forData', function (newVal, oldVal) { - if (newVal != oldVal) { - delete scope.error; - } - }); - scope.$watch('error', function (newVal, oldVal) { - attrs.tooltip = newVal; - if (angular.isDefined(newVal)) { - $(element[0]).addClass('has-error'); + $timeout(function () { + scope.$watch('forData', function (newVal, oldVal) { + if (newVal != oldVal) { + delete scope.error; + } + }); + scope.$watch('error', function (newVal, oldVal) { + attrs.tooltip = newVal; + if (angular.isDefined(newVal)) { + $(element[0]).addClass('has-error'); - } - else { - $(element[0]).removeClass('has-error'); - } - }) + } + else { + $(element[0]).removeClass('has-error'); + } + }) + }); } }; -}) +}]) ////////////////////////////////////// ///// SELECT ON CLICK ///// ////////////////////////////////////// -.directive('selectOnClick', function () { +.directive('selectOnClick', [function () { return { restrict: 'A', link: function (scope, element, attrs) { @@ -188,13 +190,13 @@ angular.module('pollenDirective', []) }); } }; -}) +}]) ////////////////////////////////////// ///// AUTO SAVE ///// ////////////////////////////////////// -.directive('autoSave', function ($timeout) { +.directive('autoSave', ['$timeout', function ($timeout) { return { restrict : 'A', link : function (scope, element, attrs) { @@ -237,13 +239,13 @@ angular.module('pollenDirective', []) }); } } -}) +}]) ////////////////////////////////////// ///// MAKE PAGINATION ///// ////////////////////////////////////// -.directive('makePagination', function () { +.directive('makePagination', ['$timeout', function ($timeout) { return { restrict: 'E', scope: { @@ -269,12 +271,14 @@ angular.module('pollenDirective', []) //set pageList scope.pageList = []; - scope.$watch('lastPage', function (newVal) { - scope.pageList = []; - for (var i = 0; i <= newVal; i++) { - scope.pageList.push(i); - } - setNavPage(); + $timeout(function () { + scope.$watch('lastPage', function (newVal) { + scope.pageList = []; + for (var i = 0; i <= newVal; i++) { + scope.pageList.push(i); + } + setNavPage(); + }); }); scope.goPage = function (pageNumber) { @@ -283,13 +287,13 @@ angular.module('pollenDirective', []) }; } } -}) +}]) ////////////////////////////////////// ///// JQPLOT CHART ///// ////////////////////////////////////// -.directive('chart', function ($timeout) { +.directive('chart', ['$timeout', function ($timeout) { return { restrict : 'E', scope : { @@ -346,13 +350,13 @@ angular.module('pollenDirective', []) }); } } -}) +}]) ////////////////////////////////////// ///// JQPLOT PIE ///// ////////////////////////////////////// -.directive('pie', function ($timeout) { +.directive('pie', ['$timeout', function ($timeout) { return { restrict : 'E', scope : { @@ -387,9 +391,11 @@ angular.module('pollenDirective', []) } }; - scope.$watch('data', function () { - initChart(); - }); + $timeout(function () { + scope.$watch('data', function () { + initChart(); + }); + }) } } -}) \ No newline at end of file +}]) \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: Implement type Date in choice
by chorem.org scm 02 Jul '14

02 Jul '14

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 4165b424fb94ffa4ff1cea0adad11be6411c8071 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 12:17:49 2014 +0200 Implement type Date in choice --- .../chorem/pollen/services/bean/ChoiceBean.java | 52 +++++++++++++++++++++- .../pollen/services/service/ChoiceService.java | 31 +++++++++++-- .../i18n/pollen-services_en_GB.properties | 2 + .../i18n/pollen-services_fr_FR.properties | 2 + .../src/main/webapp/js/controllers/pollCtrl.js | 28 ++++++++++-- .../src/main/webapp/partials/inline-poll.html | 8 +++- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- 7 files changed, 114 insertions(+), 11 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java index c5ee22a..215498b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java @@ -25,6 +25,8 @@ import org.chorem.pollen.persistence.entity.Choice; import org.chorem.pollen.persistence.entity.ChoiceImpl; import org.chorem.pollen.persistence.entity.ChoiceType; +import java.util.Date; + /** * Created on 5/15/14. * @@ -39,6 +41,8 @@ public class ChoiceBean extends PollenBean<Choice> { protected String name; + protected Date date; + protected ChoiceType choiceType; protected String description; @@ -61,7 +65,24 @@ public class ChoiceBean extends PollenBean<Choice> { } - setName(entity.getName()); + switch (entity.getChoiceType()) { + + case TEXT: + setName(entity.getName()); + setDate(null); + break; + + case DATE: + setName(null); + setDate(new Date(Long.parseLong(entity.getName()))); + break; + + case IMAGE: + + throw new IllegalStateException("Not implemented"); + //break; + } + setDescription(entity.getDescription()); setChoiceType(entity.getChoiceType()); setChoiceOrder(entity.getChoiceOrder()); @@ -74,7 +95,26 @@ public class ChoiceBean extends PollenBean<Choice> { Choice entity = new ChoiceImpl(); entity.setTopiaId(getEntityId()); - entity.setName(getName()); + + switch (getChoiceType()) { + case TEXT: + entity.setName(getName()); + + break; + + case DATE: + if (getDate() != null) { + entity.setName(String.valueOf(getDate().getTime())); + } + + break; + + case IMAGE: + + throw new IllegalStateException("Not implemented"); + //break; + } + entity.setDescription(getDescription()); entity.setChoiceType(getChoiceType()); entity.setChoiceOrder(getChoiceOrder()); @@ -99,6 +139,14 @@ public class ChoiceBean extends PollenBean<Choice> { this.name = name; } + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + public ChoiceType getChoiceType() { return choiceType; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 3e6acc0..a6c9f2e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -34,6 +34,7 @@ import org.chorem.pollen.services.bean.ChoiceBean; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.service.security.PermissionVerb; +import java.util.Date; import java.util.List; import java.util.Set; @@ -168,7 +169,7 @@ public class ChoiceService extends PollenServiceSupport { // can't delete this choice // will be the last one ErrorMap errors = new ErrorMap(); - errors.addError("choice", "need at least one choice"); + errors.addError("choice", l(getLocale(), "pollen.error.poll.choice.mandatory")); errors.failIfNotEmpty(); } @@ -230,6 +231,8 @@ public class ChoiceService extends PollenServiceSupport { } + toSave.setChoiceType(choice.getChoiceType()); + switch (toSave.getChoiceType()) { case TEXT: @@ -242,7 +245,11 @@ public class ChoiceService extends PollenServiceSupport { case DATE: - throw new IllegalStateException("Not implemented"); + toSave.setName(String.valueOf(choice.getDate().getTime())); + toSave.setDescription(choice.getDescription()); + toSave.setCreator(poll.getCreator()); + + break; case IMAGE: @@ -301,7 +308,25 @@ public class ChoiceService extends PollenServiceSupport { break; case DATE: - throw new IllegalStateException("Not implemented"); + Date choiceDate = choice.getDate(); + + boolean dateNotBlank; + if (choiceDate == null) { + dateNotBlank = checkNotBlank(errors, "date", null, l(getLocale(), "pollen.error.choice.choiceDateEmpty")); + } + else { + dateNotBlank = checkNotBlank(errors, + "date", + String.valueOf(choiceDate), + l(getLocale(), "pollen.error.choice.choiceDateEmpty")); + } + + if (dateNotBlank) { + boolean dateAdded = choiceNames.add(String.valueOf(choiceDate.getTime())); + check(errors, "date", dateAdded, l(getLocale(), "pollen.error.choice.choiceDateExist")); + } + + break; case IMAGE: diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index 24b79ec..2ec870f 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -11,6 +11,8 @@ pollen.configuration.defaultPollVoteVisibility=Default Poll vote visibility used pollen.configuration.defaultPollenUserPageSize= pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll pollen.configuration.sessionTimeoutDelay=Inactivity delay before invalidate the session of a user (in seconds) +pollen.error.choice.choiceDateEmpty=choice date can not be empty +pollen.error.choice.choiceDateExist=choice date already used in this list pollen.error.choice.choiceNameEmpty=choice name can not be empty pollen.error.choice.choiceNameExist=choice name already used in this list pollen.error.choice.choiceTypeEmpty=choiceType can not be null diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index c7df00c..2685800 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -11,6 +11,8 @@ pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut pollen.configuration.defaultPollenUserPageSize= pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes) +pollen.error.choice.choiceDateEmpty=La date ne peut pas être vide +pollen.error.choice.choiceDateExist=La date exist déjà utilisé sur ce sondage pollen.error.choice.choiceNameEmpty=Le nom du choix ne peut pas être vide pollen.error.choice.choiceNameExist=Le nom du choix est déjà utilisé sur ce sondage pollen.error.choice.choiceTypeEmpty=Le type du choix doit être défini diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index fc54416..4f4637a 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -256,7 +256,7 @@ angular.module('pollControllers', []) $scope.globalVariables.editMode = true; $scope.globalVariables.voted = angular.isDefined($scope.data.votants); $scope.globalVariables.lastType = 'TEXT'; - $scope.globalVariables.lastDate = new Date(); + $scope.globalVariables.lastDate = null; $scope.restError = {}; //////////////////////////////// @@ -423,6 +423,12 @@ angular.module('pollControllers', []) var poll = angular.copy($scope.data.poll); poll.choice = angular.copy($scope.data.choices); + angular.forEach(poll.choice, function(choice) { + if (angular.isDate(choice.date)) { + choice.date = choice.date.getTime(); + } + }); + if (angular.isDate(poll.beginDate)) { poll.beginDate = poll.beginDate.getTime(); } @@ -446,6 +452,10 @@ angular.module('pollControllers', []) if (angular.isDefined(error.data['choice['+index+'].name'])) { choice.restError = {name:error.data['choice['+index+'].name']}; } + + if (angular.isDefined(error.data['choice['+index+'].date'])) { + choice.restError = {date:error.data['choice['+index+'].date']}; + } }); if (angular.isDefined(error.data.choice)) { @@ -471,7 +481,13 @@ angular.module('pollControllers', []) //////////////////////////////// $scope.callBackAddChoice = function (choice) { - PollChoice.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.pollToken}, choice, function (data) { + saveChoice = angular.copy(choice); + + if (angular.isDate(saveChoice.date)) { + saveChoice.date = saveChoice.date.getTime(); + } + + PollChoice.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.pollToken}, saveChoice, function (data) { delete choice.restError; choice.id = data.id; $rootScope.$broadcast('newSuccess', 'poll.saved'); @@ -481,7 +497,13 @@ angular.module('pollControllers', []) } $scope.callBackEditChoice = function (choice) { - PollChoice.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.pollToken}, choice, function() { + saveChoice = angular.copy(choice); + + if (angular.isDate(saveChoice.date)) { + saveChoice.date = saveChoice.date.getTime(); + } + + PollChoice.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.pollToken}, saveChoice, function() { delete choice.restError; $rootScope.$broadcast('newSuccess', 'poll.saved'); }, function (error) { diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index e19b41e..87d801c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -28,7 +28,7 @@ <td ng-repeat="choice in data.choices" class="pollChoice pollAnim" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> <div ng-if="choice.choiceType == 'TEXT'" edit-me="showEdit" > <div ng-hide="showEdit && !globalVariables.voted" class="fixe-input" title="{{choice.description}}"> - {{choice.name || 'poll.edit' | translate}} + {{ choice.name || ('poll.edit' | translate) }} <info-error error="choice.restError.name[0]" data="choice.name"></info-error> <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> <div ng-show="showEdit && !globalVariables.voted"> @@ -37,7 +37,11 @@ </div> </div> <div ng-if="choice.choiceType == 'DATE'" edit-me="showEdit" > - <div ng-hide="!globalVariables.voted && showEdit || isOpen" class="fixe-input" title="{{choice.description}}">{{choice.date | date:globalVariables.dateFormat}} <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> + <div ng-hide="!globalVariables.voted && showEdit || isOpen" class="fixe-input" title="{{choice.description}}"> + {{ (choice.date | date:globalVariables.dateFormat) || ('poll.edit' | translate) }} + <info-error error="choice.restError.date[0]" data="choice.date"></info-error> + <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/> + </div> <div ng-show="!globalVariables.voted && showEdit || isOpen" > <input type="text" class="form-control" ng-model="choice.date" focus-me="showEdit" datepicker-popup="{{globalVariables.dateFormat}}" is-open="isOpen" ng-exit="showEdit = false" ng-click="isOpen = true" auto-save="saveChoice(choice)" required/> <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html index f86dfca..3264210 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -30,7 +30,7 @@ <div class="col-sm-8 btn-group"> <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'TEXT'">Text</button> - <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'DATE'" disabled>Date</button> + <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'DATE'">Date</button> <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'IMAGE'" disabled>Image</button> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: edit title, reload page for new cloned poll
by chorem.org scm 02 Jul '14

02 Jul '14

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 f34304bb84b757ab31900103bdb1295ecc09a5b0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 10:18:58 2014 +0200 edit title, reload page for new cloned poll --- .../src/main/java/org/chorem/pollen/services/service/PollService.java | 2 ++ pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 a33d04c..ffdbf77 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 @@ -229,6 +229,8 @@ public class PollService extends PollenServiceSupport { clonedPoll.setBeginChoiceDate(null); clonedPoll.setEndChoiceDate(null); + clonedPoll.setTitle(clonedPoll.getTitle() + " (clone)"); + List<ChoiceBean> clonedChoices = getChoiceService().getChoices(pollId); for (ChoiceBean choice : clonedChoices) { choice.setEntityId(null); diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 09c8e9e..fc54416 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -239,9 +239,9 @@ angular.module('pollControllers', []) $scope.clonePoll = function () { if (angular.isDefined($scope.data.poll.id)) { Poll.clone({pollId: $scope.data.poll.id, permission: $scope.globalVariables.pollToken}, {}, function (data) { - console.log(data); $rootScope.$broadcast('newSuccess', 'poll.cloned'); $location.url('/poll/edit/'+data.id); + $route.reload(); }); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: clone poll
by chorem.org scm 01 Jul '14

01 Jul '14

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 75da148fe63ed0573999f5f09c4998ffcc0b80c2 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jul 1 17:34:28 2014 +0200 clone poll --- .../org/chorem/pollen/rest/api/v1/PollApi.java | 4 ++-- pollen-rest-api/src/main/resources/mapping | 2 +- .../pollen/services/service/PollService.java | 26 +++++++++++++++++----- .../pollen/services/service/VoteService.java | 9 ++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 10 +++++++++ pollen-ui-angular/src/main/webapp/js/services.js | 4 ++++ .../src/main/webapp/partials/poll-link.html | 8 +++---- 7 files changed, 51 insertions(+), 12 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 9a6f671..6d90b52 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 @@ -112,9 +112,9 @@ public class PollApi extends WebMotionController { } - public PollBean clonePoll(PollService pollService, PollenEntityId<Poll> pollId) { + public PollenEntityRef<Poll> clonePoll(PollService pollService, PollenEntityId<Poll> pollId) { - PollBean clonedPoll = pollService.clonePoll(pollId.getEntityId()); + PollenEntityRef<Poll> clonedPoll = pollService.clonePoll(pollId.getEntityId()); return clonedPoll; } diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 22f2d98..4340a23 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -109,7 +109,7 @@ POST /v1/polls/{pollId}/edit PollApi.editPoll GET /v1/polls/{pollId} PollApi.getPoll DELETE /v1/polls/{pollId} PollApi.deletePoll -# POST /v1/polls/{pollId} PollApi.clonePoll +POST /v1/polls/{pollId}/clone PollApi.clonePoll GET /v1/polls/{pollId}/export PollApi.exportPoll PUT /v1/polls/{pollId}/close PollApi.closePoll 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 0ed03c6..a33d04c 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 @@ -214,19 +214,35 @@ public class PollService extends PollenServiceSupport { } - public PollBean clonePoll(String pollId) { + public PollenEntityRef<Poll> clonePoll(String pollId) { checkNotNull(pollId); checkPermission(PermissionVerb.clonePoll, pollId); - Poll poll = getPoll0(pollId); + PollBean clonedPoll = toBean(PollBean.class, getPoll0(pollId)); - //TODO + clonedPoll.setEntityId(null); + clonedPoll.setPermission(null); + clonedPoll.setClosed(false); + clonedPoll.setBeginDate(serviceContext.getNow()); + clonedPoll.setEndDate(null); + clonedPoll.setBeginChoiceDate(null); + clonedPoll.setEndChoiceDate(null); + + List<ChoiceBean> clonedChoices = getChoiceService().getChoices(pollId); + for (ChoiceBean choice : clonedChoices) { + choice.setEntityId(null); + choice.setPermission(null); + } + + Poll savedPoll = savePoll(clonedPoll, clonedChoices); commit(); - getNotificationService().onPollCreated(poll); + getNotificationService().onPollCreated(savedPoll); + + PollenEntityRef<Poll> createBeanRef = PollenEntityRef.of(savedPoll); - return toBean(PollBean.class, poll); + return createBeanRef; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index 90c6331..dad35e2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -241,6 +241,15 @@ public class VoteService extends PollenServiceSupport { // toSave.getVoter().setEmail(getCleanMail(vote.getVoter().getEmail())); // } + PollenUser connectedUser = getConnectedUser(); + + if (connectedUser != null) { + + // link to connected user + toSave.getVoter().setPollenUser(connectedUser); + + } + // -- List of VoteToChoice -- // Set<VoteToChoice> choicesToSave = new HashSet<>(); diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index a6820e8..09c8e9e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -236,6 +236,16 @@ angular.module('pollControllers', []) } }; + $scope.clonePoll = function () { + if (angular.isDefined($scope.data.poll.id)) { + Poll.clone({pollId: $scope.data.poll.id, permission: $scope.globalVariables.pollToken}, {}, function (data) { + console.log(data); + $rootScope.$broadcast('newSuccess', 'poll.cloned'); + $location.url('/poll/edit/'+data.id); + }); + } + } + }]) .controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', function ($scope, $controller, $modal, $timeout, $routeParams) { diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index fc3ff51..1333cae 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -52,6 +52,10 @@ angular.module('pollenServices', ['ngResource']) 'close' : { method : 'PUT', url : conf.restURL+'/polls/:pollId/close' + }, + 'clone' : { + method : 'POST', + url : conf.restURL+'/polls/:pollId/clone' } }); }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index 4c867da..73822bc 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -55,9 +55,9 @@ </li> <li> - <a class="fakeLink"> + <a class="fakeLink" ng-click="clonePoll()" href=""> <span class="glyphicon glyphicon-transfer" title="{{ 'poll.link.clone' | translate }}"></span> - <span class="text">{{ 'poll.link.clone' | translate }} (disabled)</span> + <span class="text">{{ 'poll.link.clone' | translate }}</span> </a> </li> @@ -71,14 +71,14 @@ <ul ng-if="data.poll.permission"> <li ng-if="!data.poll.isClosed"> - <a class="fakeLink danger" ng-click="closePoll()"> + <a class="fakeLink danger" href="" ng-click="closePoll()"> <span class="glyphicon glyphicon-remove" title="{{ 'poll.link.close' | translate }}"></span> <span class="text">{{ 'poll.link.close' | translate }}</span> </a> </li> <li> - <a class="fakeLink danger" ng-click="deletePoll()"> + <a class="fakeLink danger" href="" ng-click="deletePoll()"> <span class="glyphicon glyphicon-trash" title="{{ 'poll.link.delete' | translate }}"></span> <span class="text">{{ 'poll.link.delete' | translate }}</span> </a> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: set findAllParticipated without hql
by chorem.org scm 01 Jul '14

01 Jul '14

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 90e8e43aecff950e15715eb78f34a9a5f8d4ee4d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jul 1 12:17:12 2014 +0200 set findAllParticipated without hql --- .../org/chorem/pollen/persistence/entity/PollTopiaDao.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java index 55ac87a..a07efa5 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java @@ -28,6 +28,7 @@ import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -48,8 +49,14 @@ public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { } public PaginationResult<Poll> findAllParticipated(PollenUser user, PaginationParameter paginationParameter) { - //TODO - return PaginationResult.of(new ArrayList<Poll>(), 0, paginationParameter); + // TODO : use hql + VoteTopiaDao dao = topiaDaoSupplier.getDao(Vote.class, VoteTopiaDao.class); + List<Vote> votes = dao.forEquals(Vote.PROPERTY_VOTER + "." + PollenPrincipal.PROPERTY_POLLEN_USER, user).findAll(); + Set<Poll> polls = new HashSet<Poll>(); + for (Vote vote : votes) { + polls.add(vote.getPoll()); + } + return PaginationResult.of(new ArrayList<Poll>(polls), 0, paginationParameter); } public Set<Poll> findAllFreePolls() { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: comment save user when is connected
by chorem.org scm 01 Jul '14

01 Jul '14

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 63bebea839859d7acfe7824b60309e3faba72624 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jul 1 11:03:21 2014 +0200 comment save user when is connected --- .../org/chorem/pollen/services/service/CommentService.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java index fd1a7f2..5ecf45b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java @@ -27,11 +27,13 @@ import com.google.common.base.Function; import org.chorem.pollen.persistence.entity.Comment; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenPrincipal; +import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.services.bean.CommentBean; import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.service.security.PermissionVerb; +import org.chorem.pollen.services.service.security.SecurityService; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -194,6 +196,15 @@ public class CommentService extends PollenServiceSupport { // -- author -- // + PollenUser connectedUser = getConnectedUser(); + + if (connectedUser != null) { + + // link to connected user + toSave.getAuthor().setPollenUser(connectedUser); + + } + toSave.getAuthor().setName(comment.getAuthorName()); // if (StringUtils.isNotBlank(comment.getAuthor().getEmail())) { // -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: change check permission in SecurityService
by chorem.org scm 01 Jul '14

01 Jul '14

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 6c24a40ceca7b94545d7c4769c6addb7a0ee83ec Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 30 17:45:51 2014 +0200 change check permission in SecurityService --- .../org/chorem/pollen/services/bean/PollBean.java | 26 ---------------------- .../pollen/services/service/PollService.java | 25 ++++++++++++--------- .../services/service/security/SecurityService.java | 24 +++++++++++--------- .../src/main/webapp/js/controllers/pollCtrl.js | 11 +++++---- .../src/main/webapp/partials/poll-settings.html | 9 ++++++++ 5 files changed, 44 insertions(+), 51 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java index 93b2f5d..80a52ed 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java @@ -140,7 +140,6 @@ public class PollBean extends PollenBean<Poll> { setResultVisibility(entity.getResultVisibility()); setClosed(entity.getClosed()); - setFlag(); } @Override @@ -182,8 +181,6 @@ public class PollBean extends PollenBean<Poll> { public void setPermission(String permission) { this.permission = permission; - // check new permission - setFlag(); } public String getCreatorName() { @@ -354,27 +351,4 @@ public class PollBean extends PollenBean<Poll> { this.voteIsVisible = voteIsVisible; } - protected void setFlag() { - // TODO: check CommentVisibility.VOTER - if (getPermission() != null || getCommentVisibility() == CommentVisibility.EVERYBODY) { - setCommentIsVisible(true); - } else { - setCommentIsVisible(false); - } - - // TODO: check VoteVisibility.VOTER - if ((getPermission() != null || getVoteVisibility() == VoteVisibility.EVERYBODY) && getVoteVisibility() != VoteVisibility.ANONYMOUS) { - setVoteIsVisible(true); - } else { - setVoteIsVisible(false); - } - - // TODO: check ResultVisibility.VOTER - if ( (getPermission() != null || getResultVisibility() == ResultVisibility.EVERYBODY) - && (isContinuousResults() || isClosed()) ) { - setResultIsVisible(true); - } else { - setResultIsVisible(false); - } - } } 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 d7e65d3..0ed03c6 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 @@ -25,10 +25,7 @@ package org.chorem.pollen.services.service; import com.google.common.base.Function; import org.apache.commons.collections4.CollectionUtils; -import org.chorem.pollen.persistence.entity.Choice; -import org.chorem.pollen.persistence.entity.Poll; -import org.chorem.pollen.persistence.entity.PollenPrincipal; -import org.chorem.pollen.persistence.entity.PollenUser; +import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.bean.ChoiceBean; import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PaginationResultBean; @@ -59,7 +56,15 @@ public class PollService extends PollenServiceSupport { input.setPermission(null); input.setCreatorEmail(null); input.setCreatorName(null); + } + + input.setCommentIsVisible(isPermitted(PermissionVerb.readComment, input.getEntityId())); + + input.setVoteIsVisible(isPermitted(PermissionVerb.readVote, input.getEntityId())); + + input.setResultIsVisible(isPermitted(PermissionVerb.readPollResult, input.getEntityId())); + return input; } }; @@ -71,7 +76,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().forAll().findPage(page); - PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); + PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls, pollBeanFunction); return pollBeans; } @@ -84,7 +89,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllCreated(connectedUser, page); - PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); + PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls, pollBeanFunction); return pollBeans; } @@ -97,7 +102,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllInvited(connectedUser, page); - PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); + PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls, pollBeanFunction); return pollBeans; } @@ -110,7 +115,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllParticipated(connectedUser, page); - PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); + PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls, pollBeanFunction); return pollBeans; } @@ -190,7 +195,7 @@ public class PollService extends PollenServiceSupport { getNotificationService().onPollEdited(savedPoll); - PollBean pollBean = toBean(PollBean.class, savedPoll); + PollBean pollBean = toBean(PollBean.class, savedPoll, pollBeanFunction); return pollBean; } @@ -236,7 +241,7 @@ public class PollService extends PollenServiceSupport { savePoll(toBean(PollBean.class, poll), null); - //TODO + //TODO : check if correct commit(); getNotificationService().onPollClosed(poll); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index a5d0359..6ae0d90 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -33,17 +33,7 @@ import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.SimplePrincipalCollection; import org.apache.shiro.subject.Subject; -import org.chorem.pollen.persistence.entity.Choice; -import org.chorem.pollen.persistence.entity.Comment; -import org.chorem.pollen.persistence.entity.FavoriteList; -import org.chorem.pollen.persistence.entity.Poll; -import org.chorem.pollen.persistence.entity.PollenPrincipal; -import org.chorem.pollen.persistence.entity.PollenPrincipalTopiaDao; -import org.chorem.pollen.persistence.entity.PollenToken; -import org.chorem.pollen.persistence.entity.PollenTokenTopiaDao; -import org.chorem.pollen.persistence.entity.PollenUser; -import org.chorem.pollen.persistence.entity.SessionToken; -import org.chorem.pollen.persistence.entity.Vote; +import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.service.PollenServiceSupport; import org.nuiton.topia.persistence.TopiaEntity; @@ -380,6 +370,18 @@ public class SecurityService extends PollenServiceSupport { permissions.add(createSubjectPermission(PermissionVerb.addVote, poll)); permissions.add(createSubjectPermission(PermissionVerb.addComment, poll)); + if (poll.getCommentVisibility() == CommentVisibility.EVERYBODY) { + permissions.add(createSubjectPermission(PermissionVerb.readComment, poll)); + } + + if (poll.getVoteVisibility() == VoteVisibility.EVERYBODY) { + permissions.add(createSubjectPermission(PermissionVerb.readVote, poll)); + } + + if (poll.getResultVisibility() == ResultVisibility.EVERYBODY && (poll.isClosed() || poll.isContinuousResults())) { + permissions.add(createSubjectPermission(PermissionVerb.readPollResult, poll)); + } + // add choices permissions List<Choice> choices = getChoiceDao().forPollEquals(poll).findAll(); diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 2fde0fe..a6820e8 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -96,6 +96,7 @@ angular.module('pollControllers', []) pollDeferred.promise.then(function () { var baseUrl = window.location.protocol+'//'+window.location.hostname+window.location.pathname; + $scope.globalVariables.baseUrl = baseUrl; $scope.globalVariables.linkHome = baseUrl; $scope.globalVariables.linkVote = baseUrl; $scope.globalVariables.linkComment = baseUrl; @@ -791,8 +792,8 @@ angular.module('pollControllers', []) }]) -.controller('PollVoteCtrl', ['$scope', '$rootScope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', - function ($scope, $rootScope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate) { +.controller('PollVoteCtrl', ['$scope', '$rootScope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$location', + function ($scope, $rootScope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate, $location) { $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('vote'); @@ -875,7 +876,7 @@ angular.module('pollControllers', []) // edit vote PollVote.update({pollId:$routeParams.pollId}, sendVote, function (data) { $rootScope.$broadcast('newSuccess', 'vote.added'); - $location.url('/vote/'+$routeParams.pollId+'/'+ data.permission); + $location.url('/poll/vote/'+$routeParams.pollId+'/'+ data.permission); }, function (error) { $scope.data.vote.restError = { voterName : error.data["voter.name"]}; }) @@ -889,7 +890,9 @@ angular.module('pollControllers', []) $scope.data.votants.push(angular.copy($scope.data.vote)); $rootScope.$broadcast('newSuccess', 'vote.added'); initVote(); - $location.url('/vote/'+$routeParams.pollId+'/'+ returnRequest.permission); + + $rootScope.$on('newInfo', $scope.globalVariables.baseUrl+'#/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission, -1); + $location.url('/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission); }, function (error) { $scope.data.vote.restError = { voterName : error.data["voter.name"]}; }); 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 960d5c7..06d4df7 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -159,4 +159,13 @@ <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="false" auto-save="autoSavePoll()">Non</button> </div> </div> + + <div class="form-group"> + <label class="col-sm-4 control-label">Visibiliter des commentaires :</label> + <div class="col-sm-8"> + <label><input type="radio" ng-model="data.poll.commentVisibility" name="commentVisibility" value="EVERYBODY" auto-save="autoSavePoll()" /> Public</label> + <label><input type="radio" ng-model="data.poll.commentVisibility" name="commentVisibility" value="VOTER" auto-save="autoSavePoll()" /> Participants</label> + <label><input type="radio" ng-model="data.poll.commentVisibility" name="commentVisibility" value="NOBODY" auto-save="autoSavePoll()" /> Personne</label> + </div> + </div> </form> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: improve UI
by chorem.org scm 01 Jul '14

01 Jul '14

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 ae0a1a956c531881548a1bf4ca1ed6ec962df51f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 30 15:15:58 2014 +0200 improve UI --- pollen-ui-angular/src/main/webapp/index.html | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 8 +++---- .../src/main/webapp/partials/alerts.html | 2 +- .../src/main/webapp/partials/poll-link.html | 26 ++++++++++++++++------ .../src/main/webapp/partials/poll-poll.html | 5 ----- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index d120a11..a995313 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -160,7 +160,7 @@ </div> </nav> -<div ng-include="'partials/alerts.html'"></div> +<div ng-include="'partials/alerts.html'" class="pool-alert"></div> <div ng-view class='container-fluid' id="content"></div> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index c81e4da..2fde0fe 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -95,10 +95,6 @@ angular.module('pollControllers', []) }); pollDeferred.promise.then(function () { - if ($scope.data.poll.isClosed) { - $rootScope.$broadcast('newWarning', 'poll.closed', -1); - } - var baseUrl = window.location.protocol+'//'+window.location.hostname+window.location.pathname; $scope.globalVariables.linkHome = baseUrl; $scope.globalVariables.linkVote = baseUrl; @@ -802,6 +798,10 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('vote'); var initPoll = function () { + if ($scope.data.poll.isClosed) { + $rootScope.$broadcast('newWarning', 'poll.closed', -1); + } + var pollChoicePromise = PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; }).$promise; diff --git a/pollen-ui-angular/src/main/webapp/partials/alerts.html b/pollen-ui-angular/src/main/webapp/partials/alerts.html index 17fd0c9..7afa3ab 100644 --- a/pollen-ui-angular/src/main/webapp/partials/alerts.html +++ b/pollen-ui-angular/src/main/webapp/partials/alerts.html @@ -1,3 +1,3 @@ -<div class="pool-alert" ng-controller="printAlertCtrl" > +<div ng-controller="printAlertCtrl" > <alert ng-repeat="alert in data.alerts" type="{{alert.type}}" class="fakeLink" close="hideAlert(alert)" ng-click="hideAlert(alert)"><span class="glyphicon" ng-class="alert.glyphicon"></span> {{ alert.msg | translate }} </alert> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index 87fb324..4c867da 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -23,6 +23,7 @@ <a class="fakeLink" ng-show="globalVariables.minify"><span class="glyphicon glyphicon-chevron-right"></span></a> <a class="fakeLink" ng-hide="globalVariables.minify"><span class="glyphicon glyphicon-chevron-left"></span></a> </li> + <li ng-if="! data.poll.isClosed"> <a href="{{globalVariables.linkVote}}"> <span class="glyphicon glyphicon-link" title="{{ 'poll.link.vote' | translate }}"></span> @@ -30,6 +31,7 @@ </a> <input type="text" select-on-click value="{{globalVariables.linkVote}}" readonly class="form-control input-mini"/> </li> + <li ng-if="data.poll.resultIsVisible"> <a href="{{globalVariables.linkResult}}"> <span class="glyphicon glyphicon-stats" title="{{ 'poll.link.result' | translate }}"></span> @@ -37,42 +39,52 @@ </a> <input type="text" select-on-click value="{{globalVariables.linkResult}}" readonly class="form-control input-mini"/> </li> + + <li class="empty" ng-hide="! data.poll.isClosed"> </li> + <li class="empty" ng-hide="data.poll.resultIsVisible"> </li> <li class="empty"> </li> </ul> -<ul> - <li ng-if="data.poll.permission"> + +<ul ng-if="data.poll.permission"> + <li> <a href="{{globalVariables.linkEdit}}"> <span class="glyphicon glyphicon-pencil" title="{{ 'poll.link.edit' | translate }}"></span> <span class="text">{{ 'poll.link.edit' | translate }}</span> </a> <input type="text" select-on-click value="{{globalVariables.linkEdit}}" readonly class="form-control input-mini"/> </li> - <li ng-if="data.poll.permission"> + + <li> <a class="fakeLink"> <span class="glyphicon glyphicon-transfer" title="{{ 'poll.link.clone' | translate }}"></span> <span class="text">{{ 'poll.link.clone' | translate }} (disabled)</span> </a> </li> - <li ng-if="data.poll.permission"> + + <li> <a class="fakeLink"> <span class="glyphicon glyphicon-export" title="{{ 'poll.link.export' | translate }}"></span> <span class="text">{{ 'poll.link.export' | translate }} (disabled)</span> </a> </li> </ul> -<ul> - <li ng-if="data.poll.permission"> + +<ul ng-if="data.poll.permission"> + <li ng-if="!data.poll.isClosed"> <a class="fakeLink danger" ng-click="closePoll()"> <span class="glyphicon glyphicon-remove" title="{{ 'poll.link.close' | translate }}"></span> <span class="text">{{ 'poll.link.close' | translate }}</span> </a> </li> - <li ng-if="data.poll.permission"> + + <li> <a class="fakeLink danger" ng-click="deletePoll()"> <span class="glyphicon glyphicon-trash" title="{{ 'poll.link.delete' | translate }}"></span> <span class="text">{{ 'poll.link.delete' | translate }}</span> </a> </li> + + <li class="empty" ng-hide="!data.poll.isClosed"> </li> <li class="empty"> </li> </ul> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html index a4497f9..a2c2558 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -51,8 +51,3 @@ <hr/> <button class="btn btn-primary" ng-click="savePoll()"><span class="glyphicon glyphicon-save"></span> {{ 'action.save' | translate }}</button> </div> - -<div ng-if="globalVariables.edit"> - <hr/> - <button class="btn btn-danger" ng-click="deletePoll();"><span class="glyphicon glyphicon-trash"></span> {{ 'action.delete' | translate }}</button> -</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0