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

02/02: UI use PollenResourceApi
by chorem.org scm 11 Jul '14

11 Jul '14

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

01/02: add pollen resources api
by chorem.org scm 11 Jul '14

11 Jul '14

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 c23fd692907d494fee4963275941865a3a6d1e74 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 11 14:11:10 2014 +0200 add pollen resources api --- pollen-persistence/src/main/xmi/pollen.zargo | Bin 20233 -> 20385 bytes .../pollen/rest/api/v1/PollenResourceApi.java | 69 ++++++++++++++ pollen-rest-api/src/main/resources/mapping | 9 ++ .../pollen/services/bean/ResourceFileBean.java | 96 +++++++++++++++++++ .../pollen/services/bean/ResourceMetaBean.java | 68 +++++++++++++ .../pollen/services/bean/ResourceStreamBean.java | 102 ++++++++++++++++++++ .../services/service/PollenResourceService.java | 106 +++++++++++++++++++++ .../services/service/PollenServiceSupport.java | 18 +--- 8 files changed, 455 insertions(+), 13 deletions(-) diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index 72a711c..a6810ea 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ 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 new file mode 100644 index 0000000..7793994 --- /dev/null +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenResourceApi.java @@ -0,0 +1,69 @@ +package org.chorem.pollen.rest.api.v1; + +import org.chorem.pollen.persistence.entity.PollenResource; +import org.chorem.pollen.services.bean.*; +import org.chorem.pollen.services.service.PollenResourceService; +import org.debux.webmotion.server.WebMotionController; +import org.debux.webmotion.server.call.UploadFile; +import org.debux.webmotion.server.render.Render; + +import java.io.FileNotFoundException; + +/** + * Created on 10/07/14. + * + * @author dralagen + */ +public class PollenResourceApi extends WebMotionController { + + public Render getResource(PollenResourceService pollenResourceService, PollenEntityId<PollenResource> resourceId) throws FileNotFoundException { + + ResourceStreamBean resource = pollenResourceService.getResource(resourceId.getEntityId()); + + return renderStream(resource.getResourceContent(), resource.getContentType()); + } + + public Render getPreviewResource(PollenResourceService pollenResourceService, PollenEntityId<PollenResource> resourceId) { + + ResourceStreamBean resource = pollenResourceService.getResource(resourceId.getEntityId()); + + return renderStream(resource.getResourceContent(), resource.getContentType()); + } + + public ResourceMetaBean getMetaResource(PollenResourceService pollenResourceService, PollenEntityId<PollenResource> resourceId) { + + ResourceMetaBean resource = pollenResourceService.getMetaResource(resourceId.getEntityId()); + + return resource; + } + + public PollenEntityRef<PollenResource> createResource(PollenResourceService pollenResourceService, UploadFile resource) { + + ResourceFileBean resourceBean = new ResourceFileBean(); + + resourceBean.setFile(resource.getFile()); + resourceBean.setName(resource.getName()); + resourceBean.setContentType(resource.getContentType()); + resourceBean.setSize(resource.getSize()); + + return pollenResourceService.createResource(resourceBean); + } + + public PollenEntityRef<PollenResource> editResource(PollenResourceService pollenResourceService, PollenEntityId<PollenResource> resourceId, UploadFile resource) { + + ResourceFileBean resourceBean = new ResourceFileBean(); + + resourceBean.setFile(resource.getFile()); + resourceBean.setName(resource.getName()); + resourceBean.setContentType(resource.getContentType()); + resourceBean.setSize(resource.getSize()); + + return pollenResourceService.editResource(resourceId.getEntityId(), resourceBean); + + } + + public void deleteResource(PollenResourceService pollenResourceService, PollenEntityId<PollenResource> resourceId) { + + pollenResourceService.deleteResource(resourceId.getEntityId()); + } +} diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 0c6b559..07e4877 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -114,6 +114,15 @@ POST /v1/polls/{pollId}/clone PollApi.clonePoll GET /v1/polls/{pollId}/export PollApi.exportPoll PUT /v1/polls/{pollId}/close PollApi.closePoll +# PollenResourceApi + +GET /v1/resources/{resourceId} PollenResourceApi.getResource +GET /v1/resources/{resourceId}/meta PollenResourceApi.getMetaResource +GET /v1/resources/{resourceId}/preview PollenResourceApi.getPreviewResource +POST /v1/resources PollenResourceApi.createResource +POST /v1/resources/{resourceId} PollenResourceApi.editResource +DELETE /v1/resources/{resourceId} PollenResourceApi.deleteResource + # PollenUserApi GET /v1/users PollenUserApi.getUsers 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 new file mode 100644 index 0000000..c4c6498 --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceFileBean.java @@ -0,0 +1,96 @@ +package org.chorem.pollen.services.bean; + +import org.apache.commons.io.IOUtils; +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.sql.Blob; +import java.sql.SQLException; + +/** + * Created on 11/07/14. + * + * @author dralagen + */ +public class ResourceFileBean extends PollenBean<PollenResource> { + + protected File file; + + protected String name; + + protected long size; + + protected String contentType; + + public ResourceFileBean() { + super(PollenResource.class); + } + + @Override + public void fromEntity(PollenResource entity) { + setEntityId(entity.getTopiaId()); + + setName(entity.getName()); + setSize(entity.getSize()); + setContentType(entity.getContentType()); + } + + @Override + public PollenResource toEntity() { + PollenResource entity = new PollenResourceImpl(); + + entity.setTopiaId(getEntityId()); + + try { + entity.setResourceContent(getResourceBlob()); + } catch (IOException | SQLException e) { + e.printStackTrace(); + } + + entity.setName(getName()); + entity.setSize(getSize()); + entity.setContentType(getContentType()); + + return entity; + } + + public File getFile() { + return file; + } + + public void setFile(File file) { + this.file = file; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public String getContentType() { + return contentType; + } + + public void setContentType(String contentType) { + this.contentType = contentType; + } + + public Blob getResourceBlob() throws IOException, SQLException { + InputStream stream = new FileInputStream(getFile()); + return new SerialBlob(IOUtils.toByteArray(stream)); + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceMetaBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceMetaBean.java new file mode 100644 index 0000000..3243fa6 --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceMetaBean.java @@ -0,0 +1,68 @@ +package org.chorem.pollen.services.bean; + +import org.chorem.pollen.persistence.entity.PollenResource; +import org.chorem.pollen.persistence.entity.PollenResourceImpl; + +/** + * Created on 11/07/14. + * + * @author dralagen + */ +public class ResourceMetaBean extends PollenBean<PollenResource> { + + protected String name; + + protected long size; + + protected String contentType; + + protected ResourceMetaBean() { + super(PollenResource.class); + } + + @Override + public void fromEntity(PollenResource entity) { + setEntityId(entity.getTopiaId()); + + setName(entity.getName()); + setSize(entity.getSize()); + setContentType(entity.getContentType()); + } + + @Override + public PollenResource toEntity() { + PollenResource entity = new PollenResourceImpl(); + + entity.setTopiaId(getEntityId()); + + entity.setName(getName()); + entity.setSize(getSize()); + entity.setContentType(getContentType()); + + return entity; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public String getContentType() { + return contentType; + } + + public void setContentType(String contentType) { + this.contentType = contentType; + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceStreamBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceStreamBean.java new file mode 100644 index 0000000..a4b154d --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ResourceStreamBean.java @@ -0,0 +1,102 @@ +package org.chorem.pollen.services.bean; + +import org.apache.commons.io.IOUtils; +import org.chorem.pollen.persistence.entity.PollenResource; +import org.chorem.pollen.persistence.entity.PollenResourceImpl; + +import javax.sql.rowset.serial.SerialBlob; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Blob; +import java.sql.SQLException; + +/** + * Created on 11/07/14. + * + * @author dralagen + */ +public class ResourceStreamBean extends PollenBean<PollenResource> { + + protected InputStream resourceContent; + + protected String name; + + protected long size; + + protected String contentType; + + public ResourceStreamBean() { + super(PollenResource.class); + } + + @Override + public void fromEntity(PollenResource entity) { + setEntityId(entity.getTopiaId()); + + try { + setResourceContent(entity.getResourceContent().getBinaryStream()); + } catch (SQLException e) { + e.printStackTrace(); + } + + setName(entity.getName()); + setSize(entity.getSize()); + setContentType(entity.getContentType()); + } + + @Override + public PollenResource toEntity() { + PollenResource entity = new PollenResourceImpl(); + + entity.setTopiaId(getEntityId()); + + try { + entity.setResourceContent(getResourceBlob()); + } catch (IOException | SQLException e) { + e.printStackTrace(); + } + + entity.setName(getName()); + entity.setSize(getSize()); + entity.setContentType(getContentType()); + + + return entity; + } + + public InputStream getResourceContent() { + return resourceContent; + } + + public void setResourceContent(InputStream resourceContent) { + this.resourceContent = resourceContent; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public String getContentType() { + return contentType; + } + + public void setContentType(String contentType) { + this.contentType = contentType; + } + + public Blob getResourceBlob() throws IOException, SQLException { + return new SerialBlob(IOUtils.toByteArray(getResourceContent())); + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenResourceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenResourceService.java new file mode 100644 index 0000000..0fae9bb --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenResourceService.java @@ -0,0 +1,106 @@ +package org.chorem.pollen.services.service; + +import org.chorem.pollen.persistence.entity.PollenResource; +import org.chorem.pollen.services.PollenService; +import org.chorem.pollen.services.bean.PollenEntityRef; +import org.chorem.pollen.services.bean.ResourceFileBean; +import org.chorem.pollen.services.bean.ResourceMetaBean; +import org.chorem.pollen.services.bean.ResourceStreamBean; + +import java.io.IOException; +import java.sql.SQLException; + +/** + * Created on 10/07/14. + * + * @author dralagen + */ +public class PollenResourceService extends PollenServiceSupport implements PollenService { + + public ResourceStreamBean getResource(String resourceId) { + checkNotNull(resourceId); + + PollenResource resource = getResource0(resourceId); + + return toBean(ResourceStreamBean.class, resource); + } + + public ResourceMetaBean getMetaResource(String resourceId) { + checkNotNull(resourceId); + + PollenResource resource = getResource0(resourceId); + + return toBean(ResourceMetaBean.class, resource); + } + + public PollenEntityRef<PollenResource> createResource(ResourceFileBean resource) { + checkNotNull(resource); + checkIsNotPersisted(resource); + + // TODO : check resource + + PollenResource savedResource = saveResource(resource); + commit(); + + return PollenEntityRef.of(savedResource); + } + + public PollenEntityRef<PollenResource> editResource (String resourceId, ResourceFileBean resource) { + checkNotNull(resourceId); + checkIsNotPersisted(resource); + + // TODO: check resource + + PollenResource savedResource = saveResource(resource); + commit(); + + return PollenEntityRef.of(savedResource); + + } + + public void deleteResource (String resourceId) { + checkNotNull(resourceId); + + PollenResource resource = getResource0(resourceId); + + getPollenResourceDao().delete(resource); + commit(); + } + + protected PollenResource getResource0(String resourceId) { + PollenResource resource = getPollenResourceDao().forTopiaIdEquals(resourceId).findUnique(); + + + return resource; + } + + + protected PollenResource saveResource(ResourceFileBean resource) { + + boolean resourceExist = resource.isPersisted(); + + PollenResource toSave; + + if (resourceExist) { + toSave = getResource0(resource.getEntityId()); + } + else { + toSave = getPollenResourceDao().create(); + } + + toSave.setName(resource.getName()); + toSave.setContentType(resource.getContentType()); + toSave.setSize(resource.getSize()); + try { + toSave.setResourceContent(resource.getResourceBlob()); + } catch (IOException | SQLException e) { + e.printStackTrace(); + + // no save + return null; + } + + return toSave; + } + +} 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 da78c96..beb0dfa 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 @@ -31,19 +31,7 @@ import com.google.common.collect.Multimap; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.persistence.PollenPersistenceContext; -import org.chorem.pollen.persistence.entity.ChoiceTopiaDao; -import org.chorem.pollen.persistence.entity.CommentTopiaDao; -import org.chorem.pollen.persistence.entity.FavoriteListMemberTopiaDao; -import org.chorem.pollen.persistence.entity.FavoriteListTopiaDao; -import org.chorem.pollen.persistence.entity.PollTopiaDao; -import org.chorem.pollen.persistence.entity.PollenPrincipalTopiaDao; -import org.chorem.pollen.persistence.entity.PollenUser; -import org.chorem.pollen.persistence.entity.PollenUserTopiaDao; -import org.chorem.pollen.persistence.entity.SessionTokenTopiaDao; -import org.chorem.pollen.persistence.entity.VoteToChoiceTopiaDao; -import org.chorem.pollen.persistence.entity.VoteTopiaDao; -import org.chorem.pollen.persistence.entity.VoterListMemberTopiaDao; -import org.chorem.pollen.persistence.entity.VoterListTopiaDao; +import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.PollenService; import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.bean.PollenBean; @@ -181,6 +169,10 @@ public abstract class PollenServiceSupport implements PollenService { return getPersistenceContext().getPollenPrincipalDao(); } + protected PollenResourceTopiaDao getPollenResourceDao() { + return getPersistenceContext().getPollenResourceDao(); + } + protected PollenUserTopiaDao getPollenUserDao() { return getPersistenceContext().getPollenUserDao(); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix test
by chorem.org scm 10 Jul '14

10 Jul '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit ace945679e5e1ebf56acdfaf0bd85b3706c07b89 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 10 12:13:24 2014 +0200 fix test --- .../org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java index 815f21b..6b86791 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java @@ -32,8 +32,8 @@ public class JsonArrayConverterTest { @Test public void convertToType() throws Exception { - String choicesStr = "[ {id: \"AAAA\", value: \"choice1\", choiceType: \"TEXT\", choiceOrder: 1}, " + - " {id: \"BBBB\", value: \"choice2\", choiceType: \"IMAGE\", choiceOrder: 2} ]"; + String choicesStr = "[ {id: \"AAAA\", choiceValue: \"choice1\", choiceType: \"TEXT\", choiceOrder: 1}, " + + " {id: \"BBBB\", choiceValue: \"choice2\", choiceType: \"IMAGE\", choiceOrder: 2} ]"; JsonArrayConverter converter = JsonArrayConverter.newConverter(new DefaultTopiaIdFactory(), ChoiceBean.class); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: (merge) Change Choice
by chorem.org scm 10 Jul '14

10 Jul '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 4415aef105958afd0c489050ad82a87380c2c2cc Merge: 4b7a4e4 75e6f56 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 10 10:46:51 2014 +0200 (merge) Change Choice .../persistence/PollenTopiaPersistenceContext.java | 5 +- pollen-persistence/src/main/xmi/pollen.properties | 15 ++++-- pollen-persistence/src/main/xmi/pollen.zargo | Bin 18462 -> 20233 bytes .../org/chorem/pollen/rest/api/PollApiTest.java | 5 +- .../rest/api/converter/JsonArrayConverterTest.java | 4 +- .../rest/api/converter/JsonConverterTest.java | 4 +- .../chorem/pollen/services/bean/ChoiceBean.java | 28 +++++------ .../pollen/services/service/ChoiceService.java | 16 +++--- pollen-services/src/main/resources/fixtures.yaml | 4 +- .../pollen/services/service/PollServiceTest.java | 56 ++++++++++----------- .../services/service/VoteCountingServiceTest.java | 4 +- .../services/service/VoterListServiceTest.java | 4 +- .../src/main/webapp/js/controllers/pollCtrl.js | 38 +++++++------- .../src/main/webapp/partials/inline-poll.html | 18 +++---- .../src/main/webapp/partials/poll-popupChoice.html | 6 +-- .../src/main/webapp/partials/poll-result.html | 2 +- 16 files changed, 105 insertions(+), 104 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: change choice.value to choice.choiceValue in UI
by chorem.org scm 10 Jul '14

10 Jul '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 75e6f561dd6bb62d5498b10cbc5554dac133c7f7 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 10 10:41:53 2014 +0200 change choice.value to choice.choiceValue in UI --- .../src/main/webapp/js/controllers/pollCtrl.js | 38 +++++++++++----------- .../src/main/webapp/partials/inline-poll.html | 18 +++++----- .../src/main/webapp/partials/poll-popupChoice.html | 6 ++-- .../src/main/webapp/partials/poll-result.html | 2 +- 4 files changed, 32 insertions(+), 32 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 e5a201b..c03f5a6 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -198,10 +198,10 @@ angular.module('pollControllers', []) $scope.preSendChoice = function (choice) { if (choice.choiceType == 'DATE') { - choice.value = choice.value.getTime(); + choice.choiceValue = choice.choiceValue.getTime(); } else if (choice.choiceType == 'IMAGE') { - choice.value = choice.value.meta.name+"####"+choice.value.data; + choice.choiceValue = choice.choiceValue.meta.name+"####"+choice.choiceValue.data; } return choice; @@ -209,12 +209,12 @@ angular.module('pollControllers', []) $scope.postReceiveChoice = function (choice) { if (choice.choiceType == 'DATE') { - choice.value = new Date(Number(choice.value)); + choice.choiceValue = new Date(Number(choice.choiceValue)); } else if (choice.choiceType == 'IMAGE') { - var tmp = choice.value.split("####"); + var tmp = choice.choiceValue.split("####"); - choice.value = {meta:{name:tmp[0]}, data : tmp[1]}; + choice.choiceValue = {meta:{name:tmp[0]}, data : tmp[1]}; } return choice; @@ -362,7 +362,7 @@ angular.module('pollControllers', []) var initChoice = function () { return { choiceType : $scope.globalVariables.lastType, - value : '' + choiceValue : '' }; } @@ -400,18 +400,18 @@ angular.module('pollControllers', []) title : function () { return title;}, choice : function () { if (choice.choiceType == 'TEXT') { - choice.valueText = choice.value; + choice.choiceValueText = choice.choiceValue; } else if (choice.choiceType == 'DATE') { - choice.valueDate = choice.value; + choice.choiceValueDate = choice.choiceValue; } else if (choice.choiceType == 'IMAGE') { - choice.valueImage = choice.value; + choice.choiceValueImage = choice.choiceValue; } // set default date - if (angular.isUndefined(choice.valueDate)) { - choice.valueDate = $scope.globalVariables.lastDate; + if (angular.isUndefined(choice.choiceValueDate)) { + choice.choiceValueDate = $scope.globalVariables.lastDate; } return choice; @@ -426,18 +426,18 @@ angular.module('pollControllers', []) $scope.globalVariables.lastType = choice.choiceType; if (choice.choiceType == 'TEXT') { - choice.value = choice.valueText; + choice.choiceValue = choice.choiceValueText; } else if (choice.choiceType == 'DATE') { - choice.value = choice.valueDate; - $scope.globalVariables.lastDate = angular.copy(choice.valueDate); + choice.choiceValue = choice.choiceValueDate; + $scope.globalVariables.lastDate = angular.copy(choice.choiceValueDate); } else if (choice.choiceType == 'IMAGE') { - choice.value = choice.valueImage; + choice.choiceValue = choice.choiceValueImage; } if (!angular.equals(choiceEdit, choice)) { - choiceEdit.value = choice.value; + choiceEdit.choiceValue = choice.choiceValue; choiceEdit.choiceType = choice.choiceType; choiceEdit.description = choice.description; @@ -1277,15 +1277,15 @@ angular.module('pollControllers', []) switch (value.choice.choiceType) { case 'TEXT': - scores.push([value.choice.value, value.scoreValue]); + scores.push([value.choice.choiceValue, value.scoreValue]); break; case 'DATE': - scores.push([$filter('date')(value.choice.value, $scope.globalVariables.dateFormat), value.scoreValue]); + scores.push([$filter('date')(value.choice.choiceValue, $scope.globalVariables.dateFormat), value.scoreValue]); break; case 'IMAGE': - scores.push([value.choice.value.meta.name, value.scoreValue]); + scores.push([value.choice.choiceValue.meta.name, value.scoreValue]); break; default: 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 af8c658..f42f38f 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -30,33 +30,33 @@ <td ng-repeat="choice in data.choices" class="pollChoice pollAnim" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> <div ng-if="choice.choiceType == 'TEXT'" edit-me="showEdit" > <div ng-hide="showEdit && !globalVariables.voted" class="fixe-input" title="{{choice.description}}"> - {{ choice.value || ('poll.edit' | translate) }} - <info-error error="choice.restError.value[0]" data="choice.value"></info-error> + {{ choice.choiceValue || ('poll.edit' | translate) }} + <info-error error="choice.restError.choiceValue[0]" data="choice.choiceValue"></info-error> <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> <div ng-show="showEdit && !globalVariables.voted"> - <input type="text" class="form-control" ng-model="choice.value" focus-me="showEdit" ng-exit="showEdit = false;" auto-save="saveChoice(choice)" required/> + <input type="text" class="form-control" ng-model="choice.choiceValue" focus-me="showEdit" ng-exit="showEdit = false;" auto-save="saveChoice(choice)" required/> <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> </div> </div> <div ng-if="choice.choiceType == 'DATE'" edit-me="showEdit" > <div ng-hide="!globalVariables.voted && showEdit || isOpen" class="fixe-input" title="{{choice.description}}"> - {{ (choice.value | date:globalVariables.dateFormat) || ('poll.edit' | translate) }} - <info-error error="choice.restError.value[0]" data="choice.value"></info-error> + {{ (choice.choiceValue | date:globalVariables.dateFormat) || ('poll.edit' | translate) }} + <info-error error="choice.restError.choiceValue[0]" data="choice.choiceValue"></info-error> <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/> </div> <div ng-show="!globalVariables.voted && showEdit || isOpen" > - <input type="text" class="form-control" ng-model="choice.value" focus-me="showEdit" datepicker-popup="{{globalVariables.dateFormat}}" is-open="isOpen" ng-exit="showEdit = false" ng-click="isOpen = true" auto-save="saveChoice(choice)" required/> + <input type="text" class="form-control" ng-model="choice.choiceValue" focus-me="showEdit" datepicker-popup="{{globalVariables.dateFormat}}" is-open="isOpen" ng-exit="showEdit = false" ng-click="isOpen = true" auto-save="saveChoice(choice)" required/> <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> </div> </div> <div ng-if="choice.choiceType == 'IMAGE'"> <div class="fixe-input" title="{{choice.description}}"> - {{choice.value.meta.name}} - <info-error error="choice.restError.value[0]" data="choice.value"></info-error> + {{choice.choiceValue.meta.name}} + <info-error error="choice.restError.choiceValue[0]" data="choice.choiceValue"></info-error> <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/> <br/> - <zoom-image image="choice.value.data" name="choice.value.meta.name"></zoom-image> + <zoom-image image="choice.choiceValue.data" name="choice.choiceValue.meta.name"></zoom-image> </div> 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 88a448e..0a5a988 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -39,7 +39,7 @@ <label for="popChoiceText" class="col-sm-4 control-label">Nom du Choix : </label> <div class="col-sm-6"> - <input id="popChoiceText" type="text" ng-model="choice.valueText" class="form-control" focus-me="choice.choiceType == 'TEXT'"/> + <input id="popChoiceText" type="text" ng-model="choice.choiceValueText" class="form-control" focus-me="choice.choiceType == 'TEXT'"/> </div> </div> @@ -49,7 +49,7 @@ <div class="col-sm-6"> <div class="right-inner-addon "> <i class="glyphicon glyphicon-calendar glyphicon-input"></i> - <input id="popChoiceDate" class="form-control" datepicker-popup="{{dateFormat}}" type="text" ng-model="choice.valueDate" is-open="opened" ng-click="opened = true" focus-me="choice.choiceType == 'DATE'"/> + <input id="popChoiceDate" class="form-control" datepicker-popup="{{dateFormat}}" type="text" ng-model="choice.choiceValueDate" is-open="opened" ng-click="opened = true" focus-me="choice.choiceType == 'DATE'"/> </div> </div> </div> @@ -58,7 +58,7 @@ <label class="col-sm-4 control-label">Image : </label> <div class="col-sm-6"> - <upload-file ng-model="choice.valueImage"></upload-file> + <upload-file ng-model="choice.choiceValueImage"></upload-file> </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 6965664..3f8a503 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -24,7 +24,7 @@ <th>{{ 'poll.result.score' | translate }}</th> </tr> <tr ng-repeat="score in data.result.scores"> - <th> {{ score.choice.value.meta.name || (score.choice.value | date:globalVariables.dateFormat) || score.choice.value }} </th> + <th> {{ score.choice.choiceValue.meta.name || (score.choice.choiceValue | date:globalVariables.dateFormat) || score.choice.choiceValue }} </th> <td> {{score.scoreValue}} </td> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: add PollenResource entity + remove dummy entity stereotype + rename Choice.name to Choice.choiceValue
by chorem.org scm 10 Jul '14

10 Jul '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit a2fec165a0b2a2a25e7b41a9a442955fb5bc9474 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jul 9 18:35:57 2014 +0200 add PollenResource entity + remove dummy entity stereotype + rename Choice.name to Choice.choiceValue --- .../persistence/PollenTopiaPersistenceContext.java | 5 +- pollen-persistence/src/main/xmi/pollen.properties | 15 ++++-- pollen-persistence/src/main/xmi/pollen.zargo | Bin 18462 -> 20233 bytes .../org/chorem/pollen/rest/api/PollApiTest.java | 5 +- .../rest/api/converter/JsonArrayConverterTest.java | 4 +- .../rest/api/converter/JsonConverterTest.java | 4 +- .../chorem/pollen/services/bean/ChoiceBean.java | 28 +++++------ .../pollen/services/service/ChoiceService.java | 16 +++--- pollen-services/src/main/resources/fixtures.yaml | 4 +- .../pollen/services/service/PollServiceTest.java | 56 ++++++++++----------- .../services/service/VoteCountingServiceTest.java | 4 +- .../services/service/VoterListServiceTest.java | 4 +- 12 files changed, 73 insertions(+), 72 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java index 8d5f5ea..bbcf552 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java @@ -25,16 +25,15 @@ import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.internal.HibernateProvider; import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; -import org.nuiton.topia.persistence.support.TopiaListenableSupport; public class PollenTopiaPersistenceContext extends AbstractPollenTopiaPersistenceContext { public PollenTopiaPersistenceContext(HibernateProvider hibernateProvider, - TopiaFiresSupport applicationFiresSupport, + TopiaFiresSupport listenableSupport, TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { super(hibernateProvider, - applicationFiresSupport, + listenableSupport, topiaIdFactory, sessionRegistry); } diff --git a/pollen-persistence/src/main/xmi/pollen.properties b/pollen-persistence/src/main/xmi/pollen.properties index 8a4f95e..7e82326 100644 --- a/pollen-persistence/src/main/xmi/pollen.properties +++ b/pollen-persistence/src/main/xmi/pollen.properties @@ -21,18 +21,23 @@ # #L% ###m model.tagvalue.version=2.0 -model.tagValue.notGenerateToString=true -model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.useEnumerationName=true -model.tagValue.indexForeignKeys=true +#model.tagValue.notGenerateToString=true +#model.tagValue.constantPrefix=PROPERTY_ +#model.tagValue.useEnumerationName=true +#model.tagValue.indexForeignKeys=true model.tagValue.hibernateAttributeType.String=string +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.name.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 +#org.chorem.pollen.persistence.entity.PollenResource.attribute.resourceContent.tagValue.sqlType=blob + # clef naturelle non modifiable sur PollenToken.token org.chorem.pollen.persistence.entity.PollenToken.class.tagValue.naturalIdMutable=true org.chorem.pollen.persistence.entity.PollenToken.attribute.token.stereotype=unique diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index 7d095e4..72a711c 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java index 37cf5b1..8ca03b6 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java @@ -26,7 +26,6 @@ import org.apache.http.client.fluent.Request; import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.PollenFixtures; import org.chorem.pollen.services.bean.ChoiceBean; -import org.chorem.pollen.services.bean.PollenBeans; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -124,11 +123,11 @@ public class PollApiTest extends AbstractPollenRestApiTest { List<ChoiceBean> choices = new ArrayList<>(); ChoiceBean choice1 = new ChoiceBean(); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setValue("choiceA"); + choice1.setChoiceValue("choiceA"); choices.add(choice1); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("choiceB"); + choice2.setChoiceValue("choiceB"); choices.add(choice2); String choiceStr = getJsonHelper().toJson(choices); diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java index 649e8a6..815f21b 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java @@ -42,12 +42,12 @@ public class JsonArrayConverterTest { Assert.assertEquals(2, choices.length); Assert.assertNotNull(choices[0]); - Assert.assertEquals("choice1", choices[0].getValue()); + Assert.assertEquals("choice1", choices[0].getChoiceValue()); Assert.assertEquals(ChoiceType.TEXT, choices[0].getChoiceType()); Assert.assertEquals(1, choices[0].getChoiceOrder()); Assert.assertNotNull(choices[1]); - Assert.assertEquals("choice2", choices[1].getValue()); + Assert.assertEquals("choice2", choices[1].getChoiceValue()); Assert.assertEquals(ChoiceType.IMAGE, choices[1].getChoiceType()); Assert.assertEquals(2, choices[1].getChoiceOrder()); diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java index eea755d..8ca1be5 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java @@ -78,9 +78,9 @@ public class JsonConverterTest { Assert.assertEquals(CommentVisibility.NOBODY, poll.getCommentVisibility()); Assert.assertEquals(PollType.FREE, poll.getPollType()); // Assert.assertEquals(2, poll.sizeChoice()); -// Assert.assertEquals("choice1", poll.getChoice(0).getName()); +// Assert.assertEquals("choice1", poll.getChoice(0).getChoiceValue()); // Assert.assertEquals(ChoiceType.TEXT, poll.getChoice(0).getChoiceType()); -// Assert.assertEquals("choice2", poll.getChoice(1).getName()); +// Assert.assertEquals("choice2", poll.getChoice(1).getChoiceValue()); // Assert.assertEquals(ChoiceType.IMAGE, poll.getChoice(1).getChoiceType()); String convert = converter.convert(String.class, poll); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java index fa0b5fa..40e8691 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java @@ -25,8 +25,6 @@ import org.chorem.pollen.persistence.entity.Choice; import org.chorem.pollen.persistence.entity.ChoiceImpl; import org.chorem.pollen.persistence.entity.ChoiceType; -import java.util.Date; - /** * Created on 5/15/14. * @@ -39,7 +37,7 @@ public class ChoiceBean extends PollenBean<Choice> { protected int choiceOrder; - protected String value; + protected String choiceValue; protected ChoiceType choiceType; @@ -66,16 +64,16 @@ public class ChoiceBean extends PollenBean<Choice> { switch (entity.getChoiceType()) { case TEXT: - setValue(entity.getName()); + setChoiceValue(entity.getChoiceValue()); break; case DATE: - setValue(entity.getName()); + setChoiceValue(entity.getChoiceValue()); break; case IMAGE: - setValue(entity.getName()); + setChoiceValue(entity.getChoiceValue()); break; } @@ -96,21 +94,21 @@ public class ChoiceBean extends PollenBean<Choice> { if (choiceType != null) { switch (choiceType) { case TEXT: - entity.setName(getValue()); + entity.setChoiceValue(getChoiceValue()); break; case DATE: - if ( getValue() != null ) { - entity.setName(getValue()); + if ( getChoiceValue() != null ) { + entity.setChoiceValue(getChoiceValue()); } break; case IMAGE: - if ( getValue() != null ) { - entity.setName(getValue()); + if ( getChoiceValue() != null ) { + entity.setChoiceValue(getChoiceValue()); } break; @@ -133,12 +131,12 @@ public class ChoiceBean extends PollenBean<Choice> { this.permission = permission; } - public String getValue() { - return value; + public String getChoiceValue() { + return choiceValue; } - public void setValue(String value) { - this.value = value; + public void setChoiceValue(String value) { + this.choiceValue = value; } public ChoiceType getChoiceType() { 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 ae476f4..b08c1c5 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 @@ -98,7 +98,7 @@ public class ChoiceService extends PollenServiceSupport { // // if (connectedUser != null) { // -// creator.setName(connectedUser.getName()); +// creator.setChoiceValue(connectedUser.getChoiceValue()); // creator.setEmail(connectedUser.getEmail()); // } // @@ -220,7 +220,7 @@ public class ChoiceService extends PollenServiceSupport { //FIXME // PollenPrincipal creator = choice.getCreator(); // if (creator != null) { -// principal.setName(creator.getName()); +// principal.setChoiceValue(creator.getChoiceValue()); // principal.setEmail(creator.getEmail()); // } @@ -236,19 +236,19 @@ public class ChoiceService extends PollenServiceSupport { case TEXT: - toSave.setName(choice.getValue()); + toSave.setChoiceValue(choice.getChoiceValue()); break; case DATE: - toSave.setName(choice.getValue()); + toSave.setChoiceValue(choice.getChoiceValue()); break; case IMAGE: - toSave.setName(choice.getValue()); + toSave.setChoiceValue(choice.getChoiceValue()); } @@ -282,7 +282,7 @@ public class ChoiceService extends PollenServiceSupport { } - choiceNames.add(choice1.getName()); + choiceNames.add(choice1.getChoiceValue()); } } @@ -293,7 +293,7 @@ public class ChoiceService extends PollenServiceSupport { case TEXT: - String choiceName = choice.getValue(); + String choiceName = choice.getChoiceValue(); boolean nameNotBlank = checkNotBlank(errors, "value", choiceName, @@ -307,7 +307,7 @@ public class ChoiceService extends PollenServiceSupport { break; case DATE: - Date choiceDate = new Date(Long.parseLong(choice.getValue())); + Date choiceDate = new Date(Long.parseLong(choice.getChoiceValue())); boolean dateNotBlank; if (choiceDate == null) { diff --git a/pollen-services/src/main/resources/fixtures.yaml b/pollen-services/src/main/resources/fixtures.yaml index 6f02abe..b2a4219 100644 --- a/pollen-services/src/main/resources/fixtures.yaml +++ b/pollen-services/src/main/resources/fixtures.yaml @@ -76,14 +76,14 @@ poll_normal: choiceA: &normal_choixA !choice poll: *normal - name: choixA + choiceValue: choixA description: choixA description choiceType: TEXT choiceB: &normal_choixB !choice poll: *normal - name: choixB + choiceValue: choixB description: choixB description choiceType: TEXT 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 448e5a8..3d17723 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 @@ -85,13 +85,13 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean choice1 = new ChoiceBean(); choices.add(choice1); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setValue("A"); + choice1.setChoiceValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("B"); + choice2.setChoiceValue("B"); choice2.setDescription("Choice B"); choices.add(choice2); @@ -117,7 +117,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean reloadedChoice1 = choiceService.getChoice(createdPollId, createdChoice1.getEntityId()); Assert.assertEquals(createdChoice1, reloadedChoice1); - Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); + Assert.assertEquals(choice1.getChoiceValue(), createdChoice1.getChoiceValue()); Assert.assertEquals(choice1.getDescription(), createdChoice1.getDescription()); @@ -128,7 +128,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean reloadedChoice2 = choiceService.getChoice(createdPollId, createdChoice2.getEntityId()); Assert.assertEquals(createdChoice2, reloadedChoice2); - Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); + Assert.assertEquals(choice2.getChoiceValue(), createdChoice2.getChoiceValue()); Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); } @@ -172,13 +172,13 @@ public class PollServiceTest extends AbstractPollenServiceTest { assertErrorKeyFound(e, "choice[0].value"); } - choice1.setValue("A"); + choice1.setChoiceValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("A"); + choice2.setChoiceValue("A"); choice2.setDescription("Choice B"); choices.add(choice2); @@ -190,7 +190,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { assertErrorKeyFound(e, "choice[1].value"); } - choice2.setValue("B"); + choice2.setChoiceValue("B"); PollenEntityRef<Poll> createdPoll = service.createPoll(poll, choices); @@ -205,7 +205,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // Assert.assertNotNull(createdPoll.getCreator()); // Assert.assertNotNull(createdPoll.getCreator().getTopiaId()); -// Assert.assertNull(createdPoll.getCreator().getValue()); +// Assert.assertNull(createdPoll.getCreator().getChoiceValue()); // Assert.assertNull(createdPoll.getCreator().getEmail()); // Assert.assertNull(createdPoll.getComment()); // Assert.assertNull(createdPoll.getVote()); @@ -224,7 +224,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean reloadedChoice1 = choiceService.getChoice(createdPollId, createdChoice1.getEntityId()); Assert.assertEquals(createdChoice1, reloadedChoice1); - Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); + Assert.assertEquals(choice1.getChoiceValue(), createdChoice1.getChoiceValue()); Assert.assertEquals(choice1.getDescription(), createdChoice1.getDescription()); ChoiceBean createdChoice2 = createdChoices.get(1); @@ -234,7 +234,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean reloadedChoice2 = choiceService.getChoice(createdPollId, createdChoice2.getEntityId()); Assert.assertEquals(createdChoice2, reloadedChoice2); - Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); + Assert.assertEquals(choice2.getChoiceValue(), createdChoice2.getChoiceValue()); Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); } @@ -253,13 +253,13 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean choice1 = new ChoiceBean(); // choices.add(choice1); // choice1.setChoiceType(ChoiceType.TEXT); -// choice1.setValue("A"); +// choice1.setChoiceValue("A"); // choice1.setDescription("Choice A"); // // // ChoiceBean choice2 = new ChoiceBean(); // choice2.setChoiceType(ChoiceType.TEXT); -// choice2.setValue("B"); +// choice2.setChoiceValue("B"); // choice2.setDescription("Choice B"); // choices.add(choice2); // @@ -289,7 +289,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // //// Assert.assertNotNull(createdPoll.getCreator()); //// Assert.assertNotNull(createdPoll.getCreator().getTopiaId()); -//// Assert.assertNull(createdPoll.getCreator().getValue()); +//// Assert.assertNull(createdPoll.getCreator().getChoiceValue()); //// Assert.assertNull(createdPoll.getCreator().getEmail()); // // List<ChoiceBean> createdChoices = choiceService.getChoices(createdPollId); @@ -304,7 +304,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean reloadedChoice1 = choiceService.getChoice(createdPollId, createdChoice1.getEntityId()); // Assert.assertEquals(createdChoice1, reloadedChoice1); // -// Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); +// Assert.assertEquals(choice1.getChoiceValue(), createdChoice1.getChoiceValue()); // Assert.assertEquals(choice1.getDescription(), createdChoice1.getDescription()); //// Assert.assertEquals(createdPoll.getCreator(), createdChoice1.getCreator()); // @@ -315,7 +315,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean reloadedChoice2 = choiceService.getChoice(createdPollId, createdChoice2.getEntityId()); // Assert.assertEquals(createdChoice2, reloadedChoice2); // -// Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); +// Assert.assertEquals(choice2.getChoiceValue(), createdChoice2.getChoiceValue()); // Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); //// Assert.assertEquals(createdPoll.getCreator(), createdChoice2.getCreator()); // @@ -330,7 +330,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // VoterListBean reloadedVoterList = voterListService.getVoterList(createdPollId, createdVoterList.getEntityId()); // Assert.assertEquals(createdVoterList, reloadedVoterList); // -// Assert.assertEquals(voterList.getValue(), createdVoterList.getValue()); +// Assert.assertEquals(voterList.getChoiceValue(), createdVoterList.getChoiceValue()); // Assert.assertEquals(voterList.getWeight(), createdVoterList.getWeight(), 0); // // Assert.assertNotNull(createdVoterList.getMember()); @@ -350,14 +350,14 @@ public class PollServiceTest extends AbstractPollenServiceTest { // // ChoiceBean choice1 = new ChoiceBean(); // choice1.setChoiceType(ChoiceType.TEXT); -// choice1.setValue("A"); +// choice1.setChoiceValue("A"); // choice1.setDescription("Choice A"); // // choices.add(choice1); // // ChoiceBean choice2 = new ChoiceBean(); // choice2.setChoiceType(ChoiceType.TEXT); -// choice2.setValue("B"); +// choice2.setChoiceValue("B"); // choice2.setDescription("Choice B"); // // choices.add(choice2); @@ -387,7 +387,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // assertErrorKeyFound(e, "voterList[0].name", "voterList[0].weight", "voterList[0].member"); // } // -// voterList.setValue("voterList1"); +// voterList.setChoiceValue("voterList1"); // voterList.setWeight(1); // // VoterListMemberBean voterListMember1 = new VoterListMemberBean(); @@ -402,7 +402,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // assertErrorKeyFound(e, "voterList[0].member[0].name", "voterList[0].member[0].email", "voterList[0].member[0].weight"); // } // -// voterListMember1.setValue("voter1"); +// voterListMember1.setChoiceValue("voter1"); // voterListMember1.setWeight(0.3); // voterListMember1.setEmail("voter1_pollen.org"); // @@ -417,7 +417,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // voterListMember1.setEmail("voter1(a)pollen.org"); // // VoterListMemberBean voterListMember2 = new VoterListMemberBean(); -// voterListMember2.setValue("voter1"); +// voterListMember2.setChoiceValue("voter1"); // voterListMember2.setWeight(0.7); // voterListMember2.setEmail("voter1(a)pollen.org"); // voterList.addMember(voterListMember2); @@ -431,7 +431,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // assertErrorKeyFound(e, "voterList[0].member[1].name", "voterList[0].member[1].email"); // } // -// voterListMember2.setValue("voter2"); +// voterListMember2.setChoiceValue("voter2"); // voterListMember2.setEmail("voter2(a)pollen.org"); // // PollenEntityRef<Poll> createdPoll = service.createPoll(poll, choices); @@ -457,7 +457,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // //// Assert.assertNotNull(createdPoll.getCreator()); //// Assert.assertNotNull(createdPoll.getCreator().getTopiaId()); -//// Assert.assertNull(createdPoll.getCreator().getValue()); +//// Assert.assertNull(createdPoll.getCreator().getChoiceValue()); //// Assert.assertNull(createdPoll.getCreator().getEmail()); //// Assert.assertNull(createdPoll.getComment()); //// Assert.assertNull(createdPoll.getVote()); @@ -474,7 +474,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean reloadedChoice1 = choiceService.getChoice(createdPollId, createdChoice1.getEntityId()); // Assert.assertEquals(createdChoice1, reloadedChoice1); // -// Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); +// Assert.assertEquals(choice1.getChoiceValue(), createdChoice1.getChoiceValue()); // Assert.assertEquals(choice1.getDescription(), createdChoice1.getDescription()); //// Assert.assertEquals(createdPoll.getCreator(), createdChoice1.getCreator()); // @@ -485,7 +485,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean reloadedChoice2 = choiceService.getChoice(createdPollId, createdChoice2.getEntityId()); // Assert.assertEquals(createdChoice2, reloadedChoice2); // -// Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); +// Assert.assertEquals(choice2.getChoiceValue(), createdChoice2.getChoiceValue()); // Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); //// Assert.assertEquals(createdPoll.getCreator(), createdChoice2.getCreator()); // @@ -500,7 +500,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // VoterListBean reloadedVoterList = voterListService.getVoterList(createdPollId, createdVoterList.getEntityId()); // Assert.assertEquals(createdVoterList, reloadedVoterList); // -// Assert.assertEquals(voterList.getValue(), createdVoterList.getValue()); +// Assert.assertEquals(voterList.getChoiceValue(), createdVoterList.getChoiceValue()); // Assert.assertEquals(voterList.getWeight(), createdVoterList.getWeight(), 0); // // Assert.assertNotNull(createdVoterList.getMember()); @@ -513,7 +513,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { //// VoterListMember reloadedVoterListMember1 = voterListService.getMember(createdPoll.getTopiaId(), createdVoterList.getTopiaId(), createdVoterListMember1.getTopiaId()); //// Assert.assertEquals(createdVoterListMember1, reloadedVoterListMember1); //// -//// Assert.assertEquals(reloadedVoterListMember1.getValue(), createdVoterListMember1.getValue()); +//// Assert.assertEquals(reloadedVoterListMember1.getChoiceValue(), createdVoterListMember1.getChoiceValue()); //// Assert.assertEquals(reloadedVoterListMember1.getEmail(), createdVoterListMember1.getEmail()); //// Assert.assertEquals(reloadedVoterListMember1.getWeight(), createdVoterListMember1.getWeight(), 0); //// @@ -525,7 +525,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { //// VoterListMember reloadedVoterListMember2 = voterListService.getMember(createdPoll.getTopiaId(), createdVoterList.getTopiaId(), createdVoterListMember2.getTopiaId()); //// Assert.assertEquals(createdVoterListMember2, reloadedVoterListMember2); //// -//// Assert.assertEquals(reloadedVoterListMember2.getValue(), createdVoterListMember2.getValue()); +//// Assert.assertEquals(reloadedVoterListMember2.getChoiceValue(), createdVoterListMember2.getChoiceValue()); //// Assert.assertEquals(reloadedVoterListMember2.getEmail(), createdVoterListMember2.getEmail()); //// Assert.assertEquals(reloadedVoterListMember2.getWeight(), createdVoterListMember2.getWeight(), 0); // diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java index d7f1703..3238aaa 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java @@ -83,13 +83,13 @@ public class VoteCountingServiceTest extends AbstractPollenServiceTest { ChoiceBean choice1 = new ChoiceBean(); choices.add(choice1); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setValue("A"); + choice1.setChoiceValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("B"); + choice2.setChoiceValue("B"); choice2.setDescription("Choice B"); choices.add(choice2); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java index 1fcc304..44ba4c1 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java @@ -100,12 +100,12 @@ public class VoterListServiceTest extends AbstractPollenServiceTest { ChoiceBean choice1 = new ChoiceBean(); choices.add(choice1); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setValue("A"); + choice1.setChoiceValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("B"); + choice2.setChoiceValue("B"); choice2.setDescription("Choice B"); choices.add(choice2); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add PollenResource entity + remove dummy entity stereotype + rename Choice.name to Choice.choiceValue
by chorem.org scm 09 Jul '14

09 Jul '14

This is an automated email from the git hooks/post-receive script. New commit to branch addFileChoice in repository pollen. See http://git.chorem.org/pollen.git commit d4a36100845c5952bacdd2f20ecb67062ee4ccf2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jul 9 18:35:57 2014 +0200 add PollenResource entity + remove dummy entity stereotype + rename Choice.name to Choice.choiceValue --- .../persistence/PollenTopiaPersistenceContext.java | 4 +- pollen-persistence/src/main/xmi/pollen.properties | 15 ++++-- pollen-persistence/src/main/xmi/pollen.zargo | Bin 18462 -> 20233 bytes .../org/chorem/pollen/rest/api/PollApiTest.java | 5 +- .../rest/api/converter/JsonArrayConverterTest.java | 4 +- .../rest/api/converter/JsonConverterTest.java | 4 +- .../chorem/pollen/services/bean/ChoiceBean.java | 28 +++++------ .../pollen/services/service/ChoiceService.java | 16 +++--- pollen-services/src/main/resources/fixtures.yaml | 4 +- .../pollen/services/service/PollServiceTest.java | 56 ++++++++++----------- .../services/service/VoteCountingServiceTest.java | 4 +- .../services/service/VoterListServiceTest.java | 4 +- 12 files changed, 73 insertions(+), 71 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java index d01cfcf..bbcf552 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java @@ -24,12 +24,12 @@ package org.chorem.pollen.persistence; import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.internal.HibernateProvider; import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; -import org.nuiton.topia.persistence.support.TopiaListenableSupport; +import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; public class PollenTopiaPersistenceContext extends AbstractPollenTopiaPersistenceContext { public PollenTopiaPersistenceContext(HibernateProvider hibernateProvider, - TopiaListenableSupport listenableSupport, + TopiaFiresSupport listenableSupport, TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { super(hibernateProvider, diff --git a/pollen-persistence/src/main/xmi/pollen.properties b/pollen-persistence/src/main/xmi/pollen.properties index 8a4f95e..7e82326 100644 --- a/pollen-persistence/src/main/xmi/pollen.properties +++ b/pollen-persistence/src/main/xmi/pollen.properties @@ -21,18 +21,23 @@ # #L% ###m model.tagvalue.version=2.0 -model.tagValue.notGenerateToString=true -model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.useEnumerationName=true -model.tagValue.indexForeignKeys=true +#model.tagValue.notGenerateToString=true +#model.tagValue.constantPrefix=PROPERTY_ +#model.tagValue.useEnumerationName=true +#model.tagValue.indexForeignKeys=true model.tagValue.hibernateAttributeType.String=string +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.name.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 +#org.chorem.pollen.persistence.entity.PollenResource.attribute.resourceContent.tagValue.sqlType=blob + # clef naturelle non modifiable sur PollenToken.token org.chorem.pollen.persistence.entity.PollenToken.class.tagValue.naturalIdMutable=true org.chorem.pollen.persistence.entity.PollenToken.attribute.token.stereotype=unique diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index 7d095e4..72a711c 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java index 37cf5b1..8ca03b6 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java @@ -26,7 +26,6 @@ import org.apache.http.client.fluent.Request; import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.PollenFixtures; import org.chorem.pollen.services.bean.ChoiceBean; -import org.chorem.pollen.services.bean.PollenBeans; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -124,11 +123,11 @@ public class PollApiTest extends AbstractPollenRestApiTest { List<ChoiceBean> choices = new ArrayList<>(); ChoiceBean choice1 = new ChoiceBean(); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setValue("choiceA"); + choice1.setChoiceValue("choiceA"); choices.add(choice1); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("choiceB"); + choice2.setChoiceValue("choiceB"); choices.add(choice2); String choiceStr = getJsonHelper().toJson(choices); diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java index 649e8a6..815f21b 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonArrayConverterTest.java @@ -42,12 +42,12 @@ public class JsonArrayConverterTest { Assert.assertEquals(2, choices.length); Assert.assertNotNull(choices[0]); - Assert.assertEquals("choice1", choices[0].getValue()); + Assert.assertEquals("choice1", choices[0].getChoiceValue()); Assert.assertEquals(ChoiceType.TEXT, choices[0].getChoiceType()); Assert.assertEquals(1, choices[0].getChoiceOrder()); Assert.assertNotNull(choices[1]); - Assert.assertEquals("choice2", choices[1].getValue()); + Assert.assertEquals("choice2", choices[1].getChoiceValue()); Assert.assertEquals(ChoiceType.IMAGE, choices[1].getChoiceType()); Assert.assertEquals(2, choices[1].getChoiceOrder()); diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java index eea755d..8ca1be5 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java @@ -78,9 +78,9 @@ public class JsonConverterTest { Assert.assertEquals(CommentVisibility.NOBODY, poll.getCommentVisibility()); Assert.assertEquals(PollType.FREE, poll.getPollType()); // Assert.assertEquals(2, poll.sizeChoice()); -// Assert.assertEquals("choice1", poll.getChoice(0).getName()); +// Assert.assertEquals("choice1", poll.getChoice(0).getChoiceValue()); // Assert.assertEquals(ChoiceType.TEXT, poll.getChoice(0).getChoiceType()); -// Assert.assertEquals("choice2", poll.getChoice(1).getName()); +// Assert.assertEquals("choice2", poll.getChoice(1).getChoiceValue()); // Assert.assertEquals(ChoiceType.IMAGE, poll.getChoice(1).getChoiceType()); String convert = converter.convert(String.class, poll); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java index fa0b5fa..40e8691 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java @@ -25,8 +25,6 @@ import org.chorem.pollen.persistence.entity.Choice; import org.chorem.pollen.persistence.entity.ChoiceImpl; import org.chorem.pollen.persistence.entity.ChoiceType; -import java.util.Date; - /** * Created on 5/15/14. * @@ -39,7 +37,7 @@ public class ChoiceBean extends PollenBean<Choice> { protected int choiceOrder; - protected String value; + protected String choiceValue; protected ChoiceType choiceType; @@ -66,16 +64,16 @@ public class ChoiceBean extends PollenBean<Choice> { switch (entity.getChoiceType()) { case TEXT: - setValue(entity.getName()); + setChoiceValue(entity.getChoiceValue()); break; case DATE: - setValue(entity.getName()); + setChoiceValue(entity.getChoiceValue()); break; case IMAGE: - setValue(entity.getName()); + setChoiceValue(entity.getChoiceValue()); break; } @@ -96,21 +94,21 @@ public class ChoiceBean extends PollenBean<Choice> { if (choiceType != null) { switch (choiceType) { case TEXT: - entity.setName(getValue()); + entity.setChoiceValue(getChoiceValue()); break; case DATE: - if ( getValue() != null ) { - entity.setName(getValue()); + if ( getChoiceValue() != null ) { + entity.setChoiceValue(getChoiceValue()); } break; case IMAGE: - if ( getValue() != null ) { - entity.setName(getValue()); + if ( getChoiceValue() != null ) { + entity.setChoiceValue(getChoiceValue()); } break; @@ -133,12 +131,12 @@ public class ChoiceBean extends PollenBean<Choice> { this.permission = permission; } - public String getValue() { - return value; + public String getChoiceValue() { + return choiceValue; } - public void setValue(String value) { - this.value = value; + public void setChoiceValue(String value) { + this.choiceValue = value; } public ChoiceType getChoiceType() { 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 ae476f4..b08c1c5 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 @@ -98,7 +98,7 @@ public class ChoiceService extends PollenServiceSupport { // // if (connectedUser != null) { // -// creator.setName(connectedUser.getName()); +// creator.setChoiceValue(connectedUser.getChoiceValue()); // creator.setEmail(connectedUser.getEmail()); // } // @@ -220,7 +220,7 @@ public class ChoiceService extends PollenServiceSupport { //FIXME // PollenPrincipal creator = choice.getCreator(); // if (creator != null) { -// principal.setName(creator.getName()); +// principal.setChoiceValue(creator.getChoiceValue()); // principal.setEmail(creator.getEmail()); // } @@ -236,19 +236,19 @@ public class ChoiceService extends PollenServiceSupport { case TEXT: - toSave.setName(choice.getValue()); + toSave.setChoiceValue(choice.getChoiceValue()); break; case DATE: - toSave.setName(choice.getValue()); + toSave.setChoiceValue(choice.getChoiceValue()); break; case IMAGE: - toSave.setName(choice.getValue()); + toSave.setChoiceValue(choice.getChoiceValue()); } @@ -282,7 +282,7 @@ public class ChoiceService extends PollenServiceSupport { } - choiceNames.add(choice1.getName()); + choiceNames.add(choice1.getChoiceValue()); } } @@ -293,7 +293,7 @@ public class ChoiceService extends PollenServiceSupport { case TEXT: - String choiceName = choice.getValue(); + String choiceName = choice.getChoiceValue(); boolean nameNotBlank = checkNotBlank(errors, "value", choiceName, @@ -307,7 +307,7 @@ public class ChoiceService extends PollenServiceSupport { break; case DATE: - Date choiceDate = new Date(Long.parseLong(choice.getValue())); + Date choiceDate = new Date(Long.parseLong(choice.getChoiceValue())); boolean dateNotBlank; if (choiceDate == null) { diff --git a/pollen-services/src/main/resources/fixtures.yaml b/pollen-services/src/main/resources/fixtures.yaml index 6f02abe..b2a4219 100644 --- a/pollen-services/src/main/resources/fixtures.yaml +++ b/pollen-services/src/main/resources/fixtures.yaml @@ -76,14 +76,14 @@ poll_normal: choiceA: &normal_choixA !choice poll: *normal - name: choixA + choiceValue: choixA description: choixA description choiceType: TEXT choiceB: &normal_choixB !choice poll: *normal - name: choixB + choiceValue: choixB description: choixB description choiceType: TEXT 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 448e5a8..3d17723 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 @@ -85,13 +85,13 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean choice1 = new ChoiceBean(); choices.add(choice1); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setValue("A"); + choice1.setChoiceValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("B"); + choice2.setChoiceValue("B"); choice2.setDescription("Choice B"); choices.add(choice2); @@ -117,7 +117,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean reloadedChoice1 = choiceService.getChoice(createdPollId, createdChoice1.getEntityId()); Assert.assertEquals(createdChoice1, reloadedChoice1); - Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); + Assert.assertEquals(choice1.getChoiceValue(), createdChoice1.getChoiceValue()); Assert.assertEquals(choice1.getDescription(), createdChoice1.getDescription()); @@ -128,7 +128,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean reloadedChoice2 = choiceService.getChoice(createdPollId, createdChoice2.getEntityId()); Assert.assertEquals(createdChoice2, reloadedChoice2); - Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); + Assert.assertEquals(choice2.getChoiceValue(), createdChoice2.getChoiceValue()); Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); } @@ -172,13 +172,13 @@ public class PollServiceTest extends AbstractPollenServiceTest { assertErrorKeyFound(e, "choice[0].value"); } - choice1.setValue("A"); + choice1.setChoiceValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("A"); + choice2.setChoiceValue("A"); choice2.setDescription("Choice B"); choices.add(choice2); @@ -190,7 +190,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { assertErrorKeyFound(e, "choice[1].value"); } - choice2.setValue("B"); + choice2.setChoiceValue("B"); PollenEntityRef<Poll> createdPoll = service.createPoll(poll, choices); @@ -205,7 +205,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // Assert.assertNotNull(createdPoll.getCreator()); // Assert.assertNotNull(createdPoll.getCreator().getTopiaId()); -// Assert.assertNull(createdPoll.getCreator().getValue()); +// Assert.assertNull(createdPoll.getCreator().getChoiceValue()); // Assert.assertNull(createdPoll.getCreator().getEmail()); // Assert.assertNull(createdPoll.getComment()); // Assert.assertNull(createdPoll.getVote()); @@ -224,7 +224,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean reloadedChoice1 = choiceService.getChoice(createdPollId, createdChoice1.getEntityId()); Assert.assertEquals(createdChoice1, reloadedChoice1); - Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); + Assert.assertEquals(choice1.getChoiceValue(), createdChoice1.getChoiceValue()); Assert.assertEquals(choice1.getDescription(), createdChoice1.getDescription()); ChoiceBean createdChoice2 = createdChoices.get(1); @@ -234,7 +234,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { ChoiceBean reloadedChoice2 = choiceService.getChoice(createdPollId, createdChoice2.getEntityId()); Assert.assertEquals(createdChoice2, reloadedChoice2); - Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); + Assert.assertEquals(choice2.getChoiceValue(), createdChoice2.getChoiceValue()); Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); } @@ -253,13 +253,13 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean choice1 = new ChoiceBean(); // choices.add(choice1); // choice1.setChoiceType(ChoiceType.TEXT); -// choice1.setValue("A"); +// choice1.setChoiceValue("A"); // choice1.setDescription("Choice A"); // // // ChoiceBean choice2 = new ChoiceBean(); // choice2.setChoiceType(ChoiceType.TEXT); -// choice2.setValue("B"); +// choice2.setChoiceValue("B"); // choice2.setDescription("Choice B"); // choices.add(choice2); // @@ -289,7 +289,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // //// Assert.assertNotNull(createdPoll.getCreator()); //// Assert.assertNotNull(createdPoll.getCreator().getTopiaId()); -//// Assert.assertNull(createdPoll.getCreator().getValue()); +//// Assert.assertNull(createdPoll.getCreator().getChoiceValue()); //// Assert.assertNull(createdPoll.getCreator().getEmail()); // // List<ChoiceBean> createdChoices = choiceService.getChoices(createdPollId); @@ -304,7 +304,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean reloadedChoice1 = choiceService.getChoice(createdPollId, createdChoice1.getEntityId()); // Assert.assertEquals(createdChoice1, reloadedChoice1); // -// Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); +// Assert.assertEquals(choice1.getChoiceValue(), createdChoice1.getChoiceValue()); // Assert.assertEquals(choice1.getDescription(), createdChoice1.getDescription()); //// Assert.assertEquals(createdPoll.getCreator(), createdChoice1.getCreator()); // @@ -315,7 +315,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean reloadedChoice2 = choiceService.getChoice(createdPollId, createdChoice2.getEntityId()); // Assert.assertEquals(createdChoice2, reloadedChoice2); // -// Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); +// Assert.assertEquals(choice2.getChoiceValue(), createdChoice2.getChoiceValue()); // Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); //// Assert.assertEquals(createdPoll.getCreator(), createdChoice2.getCreator()); // @@ -330,7 +330,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // VoterListBean reloadedVoterList = voterListService.getVoterList(createdPollId, createdVoterList.getEntityId()); // Assert.assertEquals(createdVoterList, reloadedVoterList); // -// Assert.assertEquals(voterList.getValue(), createdVoterList.getValue()); +// Assert.assertEquals(voterList.getChoiceValue(), createdVoterList.getChoiceValue()); // Assert.assertEquals(voterList.getWeight(), createdVoterList.getWeight(), 0); // // Assert.assertNotNull(createdVoterList.getMember()); @@ -350,14 +350,14 @@ public class PollServiceTest extends AbstractPollenServiceTest { // // ChoiceBean choice1 = new ChoiceBean(); // choice1.setChoiceType(ChoiceType.TEXT); -// choice1.setValue("A"); +// choice1.setChoiceValue("A"); // choice1.setDescription("Choice A"); // // choices.add(choice1); // // ChoiceBean choice2 = new ChoiceBean(); // choice2.setChoiceType(ChoiceType.TEXT); -// choice2.setValue("B"); +// choice2.setChoiceValue("B"); // choice2.setDescription("Choice B"); // // choices.add(choice2); @@ -387,7 +387,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // assertErrorKeyFound(e, "voterList[0].name", "voterList[0].weight", "voterList[0].member"); // } // -// voterList.setValue("voterList1"); +// voterList.setChoiceValue("voterList1"); // voterList.setWeight(1); // // VoterListMemberBean voterListMember1 = new VoterListMemberBean(); @@ -402,7 +402,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // assertErrorKeyFound(e, "voterList[0].member[0].name", "voterList[0].member[0].email", "voterList[0].member[0].weight"); // } // -// voterListMember1.setValue("voter1"); +// voterListMember1.setChoiceValue("voter1"); // voterListMember1.setWeight(0.3); // voterListMember1.setEmail("voter1_pollen.org"); // @@ -417,7 +417,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // voterListMember1.setEmail("voter1(a)pollen.org"); // // VoterListMemberBean voterListMember2 = new VoterListMemberBean(); -// voterListMember2.setValue("voter1"); +// voterListMember2.setChoiceValue("voter1"); // voterListMember2.setWeight(0.7); // voterListMember2.setEmail("voter1(a)pollen.org"); // voterList.addMember(voterListMember2); @@ -431,7 +431,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // assertErrorKeyFound(e, "voterList[0].member[1].name", "voterList[0].member[1].email"); // } // -// voterListMember2.setValue("voter2"); +// voterListMember2.setChoiceValue("voter2"); // voterListMember2.setEmail("voter2(a)pollen.org"); // // PollenEntityRef<Poll> createdPoll = service.createPoll(poll, choices); @@ -457,7 +457,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // //// Assert.assertNotNull(createdPoll.getCreator()); //// Assert.assertNotNull(createdPoll.getCreator().getTopiaId()); -//// Assert.assertNull(createdPoll.getCreator().getValue()); +//// Assert.assertNull(createdPoll.getCreator().getChoiceValue()); //// Assert.assertNull(createdPoll.getCreator().getEmail()); //// Assert.assertNull(createdPoll.getComment()); //// Assert.assertNull(createdPoll.getVote()); @@ -474,7 +474,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean reloadedChoice1 = choiceService.getChoice(createdPollId, createdChoice1.getEntityId()); // Assert.assertEquals(createdChoice1, reloadedChoice1); // -// Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); +// Assert.assertEquals(choice1.getChoiceValue(), createdChoice1.getChoiceValue()); // Assert.assertEquals(choice1.getDescription(), createdChoice1.getDescription()); //// Assert.assertEquals(createdPoll.getCreator(), createdChoice1.getCreator()); // @@ -485,7 +485,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // ChoiceBean reloadedChoice2 = choiceService.getChoice(createdPollId, createdChoice2.getEntityId()); // Assert.assertEquals(createdChoice2, reloadedChoice2); // -// Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); +// Assert.assertEquals(choice2.getChoiceValue(), createdChoice2.getChoiceValue()); // Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); //// Assert.assertEquals(createdPoll.getCreator(), createdChoice2.getCreator()); // @@ -500,7 +500,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // VoterListBean reloadedVoterList = voterListService.getVoterList(createdPollId, createdVoterList.getEntityId()); // Assert.assertEquals(createdVoterList, reloadedVoterList); // -// Assert.assertEquals(voterList.getValue(), createdVoterList.getValue()); +// Assert.assertEquals(voterList.getChoiceValue(), createdVoterList.getChoiceValue()); // Assert.assertEquals(voterList.getWeight(), createdVoterList.getWeight(), 0); // // Assert.assertNotNull(createdVoterList.getMember()); @@ -513,7 +513,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { //// VoterListMember reloadedVoterListMember1 = voterListService.getMember(createdPoll.getTopiaId(), createdVoterList.getTopiaId(), createdVoterListMember1.getTopiaId()); //// Assert.assertEquals(createdVoterListMember1, reloadedVoterListMember1); //// -//// Assert.assertEquals(reloadedVoterListMember1.getValue(), createdVoterListMember1.getValue()); +//// Assert.assertEquals(reloadedVoterListMember1.getChoiceValue(), createdVoterListMember1.getChoiceValue()); //// Assert.assertEquals(reloadedVoterListMember1.getEmail(), createdVoterListMember1.getEmail()); //// Assert.assertEquals(reloadedVoterListMember1.getWeight(), createdVoterListMember1.getWeight(), 0); //// @@ -525,7 +525,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { //// VoterListMember reloadedVoterListMember2 = voterListService.getMember(createdPoll.getTopiaId(), createdVoterList.getTopiaId(), createdVoterListMember2.getTopiaId()); //// Assert.assertEquals(createdVoterListMember2, reloadedVoterListMember2); //// -//// Assert.assertEquals(reloadedVoterListMember2.getValue(), createdVoterListMember2.getValue()); +//// Assert.assertEquals(reloadedVoterListMember2.getChoiceValue(), createdVoterListMember2.getChoiceValue()); //// Assert.assertEquals(reloadedVoterListMember2.getEmail(), createdVoterListMember2.getEmail()); //// Assert.assertEquals(reloadedVoterListMember2.getWeight(), createdVoterListMember2.getWeight(), 0); // diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java index d7f1703..3238aaa 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java @@ -83,13 +83,13 @@ public class VoteCountingServiceTest extends AbstractPollenServiceTest { ChoiceBean choice1 = new ChoiceBean(); choices.add(choice1); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setValue("A"); + choice1.setChoiceValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("B"); + choice2.setChoiceValue("B"); choice2.setDescription("Choice B"); choices.add(choice2); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java index 1fcc304..44ba4c1 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java @@ -100,12 +100,12 @@ public class VoterListServiceTest extends AbstractPollenServiceTest { ChoiceBean choice1 = new ChoiceBean(); choices.add(choice1); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setValue("A"); + choice1.setChoiceValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setValue("B"); + choice2.setChoiceValue("B"); choice2.setDescription("Choice B"); choices.add(choice2); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: comment style and delete not used image
by chorem.org scm 09 Jul '14

09 Jul '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 4b7a4e4e5ad4ac15136127fc2046c186fcda192f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 9 17:01:40 2014 +0200 comment style and delete not used image --- .../src/main/webapp/img/glyphicons_050_link.png | Bin 1410 -> 0 bytes pollen-ui-angular/src/main/webapp/less/style.less | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/pollen-ui-angular/src/main/webapp/img/glyphicons_050_link.png b/pollen-ui-angular/src/main/webapp/img/glyphicons_050_link.png deleted file mode 100644 index a68cbfc..0000000 Binary files a/pollen-ui-angular/src/main/webapp/img/glyphicons_050_link.png and /dev/null differ diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index f61e193..847dba8 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -11,6 +11,7 @@ margin-top:60px; } +/* global min width */ @media screen and (max-width: @responsive-min-width) { #content, #pollenMenu, #pollenMenu .container-fluid, #poll-link { width:@responsive-min-width !important; @@ -44,6 +45,7 @@ } } +/* width > @responsive-large-width */ @media screen and (min-width: (@responsive-large-width + 1px)) { @width-max : 300px; @width-min : 35px; @@ -129,6 +131,7 @@ } } +/* width < @responsive-large-width */ @media screen and (max-width: @responsive-large-width) { @foot-padding : 1.8%; @foot-height : 80px; @@ -162,6 +165,7 @@ display:none; } + /* height < @responsive-height */ @media (max-height: @responsive-height) { position:relative; background-color:inherit; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix PLURAL_CATEGORY
by chorem.org scm 09 Jul '14

09 Jul '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 58906ab4c7e59c896a8d40272c45255b8566bf5d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 9 16:11:32 2014 +0200 fix PLURAL_CATEGORY --- pollen-ui-angular/src/main/webapp/i18n/en.js | 5 +++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 66046a0..968332e 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -117,6 +117,11 @@ var translateEN = { } +// +// Source i18n : https://github.com/angular/bower-angular-i18n/blob/v1.2.19-build.267%2Bsha.… +// + +var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"}; var i18n_EN = { "DATETIME_FORMATS": { "AMPMS": [ diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index ea9c74b..0b24993 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -117,6 +117,11 @@ var translateFR = { } +// +// Source i18n : https://github.com/angular/bower-angular-i18n/blob/v1.2.19-build.267%2Bsha.… +// + +var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"}; var i18n_FR = { "DATETIME_FORMATS": { "AMPMS": [ @@ -210,6 +215,6 @@ var i18n_FR = { ] }, "id": "fr", - "pluralCat": function (n) { if (n >= 0 && n <= 2 && n != 2) { return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;} + "pluralCat": function (n) { if (n == 1) { return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER; } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/04: add in conf date Format
by chorem.org scm 09 Jul '14

09 Jul '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 23708fc1b737eb85d69dac9fa2ae9029330901ef Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 9 15:42:11 2014 +0200 add in conf date Format --- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 -- pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 -- .../src/main/webapp/js/conf.js.exemple | 12 ++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 22 +++++++------- pollen-ui-angular/src/main/webapp/js/services.js | 34 ++++++++++++++++++++++ .../src/main/webapp/partials/poll-comment.html | 2 +- .../src/main/webapp/partials/poll-popupChoice.html | 1 + 7 files changed, 59 insertions(+), 16 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 8ae450a..66046a0 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -113,8 +113,6 @@ var translateEN = { 'action.message.confirmDelete' : 'Are you sure to delete it?', 'action.message.confirmClose' : 'Are you sure to close it?', -'dateFormat' : 'MM-dd-yy', - 'error.forbidden' : 'Access forbidden', } diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 86bccd4..ea9c74b 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -113,8 +113,6 @@ var translateFR = { 'action.message.confirmDelete' : 'Êtes vous sûr de vouloir le supprimer?', 'action.message.confirmClose' : 'Êtes vous sûr de vouloir le fermer?', -'dateFormat' : 'dd/MM/yyyy', - 'error.forbidden' : 'Accès interdit', } diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index 9c44d4a..4135a7c 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -32,4 +32,16 @@ var conf = { // Time in ms to print alert error // -1 for infinite time, click or reload for close alert defaultAlertTimeError: -1, // infinite + + // Format Date + // preference : shortDate, mediumDate, longDate, fullDate + defaultDateFormat : "shortDate", + + // Format Time + // preference : shortTime, mediumTime + defaultTimeFormat: "shortTime", + + // Format DateTime + // preference : short, medium + defaultDateTimeFormat: "short", } \ No newline at end of file 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 d038e2c..e5a201b 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', - function ( $scope, $rootScope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route, $q, Poll, Page) { + ['$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.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -69,15 +69,11 @@ angular.module('pollControllers', []) } var setDateFormat = function () { - $translate('dateFormat').then(function (dateFormat) { - $scope.globalVariables.dateFormat = dateFormat; - }); + $scope.globalVariables.dateFormat = DateFormat.getDateFormat(); + $scope.globalVariables.timeFormat = DateFormat.getTimeFormat(); + $scope.globalVariables.dateTimeFormat = DateFormat.getDateTimeFormat(); }; setDateFormat(); - $scope.$on('switchLocale', function() { - setDateFormat(); - }) - $scope.data = {}; $scope.data.poll = {}; @@ -1229,8 +1225,8 @@ angular.module('pollControllers', []) }]) -.controller('PollResultCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$filter', 'Page', - function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate, $filter, Page) { +.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('PollCtrl', {$scope:$scope}); Page.setTitle('title.poll.result'); @@ -1244,6 +1240,10 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('result'); $scope.plot = 'chart'; + $scope.$on('switchLocale', function() { + $route.reload(); + }) + var choicesDeferred = $q.defer(); PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index c9495f8..a1303ab 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -362,4 +362,38 @@ angular.module('pollenServices', ['ngResource']) localStorage.setItem(storageId, JSON.stringify(session)); } } +}]) + +////////////////////////////////////// +///// DATE AND TIME FORMAT ///// +////////////////////////////////////// +.factory('DateFormat', [function() { + return { + getDateFormat : function () { + if (angular.isDefined(conf.defaultDateFormat)) { + return conf.defaultDateFormat; + } + else { + return "shortDate"; + } + }, + + getTimeFormat : function () { + if (angular.isDefined(conf.defaultTimeFormat)) { + return conf.defaultTimeFormat; + } + else { + return "shortTime"; + } + }, + + getDateTimeFormat : function () { + if (angular.isDefined(conf.defaultDateTimeFormat)) { + return conf.defaultDateTimeFormat; + } + else { + return "short"; + } + } + } }]) \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index 841eb54..9aa9aba 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -62,7 +62,7 @@ <tr ng-repeat="comment in data.comments"> <td> <span class="glyphicon glyphicon-user"></span>{{comment.authorName}}<br/> - <span class="glyphicon glyphicon-calendar"></span>{{comment.postDate | date:globalVariables.dateFormat}}<br/> + <span class="glyphicon glyphicon-calendar"></span>{{comment.postDate | date:globalVariables.dateTimeFormat}}<br/> <a class="fakeLink" ng-click="editPost(comment)" ng-if="comment.permission"><span class="glyphicon glyphicon-pencil" ng-show="comment.id"></span></a> <a class="fakeLink" ng-click="deletePost(comment)" ng-if="comment.permission"><span class="glyphicon glyphicon-trash danger" ng-show="comment.id"></span></a> </td> 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 a8a06f0..88a448e 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -59,6 +59,7 @@ <div class="col-sm-6"> <upload-file ng-model="choice.valueImage"></upload-file> + </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0