Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Statistical Analysis of Questions #109

Merged
merged 4 commits into from
Apr 5, 2021
Merged

Added Statistical Analysis of Questions #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8801366
Added Statistical Analysis of Questions
Apr 5, 2021
a0a6395
Merge branch 'main' into Jon-M
Apr 5, 2021
8b43ee8
removing unwanted dep
Apr 5, 2021
10d8f0f
Fix
Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 40 additions & 4 deletions src/main/java/org/surveymonkey/controllers/SurveyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
import org.surveymonkey.services.iservices.IQuestionService;
import org.surveymonkey.services.iservices.ISurveyService;


import javax.persistence.criteria.CriteriaBuilder;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.lang.reflect.Array;
import java.util.*;

@Controller
public class SurveyController {
Expand Down Expand Up @@ -187,6 +187,42 @@ public String surveyResponses(@PathVariable long surveyID, Model model) {
Survey survey = surveyService.findById(surveyID);
List<Question> questionList = survey.getQuestions();
model.addAttribute("survey", survey);


HashMap<Integer, ArrayList<Integer>> questionHistogramData = new HashMap<Integer, ArrayList<Integer>>();

for(int i = 0; i < questionList.size(); i++){
Question question = questionList.get(i);
if(question instanceof NumberQuestion) {
NumberQuestion numberQuestion = (NumberQuestion) question;
List<String> answers = numberQuestion.getAnswers();
ArrayList<Integer> dataSet = new ArrayList<Integer>();
for (int j = 0; j < answers.size(); j++) {
if(!answers.get(j).equals("")) {
dataSet.add(Integer.parseInt(answers.get(j)));
}
}
questionHistogramData.put((int) question.getId(), dataSet);
}else if(question instanceof ChoiceQuestion){
ChoiceQuestion choiceQuestion = (ChoiceQuestion) question;
List<String> answers = choiceQuestion.getAnswers();
List<String> options = choiceQuestion.getChoices();
ArrayList<String> choices = new ArrayList<String>();
ArrayList<Integer> occurences = new ArrayList<Integer>();
for (int j = 0; j < options.size(); j++) {

String option = (options.get(j));
int occurrence = Collections.frequency(answers, option);
occurences.add(occurrence);

}
questionHistogramData.put((int) question.getId(), occurences);
}

}


model.addAttribute("questionHistogramData", questionHistogramData);
model.addAttribute("questions", questionList);
return "viewResponses";
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/surveymonkey/kafka/Producer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class Producer {
private final KafkaTemplate<String, String> kafkaTemplate;


@Value("${cloudkarafka.topic}")
@Value("EndUser")
private String topic;

Producer(KafkaTemplate<String, String> kafkaTemplate) {
Expand Down
16 changes: 16 additions & 0 deletions src/main/resources/static/js/histogram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Chart, HistogramSeries} from '@syncfusion/ej2-charts';
Chart.Inject(HiloOpenCloseSeries);
let chartData: Object[] = [];
let points: number[] = dataSet;
points.map((value: number) => {
chartData.push({
y: value
})});

let chart: Chart = new Chart({
series:[{
type: 'Histogram',
dataSource: chartData,
yName: 'y',
}],
}, '#Chart');
72 changes: 72 additions & 0 deletions src/main/resources/templates/viewResponses.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,38 @@
<html xmlns:th="http://www.thymeleaf.org" lang="en">
<head>
<th:block th:include="fragments/general :: headerfiles"></th:block>
<script src='https://cdn.plot.ly/plotly-latest.min.js'></script>
</head>
<body>
<header>
<th:block th:include="fragments/general :: header"></th:block>
</header>
<style>
.histogram {
all: unset;
width: 700px;
}
.pie {
all: unset;
width: 700px;
}
</style>

<main>

<div class="ui centered grid container">

<div class="row">
<h2 class="ui header" th:text="'Survey ' + ${survey.getId()} + ' Results'"></h2>
</div>

<div class="row">
<table id="viewResponsesTable" class="ui selectable padded striped collapsing table">
<thead>
<tr>
<th>Questions</th>
<th>Responses</th>
<th>Statistics</th>
</tr>
</thead>
<tbody>
Expand All @@ -28,10 +44,66 @@ <h2 class="ui header" th:text="'Survey ' + ${survey.getId()} + ' Results'"></h2>
<li th:each="answer : ${question.getAnswers()}" th:text="${answer}"></li>
</ul>
</td>
<td>
<div th:switch="${question.getType().toString()}">
<div th:case="'NUMBER'" th:with="dataSet=${questionHistogramData.get(__${question.getId()}__)}">
<div class = "histogram" th:id=" 'histogram' + ${question.getId()}"><!-- Plotly chart will be drawn inside this DIV --></div>
<script >
var x = [[${dataSet}]];
var questionId = [[${question.getId()}]];
var trace = {
x: x,
type: 'histogram',
};
var data = [trace];
Plotly.newPlot('histogram' + questionId, data);
</script>
</div>
<div th:case="CHOICE" th:with="dataSet=${questionHistogramData.get(__${question.getId()}__)}">
<div class = "pie" th:id=" 'pie' + ${question.getId()}"><!-- Plotly chart will be drawn inside this DIV --></div>

<script>
var choices = [];
let i = 0;
</script>

<script th:each="choice : ${question.getChoices()}">
i = choices.length;
choices[i] = "[[${choice}]]";
</script>


<script >
var x = [[${dataSet}]];

console.log(choices);
var questionId = [[${question.getId()}]];



var data = [{
values: x,
labels: choices,
type: 'pie'
}];
var layout = {
height: 400,
width: 700
};
Plotly.newPlot('pie' + questionId, data,layout);
</script>

</div>
</div>

</td>
</tr>
</tbody>
</table>
</div>



<div class="row">
<form class="ui form" th:action="@{/survey/__${survey.getId()}__/}" method="get" id="backForm">
<button class="ui labeled icon green button" type="submit" form="backForm" value="Submit">
Expand Down