From d2a12d1eea96e6c002b456524c3bf0a7e6d2f6db Mon Sep 17 00:00:00 2001
From: Vincenzo Cutrona <vincenzo.cutrona@supsi.ch>
Date: Tue, 24 Oct 2023 19:27:33 +0200
Subject: [PATCH 1/2] hide question ID when showing questions and results

---
 .../src/main/resources/templates/live/results.html    | 11 +++++------
 .../src/main/resources/templates/live/survey.html     |  4 +---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/AdapQuestBackend/src/main/resources/templates/live/results.html b/AdapQuestBackend/src/main/resources/templates/live/results.html
index ea77540..1f22a10 100644
--- a/AdapQuestBackend/src/main/resources/templates/live/results.html
+++ b/AdapQuestBackend/src/main/resources/templates/live/results.html
@@ -27,14 +27,13 @@
             <ul>
                 <li th:each="question : ${questions}">
                     <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
index 499e655..d32766f 100644
--- 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"

From 8700eb336f9d5c103fc824e660dd9443329f7f53 Mon Sep 17 00:00:00 2001
From: Vincenzo Cutrona <vincenzo.cutrona@supsi.ch>
Date: Tue, 24 Oct 2023 19:28:09 +0200
Subject: [PATCH 2/2] remove questions with no answers from results

---
 .../src/main/resources/templates/live/results.html             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AdapQuestBackend/src/main/resources/templates/live/results.html b/AdapQuestBackend/src/main/resources/templates/live/results.html
index 1f22a10..af6c662 100644
--- a/AdapQuestBackend/src/main/resources/templates/live/results.html
+++ b/AdapQuestBackend/src/main/resources/templates/live/results.html
@@ -25,7 +25,8 @@
 
         <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.question}"></span>
                     </div>