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

01/01: fix dependence
by chorem.org scm July 15, 2014

July 15, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/unitTest in repository pollen. See http://git.chorem.org/pollen.git commit e0c165a2e467d453da2cf2e812dcf4f56f59ac68 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jul 15 17:26:39 2014 +0200 fix dependence --- pollen-ui-angular/bower.json | 3 +++ pollen-ui-angular/package.json | 5 ++++- pollen-ui-angular/pom.xml | 24 ++++++++++++++++++++---- pollen-ui-angular/src/test/karma.conf.js | 1 + 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index c2d33f7..7261c1b 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -20,5 +20,8 @@ "jqplot": "*", "ckeditor": "4.4.2", "less": "1.7.3" + }, + "devDependencies": { + "angular-mocks": "1.2.16" } } diff --git a/pollen-ui-angular/package.json b/pollen-ui-angular/package.json index 5ff1f26..db0d1c6 100644 --- a/pollen-ui-angular/package.json +++ b/pollen-ui-angular/package.json @@ -15,5 +15,8 @@ "test": "karma start src/test/karma.conf.js" }, "author": "garandel", - "license": "AGPL" + "license": "AGPL", + "dependencies": { + "bower": "^1.3.8" + } } diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index ff50ec3..0695181 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -33,13 +33,28 @@ <goals> <goal>exec</goal> </goals> + <configuration> + <executable>npm</executable> + <arguments> + <argument>install</argument> + </arguments> + </configuration> + </execution> + + <execution> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>bower</executable> + <arguments> + <argument>install</argument> + </arguments> + </configuration> </execution> </executions> <configuration> - <executable>bower</executable> - <arguments> - <argument>install</argument> - </arguments> <workingDirectory>${basedir}</workingDirectory> </configuration> </plugin> @@ -81,6 +96,7 @@ <configuration> <karmaExecutable>${basedir}/node_modules/karma/bin/karma</karmaExecutable> <configFile>src/test/karma.conf.js</configFile> + <junitReportFile>target/test-results.xml</junitReportFile> <reportsDirectory>${project.build.directory}/karma-reports</reportsDirectory> <browsers>PhantomJS</browsers> <autoWatch>false</autoWatch> diff --git a/pollen-ui-angular/src/test/karma.conf.js b/pollen-ui-angular/src/test/karma.conf.js index 7274e8e..69eca3a 100644 --- a/pollen-ui-angular/src/test/karma.conf.js +++ b/pollen-ui-angular/src/test/karma.conf.js @@ -15,6 +15,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ + 'src/main/webapp/js/conf.js.exemple', // fix conf is not defined for controller 'src/main/webapp/lib/jquery/dist/jquery.min.js', 'src/main/webapp/lib/jqplot/jquery.jqplot.min.js', 'src/main/webapp/lib/jqplot/plugins/jqplot.barRenderer.min.js', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add test pollCtrl
by chorem.org scm July 15, 2014

July 15, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/unitTest in repository pollen. See http://git.chorem.org/pollen.git commit 280bb61fac8049eb03b0748c3e558564bcfddfd4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jul 15 16:35:34 2014 +0200 add test pollCtrl --- pollen-ui-angular/.gitignore | 2 + pollen-ui-angular/package.json | 19 ++ pollen-ui-angular/pom.xml | 27 +++ pollen-ui-angular/src/main/webapp/js/app.js | 4 +- .../src/main/webapp/js/controllers/alertCtrl.js | 1 + .../main/webapp/js/controllers/favoriteListCtrl.js | 2 + .../src/main/webapp/js/controllers/localeCtrl.js | 2 + .../src/main/webapp/js/controllers/mainCtrl.js | 4 +- .../src/main/webapp/js/controllers/pollCtrl.js | 135 +++++++------ .../src/main/webapp/js/controllers/userCtrl.js | 4 +- pollen-ui-angular/src/main/webapp/js/directives.js | 35 +--- pollen-ui-angular/src/main/webapp/js/services.js | 36 ++++ pollen-ui-angular/src/test/karma.conf.js | 97 ++++++++++ .../src/test/unit/pollControllersTest.js | 214 +++++++++++++++++++++ 14 files changed, 489 insertions(+), 93 deletions(-) diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index a3ec35a..1c7c2ba 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -1,4 +1,6 @@ *.iml +node_modules/* +test_out/* src/main/webapp/lib src/main/webapp/css/style.css src/main/webapp/js/conf.js diff --git a/pollen-ui-angular/package.json b/pollen-ui-angular/package.json new file mode 100644 index 0000000..5ff1f26 --- /dev/null +++ b/pollen-ui-angular/package.json @@ -0,0 +1,19 @@ +{ + "name": "Pollen-test", + "version": "2.0.0", + "description": "", + "main": "src/test/karma.conf.js", + "devDependencies": { + "karma": "^0.12.17", + "karma-chrome-launcher": "^0.1.4", + "karma-firefox-launcher": "^0.1.3", + "karma-jasmine": "^0.1.5", + "karma-junit-reporter": "^0.2.2", + "karma-phantomjs-launcher": "^0.1.4" + }, + "scripts": { + "test": "karma start src/test/karma.conf.js" + }, + "author": "garandel", + "license": "AGPL" +} diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 3239320..ff50ec3 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -65,6 +65,33 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>com.kelveden</groupId> + <artifactId>maven-karma-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <phase>test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + </executions> + <configuration> + <karmaExecutable>${basedir}/node_modules/karma/bin/karma</karmaExecutable> + <configFile>src/test/karma.conf.js</configFile> + <reportsDirectory>${project.build.directory}/karma-reports</reportsDirectory> + <browsers>PhantomJS</browsers> + <autoWatch>false</autoWatch> + <singleRun>true</singleRun> + <colors>true</colors> + <skipKarma>false</skipKarma> + <skipTests>false</skipTests> + <karmaFailureIgnore>false</karmaFailureIgnore> + <reporters>dots,junit</reporters> + </configuration> + </plugin> </plugins> </build> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 28ff905..ef73d67 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -var pollen = angular.module('pollen', ['pollenDirective', 'pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'alertControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) +'use strict'; + +angular.module('pollen', ['pollenDirective', 'pollenServices', 'ngRoute', 'PollenMainControllers', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'alertControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js index a6ea298..81a5802 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js @@ -18,6 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ +'use strict'; angular.module('alertControllers', []) .controller('printAlertCtrl', ['$scope', '$timeout', diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js index 932e82c..1477c4b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js @@ -18,6 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ +'use strict'; + angular.module('favoriteListControllers', []) .controller('FavoriteListCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', 'Page', function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams, Page) { diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js index 524e3ef..47667e8 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js @@ -18,6 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ +'use strict'; + angular.module('localeControllers', []) .controller('LocaleCtrl', ['$scope', '$rootScope', '$translate', 'SessionStorage', '$locale', function ($scope, $rootScope, $translate, SessionStorage, $locale) { $scope.debug = conf.debug; diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js index d0ccb2a..38d47af 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/mainCtrl.js @@ -1,4 +1,6 @@ -pollen.controller('MainCtrl', ['$scope', 'Page', +'use strict'; + +angular.module('PollenMainControllers', ['pollenServices']).controller('MainCtrl', ['$scope', 'Page', function ($scope, Page) { $scope.$on('titleChange', function () { 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 4a691b1..dafeadf 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -18,7 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollControllers', []) +'use strict'; + +angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.translate', 'ui.bootstrap']) .controller('HomeCtrl', ['$scope', 'Poll', 'Page', function ($scope, Poll, Page) { Page.setTitle('title.home'); Poll.skeletonNew(); @@ -172,13 +174,22 @@ angular.module('pollControllers', []) }; initTemplateURL(); var lastRoute = $route.current; - $scope.$on('$locationChangeSuccess', function(event) { - if (lastRoute.$$route.controller == $route.current.$$route.controller) { - $route.current = lastRoute; - } + $timeout(function() { + $scope.$on('$locationChangeSuccess', function(event) { + if (lastRoute.$$route.controller == $route.current.$$route.controller) { + $route.current = lastRoute; + } + }); }); + $scope.voteCountingIsBoolean = function () { + if (angular.isDefined($scope.data.voteCountingType)) { + return $scope.data.voteCountingType.renderType == 'checkbox'; + } + return false; + } + $scope.getChoiceValue = function (choiceValue) { if ($scope.voteCountingIsBoolean()) { return (choiceValue)?true:false; @@ -198,7 +209,12 @@ angular.module('pollControllers', []) $scope.preSendChoice = function (choice) { if (choice.choiceType == 'DATE') { - choice.choiceValue = choice.choiceValue.getTime(); + if (angular.isDate(choice.choiceValue)) { + choice.choiceValue = choice.choiceValue.getTime(); + } + else { + choice.choiceValue = null; + } } else if (choice.choiceType == 'IMAGE') { try { @@ -216,7 +232,9 @@ angular.module('pollControllers', []) choice.choiceValue = new Date(Number(choice.choiceValue)); } else if (choice.choiceType == 'IMAGE') { - PollenResource.getMeta({resourceId : choice.choiceValue}, function (data) { + var resourceId = choice.choiceValue; + choice.choiceValue = {meta:{id:resourceId}, data:conf.restURL+'/resources/'+resourceId, id: resourceId}; + PollenResource.getMeta({resourceId : resourceId}, function (data) { choice.choiceValue = {meta:data, data : conf.restURL+'/resources/'+data.id, id : data.id}; }); } @@ -246,13 +264,6 @@ angular.module('pollControllers', []) }); }); - $scope.voteCountingIsBoolean = function () { - if (angular.isDefined($scope.data.voteCountingType)) { - return $scope.data.voteCountingType.renderType == 'checkbox'; - } - return false; - } - $scope.deletePoll = function () { if (angular.isDefined($scope.data.poll.id)) { var confirmMessage; @@ -299,7 +310,8 @@ angular.module('pollControllers', []) }]) -.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', 'Poll', function ($scope, $controller, $modal, $timeout, $routeParams, Poll) { +.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', 'Poll', + function ($scope, $controller, $modal, $timeout, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('edit'); @@ -329,26 +341,28 @@ angular.module('pollControllers', []) $scope.data.voterList = []; $scope.data.voterList.push(newGroup()); - $scope.$watch('data.poll.pollType', function (newVal, oldVal) { - if (newVal != oldVal && newVal == 'RESTRICTED') { - var listMember = []; - for (var i = 0; i < $scope.data.voterList.length; i++) { - for (var j = 0; j < $scope.data.voterList[i].members.length; j++) { - // check if not a empty line - if ($scope.data.voterList[i].members[j].email != '' || $scope.data.voterList[i].members[j].name != '') { - listMember.push($scope.data.voterList[i].members[j]); + $timeout(function () { + $scope.$watch('data.poll.pollType', function (newVal, oldVal) { + if (newVal != oldVal && newVal == 'RESTRICTED') { + var listMember = []; + for (var i = 0; i < $scope.data.voterList.length; i++) { + for (var j = 0; j < $scope.data.voterList[i].members.length; j++) { + // check if not a empty line + if ($scope.data.voterList[i].members[j].email != '' || $scope.data.voterList[i].members[j].name != '') { + listMember.push($scope.data.voterList[i].members[j]); + } } } - } - // get the first group - $scope.data.voterList = $scope.data.voterList.splice(0,1); + // get the first group + $scope.data.voterList = $scope.data.voterList.splice(0,1); - // check if one voter is enter in one group - if (listMember.length > 0) { - $scope.data.voterList[0].members = listMember; + // check if one voter is enter in one group + if (listMember.length > 0) { + $scope.data.voterList[0].members = listMember; + } } - } + }); }); $scope.addVoter = function (index) { @@ -502,8 +516,10 @@ angular.module('pollControllers', []) }); }; - $scope.$on('switchLocale', function() { - initVoteCountingType(); + $timeout(function () { + $scope.$on('switchLocale', function() { + initVoteCountingType(); + }); }); $timeout(function () { @@ -527,7 +543,6 @@ angular.module('pollControllers', []) $scope.data.choices = []; $scope.data.vote = {}; $scope.data.vote.choices = $scope.data.choices; - $scope.restRequest = poll; }); } initPoll(); @@ -590,7 +605,7 @@ angular.module('pollControllers', []) //////////////////////////////// $scope.callBackAddChoice = function (choice) { - saveChoice = angular.copy(choice); + var saveChoice = angular.copy(choice); saveChoice = $scope.preSendChoice(saveChoice); @@ -604,7 +619,7 @@ angular.module('pollControllers', []) } $scope.callBackEditChoice = function (choice) { - saveChoice = angular.copy(choice); + var saveChoice = angular.copy(choice); saveChoice = $scope.preSendChoice(saveChoice); @@ -1072,8 +1087,8 @@ angular.module('pollControllers', []) }]) .controller('PollCommentCtrl', - ['$scope', '$rootScope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', '$location', 'Page', - function ( $scope, $rootScope, $controller, $routeParams, Poll, PollComment, $translate, $location, Page) { + ['$scope', '$rootScope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', '$timeout', '$location', 'Page', + function ( $scope, $rootScope, $controller, $routeParams, Poll, PollComment, $translate, $timeout, $location, Page) { $controller('PollCtrl', {$scope:$scope}); Page.setTitle('title.poll.comment'); @@ -1133,13 +1148,15 @@ angular.module('pollControllers', []) return commentPromise; }; initComments(); - $scope.$watch('data.commentsPagination.currentPage', function (newVal, oldVal) { - if (angular.isDefined(oldVal) && newVal != oldVal) { // Value change - if (paginationParameter.pageNumber != $scope.data.commentsPagination.currentPage) { // not same page - paginationParameter.pageNumber = $scope.data.commentsPagination.currentPage; - initComments(); + $timeout(function () { + $scope.$watch('data.commentsPagination.currentPage', function (newVal, oldVal) { + if (angular.isDefined(oldVal) && newVal != oldVal) { // Value change + if (paginationParameter.pageNumber != $scope.data.commentsPagination.currentPage) { // not same page + paginationParameter.pageNumber = $scope.data.commentsPagination.currentPage; + initComments(); + } } - } + }); }); $scope.postComment = function () { @@ -1225,8 +1242,8 @@ angular.module('pollControllers', []) }]) -.controller('PollResultCtrl', ['$scope', '$q', '$controller', '$route', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$filter', 'Page', - function ($scope, $q, $controller, $route, $routeParams, Poll, PollChoice, PollVote, $translate, $filter, Page) { +.controller('PollResultCtrl', ['$scope', '$q', '$controller', '$route', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$filter', '$timeout', 'Page', + function ($scope, $q, $controller, $route, $routeParams, Poll, PollChoice, PollVote, $translate, $filter, $timeout, Page) { $controller('PollCtrl', {$scope:$scope}); Page.setTitle('title.poll.result'); @@ -1240,9 +1257,11 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('result'); $scope.plot = 'chart'; - $scope.$on('switchLocale', function() { - $route.reload(); - }) + $timeout(function () { + $scope.$on('switchLocale', function() { + $route.reload(); + }); + }); var choicesDeferred = $q.defer(); PollChoice.query({pollId:$routeParams.pollId}, function (choices) { @@ -1309,8 +1328,8 @@ angular.module('pollControllers', []) }]) .controller('PollListCtrl', - ['$scope', '$rootScope', '$controller', '$routeParams', '$location', 'Poll', 'Page', - function ($scope, $rootScope, $controller, $routeParams, $location, Poll, Page) { + ['$scope', '$rootScope', '$controller', '$routeParams', '$timeout', '$location', 'Poll', 'Page', + function ($scope, $rootScope, $controller, $routeParams, $timeout, $location, Poll, Page) { $scope.data = {}; Page.setTitle('title.poll.list'); @@ -1342,13 +1361,15 @@ angular.module('pollControllers', []) }); }; initPolls(); - $scope.$watch('data.pollsPagination.currentPage', function (newVal, oldVal) { - // check if the current page has changed - if (angular.isDefined(oldVal) && newVal != oldVal) { - paginationParameter.pageNumber = $scope.data.pollsPagination.currentPage; - initPolls(); - } - }); + $timeout(function () { + $scope.$watch('data.pollsPagination.currentPage', function (newVal, oldVal) { + // check if the current page has changed + if (angular.isDefined(oldVal) && newVal != oldVal) { + paginationParameter.pageNumber = $scope.data.pollsPagination.currentPage; + initPolls(); + } + }); + }) }]) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index a64dad8..d93ee6a 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -18,7 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ - angular.module('userControllers', []) +'use strict'; + +angular.module('userControllers', []) .controller('UserRegisterCtrl', ['$scope', '$rootScope', '$location', 'User', 'SessionStorage', 'Page', function ($scope, $rootScope, $location, User, SessionStorage, Page) { Page.setTitle('title.user.register'); diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index b5dd14c..478f369 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -18,40 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollenDirective', []) - -////////////////////////////////////// -///// PAGE ///// -////////////////////////////////////// - -.factory('Page', ['$rootScope', '$filter', function ($rootScope, $filter) { - var title = ''; - var value; - return { - title : function () { - var makeTitle = "Pollen"; - if (title != '') { - makeTitle += " - " + $filter('translate')(title); - - } - - if (value !== undefined) { - makeTitle += " - " + value; - } +'use strict'; - return makeTitle; - }, - setTitle: function(newTitle, newValue) { - title = newTitle; - value = newValue; - $rootScope.$broadcast('titleChange'); - }, - setValue: function(newValue) { - value = newValue; - $rootScope.$broadcast('titleChange'); - } - }; -}]) +angular.module('pollenDirective', []) ////////////////////////////////////// ///// FOCUS ME ///// diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 78b6ffa..fc4fef3 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -18,6 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ +'use strict'; + angular.module('pollenServices', ['ngResource']) ////////////////////////////////////// @@ -417,4 +419,38 @@ angular.module('pollenServices', ['ngResource']) } } } +}]) + + +////////////////////////////////////// +///// PAGE ///// +////////////////////////////////////// + +.factory('Page', ['$rootScope', '$filter', function ($rootScope, $filter) { + var title = ''; + var value; + return { + title : function () { + var makeTitle = "Pollen"; + if (title != '') { + makeTitle += " - " + $filter('translate')(title); + + } + + if (value !== undefined) { + makeTitle += " - " + value; + } + + return makeTitle; + }, + setTitle: function(newTitle, newValue) { + title = newTitle; + value = newValue; + $rootScope.$broadcast('titleChange'); + }, + setValue: function(newValue) { + value = newValue; + $rootScope.$broadcast('titleChange'); + } + }; }]) \ No newline at end of file diff --git a/pollen-ui-angular/src/test/karma.conf.js b/pollen-ui-angular/src/test/karma.conf.js new file mode 100644 index 0000000..7274e8e --- /dev/null +++ b/pollen-ui-angular/src/test/karma.conf.js @@ -0,0 +1,97 @@ +// Karma configuration +// Generated on Tue Jul 15 2014 10:21:18 GMT+0200 (CEST) + +module.exports = function(config) { + config.set({ + + // base path that will be used to resolve all patterns (eg. files, exclude) + basePath: '../../', + + + // frameworks to use + // available frameworks: https://npmjs.org/browse/keyword/karma-adapter + frameworks: ['jasmine'], + + + // list of files / patterns to load in the browser + files: [ + 'src/main/webapp/lib/jquery/dist/jquery.min.js', + 'src/main/webapp/lib/jqplot/jquery.jqplot.min.js', + 'src/main/webapp/lib/jqplot/plugins/jqplot.barRenderer.min.js', + 'src/main/webapp/lib/jqplot/plugins/jqplot.pieRenderer.min.js', + 'src/main/webapp/lib/jqplot/plugins/jqplot.categoryAxisRenderer.min.js', + 'src/main/webapp/lib/jqplot/plugins/jqplot.pointLabels.min.js', + 'src/main/webapp/lib/jqplot/plugins/jqplot.highlighter.min.js', + 'src/main/webapp/lib/ckeditor/ckeditor.js', + 'src/main/webapp/lib/angular/angular.js', + 'src/main/webapp/lib/angular-mocks/angular-mocks.js', + 'src/main/webapp/lib/angular-bootstrap/ui-bootstrap-tpls.js', + 'src/main/webapp/lib/angular-resource/angular-resource.js', + 'src/main/webapp/lib/angular-route/angular-route.js', + 'src/main/webapp/lib/angular-translate/angular-translate.js', + 'src/main/webapp/lib/angular-animate/angular-animate.js', + 'src/main/webapp/js/*.js', + 'src/main/webapp/js/**/*.js', + 'src/main/webapp/i18n/*.js', + 'src/test/unit/**/*.js' + ], + + + // list of files to exclude + exclude: [ + ], + + + // preprocess matching files before serving them to the browser + // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor + preprocessors: { + + }, + + + // test results reporter to use + // possible values: 'dots', 'progress' + // available reporters: https://npmjs.org/browse/keyword/karma-reporter + reporters: ['progress'], + + + // web server port + port: 9876, + + + // enable / disable colors in the output (reporters and logs) + colors: true, + + + // level of logging + // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG + logLevel: config.LOG_INFO, + + + // enable / disable watching file and executing tests whenever any file changes + autoWatch: true, + + + // start these browsers + // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher + browsers: ['Chrome', 'Firefox', 'PhantomJS'], + + plugins : [ + 'karma-chrome-launcher', + 'karma-firefox-launcher', + 'karma-phantomjs-launcher', + 'karma-jasmine', + 'karma-junit-reporter' + ], + + junitReporter : { + outputFile: 'test_out/unit.xml', + suite: 'unit' + }, + + // Continuous Integration mode + // if true, Karma captures browsers, runs the tests and exits + singleRun: false + }); +}; + diff --git a/pollen-ui-angular/src/test/unit/pollControllersTest.js b/pollen-ui-angular/src/test/unit/pollControllersTest.js new file mode 100644 index 0000000..f4bb7b3 --- /dev/null +++ b/pollen-ui-angular/src/test/unit/pollControllersTest.js @@ -0,0 +1,214 @@ +'use strict'; + +//////////////////////////// +///// TEST PollCtrl //// +//////////////////////////// + +describe('Test pollCtrl', function () { + beforeEach(module('pollControllers')); + beforeEach(inject(function($controller) { + $scope = {}; + ctrl = $controller('PollCtrl', {$scope: $scope}); + })); + + var $scope = {}; + var ctrl = null; + it('should load PollCtrl', function () { + expect(ctrl).toBeDefined(); + expect(ctrl).not.toBeNull(); + + }); + + it('should set good default tab', function() { + + expect($scope.tab).toEqual('home'); + }); + + it('should set good default dateFormat', function() { + expect($scope.globalVariables.dateFormat).not.toBeNull(); + expect($scope.globalVariables.dateFormat).toBeDefined(); + + expect($scope.globalVariables.timeFormat).not.toBeNull(); + expect($scope.globalVariables.timeFormat).toBeDefined; + + expect($scope.globalVariables.dateTimeFormat).not.toBeNull(); + expect($scope.globalVariables.dateTimeFormat).toBeDefined(); + }); + + it('should set good template url', function () { + expect($scope.templateURL).toBeDefined(); + expect($scope.templateURL).not.toBeNull(); + }); + + + it('should get good voteCounting', function () { + // voteCounting boolean + runs(function () { + $scope.data.voteCountingType = {renderType:'checkbox'}; + expect($scope.voteCountingIsBoolean()).toBeTruthy(); + }); + + // voteCounting not boolean + runs(function () { + $scope.data.voteCountingType = {renderType: 'text'}; + expect($scope.voteCountingIsBoolean()).toBeFalsy(); + }); + }); + + it('should get good choiceValue', function () { + // voteCounting boolean + runs(function () { + $scope.data.voteCountingType = {renderType:'checkbox'}; + + var valueOf1 = $scope.getChoiceValue(1.0); + expect(valueOf1).toBeTruthy(); + var valueOf2 = $scope.getChoiceValue(2.0); + expect(valueOf2).toBeTruthy(); + + var valueOf0 = $scope.getChoiceValue(0.0); + expect(valueOf0).toBeFalsy(); + + var valueOfTrue = $scope.getChoiceValue(true); + expect(valueOfTrue).toBeTruthy(); + var valueOfFalse = $scope.getChoiceValue(false); + expect(valueOfFalse).toBeFalsy(); + + }); + + // voteCounting not boolean + runs(function () { + $scope.data.voteCountingType = {renderType: 'text'}; + + var valueOf1 = $scope.getChoiceValue(1.0); + expect(valueOf1).toEqual(1.0); + + var valueOf0 = $scope.getChoiceValue(0.0); + expect($scope.getChoiceValue(0.0)).toEqual(0.0); + + var valueOfTrue = $scope.getChoiceValue(true); + expect(valueOfTrue).toEqual(1.0); + + var valueOfFalse = $scope.getChoiceValue(false) + expect(valueOfFalse).toEqual(0.0); + + }); + }); + + it('should prepare good choice before send', function () { + // choice type text + runs(function () { + var makeChoice = {choiceType:'TEXT', choiceValue:'value of this choice'}; + var sendChoice = $scope.preSendChoice(makeChoice); + + expect(sendChoice).toEqual(makeChoice); + }); + + // choice type date + runs(function () { + var date = new Date(); + var makeChoice, sendChoice; + + makeChoice = {choiceType:'DATE', choiceValue: 'not a date'}; + sendChoice = $scope.preSendChoice(makeChoice); + + expect(sendChoice.choiceValue).toBeNull(); + expect(sendChoice.choiceType).toEqual('DATE'); + + makeChoice.choiceValue = date; + sendChoice = $scope.preSendChoice(makeChoice); + + expect(sendChoice.choiceValue).toEqual(date.getTime()); + expect(sendChoice.choiceType).toEqual('DATE'); + + }); + + // choice type image + runs(function () { + var makeChoice, sendChoice; + + makeChoice = {choiceType:'IMAGE', choiceValue:'not an image'}; + sendChoice = $scope.preSendChoice(makeChoice); + + expect(sendChoice.choiceValue).toBeNull(); + expect(sendChoice.choiceType).toEqual('IMAGE'); + + makeChoice.choiceValue = {meta:{name:'image.png', id:'shortTopiaId'}, data:'urlpicture', id:'shortTopiaId'}; + sendChoice = $scope.preSendChoice(makeChoice); + + expect(sendChoice.choiceValue).toEqual('shortTopiaId'); + expect(sendChoice.choiceType).toEqual('IMAGE'); + }); + }); + + it('should good receive choice', function () { + // choice type text + runs(function () { + var makeChoice = {choiceType:'TEXT', choiceValue:'value of this choice'}; + var receiveChoice = $scope.postReceiveChoice(makeChoice); + + expect(receiveChoice).toEqual(makeChoice); + }); + + // choice type date + runs(function () { + var date = new Date(1405461600000); + var makeChoice, receiveChoice; + + makeChoice = {choiceType:'DATE', choiceValue: "1405461600000"}; + receiveChoice = $scope.postReceiveChoice(makeChoice); + + expect(receiveChoice.choiceValue).toEqual(date);; + expect(receiveChoice.choiceType).toEqual('DATE'); + + }); + + // choice type image + runs(function () { + var makeChoice, receiveChoice; + + makeChoice = {choiceType:'IMAGE', choiceValue:'shortTopiaId'}; + receiveChoice = $scope.postReceiveChoice(makeChoice); + + expect(receiveChoice.choiceValue.id).toEqual('shortTopiaId'); + expect(receiveChoice.choiceValue.meta.id).toEqual('shortTopiaId'); + expect(receiveChoice.choiceValue.data).toEqual(conf.restURL+'/resources/shortTopiaId'); + expect(receiveChoice.choiceType).toEqual('IMAGE'); + }); + }); + +}); + +describe('load poll controllers', function () { + beforeEach(module('pollControllers')); + + it('should load PollCreateCtrl', inject(function($controller) { + var ctrl = $controller('PollCreateCtrl', {$scope:{}}); + expect(ctrl).toBeDefined(); + })); + + it('should load PollEditCtrl', inject(function($controller) { + var ctrl = $controller('PollEditCtrl', {$scope:{}}); + expect(ctrl).toBeDefined(); + })); + + it('should load PollVoteCtrl', inject(function($controller) { + var ctrl = $controller('PollVoteCtrl', {$scope:{}}); + expect(ctrl).toBeDefined(); + })); + + it('should load PollResultCtrl', inject(function($controller) { + var ctrl = $controller('PollResultCtrl', {$scope:{}}); + expect(ctrl).toBeDefined(); + })); + + it('should load PollCommentCtrl', inject(function($controller) { + var ctrl = $controller('PollCommentCtrl', {$scope:{}}); + expect(ctrl).toBeDefined(); + })); + + it('should load PollListCtrl', inject(function($controller) { + var ctrl = $controller('PollListCtrl', {$scope:{}}); + expect(ctrl).toBeDefined(); + })); + +}) \ 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: Merge branch 'feature/addPollenResourceApi' into develop
by chorem.org scm July 11, 2014

July 11, 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 09e95b1b8bfe4f51e374da4e394d40e30ebd291a Merge: 5fcf5d3 16d92db Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 11 18:11:30 2014 +0200 Merge branch 'feature/addPollenResourceApi' into develop pollen-persistence/src/main/xmi/pollen.properties | 1 - pollen-persistence/src/main/xmi/pollen.zargo | Bin 20233 -> 20385 bytes .../pollen/rest/api/v1/PollenResourceApi.java | 77 +++++++++++++++ pollen-rest-api/src/main/resources/mapping | 9 ++ .../pollen/services/bean/ResourceFileBean.java | 108 +++++++++++++++++++++ .../pollen/services/bean/ResourceMetaBean.java | 68 +++++++++++++ .../pollen/services/bean/ResourceStreamBean.java | 102 +++++++++++++++++++ .../pollen/services/service/ChoiceService.java | 20 +++- .../services/service/PollenResourceService.java | 106 ++++++++++++++++++++ .../services/service/PollenServiceSupport.java | 22 ++--- .../src/main/webapp/js/controllers/pollCtrl.js | 24 ++--- pollen-ui-angular/src/main/webapp/js/directives.js | 12 ++- pollen-ui-angular/src/main/webapp/js/services.js | 21 ++++ .../src/main/webapp/partials/home.html | 2 +- 14 files changed, 537 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: try to gzip Resource
by chorem.org scm July 11, 2014

July 11, 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 16d92db9e22dad32f48d6e4a13e88c30c306a923 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 11 18:07:02 2014 +0200 try to gzip Resource --- .../org/chorem/pollen/services/bean/ResourceFileBean.java | 12 +++++++++++- .../src/main/webapp/js/controllers/pollCtrl.js | 14 +++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java index 5997c2e..ff3ad7f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java @@ -11,6 +11,8 @@ import java.io.IOException; import java.io.InputStream; import java.sql.Blob; import java.sql.SQLException; +import java.util.zip.GZIPInputStream; +import java.util.zip.ZipException; /** * Created on 11/07/14. @@ -92,7 +94,15 @@ public class ResourceFileBean extends PollenBean<PollenResource> { } public Blob getResourceBlob() throws IOException, SQLException { - InputStream stream = new FileInputStream(getFile()); + InputStream stream; + + try { + stream = new GZIPInputStream(new FileInputStream(getFile())); + } + catch (ZipException e) { + stream = new FileInputStream(getFile()); + } + return new SerialBlob(IOUtils.toByteArray(stream)); } } 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 1230902..4a691b1 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -201,7 +201,11 @@ angular.module('pollControllers', []) choice.choiceValue = choice.choiceValue.getTime(); } else if (choice.choiceType == 'IMAGE') { - choice.choiceValue = choice.choiceValue.meta.id; + try { + choice.choiceValue = choice.choiceValue.meta.id; + } catch (e) { + choice.choiceValue = null; + } } return choice; @@ -556,12 +560,8 @@ angular.module('pollControllers', []) $scope.globalVariables.restError = true; $scope.restError = error.data; angular.forEach($scope.data.choices, function (choice, index) { - 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['+index+'].choiceValue'])) { + choice.restError = {choiceValue:error.data['choice['+index+'].choiceValue']}; } }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: rename error choice[.].value to choice[.].choiceValue
by chorem.org scm July 11, 2014

July 11, 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 5fcf5d38e64c33efec2e002ebc68a1a65427e621 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 11 18:09:32 2014 +0200 rename error choice[.].value to choice[.].choiceValue --- .../java/org/chorem/pollen/services/service/ChoiceService.java | 10 +++++----- .../org/chorem/pollen/services/service/PollServiceTest.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) 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 b08c1c5..30dffdc 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 @@ -295,13 +295,13 @@ public class ChoiceService extends PollenServiceSupport { String choiceName = choice.getChoiceValue(); boolean nameNotBlank = checkNotBlank(errors, - "value", + "choiceValue", choiceName, l(getLocale(), "pollen.error.choice.choiceNameEmpty")); if (nameNotBlank) { boolean nameAdded = choiceNames.add(choiceName); - check(errors, "value", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist")); + check(errors, "choiceValue", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist")); } break; @@ -311,18 +311,18 @@ public class ChoiceService extends PollenServiceSupport { boolean dateNotBlank; if (choiceDate == null) { - dateNotBlank = checkNotBlank(errors, "value", null, l(getLocale(), "pollen.error.choice.choiceDateEmpty")); + dateNotBlank = checkNotBlank(errors, "choiceValue", null, l(getLocale(), "pollen.error.choice.choiceDateEmpty")); } else { dateNotBlank = checkNotBlank(errors, - "value", + "choiceValue", String.valueOf(choiceDate), l(getLocale(), "pollen.error.choice.choiceDateEmpty")); } if (dateNotBlank) { boolean dateAdded = choiceNames.add(String.valueOf(choiceDate.getTime())); - check(errors, "value", dateAdded, l(getLocale(), "pollen.error.choice.choiceDateExist")); + check(errors, "choiceValue", dateAdded, l(getLocale(), "pollen.error.choice.choiceDateExist")); } break; diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java index 3d17723..41fbce4 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java @@ -169,7 +169,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { Assert.fail(); } catch (InvalidFormException e) { // missing choice name - assertErrorKeyFound(e, "choice[0].value"); + assertErrorKeyFound(e, "choice[0].choiceValue"); } choice1.setChoiceValue("A"); @@ -187,7 +187,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { Assert.fail(); } catch (InvalidFormException e) { // duplicated choice name - assertErrorKeyFound(e, "choice[1].value"); + assertErrorKeyFound(e, "choice[1].choiceValue"); } choice2.setChoiceValue("B"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: use new Version object from nuiton-utils
by chorem.org scm July 11, 2014

July 11, 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 df5fe08ea1c66506b760b37f1ce96e1fb127a3c2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Jul 11 17:42:52 2014 +0200 use new Version object from nuiton-utils --- .../java/org/chorem/pollen/services/config/PollenServiceConfig.java | 4 ++-- .../org/chorem/pollen/services/config/PollenServiceConfigOption.java | 2 +- pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java index 5834964..bf52f86 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java @@ -37,7 +37,7 @@ import org.chorem.pollen.persistence.entity.VoteVisibility; import org.chorem.pollen.services.PollenTechnicalException; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import java.io.File; import java.util.List; @@ -227,6 +227,6 @@ public class PollenServiceConfig { } public Version getVersion() { - return applicationConfig.getOptionAsVersion(PollenServiceConfigOption.APPLICATION_VERSION.key); + return applicationConfig.getOption(Version.class, PollenServiceConfigOption.APPLICATION_VERSION.key); } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java index 3193322..a3c2208 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java @@ -29,7 +29,7 @@ import org.chorem.pollen.persistence.entity.PollType; import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; import org.nuiton.config.ConfigOptionDef; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import java.io.File; diff --git a/pom.xml b/pom.xml index 828fae2..cdead1e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.8</version> + <version>5.0.9</version> </parent> <groupId>org.chorem</groupId> @@ -167,7 +167,7 @@ <topiaVersion>3.0-SNAPSHOT</topiaVersion> <nuitonWebVersion>1.17-SNAPSHOT</nuitonWebVersion> - <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: auto delete resource when delete choice
by chorem.org scm July 11, 2014

July 11, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addPollenResourceApi in repository pollen. See http://git.chorem.org/pollen.git commit 91c71bbf77d40085fecf089136b84906f14119f8 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 11 17:05:03 2014 +0200 auto delete resource when delete choice --- .../pollen/services/service/ChoiceService.java | 20 +++++++++++++++----- .../services/service/PollenServiceSupport.java | 4 ++++ 2 files changed, 19 insertions(+), 5 deletions(-) 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 b08c1c5..f75e72e 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 @@ -26,13 +26,12 @@ package org.chorem.pollen.services.service; import com.google.common.base.Function; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; -import org.chorem.pollen.persistence.entity.Choice; -import org.chorem.pollen.persistence.entity.ChoiceTopiaDao; -import org.chorem.pollen.persistence.entity.Poll; -import org.chorem.pollen.persistence.entity.PollenPrincipal; +import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.bean.ChoiceBean; +import org.chorem.pollen.services.bean.PollenEntityId; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.service.security.PermissionVerb; +import org.nuiton.topia.persistence.TopiaIdFactory; import java.util.Date; import java.util.List; @@ -173,7 +172,18 @@ public class ChoiceService extends PollenServiceSupport { errors.failIfNotEmpty(); } - //TODO Check if this is not the last choice, if so can not delete + if (choice.getChoiceType() == ChoiceType.IMAGE) { + + PollenEntityId<PollenResource> resourceId = PollenEntityId.newId(PollenResource.class); + resourceId.setReducedId(choice.getChoiceValue()); + TopiaIdFactory topiaIdFactory = serviceContext.getTopiaApplicationContext().getTopiaIdFactory(); + resourceId.decode(topiaIdFactory); + + PollenResource resource = getResourceService().getResource0(resourceId.getEntityId()); + + getPollenResourceDao().delete(resource); + } + getChoiceDao().delete(choice); commit(); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java index beb0dfa..71c2aca 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java @@ -123,6 +123,10 @@ public abstract class PollenServiceSupport implements PollenService { return newService(SecurityService.class); } + protected PollenResourceService getResourceService() { + return newService(PollenResourceService.class); + } + protected PollenUserService getUserService() { return newService(PollenUserService.class); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: delete tmp file
by chorem.org scm July 11, 2014

July 11, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addPollenResourceApi in repository pollen. See http://git.chorem.org/pollen.git commit b40b5af4f5f13ecb21875e087dda5a5cd2d73f1c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 11 16:17:10 2014 +0200 delete tmp file --- pollen-persistence/src/main/xmi/pollen.properties | 1 - .../org/chorem/pollen/rest/api/v1/PollenResourceApi.java | 12 ++++++++++-- .../org/chorem/pollen/services/bean/ResourceFileBean.java | 6 ++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pollen-persistence/src/main/xmi/pollen.properties b/pollen-persistence/src/main/xmi/pollen.properties index 7e82326..1a7496c 100644 --- a/pollen-persistence/src/main/xmi/pollen.properties +++ b/pollen-persistence/src/main/xmi/pollen.properties @@ -32,7 +32,6 @@ package.org.chorem.pollen.persistence.entity.stereotype=entity # Text org.chorem.pollen.persistence.entity.Poll.attribute.description.tagValue.hibernateAttributeType=text org.chorem.pollen.persistence.entity.Choice.attribute.description.tagValue.hibernateAttributeType=text -org.chorem.pollen.persistence.entity.Choice.attribute.choiceValue.tagValue.hibernateAttributeType=text org.chorem.pollen.persistence.entity.Comment.attribute.text.tagValue.hibernateAttributeType=text # Blob diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenResourceApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenResourceApi.java index 7793994..7db0f32 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenResourceApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenResourceApi.java @@ -46,7 +46,11 @@ public class PollenResourceApi extends WebMotionController { resourceBean.setContentType(resource.getContentType()); resourceBean.setSize(resource.getSize()); - return pollenResourceService.createResource(resourceBean); + PollenEntityRef<PollenResource> createRef = pollenResourceService.createResource(resourceBean); + + resource.getFile().delete(); + + return createRef; } public PollenEntityRef<PollenResource> editResource(PollenResourceService pollenResourceService, PollenEntityId<PollenResource> resourceId, UploadFile resource) { @@ -58,7 +62,11 @@ public class PollenResourceApi extends WebMotionController { resourceBean.setContentType(resource.getContentType()); resourceBean.setSize(resource.getSize()); - return pollenResourceService.editResource(resourceId.getEntityId(), resourceBean); + PollenEntityRef<PollenResource> createRef = pollenResourceService.editResource(resourceId.getEntityId(), resourceBean); + + resource.getFile().delete(); + + return createRef; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java index c4c6498..5997c2e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java @@ -5,8 +5,10 @@ import org.chorem.pollen.persistence.entity.PollenResource; import org.chorem.pollen.persistence.entity.PollenResourceImpl; import javax.sql.rowset.serial.SerialBlob; -import javax.sql.rowset.serial.SerialException; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import java.sql.Blob; import java.sql.SQLException; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: update gitignore
by chorem.org scm July 11, 2014

July 11, 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 03ae74080c9bf558774aefd9bafe567784ab019f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 11 16:10:37 2014 +0200 update gitignore --- .gitignore | 4 ---- pollen-ui-angular/.gitignore | 1 + pollen-ui-js/.gitignore | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5a36c89..3bd2c32 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,4 @@ target/* */target/* *~ */*~ -pollen-ui-angular/src/main/webapp/js/conf.js - -pollen-ui-js/src/main/webapp/pollen-ui-js.css -pollen-ui-js/src/main/webapp/pollen-ui-js.js diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index 5575e6a..a3ec35a 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -1,4 +1,5 @@ *.iml src/main/webapp/lib src/main/webapp/css/style.css +src/main/webapp/js/conf.js diff --git a/pollen-ui-js/.gitignore b/pollen-ui-js/.gitignore new file mode 100644 index 0000000..74b4077 --- /dev/null +++ b/pollen-ui-js/.gitignore @@ -0,0 +1,2 @@ +src/main/webapp/pollen-ui-js.css +src/main/webapp/pollen-ui-js.js \ 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: UI use PollenResourceApi
by chorem.org scm July 11, 2014

July 11, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addPollenResourceApi in repository pollen. See http://git.chorem.org/pollen.git commit 3cf3443f15e6def8068ba2a52b9f75e2de42a747 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 11 15:08:37 2014 +0200 UI use PollenResourceApi --- .../src/main/webapp/js/controllers/pollCtrl.js | 12 ++++++------ pollen-ui-angular/src/main/webapp/js/directives.js | 12 +++++++++--- pollen-ui-angular/src/main/webapp/js/services.js | 21 +++++++++++++++++++++ .../src/main/webapp/partials/home.html | 2 +- 4 files changed, 37 insertions(+), 10 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 c03f5a6..1230902 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -25,8 +25,8 @@ angular.module('pollControllers', []) }]) .controller('PollCtrl', - ['$scope', '$rootScope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', '$q', 'Poll', 'Page', 'DateFormat', - function ( $scope, $rootScope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route, $q, Poll, Page, DateFormat) { + ['$scope', '$rootScope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', '$q', 'Poll', 'PollenResource', 'Page', 'DateFormat', + function ( $scope, $rootScope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route, $q, Poll, PollenResource, Page, DateFormat) { $scope.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -201,7 +201,7 @@ angular.module('pollControllers', []) choice.choiceValue = choice.choiceValue.getTime(); } else if (choice.choiceType == 'IMAGE') { - choice.choiceValue = choice.choiceValue.meta.name+"####"+choice.choiceValue.data; + choice.choiceValue = choice.choiceValue.meta.id; } return choice; @@ -212,9 +212,9 @@ angular.module('pollControllers', []) choice.choiceValue = new Date(Number(choice.choiceValue)); } else if (choice.choiceType == 'IMAGE') { - var tmp = choice.choiceValue.split("####"); - - choice.choiceValue = {meta:{name:tmp[0]}, data : tmp[1]}; + PollenResource.getMeta({resourceId : choice.choiceValue}, function (data) { + choice.choiceValue = {meta:data, data : conf.restURL+'/resources/'+data.id, id : data.id}; + }); } return choice; diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 755eb81..b5dd14c 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -438,27 +438,33 @@ angular.module('pollenDirective', []) ///// UPLOAD FILE ///// ////////////////////////////////////// -.directive("uploadFile", function () { +.directive("uploadFile", ["PollenResource", function (PollenResource) { return { restrict : "E", scope: { ngModel: "=" }, - template:'<input type="file" />', + template:'<form><input type="file" name="resource" /></form>', link: function (scope, element, attrs) { element.bind("change", function (changeEvent) { var reader = new FileReader(); reader.onload = function (loadEvent) { + var formData = new FormData(element[0].firstChild); scope.$apply(function () { scope.ngModel = { meta: changeEvent.target.files[0], data: loadEvent.target.result}; }); + + PollenResource.upload(formData, function (response) { + scope.ngModel.meta.id = response.id; + }); + } reader.readAsDataURL( changeEvent.target.files[0] ); }); } } -}) +}]) ////////////////////////////////////// ///// ZOOM IMAGE ///// diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index a1303ab..78b6ffa 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -318,6 +318,27 @@ angular.module('pollenServices', ['ngResource']) }]) ////////////////////////////////////// +///// RESOURCES FILE ///// +////////////////////////////////////// + +.factory('PollenResource', ['$resource', function ($resource) { + return $resource(conf.restURL+'/resources/:resourceId', null, + { + 'getMeta': { + method : 'GET', + url: conf.restURL+'/resources/:resourceId/meta' + }, + 'upload' : { + method: 'POST', + transformRequest: angular.identity, + headers:{ + 'Content-Type':undefined + } + } + }); +}]) + +////////////////////////////////////// ///// SESSION STORAGE RESOURCE ///// ////////////////////////////////////// diff --git a/pollen-ui-angular/src/main/webapp/partials/home.html b/pollen-ui-angular/src/main/webapp/partials/home.html index d5a161f..846d330 100644 --- a/pollen-ui-angular/src/main/webapp/partials/home.html +++ b/pollen-ui-angular/src/main/webapp/partials/home.html @@ -18,6 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<div class="hero-unit"> +<div> <img src="img/pollen.png"/> </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