diff --git a/src/main/java/com/group11/surveymonkey/SurveyWebController.java b/src/main/java/com/group11/surveymonkey/SurveyWebController.java index 870a79a..647c095 100644 --- a/src/main/java/com/group11/surveymonkey/SurveyWebController.java +++ b/src/main/java/com/group11/surveymonkey/SurveyWebController.java @@ -172,9 +172,20 @@ public String viewSurveyResults(HttpServletRequest request, @PathVariable("id") rangeData.add(List.of(rangeQnA.getQuestionText(), rangeAnswers)); } + List choiceQnAs = survey.getChoiceList(); + List> choiceData = new ArrayList<>(); + for(ChoiceQnA choiceQnA : choiceQnAs) { + List choiceAnswers = new ArrayList<>(); + for(ChoiceAnswer choiceAnswer : choiceQnA.getChoiceAnswers()) { + choiceAnswers.add(choiceAnswer.getAnswer()); + } + choiceData.add(List.of(choiceQnA.getQuestionText(), choiceAnswers)); + } + model.addAttribute("survey", survey); model.addAttribute("surveyId", surveyId); model.addAttribute("rangeData", rangeData); + model.addAttribute("choiceData", choiceData); return "resultViewer"; } diff --git a/src/main/resources/templates/resultViewer.html b/src/main/resources/templates/resultViewer.html index c4ddfc3..e061ea1 100644 --- a/src/main/resources/templates/resultViewer.html +++ b/src/main/resources/templates/resultViewer.html @@ -46,6 +46,31 @@

Range Question Results

Choice Question Results

+
+
+ +
Return to Survey Display \ No newline at end of file