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

02/02: Merge branch 'feature/addBuilder' into develop
by chorem.org scm June 25, 2014

June 25, 2014

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 deec9511dae838e74f084e4eb7ddc45b2d32c073 Merge: 4d9dbea c93c8b0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 25 17:19:45 2014 +0200 Merge branch 'feature/addBuilder' into develop pollen-ui-angular/.bowerrc | 4 + pollen-ui-angular/.gitignore | 4 +- pollen-ui-angular/bower.json | 23 ++ pollen-ui-angular/pom.xml | 25 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 3 +- pollen-ui-angular/src/main/webapp/index.html | 70 +++-- pollen-ui-angular/src/main/webapp/js/app.js | 348 +-------------------- .../src/main/webapp/js/controllers/pollCtrl.js | 121 +++++-- .../src/main/webapp/js/{app.js => directives.js} | 119 +++---- .../src/main/webapp/partials/inline-poll.html | 6 +- .../main/webapp/partials/poll-listParticipant.html | 28 +- .../src/main/webapp/partials/poll-poll.html | 2 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll-result.html | 2 +- .../src/main/webapp/partials/poll.html | 6 +- 15 files changed, 274 insertions(+), 489 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: change countingType, change route
by chorem.org scm June 25, 2014

June 25, 2014

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 c93c8b0887617ebdcd7e0970a9cbc9bdb424d7e0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 25 17:19:03 2014 +0200 change countingType, change route --- pollen-ui-angular/src/main/webapp/js/app.js | 14 +-- .../src/main/webapp/js/controllers/pollCtrl.js | 115 +++++++++++++++------ pollen-ui-angular/src/main/webapp/js/directives.js | 4 +- .../src/main/webapp/partials/poll-poll.html | 2 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll-result.html | 2 +- .../src/main/webapp/partials/poll.html | 6 +- 7 files changed, 100 insertions(+), 45 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 133ef9c..00bbfe7 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -57,13 +57,13 @@ angular.module('pollen', ['pollenDirective', 'pollenServices', 'ngRoute', 'pollC .config(['$routeProvider', function($routeProvider) { $routeProvider.when('/', {templateUrl: './partials/home.html', controller: "HomeCtrl"}) - .when('/poll/create', {templateUrl: './partials/poll.html', controller: "PollCreateCtrl"}) - .when('/poll/edit/:pollId', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) - .when('/poll/vote/:pollId', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) - .when('/poll/result/:pollId', {templateUrl: './partials/poll.html', controller :"PollResultCtrl"}) - .when('/poll/comment/:pollId', {templateUrl: './partials/poll.html', controller :"PollCommentCtrl"}) - .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) - .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) + .when('/poll/home/:pollId', {templateUrl: './partials/poll.html', controller: "PollCtrl"}) + .when('/poll/create/:tab?', {templateUrl: './partials/poll.html', controller: "PollCreateCtrl"}) + .when('/poll/edit/:pollId/:token?/:tab?', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) + .when('/poll/vote/:pollId/:token?', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) + .when('/poll/result/:pollId/:token?', {templateUrl: './partials/poll.html', controller :"PollResultCtrl"}) + .when('/poll/comment/:pollId/:token?', {templateUrl: './partials/poll.html', controller :"PollCommentCtrl"}) + .when('/poll/list/:cmd?', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) .when('/user/lostpassword', {templateUrl: './partials/user-lostPassword.html', controller:"UserLostPasswordCtrl"}) 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 6ff94fd..a3e0eda 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -35,6 +35,8 @@ angular.module('pollControllers', []) } }; + $scope.tab = $scope.setTab('home'); + $scope.setUrl = function (exclude) { var url = window.location.origin+window.location.pathname+'#'+$location.path(); if ($location.search().length != 0) { @@ -50,9 +52,6 @@ angular.module('pollControllers', []) return url; }; - $scope.urlTab = $scope.setUrl(['tab']); - - if (angular.isUndefined($scope.globalVariables)) { $scope.globalVariables = {}; @@ -108,24 +107,26 @@ angular.module('pollControllers', []) pollDeferred.promise.then(function () { var baseUrl = window.location.origin+window.location.pathname; + $scope.globalVariables.linkHome = baseUrl; $scope.globalVariables.linkVote = baseUrl; $scope.globalVariables.linkComment = baseUrl; $scope.globalVariables.linkEdit = baseUrl; $scope.globalVariables.linkResult = baseUrl; + $scope.globalVariables.linkHome += '#/poll/home/'+$routeParams.pollId; $scope.globalVariables.linkVote += '#/poll/vote/'+$routeParams.pollId; $scope.globalVariables.linkComment += '#/poll/comment/'+$routeParams.pollId; $scope.globalVariables.linkEdit += '#/poll/edit/'+$routeParams.pollId; $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; if (angular.isDefined($scope.globalVariables.permission)) { - $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; - $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; + $scope.globalVariables.linkEdit += '/'+$scope.globalVariables.permission; + $scope.globalVariables.linkResult += '/'+$scope.globalVariables.permission; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/participant'; } else { - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'/conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'/participant'; } }); } @@ -165,6 +166,50 @@ angular.module('pollControllers', []) } }); + $scope.getInputType = function () { + if ($scope.voteCountingIsBoolean()) { + return 'checkbox'; + } else { + return 'text'; + } + } + + $scope.getChoiceValue = function (choiceValue) { + if ($scope.voteCountingIsBoolean()) { + return (choiceValue)?true:false; + } + else { + if (choiceValue === true) { + return 1.0; + } + else if (choiceValue === false) { + return 0.0; + } + else { + choiceValue; + } + } + } + + $scope.$watch('data.poll.voteCountingType', function (newVal, oldVal) { + if ((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(); + choice.voteValue = $scope.getChoiceValue(choice.voteValue); + }) + }); + } + }) + + $scope.voteCountingIsBoolean = function () { + if (angular.isDefined($scope.data.poll) && angular.isDefined($scope.data.poll.voteCountingType)) { + return $scope.data.poll.voteCountingType == 1; + } + return false; + } + }]) .controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', function ($scope, $controller, $modal, $timeout, $routeParams) { @@ -236,7 +281,7 @@ angular.module('pollControllers', []) name: '', date: $scope.globalVariables.lastDate, choiceType: $scope.globalVariables.lastType, - inputType:'checkbox' + inputType: $scope.getInputType() }; } @@ -668,13 +713,15 @@ angular.module('pollControllers', []) $scope.data.votants = votes; angular.forEach($scope.data.votants, function (vote) { angular.forEach(vote.choice, function (choice) { - if (choice.voteValue != null && choice.voteValue != 0.0) { - choice.voteValue = true; - } - else { - choice.voteValue = false; + if ($scope.voteCountingIsBoolean()) { + if (choice.voteValue != null && choice.voteValue != 0.0) { + choice.voteValue = true; + } + else { + choice.voteValue = false; + } } - choice.inputType = 'checkbox'; + choice.inputType = $scope.getInputType(); }) }) }); @@ -690,10 +737,12 @@ angular.module('pollControllers', []) $location.path('/'); }); - - + var oldPoll = angular.copy($scope.data.poll); $scope.autoSavePoll = function () { - $scope.savePoll(); + if (!angular.equals(oldPoll, $scope.data.poll)) { + $scope.savePoll(); + oldPoll = angular.copy($scope.data.poll); + } }; $scope.savePoll = function () { @@ -744,13 +793,15 @@ angular.module('pollControllers', []) $scope.data.votants = votes; angular.forEach($scope.data.votants, function (vote) { angular.forEach(vote.choice, function (choice) { - if (choice.voteValue != null && choice.voteValue != 0.0) { - choice.voteValue = true; - } - else { - choice.voteValue = false; + if ($scope.voteCountingIsBoolean()) { + if (choice.voteValue != null && choice.voteValue != 0.0) { + choice.voteValue = true; + } + else { + choice.voteValue = false; + } } - choice.inputType = 'checkbox'; + choice.inputType = $scope.getInputType(); }) }) }); @@ -777,16 +828,22 @@ angular.module('pollControllers', []) initAuthor(); $scope.data.vote.anonymous = false; $scope.data.vote.choice = []; + + var defaultValue = ($scope.voteCountingIsBoolean()) ? false : 0.0; + for (var i = 0; i < $scope.data.choices.length; ++i) { - $scope.data.vote.choice.push({choiceId:$scope.data.choices[i].id, voteValue:false, inputType:'checkbox'}); + + $scope.data.vote.choice.push({'choiceId':$scope.data.choices[i].id, 'voteValue': defaultValue, 'inputType': $scope.getInputType()}); } } $scope.voter = function () { var sendVote = angular.copy($scope.data.vote); - angular.forEach(sendVote.choice, function (choice) { - choice.voteValue = (choice.voteValue) ? 1.0 : 0.0; - }); + if ($scope.voteCountingIsBoolean()) { + angular.forEach(sendVote.choice, function (choice) { + choice.voteValue = (choice.voteValue) ? 1.0 : 0.0; + }); + } if (angular.isDefined($scope.data.vote.id)) { // edit vote diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 4abdc16..051cb75 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -293,8 +293,7 @@ angular.module('pollenDirective', []) return { restrict : 'E', scope : { - data:'=', - max:'=' + data:'=' }, template:'<div class="jqplot-target"></div>', link: function(scope, element, attrs) { @@ -314,7 +313,6 @@ angular.module('pollenDirective', []) axesDefaults: { showTicks: true, showTickMarks: true, - max: scope.max, tickOptions: { showGridline: false, show:true, 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 ede3062..a4497f9 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -38,7 +38,7 @@  <button type="button" class="btn btn-primary" ng-click="showEditDesc = false;" ng-show="globalVariables.create">{{ 'action.return' | translate }}</button> - <button type="button" class="btn btn-primary" ng-click="showEditDesc = false; savePoll()" ng-show="globalVariables.edit">{{ 'action.return' | translate }}</button> + <button type="button" class="btn btn-primary" ng-click="showEditDesc = false; autoSavePoll()" ng-show="globalVariables.edit">{{ 'action.return' | translate }}</button> </div> <div id="poll"> 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 402cf6a..f86dfca 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -31,7 +31,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="'PICTURE'" disabled>Image</button> + <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'IMAGE'" disabled>Image</button> </div> </div> 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 47af606..5277130 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -11,7 +11,7 @@ </div> <div class="plot"> <div ng-if="plot == 'chart'"> - <chart data="data.result.scoresChart" max="data.result.nbVotant"></chart> + <chart data="data.result.scoresChart"></chart> </div> <div ng-if="plot == 'pie'"> <pie data="data.result.scoresChart"></pie> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 58bc694..b974c20 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -21,14 +21,14 @@ <div> <ul class="nav nav-tabs"> - <li ng-class="{active: tab == 'home'}"><a href="{{urlTab}}tab=home" ng-click="tab = 'home'"> <span class="glyphicon glyphicon-home"></span> </a></li> + <li ng-class="{active: tab == 'home'}"><a href="{{globalVariables.linkHome || '#/poll/create/home' }}" ng-click="tab = 'home'"> <span class="glyphicon glyphicon-home"></span> </a></li> <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}" ng-click="tab = 'vote'">{{ 'poll.tab.vote' | translate }}</a></li> <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.id"><a href="{{globalVariables.linkComment}}" ng-click="tab = 'comment'">{{ 'poll.tab.comment' | translate }}</a></li> <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}" ng-click="tab = 'result'">{{ 'poll.tab.result' | translate }}</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="globalVariables.create"><a href="#/poll/create" ng-click="tab = 'edit'">{{ 'poll.tab.create' | translate }}</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}" ng-click="tab = 'edit'">{{ 'poll.tab.edit' | translate }}</a></li> - <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkConf || '#/poll/create?tab=conf'}}" ng-click="tab = 'conf'">{{ 'poll.tab.conf' | translate }}</a></li> - <li ng-class="{active: tab == 'participant'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkParticipant || '#/poll/create?tab=participant'}}" ng-click="tab = 'participant'">{{ 'poll.tab.participant' | translate }}</a></li> + <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkConf || '#/poll/create/conf'}}" ng-click="tab = 'conf'">{{ 'poll.tab.conf' | translate }}</a></li> + <li ng-class="{active: tab == 'participant'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkParticipant || '#/poll/create/participant'}}" ng-click="tab = 'participant'">{{ 'poll.tab.participant' | translate }}</a></li> </ul> <div ng-include="'./partials/poll-link.html'" ng-if="tab == 'home'"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: change directory bower to lib
by chorem.org scm June 25, 2014

June 25, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 606b8a20ddaa07412f4bd1da9415dea52937c30f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 25 14:41:57 2014 +0200 change directory bower to lib --- pollen-ui-angular/.bowerrc | 2 +- pollen-ui-angular/.gitignore | 2 +- pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/index.html | 36 +++++++++++----------- .../src/main/webapp/js/controllers/pollCtrl.js | 4 ++- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/pollen-ui-angular/.bowerrc b/pollen-ui-angular/.bowerrc index 20d69e9..52e49a3 100644 --- a/pollen-ui-angular/.bowerrc +++ b/pollen-ui-angular/.bowerrc @@ -1,4 +1,4 @@ { - "directory" : "./src/main/webapp/bower" + "directory" : "./src/main/webapp/lib" } diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index 9b808b5..951db95 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -1,3 +1,3 @@ *.iml -src/main/webapp/bower +src/main/webapp/lib diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 57deb61..8e8c94f 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -17,6 +17,7 @@ "angular-animate": "1.2.16", "bootstrap": "3.1.1", "jquery": "2.1.1", - "jqplot": "*" + "jqplot": "*", + "ckeditor": "4.4.2" } } diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 5b8200e..922dc6d 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -24,28 +24,28 @@ <title>Pollen</title> <meta charset="utf-8" /> - <link rel="stylesheet" type="text/css" href="bower/bootstrap/dist/css/bootstrap.min.css" /> - <link rel="stylesheet" type="text/css" href="bower/jqplot/jquery.jqplot.min.css" /> + <link rel="stylesheet" type="text/css" href="lib/bootstrap/dist/css/bootstrap.min.css" /> + <link rel="stylesheet" type="text/css" href="lib/jqplot/jquery.jqplot.min.css" /> <link rel="stylesheet" type="text/css" href="css/style.css"/> <script language="javascript" type="text/javascript" src="js/conf.js"></script> - <script language="javascript" type="text/javascript" src="bower/jquery/dist/jquery.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/jquery.jqplot.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.barRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pieRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"> </script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pointLabels.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.highlighter.min.js"></script> - - <script language="javascript" type="text/javascript" src="bower/ckeditor/ckeditor.js"></script> - - <script language="javascript" type="text/javascript" src="bower/angular/angular.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-route/angular-route.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-resource/angular-resource.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-translate/angular-translate.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-animate/angular-animate.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jquery/dist/jquery.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/jquery.jqplot.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.barRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.pieRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"> </script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.pointLabels.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.highlighter.min.js"></script> + + <script language="javascript" type="text/javascript" src="lib/ckeditor/ckeditor.js"></script> + + <script language="javascript" type="text/javascript" src="lib/angular/angular.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-route/angular-route.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-resource/angular-resource.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-translate/angular-translate.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-animate/angular-animate.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> <script language=javascript" type="text/javascript" src="js/app.js"></script> <script language=javascript" type="text/javascript" src="js/directives.js"></script> 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 0cc82d8..6ff94fd 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -235,7 +235,8 @@ angular.module('pollControllers', []) return { name: '', date: $scope.globalVariables.lastDate, - choiceType: $scope.globalVariables.lastType + choiceType: $scope.globalVariables.lastType, + inputType:'checkbox' }; } @@ -673,6 +674,7 @@ angular.module('pollControllers', []) else { choice.voteValue = false; } + choice.inputType = 'checkbox'; }) }) }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix version lib
by chorem.org scm June 25, 2014

June 25, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 6d07124c180b2d294dd521fdc7ec778c28b90c25 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 25 12:43:03 2014 +0200 fix version lib --- pollen-ui-angular/bower.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 54f3ce2..57deb61 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -16,8 +16,7 @@ "angular-bootstrap": "0.11.0", "angular-animate": "1.2.16", "bootstrap": "3.1.1", - "jquery": "2.2.1", - "jqplot": "1.0.8" + "jquery": "2.1.1", + "jqplot": "*" } } - -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: fix version lib
by chorem.org scm June 25, 2014

June 25, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 185c37cdb0f5664ea8f51233de64f673ccbda3e0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 25 12:43:03 2014 +0200 fix version lib --- pollen-ui-angular/bower.json | 5 ++--- pollen-ui-angular/pom.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 54f3ce2..57deb61 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -16,8 +16,7 @@ "angular-bootstrap": "0.11.0", "angular-animate": "1.2.16", "bootstrap": "3.1.1", - "jquery": "2.2.1", - "jqplot": "1.0.8" + "jquery": "2.1.1", + "jqplot": "*" } } - diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index e46b933..025d5d7 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -23,6 +23,54 @@ <build> <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <phase>generate-sources</phase> + <configuration> + <target name="building"> + <echo> +  + </echo> + <exec executable="cmd" dir="${project.basedir}" + osfamily="windows" failonerror="true"> + <arg line="/c npm config set color false"/> + </exec> + <exec executable="bash" dir="${project.basedir}" + osfamily="unix" failonerror="true"> + <arg line="npm config set color false"/> + </exec> + <exec executable="cmd" dir="${project.basedir}" + osfamily="windows" failonerror="true"> + <arg line="/c npm install"/> + </exec> + <exec executable="bash" dir="${project.basedir}" + osfamily="unix" failonerror="true"> + <arg line="npm install"/> + </exec> + <echo> +  + </echo> + <exec executable="cmd" dir="${project.basedir}" + osfamily="windows" resultproperty="cmdresult"> + <arg line="/c bower install --no-color"/> + </exec> + <exec executable="bash" dir="${project.basedir}" + osfamily="unix" resultproperty="cmdresult"> + <arg line="bower install --no-color"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: file for directive
by chorem.org scm June 25, 2014

June 25, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit cfb2613fddb4cda9fc31364b6719fe191f5927c5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 25 12:12:21 2014 +0200 file for directive --- pollen-ui-angular/src/main/webapp/index.html | 1 + pollen-ui-angular/src/main/webapp/js/app.js | 334 +-------------------- .../src/main/webapp/js/{app.js => directives.js} | 115 +++---- 3 files changed, 47 insertions(+), 403 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 09fd223..5b8200e 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -48,6 +48,7 @@ <script language="javascript" type="text/javascript" src="bower/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> <script language=javascript" type="text/javascript" src="js/app.js"></script> + <script language=javascript" type="text/javascript" src="js/directives.js"></script> <script language=javascript" type="text/javascript" src="js/services.js"></script> <script language=javascript" type="text/javascript" src="js/controllers/pollCtrl.js"></script> <script language=javascript" type="text/javascript" src="js/controllers/userCtrl.js"></script> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 5d87bae..133ef9c 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'alertControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) +angular.module('pollen', ['pollenDirective', 'pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'alertControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); @@ -88,335 +88,3 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC } }]) -.directive('focusMe', function($timeout) { - return { - link: function($scope, element, attrs) { - $scope.$watch(attrs.focusMe, function(value) { - if(value === true) { - $timeout(function() { - element[0].focus(); - $scope[attrs.focusMe] = true; - }); - } - }); - } - }; -}) - -.directive('editMe', function() { - return { - restrict:'A', - link: function ($scope, element, attrs) { - element.bind('click', function () { - if ($scope.globalVariables.editMode) { - $scope.$apply(function () { - $scope[attrs.editMe] = true; - $scope.globalVariables.saved = false; - }); - } - }); - } - }; -}) - -.directive('ckEditor', function ($timeout) { - return { - require: '?ngModel', - link: function ($scope, element, attrs, ngModel) { - var ck = CKEDITOR.replace(element[0], {customConfig: window.location.origin + window.location.pathname + 'js/libs/ckeditor/config.js'}); - - ck.on('pasteState', function () { - $scope.$apply(function () { - ngModel.$setViewValue(ck.getData()); - }); - }); - - ck.on('instanceReady', function() { - ck.setData(ngModel.$modelValue); - }); - - ngModel.$render = function(value) { - ck.setData(ngModel.$modelValue); - }; - - if (attrs.focusMe) { - $scope.$watch(attrs.focusMe, function (value) { - if (value === true) { - $timeout(function () { ck.focus(); }); - } - }) - } - } - }; -}) - -.directive('ngExit', function ($timeout) { - return { - link: function (scope, element, attrs) { - element.bind("keydown keypress", function (event) { - if(event.which === 27 || event.which === 13) { - scope.$apply(function () { - scope.$eval(attrs.ngExit); - }); - - event.preventDefault(); - } - }); - - element.bind('blur', function () { - $timeout (function () { - scope.$apply(attrs.ngExit); - }, 150); - }); - } - }; -}) - -.directive('infoError', function() { - return { - restrict:'E', - scope: { - error: '=', - forData: '=data' - }, - template: '<span class="glyphicon glyphicon-exclamation-sign danger" tooltip="{{error}}" ng-if="error"></span>', - link: function (scope, element, attrs) { - scope.$watch('forData', function (newVal, oldVal) { - if (newVal != oldVal) { - delete scope.error; - } - }); - } - }; -}) - -.directive('inputError', function() { - return { - restrict:'E', - scope: { - error: '=', - forData: '=data' - }, - 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'); - - } - else { - $(element[0]).removeClass('has-error'); - } - }) - } - }; -}) - -.directive('selectOnClick', function () { - return { - restrict: 'A', - link: function (scope, element, attrs) { - element.on('click', function () { - this.select(); - }); - } - }; -}) - -.directive('autoSave', function ($timeout) { - return { - restrict : 'A', - link : function (scope, element, attrs) { - scope.oldVal = {}; - scope.change = false; - scope.timeout; - $timeout(function () { - scope.oldVal[attrs.ngModel] = scope.$eval(attrs.ngModel); - scope.$watch(attrs.ngModel, function (newVal, oldVal) { - if (angular.isDefined(oldVal) && newVal != scope.oldVal[attrs.ngModel]) { - scope.change = true; - } else { - scope.change = false; - } - }, true); - }, 500); - - var save = function () { - if (scope.change) { - scope.change = false; - scope.oldVal[attrs.ngModel] = scope.$eval(attrs.ngModel);; - scope.$apply(function () { - scope.$eval(attrs.autoSave); - }); - } - }; - - element.bind('change', function () { - if (scope.timeout) { - $timeout.cancel(scope.timeout) - } - scope.timeout = $timeout(save,1000); - }); - - element.bind('blur', function () { - if (scope.timeout) { - $timeout.cancel(scope.timeout) - } - scope.timeout = $timeout(save, 100); - }); - } - } -}) - -.directive('makePagination', function () { - return { - restrict: 'E', - scope: { - currentPage: '=', - lastPage: '=', - pageSize: '=' - }, - templateUrl: 'partials/pagination.html', - link: function (scope, element, attrs) { - var setNavPage = function (pageNumber) { - if (scope.currentPage > 0) { - scope.previousPage = scope.currentPage - 1; - } else { - scope.previousPage = 0; - } - - if (scope.currentPage < scope.lastPage) { - scope.nextPage = scope.currentPage + 1; - } else { - scope.nextPage = scope.lastPage; - } - } - - //set pageList - scope.pageList = []; - scope.$watch('lastPage', function (newVal) { - scope.pageList = []; - for (var i = 0; i <= newVal; i++) { - scope.pageList.push(i); - } - setNavPage(); - }); - - scope.goPage = function (pageNumber) { - scope.currentPage = pageNumber; - setNavPage(); - }; - } - } -}) - -.directive('chart', function ($timeout) { - return { - restrict : 'E', - scope : { - data:'=', - max:'=' - }, - template:'<div class="jqplot-target"></div>', - link: function(scope, element, attrs) { - - var initChart = function () { - if (angular.isDefined(scope.data)) { - $.jqplot.config.enablePlugins = true; - scope.plot = $(element).find('div').jqplot([scope.data], { - // Only animate if we're not using excanvas (not in IE 7 or IE 8).. - //animate: !$.jqplot.use_excanvas, - seriesDefaults:{ - renderer:$.jqplot.BarRenderer, - rendererOptions : { - varyBarColor: true - } - }, - axesDefaults: { - showTicks: true, - showTickMarks: true, - max: scope.max, - tickOptions: { - showGridline: false, - show:true, - showLabel: true, - } - }, - axes: { - xaxis: { - renderer: $.jqplot.CategoryAxisRenderer, - }, - yaxis: { - label:'Vote', - } - } - }); - - var imgData = $(element).find('div').jqplotToImageStr({}); - $(element).html('<img src="' + imgData + '" />') - } - }; - - $timeout( function() { - scope.$watch('data', function () { - if (angular.isDefined(scope.plot)) { - scope.plot.html(''); - initChart() - } else { - initChart(); - } - }); - }); - } - } -}) - -.directive('pie', function ($timeout) { - return { - restrict : 'E', - scope : { - data:'=', - }, - template:'<div class="jqplot-target"></div>', - link: function(scope, element, attrs) { - var initChart = function () { - if (angular.isDefined(scope.data)) { - $.jqplot.config.enablePlugins = true; - $(element).find('div').jqplot([scope.data], { - // Only animate if we're not using excanvas (not in IE 7 or IE 8).. - animate: !$.jqplot.use_excanvas, - seriesDefaults:{ - renderer:$.jqplot.PieRenderer, - rendererOptions : { - padding: 8, - sliceMargin: 4, - showDataLabels: true, - varyBarColor: true, - startAngle:-90 - } - }, - legend:{ - show:true - } - }); - - var imgData = $(element).find('div').jqplotToImageStr({}); - $(element).html('<img src="' + imgData + '" />') - - } - }; - - scope.$watch('data', function () { - initChart(); - }); - } - } -}) - diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/directives.js similarity index 71% copy from pollen-ui-angular/src/main/webapp/js/app.js copy to pollen-ui-angular/src/main/webapp/js/directives.js index 5d87bae..4abdc16 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -18,75 +18,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'alertControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) -.config(['$httpProvider', function($httpProvider) { - // edit header for locale and sessionToken - $httpProvider.interceptors.push('httpInterceptor'); +angular.module('pollenDirective', []) - // edit content-type for send data to the server - $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; -}]) - -.factory('httpInterceptor', ['$q', '$rootScope', '$location', 'SessionStorage', function ($q, $rootScope, $location, SessionStorage) { - return { - request: function($config) { - var session = SessionStorage.get(); - - // rewrite 'Accept-Language' if locale is defined - if (angular.isDefined(session.locale)) { - $config.headers['Accept-Language'] = session.locale; - } - - // set header for session token - $config.headers['X-Pollen-Session-Token'] = session.token; - return $config; - }, - responseError: function(response) { - if (response.status === 401) { - //error login or sessionToken - $rootScope.$broadcast('sessionExpired'); - } - if (response.status === 403) { - //access forbidden - $location.path('/'); - } - return $q.reject(response); - } - }; -}]) - -.config(['$routeProvider', function($routeProvider) { - $routeProvider.when('/', {templateUrl: './partials/home.html', controller: "HomeCtrl"}) - .when('/poll/create', {templateUrl: './partials/poll.html', controller: "PollCreateCtrl"}) - .when('/poll/edit/:pollId', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) - .when('/poll/vote/:pollId', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) - .when('/poll/result/:pollId', {templateUrl: './partials/poll.html', controller :"PollResultCtrl"}) - .when('/poll/comment/:pollId', {templateUrl: './partials/poll.html', controller :"PollCommentCtrl"}) - .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) - .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) - .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) - .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) - .when('/user/lostpassword', {templateUrl: './partials/user-lostPassword.html', controller:"UserLostPasswordCtrl"}) - .when('/favoriteList', {templateUrl: './partials/favoriteList-list.html', controller:"FavoriteListCtrl"}) - .when('/favoriteList/new', {templateUrl: './partials/favoriteList-edit.html', controller:"FavoriteListEditCtrl"}) - .when('/favoriteList/:favoriteListId', {templateUrl: './partials/favoriteList-edit.html', controller:"FavoriteListEditCtrl"}) - .otherwise({redirectTo: '/'}); - -}]) - -.config(['$translateProvider', function ($translateProvider) { - $translateProvider.translations('en', translateEN); - $translateProvider.translations('fr', translateFR); - - if (angular.isDefined(conf.defaultLanguage)) { - $translateProvider.preferredLanguage(conf.defaultLanguage); - // $translateProvider.fallbackLanguage(conf.defaultLanguage); - } - else { - $translateProvider.preferredLanguage('en'); - // $translateProvider.fallbackLanguage('en'); - } -}]) +////////////////////////////////////// +///// FOCUS ME ///// +////////////////////////////////////// .directive('focusMe', function($timeout) { return { @@ -103,6 +39,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +////////////////////////////////////// +///// EDIT ME ///// +////////////////////////////////////// + .directive('editMe', function() { return { restrict:'A', @@ -119,6 +59,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +////////////////////////////////////// +///// CKEDITOR ///// +////////////////////////////////////// + .directive('ckEditor', function ($timeout) { return { require: '?ngModel', @@ -150,6 +94,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +////////////////////////////////////// +///// NG EXIT ///// +////////////////////////////////////// + .directive('ngExit', function ($timeout) { return { link: function (scope, element, attrs) { @@ -172,6 +120,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +////////////////////////////////////// +///// INFO ERROR ///// +////////////////////////////////////// + .directive('infoError', function() { return { restrict:'E', @@ -190,6 +142,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +////////////////////////////////////// +///// INPUT ERROR ///// +////////////////////////////////////// + .directive('inputError', function() { return { restrict:'E', @@ -219,6 +175,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +////////////////////////////////////// +///// SELECT ON CLICK ///// +////////////////////////////////////// + .directive('selectOnClick', function () { return { restrict: 'A', @@ -230,6 +190,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +////////////////////////////////////// +///// AUTO SAVE ///// +////////////////////////////////////// + .directive('autoSave', function ($timeout) { return { restrict : 'A', @@ -275,6 +239,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC } }) +////////////////////////////////////// +///// MAKE PAGINATION ///// +////////////////////////////////////// + .directive('makePagination', function () { return { restrict: 'E', @@ -317,6 +285,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC } }) +////////////////////////////////////// +///// JQPLOT CHART ///// +////////////////////////////////////// + .directive('chart', function ($timeout) { return { restrict : 'E', @@ -378,6 +350,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC } }) +////////////////////////////////////// +///// JQPLOT PIE ///// +////////////////////////////////////// + .directive('pie', function ($timeout) { return { restrict : 'E', @@ -418,5 +394,4 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }); } } -}) - +}) \ 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

05/05: fix translate, easy change type of input vote
by chorem.org scm June 25, 2014

June 25, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit f7ab28ce2fb00514a662bc00c1f67784f2a5cdfd Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 25 11:42:18 2014 +0200 fix translate, easy change type of input vote --- pollen-ui-angular/src/main/webapp/i18n/en.js | 3 ++- .../src/main/webapp/js/controllers/pollCtrl.js | 10 +++++++- .../src/main/webapp/partials/inline-poll.html | 6 ++--- .../main/webapp/partials/poll-listParticipant.html | 28 ++++++++++++++++++---- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 9dc7f0d..650853b 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -88,7 +88,8 @@ var translateEN = { 'action.restricted.addGroup' : 'Add a Group', 'action.restricted.deleteGroup' : 'Delete the Group', 'action.restricted.notify' : 'Notify', -'action.favoriteList.import' : 'Import favorite list', +'action.favoriteList.import.addGroup' : 'Import in new group', +'action.favoriteList.import.inGroup' : 'Import in this group', 'action.favoriteList.add' : 'Add favorite list', 'action.favoriteList.delete' : 'Delete the favorite list', 'action.favoriteList.addMember' : 'Add a member', 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 ae03045..0cc82d8 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -748,6 +748,7 @@ angular.module('pollControllers', []) else { choice.voteValue = false; } + choice.inputType = 'checkbox'; }) }) }); @@ -775,7 +776,7 @@ angular.module('pollControllers', []) $scope.data.vote.anonymous = false; $scope.data.vote.choice = []; for (var i = 0; i < $scope.data.choices.length; ++i) { - $scope.data.vote.choice.push({choiceId:$scope.data.choices[i].id, voteValue:false}); + $scope.data.vote.choice.push({choiceId:$scope.data.choices[i].id, voteValue:false, inputType:'checkbox'}); } } @@ -833,6 +834,13 @@ angular.module('pollControllers', []) } + $scope.toggleValue = function (choice, event) { + if (choice.inputType == 'checkbox') { + choice.voteValue = !choice.voteValue; + event.stopPropagation(); + } + } + }]) .controller('PollCommentCtrl', 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 8544d89..733fa23 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -55,8 +55,8 @@ <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" /> </input-error> </td> - <td ng-repeat="choice in data.vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}" ng-click="choice.voteValue = !choice.voteValue"> - <input type="checkbox" name="{{choice.choiceId}}" ng-model="choice.voteValue" ng-click="choice.voteValue = !choice.voteValue;$event.stopPropagation()" /> + <td ng-repeat="choice in data.vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}" ng-click="toggleValue(choice, $event);"> + <input type="{{choice.inputType}}" name="{{choice.choiceId}}" ng-model="choice.voteValue" ng-click="toggleValue(choice, $event);" /> </td> <td> <input class="btn btn-primary btn-large" type="button" value="{{ 'action.vote' | translate }}" ng-click="voter()" /> @@ -68,7 +68,7 @@ <tr ng-repeat="vote in data.votants track by $index" class="pollAnim"> <td class="pollChoice"> {{vote.voterName}}</td> <td ng-repeat="choice in vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}"> - <input type="checkbox" ng-model="choice.voteValue" disabled /> + <input type="{{choice.inputType}}" ng-model="choice.voteValue" disabled /> </td> <td> <button class="btn btn-info" ng-if="vote.permission && !globalVariables.editMode" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index 8007aa3..6f6200f 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -68,7 +68,11 @@ <table ng-repeat="voterList in data.voterList" class="voterList" ng-hide="data.poll.pollType == 'FREE'"> <tr ng-show="data.poll.pollType == 'GROUP'" ng-class="{'has-success':voterList.group.id && !voterList.group.restError}"> - <th colspan="2" ng-class="{'has-error':voterList.group.restError.name}"> <input type="text" name="group" placeholder="name group" ng-model="voterList.group.name" class="form-control" auto-save="saveVoterList(voterList)" focus-me="!voterList.group.id"/></th> + <th colspan="2"> + <input-error error="voterList.group.restError.name[0]"> + <input type="text" name="group" placeholder="name group" ng-model="voterList.group.name" class="form-control" auto-save="saveVoterList(voterList)" focus-me="!voterList.group.id"/> + </input-error> + </th> <th class="weight" ng-class="{'has-error':voterList.group.restError.weight}"> <input type="number" step="0.1" min="0" ng-model="voterList.group.weight" select-on-click class="form-control" auto-save="saveVoterList(voterList)" /> </th> <th class="action"> </th> </tr> @@ -81,10 +85,24 @@ </tr> <tr ng-repeat="member in voterList.members" ng-class="{'has-success':member.id && !member.restError}"> - <td> <input-error error="member.restError.name[0]"><input type="text" ng-model="member.name" class="form-control" auto-save="saveVoterListMember(member, voterList)"/></input-error></td> - <td> <input-error error="member.restError.email[0]"><input type="text" ng-model="member.email" class="form-control" auto-save="saveVoterListMember(member, voterList)" /></input-error></td> - <td class="weight"> <input-error error="member.restError.weight[0]"><input type="number" step="0.1" min="0" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterListMember(member, voterList)"/></input-error></td> - <td class="action"> <button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);" tooltip="{{ 'action.restricted.deleteVoter' | translate }}"><span class="glyphicon glyphicon-trash"></span></button></td> + <td> + <input-error error="member.restError.name[0]"> + <input type="text" ng-model="member.name" class="form-control" auto-save="saveVoterListMember(member, voterList)"/> + </input-error> + </td> + <td> + <input-error error="member.restError.email[0]"> + <input type="text" ng-model="member.email" class="form-control" auto-save="saveVoterListMember(member, voterList)" /> + </input-error> + </td> + <td class="weight"> + <input-error error="member.restError.weight[0]"> + <input type="number" step="0.1" min="0" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterListMember(member, voterList)"/> + </input-error> + </td> + <td class="action"> + <button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);" tooltip="{{ 'action.restricted.deleteVoter' | translate }}"><span class="glyphicon glyphicon-trash"></span></button> + </td> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/05: add ckeditor in bower
by chorem.org scm June 25, 2014

June 25, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 96c457b251eda8e699b4f04ee3b2cefa9a704bef Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 17 11:43:52 2014 +0200 add ckeditor in bower --- pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/index.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 9f6e529..54f3ce2 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -15,7 +15,7 @@ "angular-translate": "2.0.0", "angular-bootstrap": "0.11.0", "angular-animate": "1.2.16", - "bootstrap": "~3.1.1", + "bootstrap": "3.1.1", "jquery": "2.2.1", "jqplot": "1.0.8" } diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index e63654b..09fd223 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -36,6 +36,7 @@ <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pieRenderer.min.js"></script> <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"> </script> <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pointLabels.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.highlighter.min.js"></script> <script language="javascript" type="text/javascript" src="bower/ckeditor/ckeditor.js"></script> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/05: fix conflit
by chorem.org scm June 25, 2014

June 25, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 8495c4cfc6f6a479b4cfcc8091a2c0ff5775f36c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 16 15:31:18 2014 +0200 fix conflit --- pollen-ui-angular/bower.json | 5 ++- pollen-ui-angular/src/main/webapp/index.html | 65 +++++++++++++++------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 278a446..9f6e529 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -9,14 +9,15 @@ "tests" ], "dependencies": { - "angular-route": "1.2.16", "angular": "1.2.16", + "angular-route": "1.2.16", "angular-resource": "1.2.16", "angular-translate": "2.0.0", "angular-bootstrap": "0.11.0", "angular-animate": "1.2.16", "bootstrap": "~3.1.1", - "jqplot": "*" + "jquery": "2.2.1", + "jqplot": "1.0.8" } } diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 585ad84..e63654b 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -23,37 +23,40 @@ <head> <title>Pollen</title> <meta charset="utf-8" /> - <link href="bower/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> - <link href="bower/jqplot/jquery.jqplot.min.css" rel="stylesheet"/> - <link rel="stylesheet" href="css/style.css"/> - - <script src="js/conf.js"></script> - - <script src="bower/jquery/dist/jquery.min.js"></script> - <script src="bower/jqplot/jquery.jqplot.min.js"></script> - <script src="bower/jqplot/plugins/jqplot.barRenderer.min.js"></script> - <script src="bower/jqplot/plugins/jqplot.pieRenderer.min.js"></script> - <script src="bower/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"></script> - <script src="bower/jqplot/plugins/jqplot.pointLabels.min.js"></script> - - <script src="bower/angular/angular.min.js"></script> - <script src="bower/angular-route/angular-route.min.js"></script> - <script src="bower/angular-resource/angular-resource.min.js"></script> - <script src="bower/angular-translate/angular-translate.min.js"></script> - <script src="bower/angular-animate/angular-animate.min.js"></script> - <script src="bower/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> - <script src="bower/ckeditor/ckeditor.js"></script> - - <script src="js/app.js"></script> - <script src="js/services.js"></script> - <script src="js/controllers/pollCtrl.js"></script> - <script src="js/controllers/userCtrl.js"></script> - <script src="js/controllers/favoriteListCtrl.js"></script> - <script src="js/controllers/localeCtrl.js"></script> - <script src="js/controllers/alertCtrl.js"></script> - - <script src="i18n/fr.js"></script> - <script src="i18n/en.js"></script> + + <link rel="stylesheet" type="text/css" href="bower/bootstrap/dist/css/bootstrap.min.css" /> + <link rel="stylesheet" type="text/css" href="bower/jqplot/jquery.jqplot.min.css" /> + <link rel="stylesheet" type="text/css" href="css/style.css"/> + + <script language="javascript" type="text/javascript" src="js/conf.js"></script> + + <script language="javascript" type="text/javascript" src="bower/jquery/dist/jquery.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/jquery.jqplot.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.barRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pieRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"> </script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pointLabels.min.js"></script> + + <script language="javascript" type="text/javascript" src="bower/ckeditor/ckeditor.js"></script> + + <script language="javascript" type="text/javascript" src="bower/angular/angular.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-route/angular-route.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-resource/angular-resource.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-translate/angular-translate.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-animate/angular-animate.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> + + <script language=javascript" type="text/javascript" src="js/app.js"></script> + <script language=javascript" type="text/javascript" src="js/services.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/pollCtrl.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/userCtrl.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/favoriteListCtrl.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/localeCtrl.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/alertCtrl.js"></script> + + <script language=javascript" type="text/javascript" src="i18n/fr.js"></script> + <script language=javascript" type="text/javascript" src="i18n/en.js"></script> + </head> <body> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/05: force a version for exec-maven-plugin
by chorem.org scm June 25, 2014

June 25, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 70928e88fb41e8ecd16075ed1633be9c277dffee Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 16 10:34:51 2014 +0200 force a version for exec-maven-plugin --- pollen-ui-angular/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 957e34c..e46b933 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -26,6 +26,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> + <version>1.3.1</version> <executions> <execution> <phase>generate-sources</phase> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0