Merge pull request #491 from EUSurvey/develop

Develop
EUSurvey · May 31, 2022 · f5ef752 · f5ef752
2 parents 1b89e78 + 498f613
commit f5ef752
Show file tree

Hide file tree

Showing 134 changed files with 42,152 additions and 33,398 deletions.
diff --git a/src/main/java/com/ec/survey/controller/ContributionController.java b/src/main/java/com/ec/survey/controller/ContributionController.java
@@ -435,6 +435,28 @@ public ModelAndView processSubmit(@PathVariable String code, HttpServletRequest
 					return new ModelAndView("close", "surveyprefix", origsurvey.getId() + ".");
 				}
 
+				if (origsurvey.getIsQuiz()) {
+
+					String lang = locale.getLanguage();
+					if (request.getParameter("language.code") != null && request.getParameter("language.code").length() == 2) {
+						lang = request.getParameter("language.code");
+					}
+
+					AnswerSet answerSet = answerService.automaticParseAnswerSet(request, origsurvey, uniqueCode, false, lang, u);
+					ModelAndView result = new ModelAndView("runner/quizResult", Constants.UNIQUECODE, answerSet.getUniqueCode());
+					Form form = new Form(resources, surveyService.getLanguage(locale.getLanguage().toUpperCase()),
+							translationService.getActiveTranslationsForSurvey(answerSet.getSurvey().getId()), contextpath);
+					sessionService.setFormStartDate(request, form, uniqueCode);
+					form.setSurvey(origsurvey);
+					form.getAnswerSets().add(answerSet);
+					result.addObject(form);
+					result.addObject("surveyprefix", origsurvey.getId() + ".");
+					result.addObject("quiz", QuizHelper.getQuizResult(answerSet, invisibleElements));
+					result.addObject("isquizresultpage", true);
+					result.addObject("invisibleElements", invisibleElements);
+					return result;
+				}
+
 				ModelAndView result = new ModelAndView("thanks", Constants.UNIQUECODE, oldAnswerSet.getUniqueCode());
 
 				if (origsurvey.getIsOPC()) {

diff --git a/src/main/java/com/ec/survey/controller/DashboardController.java b/src/main/java/com/ec/survey/controller/DashboardController.java
@@ -348,6 +348,12 @@ public ModelAndView dashboard(HttpServletRequest request, Locale locale, Model m
 					filter.setTitle(title);
 				}
 			}
+			if (request.getParameter("shortname") != null) {
+				String shortname = request.getParameter("shortname");
+				if (shortname.trim().length() > 0) {
+					filter.setShortname(shortname);
+				}
+			}
 			if (request.getParameter("createdfrom") != null) {
 				String createdfrom = request.getParameter("createdfrom");
 				if (createdfrom.trim().length() > 0) {