Add poll #55
Merged
Add poll #55
Conversation
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
# Conflicts: # src/main/webapp/app/jsp/my-events.jsp
# Conflicts: # src/main/webapp/app/jsp/poll.jsp
display poll
# Conflicts: # src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApi.java # src/main/webapp/app/jsp/poll.jsp
# Conflicts: # src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApi.java
Fix function savePollToDB()
| document.getElementById("edit").classList.remove("w3-hide"); | ||
| document.getElementById("update").classList.remove("w3-hide"); | ||
| document.getElementById("save").classList.add("w3-hide") | ||
| function checkFunction() { |
| if(data.name == "" || data.name == " ") { | ||
| alert("Please input Event Name"); | ||
| return; | ||
| function saveDataToDB() { |
There was a problem hiding this comment.
refactor function
validation should be in different function
| document.getElementById("agenda").value = event.eventAgenda; | ||
| }) | ||
| } | ||
| function getEventDataFromDB() { |
| var pair = vars[i].split("="); | ||
| if (pair[0] == variable) { | ||
| return pair[1]; | ||
| function getQueryVariable(variable) { |
There was a problem hiding this comment.
check why it is used and remove if there is different way to get id.
src/main/webapp/app/jsp/event.jsp
Outdated
| if (event.eventStatus === "OPEN") { | ||
| document.getElementById("voting").classList.remove("w3-hide"); | ||
| document.getElementById("feedback").classList.add("w3-hide"); | ||
| getVotingFromDB(); |
src/main/webapp/app/jsp/event.jsp
Outdated
| if (event.eventStatus === "CLOSED") { | ||
| document.getElementById("voting").classList.add("w3-hide"); | ||
| document.getElementById("feedback").classList.remove("w3-hide"); | ||
| getFeedbackFromDB() |
src/main/webapp/app/jsp/poll.jsp
Outdated
| <div id="displayPoll"> | ||
| </div> | ||
|
|
||
| <script> |
There was a problem hiding this comment.
scripts in different files
src/main/webapp/app/jsp/poll.jsp
Outdated
| }) | ||
| } | ||
|
|
||
| function getQueryVariable(variable) { |
…ished) function checkNonEmptyInput
AlexeyBuzdin
suggested changes
Sep 4, 2018
| @Inject | ||
| private AnswersStore answersStore; | ||
|
|
||
|
|
There was a problem hiding this comment.
Please remove extra blank line
| @Path("/{id}/getVotingPoll") | ||
| public List<PollDto> getVotingForEvent(@PathParam("id") Long id) { | ||
| List<Poll> poll = pollStore.getVotingPoll(id); | ||
| return poll.stream() |
There was a problem hiding this comment.
Please remove duplication by creating a mapPollToDto(poll) method
| answerList.add(answer); | ||
| } | ||
| poll.setAnswers(answerList); | ||
| em.persist(poll); |
There was a problem hiding this comment.
Please put db logic into corresponding Store
| @Path("/{id}/savePoll") | ||
| public void savePoll(PollDto pollDto, @PathParam("id") Long id) { | ||
| List<AnswerDto> answersString = pollDto.getAnswers(); | ||
| //String[] answerList = answersString.split("\n"); |
There was a problem hiding this comment.
Please remove comment if it is not needed
| @Path("/{id}/savePoll") | ||
| public void savePoll(PollDto pollDto, @PathParam("id") Long id) { | ||
| List<AnswerDto> answersString = pollDto.getAnswers(); | ||
| //String[] answerList = answersString.split("\n"); |
There was a problem hiding this comment.
Do not commit comments please
| @Inject | ||
| private AnswersStore answersStore; | ||
|
|
||
|
|
vadigerman
previously approved these changes
Sep 4, 2018
vadigerman
previously approved these changes
Sep 4, 2018
AlexeyBuzdin
previously approved these changes
Sep 4, 2018
…event-organizer into addPoll # Conflicts: # src/main/webapp/app/jsp/add-event.jsp # src/main/webapp/app/jsp/event.jsp # src/main/webapp/app/jsp/my-events.jsp # src/main/webapp/app/jsp/start.jsp # src/main/webapp/index.jsp # src/main/webapp/style.css
vadigerman
dismissed stale reviews from AlexeyBuzdin and themself
via
847e713
vadigerman
approved these changes
Sep 4, 2018
AlexeyBuzdin
approved these changes
Sep 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Checklist
mvn testfrom the root directory to see all new and existing tests passMotivation and Context
#15
#16
#14
#41
#22
#23
#24
#50
Description
Were added opportunity to create poll and display feedback and voting in dependency of event status(open or closed) .
P.S. Not all methods covered by Unit Tests