Display choice and input answers better

application/factory.py

@@ -59,8 +59,13 @@ def global_variables_context_processor():
 
 
 def register_filters(app):
-    from application.filters import map_to_tag_class_filter, slugify_filter
+    from application.filters import (
+        choice_to_list_filter,
+        map_to_tag_class_filter,
+        slugify_filter,
+    )
 
+    app.add_template_filter(choice_to_list_filter, "choice_to_list")
     app.add_template_filter(slugify_filter, "slugify")
     app.add_template_filter(map_to_tag_class_filter, "map_to_tag_class")
 

application/filters.py

@@ -11,3 +11,7 @@ def map_to_tag_class_filter(s):
     if s in stage_to_class.keys():
         return stage_to_class[s]
     return "govuk-tag--blue"
+
+
+def choice_to_list_filter(s):
+    return s.split(";")

application/templates/questions/set.html

@@ -53,7 +53,20 @@ <h3 class="govuk-heading-s">{{ question.format(consideration.name) }}</h3>
               {% elif question.question_type.value == "choose-one-from-list" %}
               <p class="govuk-body">{% if answer %}{{ answer.answer.choice }}{% endif %}</p>
               {% else %}
-              <p class="govuk-body">{% if answer %}{{ answer.answer }}{% endif %}</p>
+              <p class="govuk-body">{% if answer %}
+              {% if answer.answer.text -%}
+                {{ answer.answer.text }}
+              {% elif answer.answer.choice %}
+                {% set choices = answer.answer.choice|choice_to_list %}
+                <ul class="govuk-list govuk-list--bullet">
+                {%- for choice in choices %}
+                  <li>{{ choice }}</li>
+                {% endfor -%}
+               </ul>
+              {%- else -%}
+                {{ answer.answer }}
+              {%- endif %}
+              {% endif %}</p>
               {% endif %}
             {%- endif -%}