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 20e64cb2096b24afb43df85926eb0f9099ea19f4 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 7 11:40:13 2014 +0200 change choiceBean --- .../org/chorem/pollen/rest/api/PollApiTest.java | 22 ++---- .../rest/api/converter/JsonArrayConverterTest.java | 8 +- .../rest/api/converter/JsonConverterTest.java | 4 +- .../chorem/pollen/services/bean/ChoiceBean.java | 32 +++----- .../pollen/services/service/ChoiceService.java | 18 ++--- .../pollen/services/service/PollServiceTest.java | 56 +++++++------- .../services/service/VoteCountingServiceTest.java | 4 +- .../services/service/VoterListServiceTest.java | 4 +- .../src/main/webapp/js/controllers/pollCtrl.js | 85 ++++++++++++++++------ .../src/main/webapp/partials/inline-poll.html | 13 ++-- .../src/main/webapp/partials/poll-popupChoice.html | 4 +- 11 files changed, 138 insertions(+), 112 deletions(-) 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 7bd1100..37cf5b1 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 @@ -23,16 +23,10 @@ package org.chorem.pollen.rest.api; import org.apache.http.client.HttpResponseException; import org.apache.http.client.fluent.Request; -import org.chorem.pollen.persistence.entity.Choice; -import org.chorem.pollen.persistence.entity.ChoiceImpl; -import org.chorem.pollen.persistence.entity.ChoiceType; -import org.chorem.pollen.persistence.entity.CommentVisibility; -import org.chorem.pollen.persistence.entity.Poll; -import org.chorem.pollen.persistence.entity.PollImpl; -import org.chorem.pollen.persistence.entity.PollType; -import org.chorem.pollen.persistence.entity.ResultVisibility; -import org.chorem.pollen.persistence.entity.VoteVisibility; +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; @@ -127,14 +121,14 @@ public class PollApiTest extends AbstractPollenRestApiTest { poll.setVoteCountingType(1); poll.setTitle("title"); - List<Choice> choices = new ArrayList<>(); - Choice choice1 = new ChoiceImpl(); + List<ChoiceBean> choices = new ArrayList<>(); + ChoiceBean choice1 = new ChoiceBean(); choice1.setChoiceType(ChoiceType.TEXT); - choice1.setName("choiceA"); + choice1.setValue("choiceA"); choices.add(choice1); - Choice choice2 = new ChoiceImpl(); + ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setName("choiceB"); + choice2.setValue("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 78294be..649e8a6 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\", name: \"choice1\", choiceType: \"TEXT\", choiceOrder: 1}, " + - " {id: \"BBBB\", name: \"choice2\", choiceType: \"IMAGE\", choiceOrder: 2} ]"; + String choicesStr = "[ {id: \"AAAA\", value: \"choice1\", choiceType: \"TEXT\", choiceOrder: 1}, " + + " {id: \"BBBB\", value: \"choice2\", choiceType: \"IMAGE\", choiceOrder: 2} ]"; JsonArrayConverter converter = JsonArrayConverter.newConverter(new DefaultTopiaIdFactory(), ChoiceBean.class); @@ -42,12 +42,12 @@ public class JsonArrayConverterTest { Assert.assertEquals(2, choices.length); Assert.assertNotNull(choices[0]); - Assert.assertEquals("choice1", choices[0].getName()); + Assert.assertEquals("choice1", choices[0].getValue()); Assert.assertEquals(ChoiceType.TEXT, choices[0].getChoiceType()); Assert.assertEquals(1, choices[0].getChoiceOrder()); Assert.assertNotNull(choices[1]); - Assert.assertEquals("choice2", choices[1].getName()); + Assert.assertEquals("choice2", choices[1].getValue()); 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 35bd59d..eea755d 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 @@ -64,8 +64,8 @@ public class JsonConverterTest { public void convertEntity() { String pollStr = "{topiaCreateDate: 1399033089600, title: \"pollTitle\", " + - "choice: [ {name: \"choice1\", choiceType: \"TEXT\"}, " + - "{name: \"choice2\", choiceType: \"IMAGE\"} ], voteVisibility: \"ANONYMOUS\", " + + "choice: [ {value: \"choice1\", choiceType: \"TEXT\"}, " + + "{value: \"choice2\", choiceType: \"IMAGE\"} ], voteVisibility: \"ANONYMOUS\", " + "commentVisibility:\"NOBODY\", pollType: \"FREE\" }"; JsonConverter<Poll> converter = JsonConverter.newEntityConverter(new DefaultTopiaIdFactory(), Poll.class); 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 7e40513..99c7fb6 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 @@ -39,9 +39,7 @@ public class ChoiceBean extends PollenBean<Choice> { protected int choiceOrder; - protected String name; - - protected Date date; + protected String value; protected ChoiceType choiceType; @@ -68,13 +66,11 @@ public class ChoiceBean extends PollenBean<Choice> { switch (entity.getChoiceType()) { case TEXT: - setName(entity.getName()); - setDate(null); + setValue(entity.getName()); break; case DATE: - setName(null); - setDate(new Date(Long.parseLong(entity.getName()))); + setValue(entity.getName()); break; case IMAGE: @@ -100,13 +96,13 @@ public class ChoiceBean extends PollenBean<Choice> { if (choiceType != null) { switch (choiceType) { case TEXT: - entity.setName(getName()); + entity.setName(getValue()); break; case DATE: - if ( getDate() != null ) { - entity.setName(String.valueOf(getDate().getTime())); + if ( getValue() != null ) { + entity.setName(getValue()); } break; @@ -134,20 +130,12 @@ public class ChoiceBean extends PollenBean<Choice> { this.permission = permission; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Date getDate() { - return date; + public String getValue() { + return value; } - public void setDate(Date date) { - this.date = date; + public void setValue(String value) { + this.value = 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 72852b0..f47aa77 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 @@ -236,7 +236,7 @@ public class ChoiceService extends PollenServiceSupport { case TEXT: - toSave.setName(choice.getName()); + toSave.setName(choice.getValue()); toSave.setDescription(choice.getDescription()); toSave.setCreator(poll.getCreator()); @@ -244,7 +244,7 @@ public class ChoiceService extends PollenServiceSupport { case DATE: - toSave.setName(String.valueOf(choice.getDate().getTime())); + toSave.setName(choice.getValue()); toSave.setDescription(choice.getDescription()); toSave.setCreator(poll.getCreator()); @@ -293,36 +293,36 @@ public class ChoiceService extends PollenServiceSupport { case TEXT: - String choiceName = choice.getName(); + String choiceName = choice.getValue(); boolean nameNotBlank = checkNotBlank(errors, - "name", + "value", choiceName, l(getLocale(), "pollen.error.choice.choiceNameEmpty")); if (nameNotBlank) { boolean nameAdded = choiceNames.add(choiceName); - check(errors, "name", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist")); + check(errors, "value", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist")); } break; case DATE: - Date choiceDate = choice.getDate(); + Date choiceDate = new Date(Long.parseLong(choice.getValue())); boolean dateNotBlank; if (choiceDate == null) { - dateNotBlank = checkNotBlank(errors, "date", null, l(getLocale(), "pollen.error.choice.choiceDateEmpty")); + dateNotBlank = checkNotBlank(errors, "value", null, l(getLocale(), "pollen.error.choice.choiceDateEmpty")); } else { dateNotBlank = checkNotBlank(errors, - "date", + "value", String.valueOf(choiceDate), l(getLocale(), "pollen.error.choice.choiceDateEmpty")); } if (dateNotBlank) { boolean dateAdded = choiceNames.add(String.valueOf(choiceDate.getTime())); - check(errors, "date", dateAdded, l(getLocale(), "pollen.error.choice.choiceDateExist")); + check(errors, "value", dateAdded, l(getLocale(), "pollen.error.choice.choiceDateExist")); } break; diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java index ce07c29..e3c43d2 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.setName("A"); + choice1.setValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setName("B"); + choice2.setValue("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.getName(), createdChoice1.getName()); + Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); 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.getName(), createdChoice2.getName()); + Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); Assert.assertEquals(choice2.getDescription(), createdChoice2.getDescription()); } @@ -172,13 +172,13 @@ public class PollServiceTest extends AbstractPollenServiceTest { assertErrorKeyFound(e, "choice[0].name"); } - choice1.setName("A"); + choice1.setValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setName("A"); + choice2.setValue("A"); choice2.setDescription("Choice B"); choices.add(choice2); @@ -190,7 +190,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { assertErrorKeyFound(e, "choice[1].name"); } - choice2.setName("B"); + choice2.setValue("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().getName()); +// Assert.assertNull(createdPoll.getCreator().getValue()); // 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.getName(), createdChoice1.getName()); + Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); 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.getName(), createdChoice2.getName()); + Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); 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.setName("A"); +// choice1.setValue("A"); // choice1.setDescription("Choice A"); // // // ChoiceBean choice2 = new ChoiceBean(); // choice2.setChoiceType(ChoiceType.TEXT); -// choice2.setName("B"); +// choice2.setValue("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().getName()); +//// Assert.assertNull(createdPoll.getCreator().getValue()); //// 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.getName(), createdChoice1.getName()); +// Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); // 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.getName(), createdChoice2.getName()); +// Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); // 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.getName(), createdVoterList.getName()); +// Assert.assertEquals(voterList.getValue(), createdVoterList.getValue()); // 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.setName("A"); +// choice1.setValue("A"); // choice1.setDescription("Choice A"); // // choices.add(choice1); // // ChoiceBean choice2 = new ChoiceBean(); // choice2.setChoiceType(ChoiceType.TEXT); -// choice2.setName("B"); +// choice2.setValue("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.setName("voterList1"); +// voterList.setValue("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.setName("voter1"); +// voterListMember1.setValue("voter1"); // voterListMember1.setWeight(0.3); // voterListMember1.setEmail("voter1_pollen.org"); // @@ -417,7 +417,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // voterListMember1.setEmail("voter1@pollen.org"); // // VoterListMemberBean voterListMember2 = new VoterListMemberBean(); -// voterListMember2.setName("voter1"); +// voterListMember2.setValue("voter1"); // voterListMember2.setWeight(0.7); // voterListMember2.setEmail("voter1@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.setName("voter2"); +// voterListMember2.setValue("voter2"); // voterListMember2.setEmail("voter2@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().getName()); +//// Assert.assertNull(createdPoll.getCreator().getValue()); //// 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.getName(), createdChoice1.getName()); +// Assert.assertEquals(choice1.getValue(), createdChoice1.getValue()); // 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.getName(), createdChoice2.getName()); +// Assert.assertEquals(choice2.getValue(), createdChoice2.getValue()); // 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.getName(), createdVoterList.getName()); +// Assert.assertEquals(voterList.getValue(), createdVoterList.getValue()); // 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.getName(), createdVoterListMember1.getName()); +//// Assert.assertEquals(reloadedVoterListMember1.getValue(), createdVoterListMember1.getValue()); //// 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.getName(), createdVoterListMember2.getName()); +//// Assert.assertEquals(reloadedVoterListMember2.getValue(), createdVoterListMember2.getValue()); //// 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 e06ce45..d7f1703 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.setName("A"); + choice1.setValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setName("B"); + choice2.setValue("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 23c3976..1fcc304 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.setName("A"); + choice1.setValue("A"); choice1.setDescription("Choice A"); ChoiceBean choice2 = new ChoiceBean(); choice2.setChoiceType(ChoiceType.TEXT); - choice2.setName("B"); + choice2.setValue("B"); choice2.setDescription("Choice B"); choices.add(choice2); 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 a7ec70c..4f2620b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -341,9 +341,9 @@ angular.module('pollControllers', []) var initChoice = function () { return { - name: '', - date: $scope.globalVariables.lastDate, - choiceType: $scope.globalVariables.lastType + choiceType : $scope.globalVariables.lastType, + valueText : '', + valueDate : $scope.globalVariables.lastDate, }; } @@ -371,25 +371,54 @@ angular.module('pollControllers', []) } } - var popupChoice = function (choice, title, callBack) { - var oldChoice = angular.copy(choice); + var popupChoice = function (choiceEdit, title, callBack) { + var choice = angular.copy(choiceEdit); + var modalInstance = $modal.open({ templateUrl : 'partials/poll-popupChoice.html', controller : PollPopChoiceCtrl, resolve : { title : function () { return title;}, - choice : function () { return choice;}, + choice : function () { + if (choice.choiceType == 'TEXT') { + choice.valueText = choice.value; + } + else if (choice.choiceType == 'DATE') { + choice.valueDate = choice.value; + } + + // set default date + if (angular.isUndefined(choice.valueDate)) { + choice.valueDate = $scope.globalVariables.lastDate; + } + + return choice; + }, dateFormat : function () { return $scope.globalVariables.dateFormat;} } }); modalInstance.result.then(function (returnChoice) { - $scope.deleteChoice(returnChoice); + $scope.deleteChoice(choiceEdit); }, function () { $scope.globalVariables.lastType = choice.choiceType; - $scope.globalVariables.lastDate = choice.date; - if (!angular.equals(oldChoice, choice)) { - callBack(choice); + + if (choice.choiceType == 'TEXT') { + choice.value = choice.valueText; + } + else if (choice.choiceType == 'DATE') { + choice.value = choice.valueDate; + $scope.globalVariables.lastDate = angular.copy(choice.valueDate); + } + delete choice.valueText; + delete choice.valueDate; + + if (!angular.equals(choiceEdit, choice)) { + choiceEdit.value = choice.value; + choiceEdit.choiceType = choice.choiceType; + choiceEdit.description = choice.description; + + callBack(choiceEdit); } }); } @@ -481,8 +510,9 @@ angular.module('pollControllers', []) poll.choice = angular.copy($scope.data.choices); angular.forEach(poll.choice, function(choice) { - if (angular.isDate(choice.date)) { - choice.date = choice.date.getTime(); + console.log(choice); + if (choice.choiceType == 'DATE') { + choice.value = choice.value.getTime(); } }); @@ -542,8 +572,8 @@ angular.module('pollControllers', []) $scope.callBackAddChoice = function (choice) { saveChoice = angular.copy(choice); - if (angular.isDate(saveChoice.date)) { - saveChoice.date = saveChoice.date.getTime(); + if (saveChoice.choiceType == 'DATE') { + saveChoice.value = saveChoice.value.getTime(); } PollChoice.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.pollToken}, saveChoice, function (data) { @@ -558,8 +588,8 @@ angular.module('pollControllers', []) $scope.callBackEditChoice = function (choice) { saveChoice = angular.copy(choice); - if (angular.isDate(saveChoice.date)) { - saveChoice.date = saveChoice.date.getTime(); + if (saveChoice.choiceType == 'DATE') { + saveChoice.value = saveChoice.value.getTime(); } PollChoice.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.pollToken}, saveChoice, function() { @@ -578,9 +608,17 @@ angular.module('pollControllers', []) $scope.data.choices.splice(index,1); } }, function (error) { - angular.extend($scope.restError, error.data); - if (angular.isDefined(error.data.choice)) { - $rootScope.$broadcast('newError', error.data.choice[0]); + if (error.status == 400) { + angular.extend($scope.restError, error.data); + if (angular.isDefined(error.data.choice)) { + $rootScope.$broadcast('newError', error.data.choice[0]); + } + } + else { + var index = $scope.data.choices.indexOf(choice); + if (index > -1) { + $scope.data.choices.splice(index,1); + } } }); }; @@ -822,6 +860,11 @@ angular.module('pollControllers', []) PollChoice.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.pollToken}).$promise.then(function (choices) { $scope.data.choices = choices; + angular.forEach(choices, function (ch) { + if (ch.choiceType == 'DATE') { + ch.value = new Date(Number(ch.value)); + } + }) $scope.data.vote = {}; $scope.data.vote.choice = $scope.data.choices; }); @@ -1209,11 +1252,11 @@ angular.module('pollControllers', []) switch (value.choice.choiceType) { case 'TEXT': - scores.push([value.choice.name, value.scoreValue]); + scores.push([value.choice.value, value.scoreValue]); break; case 'DATE': - scores.push([$filter('date')(value.choice.date, $scope.globalVariables.dateFormat), value.scoreValue]); + scores.push([$filter('date')(value.choice.value, $scope.globalVariables.dateFormat), 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 6061367..abaf068 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -28,22 +28,23 @@ <td ng-repeat="choice in data.choices" class="pollChoice pollAnim" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> <div ng-if="choice.choiceType == 'TEXT'" edit-me="showEdit" > <div ng-hide="showEdit && !globalVariables.voted" class="fixe-input" title="{{choice.description}}"> - {{ choice.name || ('poll.edit' | translate) }} - <info-error error="choice.restError.name[0]" data="choice.name"></info-error> + {{ choice.value || ('poll.edit' | translate) }} + <info-error error="choice.restError.value[0]" data="choice.value"></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.name" focus-me="showEdit" ng-exit="showEdit = false;" auto-save="saveChoice(choice)" required/> + <input type="text" class="form-control" ng-model="choice.value" 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.date | date:globalVariables.dateFormat) || ('poll.edit' | translate) }} - <info-error error="choice.restError.date[0]" data="choice.date"></info-error> + {{ (choice.value | date:globalVariables.dateFormat) || ('poll.edit' | translate) }} + <info-error error="choice.restError.value[0]" data="choice.value"></info-error> <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/> </div> <div ng-show="!globalVariables.voted && showEdit || isOpen" > - <input type="text" class="form-control" ng-model="choice.date" focus-me="showEdit" datepicker-popup="{{globalVariables.dateFormat}}" is-open="isOpen" ng-exit="showEdit = false" ng-click="isOpen = true" auto-save="saveChoice(choice)" required/> + + <input type="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="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> </div> </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 3264210..b81131d 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="popNameChoiceCheck" class="col-sm-4 control-label">Nom du Choix : </label> <div class="col-sm-6"> - <input id="popNameChoiceCheck" type="text" ng-model="choice.name" class="form-control" focus-me="choice.choiceType == 'TEXT'"/> + <input id="popNameChoiceCheck" type="text" ng-model="choice.valueText" 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="popNameChoiceDate" class="form-control" datepicker-popup="{{dateFormat}}" type="text" ng-model="choice.date" is-open="opened" ng-click="opened = true" focus-me="choice.choiceType == 'DATE'"/> + <input id="popNameChoiceDate" class="form-control" datepicker-popup="{{dateFormat}}" type="text" ng-model="choice.valueDate" is-open="opened" ng-click="opened = true" focus-me="choice.choiceType == 'DATE'"/> </div> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.