Merge pull request #40 from isteps-sps-lab/main

hide IDs when showing questions
IDSIA · Oct 26, 2023 · 906029a · 906029a
2 parents 9d552a5 + 8700eb3
commit 906029a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/AdapQuestBackend/src/main/resources/templates/live/results.html b/AdapQuestBackend/src/main/resources/templates/live/results.html
@@ -25,16 +25,16 @@
 
         <div>
             <ul>
-                <li th:each="question : ${questions}">
+                <li th:each="question : ${questions}"
+                    th:if="${answers.get(question).?[!questionAnswer.text.equals('no')].size() > 0}">
                     <div>
-                        <span style="font-weight: bold" th:text="${question.name}"></span>
-                        &nbsp;
                         <span style="font-weight: bold" th:text="${question.question}"></span>
                     </div>
-                    <div th:each="answer : ${answers.get(question)}"
-                         th:with="text=${answer.questionAnswer.text}">
-                        <span th:if="${!text.equals('no')}" th:text="${text}"></span>
-                    </div>
+                    <ul>
+                        <li th:each="answer : ${answers.get(question).?[!questionAnswer.text.equals('no')]}">
+                            <span th:text="${answer.questionAnswer.text}"></span>
+                        </li>
+                    </ul>
                 </li>
             </ul>
         </div>

diff --git a/AdapQuestBackend/src/main/resources/templates/live/survey.html b/AdapQuestBackend/src/main/resources/templates/live/survey.html
@@ -18,9 +18,7 @@
         <input th:name="questionId" th:value="${question.id}" type="hidden">
         <div class="jumbotron">
             <div>
-                <h3 th:text="${question.name}"></h3>
-                <p th:text="${question.explanation}"></p>
-                <p th:text="${question.question}"></p>
+                <p class="lead" th:text="${question.question}"></p>
 
                 <div th:class="${question.multipleChoice} ? 'answers multi' : 'answers'">
                     <div class="answer"