#JC-1373 Add dynamic poll item functionality #40
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ public class PollItem extends Entity { | |
| /** | ||
| * Used only by Hibernate. | ||
| */ | ||
| public PollItem() { | ||
| } | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /** | ||
| * Copyright (C) 2011 JTalks.org Team | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| */ | ||
| package org.jtalks.jcommune.web.view; | ||
|
|
||
| import org.jtalks.jcommune.model.entity.Poll; | ||
|
|
||
| /** | ||
| * Contains configuration for Dynamic Poll Items | ||
| * @author Andrey Ivanov | ||
| */ | ||
| public class DynamicPollItemsConfig { | ||
|
|
||
| public Integer getMaxPollItems(){ | ||
| return Poll.MAX_ITEMS_NUMBER; | ||
| } | ||
|
|
||
| public Integer getMinPollItems(){ | ||
| return Poll.MIN_ITEMS_NUMBER; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| $(document).ready(function() { | ||
|
There was a problem hiding this comment. why 'poolNewTopic'? when editing we have a different behavior? There was a problem hiding this comment. yes, while editing we can't change polls but finished date field. |
||
|
|
||
| if ($("div.pollItemsValue").length == maxPollItems) { | ||
| $("a#add").hide(); | ||
| } | ||
|
|
||
| $( "#sortable" ).sortable({update: function(event, ui) {reIndex()}}); | ||
|
There was a problem hiding this comment. $( "#sortable" ) spaces are't needed |
||
|
|
||
| var name = $("#sortable").attr("rel"); | ||
|
|
||
| $("a#add").click(function(e){ | ||
| e.preventDefault(); | ||
| length = $("div.pollItemsValue").length; | ||
| if(length < maxPollItems) { | ||
| newItem = $(".pollItemsValue:last").clone(); | ||
| $(newItem).insertAfter(".pollItemsValue:last"); | ||
| $("input[type=text]", newItem).val(""); | ||
| reIndex(); | ||
| if ($("div.pollItemsValue").length == maxPollItems) { | ||
| $("a#add").hide(); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| $(".pollItemsValue .remove").live("click", function(e){ | ||
| e.preventDefault(); | ||
| if($("div.pollItemsValue").length > minPollItems) { | ||
| $(this).closest('div.pollItemsValue').remove(); | ||
| reIndex(); | ||
| if ($("div.pollItemsValue").length < maxPollItems) { | ||
|
There was a problem hiding this comment. i think this check is unnecessary. if removed, then the length would be always less than maxPollItems |
||
| $("a#add").show(); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| function reIndex(){ | ||
| $(".pollItemsValue input[type=text]").each(function(index) { | ||
| $(this).attr("name", name.replace("__index__", index)); | ||
|
There was a problem hiding this comment. check this place. after adding, the item is copied and it will have the name of last item (not contains index). or not? There was a problem hiding this comment. When items is copied then all names are changed according to pattern and index. |
||
| }); | ||
| } | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would give the name just PollItemsConfignfig