[pollen] branch develop updated (49732fd -> 90e6c7c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 49732fd Merge branch 'feature/permissionPollRestricted' into develop new eb2bdbe set weight from voter list member if possible new 90e6c7c add form creator information in poll-settings The 2 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 90e6c7cdf21db0852a34230159b4077c8625e9c1 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 18:24:57 2014 +0200 add form creator information in poll-settings commit eb2bdbec1c7741c20630aa560808c028356662d5 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 17:42:12 2014 +0200 set weight from voter list member if possible Summary of changes: .../org/chorem/pollen/services/service/VoteService.java | 4 +++- pollen-ui-angular/src/main/webapp/i18n/en.js | 4 ++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++++ pollen-ui-angular/src/main/webapp/less/style.less | 3 +++ pollen-ui-angular/src/main/webapp/less/variables.less | 1 + .../src/main/webapp/partials/poll-settings.html | 17 +++++++++++++++++ 6 files changed, 32 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 eb2bdbec1c7741c20630aa560808c028356662d5 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 17:42:12 2014 +0200 set weight from voter list member if possible --- .../src/main/java/org/chorem/pollen/services/service/VoteService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 6367201..441c2ba 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 @@ -263,7 +263,9 @@ public class VoteService extends PollenServiceSupport { } else { //FIXME Get member and his weight - weight = 1d; + VoterListMember voterListMember = getVoterListMemberDao().forEquals(VoterListMember.PROPERTY_TOPIA_ID, vote.getVoterListMemberId().getEntityId()).findUnique(); + toSave.setVoterListMember(voterListMember); + weight = voterListMember.getWeight(); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 90e6c7cdf21db0852a34230159b4077c8625e9c1 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 18:24:57 2014 +0200 add form creator information in poll-settings --- pollen-ui-angular/src/main/webapp/i18n/en.js | 4 ++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++++ pollen-ui-angular/src/main/webapp/less/style.less | 3 +++ pollen-ui-angular/src/main/webapp/less/variables.less | 1 + .../src/main/webapp/partials/poll-settings.html | 17 +++++++++++++++++ 5 files changed, 29 insertions(+) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 479a9a0..8b62746 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -92,9 +92,13 @@ var translateEN = { 'poll.result.title.zero' : 'No result', 'poll.result.title.one' : 'Result : One voter', 'poll.result.title.other' : 'Result : {{nbVoter}} Voters', +'poll.config.title.creator' : 'Creator information', 'poll.config.title.poll' : 'Global config', 'poll.config.title.choice' : 'Choice config', 'poll.config.title.vote' : 'Vote config', +'poll.config.label.creatorName' : 'Your name', +'poll.config.label.creatorEmail' : 'Your e-mail', +'poll.config.label.creatorEmail.help' : 'This e-mail is use for notify', 'poll.config.label.beginDate' : 'Begin date', 'poll.config.label.endDate' : 'End date', 'poll.config.label.resultVisibility' : 'Result visibility', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index c56413c..baa980a 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -92,9 +92,13 @@ var translateFR = { 'poll.result.title.zero' : 'Aucun Résultat', 'poll.result.title.one' : 'Résultat : Un votant', 'poll.result.title.other' : 'Résultat : {{nbVoter}} Votants', +'poll.config.title.creator' : 'Information du créateur', 'poll.config.title.poll' : 'Configuration globale', 'poll.config.title.choice' : 'Configuration des choix', 'poll.config.title.vote' : 'Configuration des votes', +'poll.config.label.creatorName' : 'Votre nom', +'poll.config.label.creatorEmail' : 'Votre courriel', +'poll.config.label.creatorEmail.help' : 'Cette adresse servira pour les notifications', 'poll.config.label.beginDate' : 'Date de début', 'poll.config.label.endDate' : 'Date de fin', 'poll.config.label.resultVisibility' : 'Visibilité des résultats', diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 3ce7125..126a8de 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -499,6 +499,9 @@ label.label-block { margin-bottom:15px; } +.text-help { + color : @help-color; +} footer { position: absolute; diff --git a/pollen-ui-angular/src/main/webapp/less/variables.less b/pollen-ui-angular/src/main/webapp/less/variables.less index 9189273..f616224 100644 --- a/pollen-ui-angular/src/main/webapp/less/variables.less +++ b/pollen-ui-angular/src/main/webapp/less/variables.less @@ -29,6 +29,7 @@ @danger-color : @brand-danger; @danger-hover-color : darken(@danger-color, 15%); +@help-color: #666; @height-pollen-menu : 50px; @height-footer: 20px; 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 33c1fb5..c8a4bc5 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -20,6 +20,23 @@ --> <h1>{{data.poll.title}}</h1> <form class="form-horizontal" novalidate> + <h4>{{ 'poll.config.title.creator' | translate }}</h4> + + <div class="form-group row"> + <label class="col-sm-4 control-label" for="formCreatorName">{{ 'poll.config.label.creatorName' | translate }}</label> + <div class="col-sm-8"> + <input type="text" class="form-control" id="formCreatorName" ng-model="data.poll.creatorName" auto-save="autoSavePoll()" /> + </div> + </div> + + <div class="form-group row"> + <label class="col-sm-4 control-label" for="formCreatorEmail">{{ 'poll.config.label.creatorEmail' | translate }}</label> + <div class="col-sm-8"> + <input type="text" class="form-control" id="formCreatorEmail" ng-model="data.poll.creatorEmail" auto-save="autoSavePoll()" /> + <span class="text-help">{{ 'poll.config.label.creatorEmail.help' | translate }}</span> + </div> + </div> + <h4>{{ 'poll.config.title.poll' | translate }}</h4> <div class="form-group row"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm